From 367fa927b0da1bc0b805e9056d8a49adf989eda2 Mon Sep 17 00:00:00 2001 From: Supun94 Date: Tue, 8 Nov 2016 13:05:02 +0530 Subject: [PATCH] Changed policy decision point package structure --- .../pom.xml | 12 ++++++------ .../internal/PolicyDecisionPointDataHolder.java | 2 +- .../internal/PolicyEvaluationServiceComponent.java | 6 +++--- .../point/merged/MergedEvaluationPoint.java} | 8 ++++---- components/policy-mgt/pom.xml | 2 +- .../pom.xml | 4 ++-- pom.xml | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) rename components/policy-mgt/{org.wso2.carbon.simple.policy.decision.point => org.wso2.carbon.policy.decision.point}/pom.xml (85%) rename components/policy-mgt/{org.wso2.carbon.simple.policy.decision.point/src/main/java/org/wso2/carbon/simple => org.wso2.carbon.policy.decision.point/src/main/java/org/wso2/carbon}/policy/decision/point/internal/PolicyDecisionPointDataHolder.java (96%) rename components/policy-mgt/{org.wso2.carbon.simple.policy.decision.point/src/main/java/org/wso2/carbon/simple => org.wso2.carbon.policy.decision.point/src/main/java/org/wso2/carbon}/policy/decision/point/internal/PolicyEvaluationServiceComponent.java (95%) rename components/policy-mgt/{org.wso2.carbon.simple.policy.decision.point/src/main/java/org/wso2/carbon/simple/policy/decision/point/SimpleEvaluationPoint.java => org.wso2.carbon.policy.decision.point/src/main/java/org/wso2/carbon/policy/decision/point/merged/MergedEvaluationPoint.java} (95%) diff --git a/components/policy-mgt/org.wso2.carbon.simple.policy.decision.point/pom.xml b/components/policy-mgt/org.wso2.carbon.policy.decision.point/pom.xml similarity index 85% rename from components/policy-mgt/org.wso2.carbon.simple.policy.decision.point/pom.xml rename to components/policy-mgt/org.wso2.carbon.policy.decision.point/pom.xml index 79ffd12b1e..809f31731d 100644 --- a/components/policy-mgt/org.wso2.carbon.simple.policy.decision.point/pom.xml +++ b/components/policy-mgt/org.wso2.carbon.policy.decision.point/pom.xml @@ -9,11 +9,11 @@ 4.0.0 org.wso2.carbon.devicemgt - org.wso2.carbon.simple.policy.decision.point + org.wso2.carbon.policy.decision.point 2.0.4-SNAPSHOT bundle - WSO2 Carbon - Simple Policy Decision Point - WSO2 Carbon - Simple Policy Decision Point + WSO2 Carbon - Policy Decision Point + WSO2 Carbon - Policy Decision Point http://wso2.org @@ -32,8 +32,8 @@ ${project.artifactId} ${project.artifactId} ${carbon.device.mgt.version} - Simple Policy Decision Point Bundle - org.wso2.carbon.simple.policy.decision.point.internal + Policy Decision Point Bundle + org.wso2.carbon.policy.decision.point.internal org.wso2.carbon.context.*; org.osgi.framework, @@ -45,7 +45,7 @@ org.wso2.carbon.device.mgt.common.* - org.wso2.carbon.simple.policy.decision.point.* + org.wso2.carbon.policy.decision.point.* diff --git a/components/policy-mgt/org.wso2.carbon.simple.policy.decision.point/src/main/java/org/wso2/carbon/simple/policy/decision/point/internal/PolicyDecisionPointDataHolder.java b/components/policy-mgt/org.wso2.carbon.policy.decision.point/src/main/java/org/wso2/carbon/policy/decision/point/internal/PolicyDecisionPointDataHolder.java similarity index 96% rename from components/policy-mgt/org.wso2.carbon.simple.policy.decision.point/src/main/java/org/wso2/carbon/simple/policy/decision/point/internal/PolicyDecisionPointDataHolder.java rename to components/policy-mgt/org.wso2.carbon.policy.decision.point/src/main/java/org/wso2/carbon/policy/decision/point/internal/PolicyDecisionPointDataHolder.java index 7b5d104ea1..41909fbd49 100644 --- a/components/policy-mgt/org.wso2.carbon.simple.policy.decision.point/src/main/java/org/wso2/carbon/simple/policy/decision/point/internal/PolicyDecisionPointDataHolder.java +++ b/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; diff --git a/components/policy-mgt/org.wso2.carbon.simple.policy.decision.point/src/main/java/org/wso2/carbon/simple/policy/decision/point/internal/PolicyEvaluationServiceComponent.java b/components/policy-mgt/org.wso2.carbon.policy.decision.point/src/main/java/org/wso2/carbon/policy/decision/point/internal/PolicyEvaluationServiceComponent.java similarity index 95% rename from components/policy-mgt/org.wso2.carbon.simple.policy.decision.point/src/main/java/org/wso2/carbon/simple/policy/decision/point/internal/PolicyEvaluationServiceComponent.java rename to components/policy-mgt/org.wso2.carbon.policy.decision.point/src/main/java/org/wso2/carbon/policy/decision/point/internal/PolicyEvaluationServiceComponent.java index 74dcca1eec..1ede6cb522 100644 --- a/components/policy-mgt/org.wso2.carbon.simple.policy.decision.point/src/main/java/org/wso2/carbon/simple/policy/decision/point/internal/PolicyEvaluationServiceComponent.java +++ b/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"); } diff --git a/components/policy-mgt/org.wso2.carbon.simple.policy.decision.point/src/main/java/org/wso2/carbon/simple/policy/decision/point/SimpleEvaluationPoint.java b/components/policy-mgt/org.wso2.carbon.policy.decision.point/src/main/java/org/wso2/carbon/policy/decision/point/merged/MergedEvaluationPoint.java similarity index 95% rename from components/policy-mgt/org.wso2.carbon.simple.policy.decision.point/src/main/java/org/wso2/carbon/simple/policy/decision/point/SimpleEvaluationPoint.java rename to components/policy-mgt/org.wso2.carbon.policy.decision.point/src/main/java/org/wso2/carbon/policy/decision/point/merged/MergedEvaluationPoint.java index 3c5e8b3275..b56c459992 100644 --- a/components/policy-mgt/org.wso2.carbon.simple.policy.decision.point/src/main/java/org/wso2/carbon/simple/policy/decision/point/SimpleEvaluationPoint.java +++ b/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 policyList; PIPDevice pipDevice; diff --git a/components/policy-mgt/pom.xml b/components/policy-mgt/pom.xml index 97d2d59b09..e7451e8627 100644 --- a/components/policy-mgt/pom.xml +++ b/components/policy-mgt/pom.xml @@ -38,7 +38,7 @@ org.wso2.carbon.policy.mgt.common org.wso2.carbon.policy.mgt.core org.wso2.carbon.policy.information.point - org.wso2.carbon.simple.policy.decision.point + org.wso2.carbon.policy.decision.point org.wso2.carbon.complex.policy.decision.point diff --git a/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml b/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml index 2c140da41f..8740cff8d6 100644 --- a/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml +++ b/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml @@ -47,7 +47,7 @@ org.wso2.carbon.devicemgt - org.wso2.carbon.simple.policy.decision.point + org.wso2.carbon.policy.decision.point org.wso2.carbon.devicemgt @@ -118,7 +118,7 @@ org.wso2.carbon.devicemgt:org.wso2.carbon.policy.mgt.common:${carbon.device.mgt.version} - 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} org.wso2.carbon.devicemgt:org.wso2.carbon.policy.information.point:${carbon.device.mgt.version} diff --git a/pom.xml b/pom.xml index cb38b4867c..2f3b5f5c42 100644 --- a/pom.xml +++ b/pom.xml @@ -195,7 +195,7 @@ org.wso2.carbon.devicemgt - org.wso2.carbon.simple.policy.decision.point + org.wso2.carbon.policy.decision.point ${carbon.device.mgt.version}