From 936e71a7435f699e41d383bac1d9818449e1b353 Mon Sep 17 00:00:00 2001
From: Supun94 <supunpramoda@gmail.com>
Date: Tue, 8 Nov 2016 14:28:18 +0530
Subject: [PATCH] Adding configurations for different policy evaluation service
 components

---
 .../mgt/core/config/policy/PolicyConfiguration.java    | 10 ++++++++++
 .../carbon-home/repository/conf/cdm-config.xml         |  2 ++
 .../src/main/resources/conf/cdm-config.xml             |  2 ++
 3 files changed, 14 insertions(+)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/policy/PolicyConfiguration.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/policy/PolicyConfiguration.java
index 73d3517d83..56a5fe4cf2 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/policy/PolicyConfiguration.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/policy/PolicyConfiguration.java
@@ -33,6 +33,7 @@ public class PolicyConfiguration {
     private int minRetriesToMarkUnreachable;
     private int minRetriesToMarkInactive;
     private List<String> platforms;
+    private String  policyEvaluationPointName;
 
     @XmlElement(name = "MonitoringClass", required = true)
     public String getMonitoringClass() {
@@ -98,4 +99,13 @@ public class PolicyConfiguration {
         this.platforms = platforms;
     }
 
+    @XmlElement(name = "PolicyEvaluationPointName", required = true)
+    public String getPolicyEvaluationPointName() {
+        return policyEvaluationPointName;
+    }
+
+    public void setPolicyEvaluationPointName(String policyEvaluationPointName) {
+        this.policyEvaluationPointName = policyEvaluationPointName;
+    }
+
 }
diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml
index 0f5861cc1d..559cc3edd5 100644
--- a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml
+++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml
@@ -42,6 +42,8 @@
             <maxRetries>5</maxRetries>
             <minRetriesToMarkUnreachable>8</minRetriesToMarkUnreachable>
             <minRetriesToMarkInactive>20</minRetriesToMarkInactive>
+            <!--<PolicyEvaluationPointName>SimplePolicyEvaluationServiceComponent</PolicyEvaluationPointName>-->
+            <PolicyEvaluationPointName>MergedPolicyEvaluationServiceComponent</PolicyEvaluationPointName>
         </PolicyConfiguration>
     </ManagementRepository>
 </DeviceMgtConfiguration>
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml
index 1f76b3dacd..9e326a4f03 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml
@@ -43,6 +43,8 @@
         <MaxRetries>5</MaxRetries>
         <MinRetriesToMarkUnreachable>8</MinRetriesToMarkUnreachable>
         <MinRetriesToMarkInactive>20</MinRetriesToMarkInactive>
+        <!--<PolicyEvaluationPointName>SimplePolicyEvaluationServiceComponent</PolicyEvaluationPointName>-->
+        <PolicyEvaluationPointName>MergedPolicyEvaluationServiceComponent</PolicyEvaluationPointName>
         <Platforms>
             <Platform>android</Platform>
             <Platform>ios</Platform>