Changed policy decision point package structure

components/policy-mgt/org.wso2.carbon.policy.decision.point/pom.xml

@@ -9,11 +9,11 @@
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
-    <artifactId>org.wso2.carbon.simple.policy.decision.point</artifactId>
+    <artifactId>org.wso2.carbon.policy.decision.point</artifactId>
     <version>2.0.4-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>WSO2 Carbon - Simple Policy Decision Point</name>
-    <description>WSO2 Carbon - Simple Policy Decision Point</description>
+    <name>WSO2 Carbon - Policy Decision Point</name>
+    <description>WSO2 Carbon - Policy Decision Point</description>
     <url>http://wso2.org</url>
 
     <build>
@@ -32,8 +32,8 @@
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
-                        <Bundle-Description>Simple Policy Decision Point Bundle</Bundle-Description>
-                        <Private-Package>org.wso2.carbon.simple.policy.decision.point.internal</Private-Package>
+                        <Bundle-Description>Policy Decision Point Bundle</Bundle-Description>
+                        <Private-Package>org.wso2.carbon.policy.decision.point.internal</Private-Package>
                         <Import-Package>
                             org.wso2.carbon.context.*;
                             org.osgi.framework,
@@ -45,7 +45,7 @@
                             org.wso2.carbon.device.mgt.common.*
                         </Import-Package>
                         <Export-Package>
-                            org.wso2.carbon.simple.policy.decision.point.*
+                            org.wso2.carbon.policy.decision.point.*
                         </Export-Package>
                     </instructions>
                 </configuration>

components/policy-mgt/org.wso2.carbon.policy.decision.point/src/main/java/org/wso2/carbon/policy/decision/point/internal/PolicyDecisionPointDataHolder.java

@@ -16,7 +16,7 @@
 * under the License.
 */
 
-package org.wso2.carbon.simple.policy.decision.point.internal;
+package org.wso2.carbon.policy.decision.point.internal;
 
 import org.wso2.carbon.policy.mgt.core.PolicyManagerService;
 import org.wso2.carbon.user.core.service.RealmService;

components/policy-mgt/org.wso2.carbon.policy.decision.point/src/main/java/org/wso2/carbon/policy/decision/point/internal/PolicyEvaluationServiceComponent.java

@@ -16,14 +16,14 @@
 * under the License.
 */
 
-package org.wso2.carbon.simple.policy.decision.point.internal;
+package org.wso2.carbon.policy.decision.point.internal;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.osgi.service.component.ComponentContext;
+import org.wso2.carbon.policy.decision.point.merged.MergedEvaluationPoint;
 import org.wso2.carbon.policy.mgt.common.PolicyEvaluationPoint;
 import org.wso2.carbon.policy.mgt.core.PolicyManagerService;
-import org.wso2.carbon.simple.policy.decision.point.SimpleEvaluationPoint;
 import org.wso2.carbon.user.core.service.RealmService;
 
 /**
@@ -54,7 +54,7 @@ public class PolicyEvaluationServiceComponent {
         try {
             //TODO: fetch PEP class from config
             componentContext.getBundleContext().registerService(PolicyEvaluationPoint.class.getName(),
-                    new SimpleEvaluationPoint(), null);
+                    new MergedEvaluationPoint(), null);
         } catch (Throwable t) {
             log.error("Error occurred while initializing the simple policy evaluation bundle");
         }

components/policy-mgt/org.wso2.carbon.policy.decision.point/src/main/java/org/wso2/carbon/policy/decision/point/merged/MergedEvaluationPoint.java

@@ -16,7 +16,7 @@
 * under the License.
 */
 
-package org.wso2.carbon.simple.policy.decision.point;
+package org.wso2.carbon.policy.decision.point.merged;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -24,14 +24,14 @@ import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.policy.mgt.common.*;
 import org.wso2.carbon.policy.mgt.core.PolicyManagerService;
-import org.wso2.carbon.simple.policy.decision.point.internal.PolicyDecisionPointDataHolder;
+import org.wso2.carbon.policy.decision.point.internal.PolicyDecisionPointDataHolder;
 
 import java.sql.Timestamp;
 import java.util.*;
 
-public class SimpleEvaluationPoint implements PolicyEvaluationPoint {
+public class MergedEvaluationPoint implements PolicyEvaluationPoint {
 
-    private static final Log log = LogFactory.getLog(SimpleEvaluationPoint.class);
+    private static final Log log = LogFactory.getLog(MergedEvaluationPoint.class);
     private PolicyManagerService policyManagerService;
     private List<Policy> policyList;
     PIPDevice pipDevice;

components/policy-mgt/pom.xml

@@ -38,7 +38,7 @@
         <module>org.wso2.carbon.policy.mgt.common</module>
         <module>org.wso2.carbon.policy.mgt.core</module>
         <module>org.wso2.carbon.policy.information.point</module>
-        <module>org.wso2.carbon.simple.policy.decision.point</module>
+        <module>org.wso2.carbon.policy.decision.point</module>
         <module>org.wso2.carbon.complex.policy.decision.point</module>
     </modules>
 

features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml

@@ -47,7 +47,7 @@
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon.devicemgt</groupId>
-            <artifactId>org.wso2.carbon.simple.policy.decision.point</artifactId>
+            <artifactId>org.wso2.carbon.policy.decision.point</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon.devicemgt</groupId>
@@ -118,7 +118,7 @@
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.policy.mgt.common:${carbon.device.mgt.version}
                                 </bundleDef>
                                 <bundleDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.simple.policy.decision.point:${carbon.device.mgt.version}
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.policy.decision.point:${carbon.device.mgt.version}
                                 </bundleDef>
                                 <bundleDef>
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.policy.information.point:${carbon.device.mgt.version}

pom.xml

@@ -195,7 +195,7 @@
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt</groupId>
-                <artifactId>org.wso2.carbon.simple.policy.decision.point</artifactId>
+                <artifactId>org.wso2.carbon.policy.decision.point</artifactId>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
             <dependency>