refactored policy mgt component

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.pull.notification/pom.xml

@@ -52,7 +52,7 @@
 		</dependency>
 		<dependency>
 			<groupId>io.entgra.device.mgt.core</groupId>
-			<artifactId>org.wso2.carbon.policy.mgt.core</artifactId>
+			<artifactId>io.entgra.device.mgt.core.policy.mgt.core</artifactId>
 		</dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
@@ -87,8 +87,8 @@
                             org.apache.commons.logging,
                             org.wso2.carbon.device.mgt.common.*,
                             org.wso2.carbon.device.mgt.core.service
-                            org.wso2.carbon.policy.mgt.core.*,
-                            org.wso2.carbon.policy.mgt.core,
+                            io.entgra.device.mgt.core.policy.mgt.core.*,
+                            io.entgra.device.mgt.core.policy.mgt.core,
                             com.google.gson,
                             org.wso2.carbon.device.mgt.core.service.*,
                             io.entgra.application.mgt.common.*,

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.pull.notification/src/main/java/org/wso2/carbon/device/mgt/extensions/pull/notification/internal/PullNotificationDataHolder.java

@@ -20,7 +20,7 @@ package org.wso2.carbon.device.mgt.extensions.pull.notification.internal;
 
 import io.entgra.application.mgt.common.services.ApplicationManager;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
-import org.wso2.carbon.policy.mgt.core.PolicyManagerService;
+import io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerService;
 
 public class PullNotificationDataHolder {
 

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.pull.notification/src/main/java/org/wso2/carbon/device/mgt/extensions/pull/notification/internal/PullNotificationServiceComponent.java

@@ -23,7 +23,7 @@ import org.apache.commons.logging.LogFactory;
 import org.osgi.service.component.ComponentContext;
 import io.entgra.application.mgt.common.services.ApplicationManager;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
-import org.wso2.carbon.policy.mgt.core.PolicyManagerService;
+import io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerService;
 
 /**
  * @scr.component name="org.wso2.carbon.device.mgt.extensions.pull.notification.internal.PullNotificationServiceComponent" immediate="true"
@@ -33,8 +33,8 @@ import org.wso2.carbon.policy.mgt.core.PolicyManagerService;
  * policy="dynamic"
  * bind="setDeviceManagementProviderService"
  * unbind="unsetDeviceManagementProviderService"
- * @scr.reference name="org.wso2.carbon.policy.mgt.core"
- * interface="org.wso2.carbon.policy.mgt.core.PolicyManagerService"
+ * @scr.reference name="io.entgra.device.mgt.core.policy.mgt.core"
+ * interface="io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerService"
  * cardinality="1..1"
  * policy="dynamic"
  * bind="setPolicyManagerService"

components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml

@@ -227,7 +227,7 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.policy.mgt.core</artifactId>
+            <artifactId>io.entgra.device.mgt.core.policy.mgt.core</artifactId>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/ConfigurationServiceImpl.java

@@ -30,8 +30,8 @@ import org.wso2.carbon.device.mgt.jaxrs.service.api.ConfigurationManagementServi
 import org.wso2.carbon.device.mgt.jaxrs.service.impl.util.RequestValidationUtil;
 import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtAPIUtils;
 import org.wso2.carbon.device.mgt.common.MDMAppConstants;
-import org.wso2.carbon.policy.mgt.common.PolicyManagementException;
-import org.wso2.carbon.policy.mgt.core.util.PolicyManagerUtil;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyManagementException;
+import io.entgra.device.mgt.core.policy.mgt.core.util.PolicyManagerUtil;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceAgentServiceImpl.java

@@ -49,8 +49,8 @@ import org.wso2.carbon.event.stream.stub.EventStreamAdminServiceStub;
 import org.wso2.carbon.event.stream.stub.types.EventStreamAttributeDto;
 import org.wso2.carbon.event.stream.stub.types.EventStreamDefinitionDto;
 import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException;
-import org.wso2.carbon.policy.mgt.common.PolicyAdministratorPoint;
-import org.wso2.carbon.policy.mgt.common.PolicyManagementException;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyAdministratorPoint;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyManagementException;
 import org.wso2.carbon.user.api.UserStoreException;
 
 import javax.validation.Valid;

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java

@@ -107,8 +107,8 @@ import org.wso2.carbon.identity.jwt.client.extension.JWTClient;
 import org.wso2.carbon.identity.jwt.client.extension.dto.AccessTokenInfo;
 import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException;
 import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService;
-import org.wso2.carbon.policy.mgt.common.PolicyManagementException;
-import org.wso2.carbon.policy.mgt.core.PolicyManagerService;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyManagementException;
+import io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerService;
 import org.wso2.carbon.user.api.UserStoreException;
 import org.wso2.carbon.utils.multitenancy.MultitenantUtils;
 

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImpl.java

@@ -62,8 +62,8 @@ import org.wso2.carbon.device.mgt.jaxrs.beans.RoleList;
 import org.wso2.carbon.device.mgt.jaxrs.service.api.GroupManagementService;
 import org.wso2.carbon.device.mgt.jaxrs.service.impl.util.RequestValidationUtil;
 import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtAPIUtils;
-import org.wso2.carbon.policy.mgt.common.PolicyAdministratorPoint;
-import org.wso2.carbon.policy.mgt.common.PolicyManagementException;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyAdministratorPoint;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyManagementException;
 
 import javax.ws.rs.DefaultValue;
 import javax.ws.rs.GET;

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/PolicyManagementServiceImpl.java

@@ -56,9 +56,9 @@ import org.wso2.carbon.device.mgt.jaxrs.service.impl.util.RequestValidationUtil;
 import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtAPIUtils;
 import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtUtil;
 import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
-import org.wso2.carbon.policy.mgt.common.PolicyAdministratorPoint;
-import org.wso2.carbon.policy.mgt.common.PolicyManagementException;
-import org.wso2.carbon.policy.mgt.core.PolicyManagerService;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyAdministratorPoint;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyManagementException;
+import io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerService;
 
 import javax.validation.Valid;
 import javax.ws.rs.*;
@@ -80,7 +80,7 @@ public class PolicyManagementServiceImpl implements PolicyManagementService {
     @POST
     @Override
     public Response addPolicy(@Valid PolicyWrapper policyWrapper) {
-        List<org.wso2.carbon.policy.mgt.common.ProfileFeature> features = RequestValidationUtil
+        List<io.entgra.device.mgt.core.policy.mgt.common.ProfileFeature> features = RequestValidationUtil
                 .validatePolicyDetails(policyWrapper);
         // validation failure results;
         if (!features.isEmpty()) {
@@ -230,7 +230,7 @@ public class PolicyManagementServiceImpl implements PolicyManagementService {
     @Path("/{id}")
     @Override
     public Response updatePolicy(@PathParam("id") int id, @Valid PolicyWrapper policyWrapper) {
-        List<org.wso2.carbon.policy.mgt.common.ProfileFeature> features = RequestValidationUtil
+        List<io.entgra.device.mgt.core.policy.mgt.common.ProfileFeature> features = RequestValidationUtil
                 .validatePolicyDetails(policyWrapper);
         // validation failure results;
         if (!features.isEmpty()) {
@@ -483,7 +483,7 @@ public class PolicyManagementServiceImpl implements PolicyManagementService {
     @Path("/validate")
     @Override
     public Response validatePolicy(List<ProfileFeature> profileFeaturesList) {
-        List<org.wso2.carbon.policy.mgt.common.ProfileFeature> features
+        List<io.entgra.device.mgt.core.policy.mgt.common.ProfileFeature> features
                 = RequestValidationUtil.validateProfileFeatures(profileFeaturesList);
         // validation failure results;
         if (!features.isEmpty()) {

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/util/RequestValidationUtil.java

@@ -52,7 +52,7 @@ import org.wso2.carbon.device.mgt.jaxrs.beans.Scope;
 import org.wso2.carbon.device.mgt.jaxrs.exception.BadRequestException;
 import org.wso2.carbon.device.mgt.jaxrs.util.Constants;
 import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtAPIUtils;
-import org.wso2.carbon.policy.mgt.common.PolicyPayloadValidator;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyPayloadValidator;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
@@ -336,7 +336,7 @@ public class RequestValidationUtil {
         }
     }
 
-    public static List<org.wso2.carbon.policy.mgt.common.ProfileFeature> validatePolicyDetails(
+    public static List<io.entgra.device.mgt.core.policy.mgt.common.ProfileFeature> validatePolicyDetails(
             PolicyWrapper policyWrapper) {
         if (policyWrapper == null) {
             String msg = "Found an empty policy";
@@ -348,7 +348,7 @@ public class RequestValidationUtil {
         return validateProfileFeatures(policyWrapper.getProfile().getProfileFeaturesList());
     }
 
-    public static List<org.wso2.carbon.policy.mgt.common.ProfileFeature> validateProfileFeatures
+    public static List<io.entgra.device.mgt.core.policy.mgt.common.ProfileFeature> validateProfileFeatures
             (List<ProfileFeature> profileFeatures) {
 
         if (profileFeatures.isEmpty()) {
@@ -357,7 +357,7 @@ public class RequestValidationUtil {
             throw new InputValidationException(new ErrorResponse.ErrorResponseBuilder()
                     .setCode(HttpStatus.SC_BAD_REQUEST).setMessage(msg).build());
         } else {
-            List<org.wso2.carbon.policy.mgt.common.ProfileFeature> features = new ArrayList<>();
+            List<io.entgra.device.mgt.core.policy.mgt.common.ProfileFeature> features = new ArrayList<>();
             String deviceType = null;
             for (ProfileFeature profileFeature : profileFeatures) {
                 if (StringUtils.isBlank(profileFeature.getDeviceTypeId())) {
@@ -373,7 +373,7 @@ public class RequestValidationUtil {
                             .setCode(HttpStatus.SC_BAD_REQUEST).setMessage(msg).build());
                 }
                 deviceType = profileFeature.getDeviceTypeId();
-                org.wso2.carbon.policy.mgt.common.ProfileFeature feature = new org.wso2.carbon.policy.mgt.common.ProfileFeature();
+                io.entgra.device.mgt.core.policy.mgt.common.ProfileFeature feature = new io.entgra.device.mgt.core.policy.mgt.common.ProfileFeature();
                 feature.setContent(profileFeature.getContent());
                 feature.setDeviceType(profileFeature.getDeviceTypeId());
                 feature.setFeatureCode(profileFeature.getFeatureCode());

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/util/DeviceMgtAPIUtils.java

@@ -109,9 +109,9 @@ import org.wso2.carbon.identity.user.store.count.UserStoreCountRetriever;
 import org.wso2.carbon.identity.user.store.count.exception.UserStoreCounterException;
 import org.wso2.carbon.identity.user.store.count.jdbc.JDBCCountRetrieverFactory;
 import org.wso2.carbon.identity.user.store.count.jdbc.internal.InternalCountRetrieverFactory;
-import org.wso2.carbon.policy.mgt.common.PolicyMonitoringTaskException;
-import org.wso2.carbon.policy.mgt.core.PolicyManagerService;
-import org.wso2.carbon.policy.mgt.core.task.TaskScheduleService;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyMonitoringTaskException;
+import io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerService;
+import io.entgra.device.mgt.core.policy.mgt.core.task.TaskScheduleService;
 import org.wso2.carbon.registry.core.service.RegistryService;
 import org.wso2.carbon.user.api.*;
 import org.wso2.carbon.user.core.jdbc.JDBCUserStoreManager;

components/device-mgt/org.wso2.carbon.device.mgt.api/src/test/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/ActivityProviderServiceImplTest.java

@@ -44,7 +44,7 @@ import org.wso2.carbon.device.mgt.jaxrs.service.api.ActivityInfoProviderService;
 import org.wso2.carbon.device.mgt.jaxrs.service.api.DeviceManagementService;
 import org.wso2.carbon.device.mgt.jaxrs.service.impl.util.RequestValidationUtil;
 import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtAPIUtils;
-import org.wso2.carbon.policy.mgt.core.util.PolicyManagerUtil;
+import io.entgra.device.mgt.core.policy.mgt.core.util.PolicyManagerUtil;
 
 import javax.ws.rs.core.Response;
 import java.util.ArrayList;

components/device-mgt/org.wso2.carbon.device.mgt.api/src/test/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/ConfigurationServiceImplTest.java

@@ -35,7 +35,7 @@ import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration
 import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfigurationManagementService;
 import org.wso2.carbon.device.mgt.jaxrs.service.api.ConfigurationManagementService;
 import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtAPIUtils;
-import org.wso2.carbon.policy.mgt.core.util.PolicyManagerUtil;
+import io.entgra.device.mgt.core.policy.mgt.core.util.PolicyManagerUtil;
 
 import javax.ws.rs.core.Response;
 import java.util.ArrayList;

components/device-mgt/org.wso2.carbon.device.mgt.api/src/test/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceAgentServiceTest.java

@@ -54,8 +54,8 @@ import org.wso2.carbon.event.stream.stub.EventStreamAdminServiceStub;
 import org.wso2.carbon.event.stream.stub.types.EventStreamAttributeDto;
 import org.wso2.carbon.event.stream.stub.types.EventStreamDefinitionDto;
 import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException;
-import org.wso2.carbon.policy.mgt.core.PolicyManagerService;
-import org.wso2.carbon.policy.mgt.core.PolicyManagerServiceImpl;
+import io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerService;
+import io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerServiceImpl;
 import org.wso2.carbon.user.api.UserStoreException;
 import org.wso2.carbon.utils.CarbonUtils;
 

components/device-mgt/org.wso2.carbon.device.mgt.api/src/test/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImplTest.java

@@ -73,8 +73,8 @@ import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderServiceIm
 import org.wso2.carbon.device.mgt.jaxrs.service.api.DeviceManagementService;
 import org.wso2.carbon.device.mgt.jaxrs.service.impl.util.DeviceMgtAPITestHelper;
 import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtAPIUtils;
-import org.wso2.carbon.policy.mgt.common.PolicyManagementException;
-import org.wso2.carbon.policy.mgt.core.PolicyManagerService;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyManagementException;
+import io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerService;
 import org.wso2.carbon.user.core.service.RealmService;
 import org.wso2.carbon.utils.multitenancy.MultitenantUtils;
 

components/device-mgt/org.wso2.carbon.device.mgt.api/src/test/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImplTest.java

@@ -63,7 +63,7 @@ import org.wso2.carbon.device.mgt.core.service.GroupManagementProviderService;
 import org.wso2.carbon.device.mgt.jaxrs.beans.DeviceToGroupsAssignment;
 import org.wso2.carbon.device.mgt.jaxrs.service.api.GroupManagementService;
 import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtAPIUtils;
-import org.wso2.carbon.policy.mgt.core.PolicyManagerService;
+import io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerService;
 
 import javax.ws.rs.core.Response;
 import java.util.ArrayList;

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/utility.js

@@ -62,7 +62,7 @@ utility = function () {
     };
 
     publicMethods.getPolicyManagementService = function () {
-        return getOsgiService("org.wso2.carbon.policy.mgt.core.PolicyManagerService");
+        return getOsgiService("io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerService");
     };
 
     publicMethods.getDeviceTypeConfig = function (deviceType) {

components/policy-mgt/io.entgra.device.mgt.core.policy.decision.point/pom.xml

@@ -8,8 +8,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>io.entgra.device.mgt.core</groupId>
-    <artifactId>org.wso2.carbon.policy.decision.point</artifactId>
+    <artifactId>io.entgra.device.mgt.core.policy.decision.point</artifactId>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Policy Decision Point</name>
     <description>WSO2 Carbon - Policy Decision Point</description>
@@ -32,19 +31,19 @@
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
                         <Bundle-Description>Policy Decision Point Bundle</Bundle-Description>
-                        <Private-Package>org.wso2.carbon.policy.decision.point.internal</Private-Package>
+                        <Private-Package>io.entgra.device.mgt.core.policy.decision.point.internal</Private-Package>
                         <Import-Package>
                             org.wso2.carbon.context;version="${carbon.kernel.version.range}",
                             org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
                             org.osgi.service.*;version="${imp.package.version.osgi.service}",
                             org.apache.commons.logging,
-                            org.wso2.carbon.policy.mgt.common.*,
-                            org.wso2.carbon.policy.mgt.core.*,
+                            io.entgra.device.mgt.core.policy.mgt.common.*,
+                            io.entgra.device.mgt.core.policy.mgt.core.*,
                             org.wso2.carbon.user.core.*,
                             org.wso2.carbon.device.mgt.common.*
                         </Import-Package>
                         <Export-Package>
-                            org.wso2.carbon.policy.decision.point.*
+                            io.entgra.device.mgt.core.policy.decision.point.*
                         </Export-Package>
                     </instructions>
                 </configuration>
@@ -92,11 +91,11 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.policy.mgt.common</artifactId>
+            <artifactId>io.entgra.device.mgt.core.policy.mgt.common</artifactId>
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.policy.mgt.core</artifactId>
+            <artifactId>io.entgra.device.mgt.core.policy.mgt.core</artifactId>
         </dependency>
     </dependencies>
 </project>

components/policy-mgt/io.entgra.device.mgt.core.policy.decision.point/src/main/java/io/entgra/device/mgt/core/policy/decision/point/internal/MergedPolicyEvaluationServiceComponent.java

@@ -16,14 +16,14 @@
 * under the License.
 */
 
-package org.wso2.carbon.policy.decision.point.internal;
+package io.entgra.device.mgt.core.policy.decision.point.internal;
 
+import io.entgra.device.mgt.core.policy.decision.point.merged.MergedEvaluationPoint;
 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 io.entgra.device.mgt.core.policy.mgt.common.PolicyEvaluationPoint;
+import io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerService;
 import org.wso2.carbon.user.core.service.RealmService;
 
 /**
@@ -35,7 +35,7 @@ import org.wso2.carbon.user.core.service.RealmService;
  * bind="setRealmService"
  * unbind="unsetRealmService"
  * @scr.reference name="org.wso2.carbon.devicemgt.policy.manager"
- * interface="org.wso2.carbon.policy.mgt.core.PolicyManagerService"
+ * interface="io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerService"
  * cardinality="0..1"
  * policy="dynamic"
  * bind="setPolicyManagerService"

components/policy-mgt/io.entgra.device.mgt.core.policy.decision.point/src/main/java/io/entgra/device/mgt/core/policy/decision/point/internal/PolicyDecisionPointDataHolder.java

@@ -16,9 +16,9 @@
 * under the License.
 */
 
-package org.wso2.carbon.policy.decision.point.internal;
+package io.entgra.device.mgt.core.policy.decision.point.internal;
 
-import org.wso2.carbon.policy.mgt.core.PolicyManagerService;
+import io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerService;
 import org.wso2.carbon.user.core.service.RealmService;
 
 public class PolicyDecisionPointDataHolder {

components/policy-mgt/io.entgra.device.mgt.core.policy.decision.point/src/main/java/io/entgra/device/mgt/core/policy/decision/point/internal/PolicyEvaluationServiceComponent.java

@@ -16,16 +16,14 @@
 * under the License.
 */
 
-package org.wso2.carbon.policy.decision.point.internal;
+package io.entgra.device.mgt.core.policy.decision.point.internal;
 
+import io.entgra.device.mgt.core.policy.decision.point.simple.PolicyEvaluationServiceImpl;
 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.decision.point.simple.PolicyEvaluationServiceImpl;
-import org.wso2.carbon.policy.decision.point.simple.SimpleEvaluationImpl;
-import org.wso2.carbon.policy.mgt.common.PolicyEvaluationPoint;
-import org.wso2.carbon.policy.mgt.core.PolicyManagerService;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyEvaluationPoint;
+import io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerService;
 import org.wso2.carbon.user.core.service.RealmService;
 
 /**
@@ -37,7 +35,7 @@ import org.wso2.carbon.user.core.service.RealmService;
  * bind="setRealmService"
  * unbind="unsetRealmService"
  * @scr.reference name="org.wso2.carbon.devicemgt.policy.manager"
- * interface="org.wso2.carbon.policy.mgt.core.PolicyManagerService"
+ * interface="io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerService"
  * cardinality="0..1"
  * policy="dynamic"
  * bind="setPolicyManagerService"

components/policy-mgt/io.entgra.device.mgt.core.policy.decision.point/src/main/java/io/entgra/device/mgt/core/policy/decision/point/merged/MergedEvaluationPoint.java

@@ -16,8 +16,9 @@
 * under the License.
 */
 
-package org.wso2.carbon.policy.decision.point.merged;
+package io.entgra.device.mgt.core.policy.decision.point.merged;
 
+import io.entgra.device.mgt.core.policy.decision.point.internal.PolicyDecisionPointDataHolder;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
@@ -25,9 +26,8 @@ import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
 import org.wso2.carbon.device.mgt.common.policy.mgt.Profile;
 import org.wso2.carbon.device.mgt.common.policy.mgt.ProfileFeature;
-import org.wso2.carbon.policy.mgt.common.*;
-import org.wso2.carbon.policy.mgt.core.PolicyManagerService;
-import org.wso2.carbon.policy.decision.point.internal.PolicyDecisionPointDataHolder;
+import io.entgra.device.mgt.core.policy.mgt.common.*;
+import io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerService;
 
 import java.sql.Timestamp;
 import java.util.*;

components/policy-mgt/io.entgra.device.mgt.core.policy.decision.point/src/main/java/io/entgra/device/mgt/core/policy/decision/point/simple/PolicyEvaluationServiceImpl.java

@@ -16,12 +16,12 @@
 * under the License.
 */
 
-package org.wso2.carbon.policy.decision.point.simple;
+package io.entgra.device.mgt.core.policy.decision.point.simple;
 
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
-import org.wso2.carbon.policy.mgt.common.PolicyEvaluationException;
-import org.wso2.carbon.policy.mgt.common.PolicyEvaluationPoint;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyEvaluationException;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyEvaluationPoint;
 import org.wso2.carbon.device.mgt.common.policy.mgt.ProfileFeature;
 
 import java.util.List;

components/policy-mgt/io.entgra.device.mgt.core.policy.decision.point/src/main/java/io/entgra/device/mgt/core/policy/decision/point/simple/SimpleEvaluation.java

@@ -17,11 +17,11 @@
 */
 
 
-package org.wso2.carbon.policy.decision.point.simple;
+package io.entgra.device.mgt.core.policy.decision.point.simple;
 
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
-import org.wso2.carbon.policy.mgt.common.PolicyEvaluationException;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyEvaluationException;
 
 public interface SimpleEvaluation  {
 

components/policy-mgt/io.entgra.device.mgt.core.policy.decision.point/src/main/java/io/entgra/device/mgt/core/policy/decision/point/simple/SimpleEvaluationImpl.java

@@ -16,15 +16,15 @@
 * under the License.
 */
 
-package org.wso2.carbon.policy.decision.point.simple;
+package io.entgra.device.mgt.core.policy.decision.point.simple;
 
+import io.entgra.device.mgt.core.policy.decision.point.internal.PolicyDecisionPointDataHolder;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
-import org.wso2.carbon.policy.decision.point.internal.PolicyDecisionPointDataHolder;
-import org.wso2.carbon.policy.mgt.common.*;
-import org.wso2.carbon.policy.mgt.core.PolicyManagerService;
+import io.entgra.device.mgt.core.policy.mgt.common.*;
+import io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerService;
 
 import java.util.ArrayList;
 import java.util.Collections;

components/policy-mgt/io.entgra.device.mgt.core.policy.information.point/pom.xml

@@ -9,8 +9,7 @@
 
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>io.entgra.device.mgt.core</groupId>
-    <artifactId>org.wso2.carbon.policy.information.point</artifactId>
+    <artifactId>io.entgra.device.mgt.core.policy.information.point</artifactId>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Policy Information Point</name>
     <description>WSO2 Carbon - Policy Information Point</description>
@@ -34,10 +33,10 @@
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
                         <Bundle-Description>Policy Information Point Bundle</Bundle-Description>
-                        <Private-Package>org.wso2.carbon.policy.information.point.internal</Private-Package>
-                        <Bundle-Activator>org.wso2.carbon.policy.information.point.internal.PolicyInformationPointBundleActivator</Bundle-Activator>
+                        <Private-Package>io.entgra.device.mgt.core.policy.information.point.internal</Private-Package>
+                        <Bundle-Activator>io.entgra.device.mgt.core.policy.information.point.internal.PolicyInformationPointBundleActivator</Bundle-Activator>
                         <Export-Package>
-                            org.wso2.carbon.policy.information.point.*
+                            io.entgra.device.mgt.core.policy.information.point.*
                         </Export-Package>
                     </instructions>
                 </configuration>
@@ -85,7 +84,7 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.policy.mgt.common</artifactId>
+            <artifactId>io.entgra.device.mgt.core.policy.mgt.common</artifactId>
         </dependency>
     </dependencies>
 

components/policy-mgt/io.entgra.device.mgt.core.policy.information.point/src/main/java/io/entgra/device/mgt/core/policy/information/point/PolicyInformationServiceImpl.java

@@ -16,13 +16,13 @@
 * under the License.
 */
 
-package org.wso2.carbon.policy.information.point;
+package io.entgra.device.mgt.core.policy.information.point;
 
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.Feature;
-import org.wso2.carbon.policy.mgt.common.PIPDevice;
+import io.entgra.device.mgt.core.policy.mgt.common.PIPDevice;
 import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
-import org.wso2.carbon.policy.mgt.common.PolicyInformationPoint;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyInformationPoint;
 
 import java.util.List;
 

components/policy-mgt/io.entgra.device.mgt.core.policy.information.point/src/main/java/io/entgra/device/mgt/core/policy/information/point/internal/PolicyInformationPointBundleActivator.java

@@ -16,15 +16,15 @@
 * under the License.
 */
 
-package org.wso2.carbon.policy.information.point.internal;
+package io.entgra.device.mgt.core.policy.information.point.internal;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
-import org.wso2.carbon.policy.information.point.PolicyInformationServiceImpl;
-import org.wso2.carbon.policy.mgt.common.PolicyInformationPoint;
+import io.entgra.device.mgt.core.policy.information.point.PolicyInformationServiceImpl;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyInformationPoint;
 
 public class PolicyInformationPointBundleActivator implements BundleActivator {
 

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.common/pom.xml

@@ -27,8 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>io.entgra.device.mgt.core</groupId>
-    <artifactId>org.wso2.carbon.policy.mgt.common</artifactId>
+    <artifactId>io.entgra.device.mgt.core.policy.mgt.common</artifactId>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Policy Management Common</name>
     <description>WSO2 Carbon - Policy Management Common</description>
@@ -59,7 +58,7 @@
                             javax.xml.bind.*,
                         </Import-Package>
                         <Export-Package>
-                            org.wso2.carbon.policy.mgt.common.*
+                            io.entgra.device.mgt.core.policy.mgt.common.*
                         </Export-Package>
                     </instructions>
                 </configuration>

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.common/src/main/java/io/entgra/device/mgt/core/policy/mgt/common/Criterion.java

@@ -17,7 +17,7 @@
  */
 
 
-package org.wso2.carbon.policy.mgt.common;
+package io.entgra.device.mgt.core.policy.mgt.common;
 
 public class Criterion {
 

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.common/src/main/java/io/entgra/device/mgt/core/policy/mgt/common/Feature.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.policy.mgt.common;
+package io.entgra.device.mgt.core.policy.mgt.common;
 
 import java.io.Serializable;
 

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.common/src/main/java/io/entgra/device/mgt/core/policy/mgt/common/FeatureManagementException.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.policy.mgt.common;
+package io.entgra.device.mgt.core.policy.mgt.common;
 
 public class FeatureManagementException extends Exception{
 

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.common/src/main/java/io/entgra/device/mgt/core/policy/mgt/common/FeatureManagerService.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.policy.mgt.common;
+package io.entgra.device.mgt.core.policy.mgt.common;
 
 import java.util.List;
 

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.common/src/main/java/io/entgra/device/mgt/core/policy/mgt/common/PIPDevice.java

@@ -16,7 +16,7 @@
 * under the License.
 */
 
-package org.wso2.carbon.policy.mgt.common;
+package io.entgra.device.mgt.core.policy.mgt.common;
 
 
 import org.wso2.carbon.device.mgt.common.Device;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.common/src/main/java/io/entgra/device/mgt/core/policy/mgt/common/PolicyAdministratorPoint.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.policy.mgt.common;
+package io.entgra.device.mgt.core.policy.mgt.common;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.DynamicTaskContext;
 import org.wso2.carbon.device.mgt.common.PaginationRequest;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.common/src/main/java/io/entgra/device/mgt/core/policy/mgt/common/PolicyEvaluationException.java

@@ -16,7 +16,7 @@
 * under the License.
 */
 
-package org.wso2.carbon.policy.mgt.common;
+package io.entgra.device.mgt.core.policy.mgt.common;
 
 public class PolicyEvaluationException extends Exception {
 

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.common/src/main/java/io/entgra/device/mgt/core/policy/mgt/common/PolicyEvaluationPoint.java

@@ -17,7 +17,7 @@
 */
 
 
-package org.wso2.carbon.policy.mgt.common;
+package io.entgra.device.mgt.core.policy.mgt.common;
 
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.common/src/main/java/io/entgra/device/mgt/core/policy/mgt/common/PolicyFilter.java

@@ -34,7 +34,7 @@
  */
 
 
-package org.wso2.carbon.policy.mgt.common;
+package io.entgra.device.mgt.core.policy.mgt.common;
 
 import org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroup;
 import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.common/src/main/java/io/entgra/device/mgt/core/policy/mgt/common/PolicyInformationPoint.java

@@ -17,7 +17,7 @@
 */
 
 
-package org.wso2.carbon.policy.mgt.common;
+package io.entgra.device.mgt.core.policy.mgt.common;
 
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.Feature;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.common/src/main/java/io/entgra/device/mgt/core/policy/mgt/common/PolicyManagementException.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.policy.mgt.common;
+package io.entgra.device.mgt.core.policy.mgt.common;
 
 public class PolicyManagementException extends Exception {
 

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.common/src/main/java/io/entgra/device/mgt/core/policy/mgt/common/PolicyMonitoringTaskException.java

@@ -17,7 +17,7 @@
  */
 
 
-package org.wso2.carbon.policy.mgt.common;
+package io.entgra.device.mgt.core.policy.mgt.common;
 
 public class PolicyMonitoringTaskException extends Exception {
 

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.common/src/main/java/io/entgra/device/mgt/core/policy/mgt/common/PolicyPayloadValidator.java

@@ -16,7 +16,7 @@
  * under the License.
  *
  */
-package org.wso2.carbon.policy.mgt.common;
+package io.entgra.device.mgt.core.policy.mgt.common;
 
 import java.util.List;
 

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.common/src/main/java/io/entgra/device/mgt/core/policy/mgt/common/PolicyTransformException.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.policy.mgt.common;
+package io.entgra.device.mgt.core.policy.mgt.common;
 
 public class PolicyTransformException extends Exception {
 

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.common/src/main/java/io/entgra/device/mgt/core/policy/mgt/common/PolicyVerficationPoint.java

@@ -17,7 +17,7 @@
  */
 
 
-package org.wso2.carbon.policy.mgt.common;
+package io.entgra.device.mgt.core.policy.mgt.common;
 
 public interface PolicyVerficationPoint {
 

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.common/src/main/java/io/entgra/device/mgt/core/policy/mgt/common/ProfileFeature.java

@@ -17,7 +17,7 @@
  *
  */
 
-package org.wso2.carbon.policy.mgt.common;
+package io.entgra.device.mgt.core.policy.mgt.common;
 
 import java.io.Serializable;
 

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.common/src/main/java/io/entgra/device/mgt/core/policy/mgt/common/ProfileManagementException.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.policy.mgt.common;
+package io.entgra.device.mgt.core.policy.mgt.common;
 
 public class ProfileManagementException extends Exception {
 

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.common/src/main/java/io/entgra/device/mgt/core/policy/mgt/common/monitor/ComplianceDecisionPoint.java

@@ -17,7 +17,7 @@
  */
 
 
-package org.wso2.carbon.policy.mgt.common.monitor;
+package io.entgra.device.mgt.core.policy.mgt.common.monitor;
 
 
 import org.wso2.carbon.device.mgt.common.Device;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.common/src/main/java/io/entgra/device/mgt/core/policy/mgt/common/monitor/PolicyDeviceWrapper.java

@@ -17,7 +17,7 @@
  */
 
 
-package org.wso2.carbon.policy.mgt.common.monitor;
+package io.entgra.device.mgt.core.policy.mgt.common.monitor;
 
 public class PolicyDeviceWrapper {
 

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.common/src/test/java/io/entgra/device/mgt/core/policy/mgt/common/utils/PolicyCreator.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wos2.carbon.policy.mgt.common.utils;
+package io.entgra.device.mgt.core.policy.mgt.common.utils;
 
 
 import org.wso2.carbon.device.mgt.common.Feature;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/pom.xml

@@ -27,7 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.policy.mgt.core</artifactId>
+    <artifactId>io.entgra.device.mgt.core.policy.mgt.core</artifactId>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Policy Management Core</name>
     <description>WSO2 Carbon - Policy Management Core</description>
@@ -50,7 +50,7 @@
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
                         <Bundle-Description>Policy Management Core Bundle</Bundle-Description>
-                        <Private-Package>org.wso2.carbon.policy.mgt.core.internal</Private-Package>
+                        <Private-Package>io.entgra.device.mgt.core.policy.mgt.core.internal</Private-Package>
                         <Import-Package>
                             org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
                             org.osgi.service.*;version="${imp.package.version.osgi.service}",
@@ -61,7 +61,7 @@
                             javax.xml.*,
                             javax.xml.parsers;version="${javax.xml.parsers.import.pkg.version}";resolution:=optional,
                             org.w3c.dom,
-                            org.wso2.carbon.policy.mgt.common.*,
+                            io.entgra.device.mgt.core.policy.mgt.common.*,
                             org.wso2.carbon.user.core.*,
                             org.wso2.carbon.utils.*,
                             org.wso2.carbon.context.*,
@@ -72,8 +72,8 @@
                             org.wso2.carbon.caching.*
                         </Import-Package>
                         <Export-Package>
-                            !org.wso2.carbon.policy.mgt.core.internal,
-                            org.wso2.carbon.policy.mgt.core.*
+                            !io.entgra.device.mgt.core.policy.mgt.core.internal,
+                            io.entgra.device.mgt.core.policy.mgt.core.*
                         </Export-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
                     </instructions>
@@ -178,7 +178,7 @@
         <!-- Policy Management Dependencies-->
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.policy.mgt.common</artifactId>
+            <artifactId>io.entgra.device.mgt.core.policy.mgt.common</artifactId>
         </dependency>
 
         <!--Test Case -->
@@ -204,6 +204,11 @@
             <artifactId>h2-database-engine</artifactId>
             <scope>test</scope>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.wso2.orbit.com.h2database</groupId>-->
+<!--            <artifactId>h2</artifactId>-->
+<!--            <scope>test</scope>-->
+<!--        </dependency>-->
 
 
         <dependency>
@@ -236,6 +241,11 @@
             <artifactId>org.wso2.carbon.identity.jwt.client.extension</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.entgra.device.mgt.core</groupId>
+            <artifactId>io.entgra.server.bootup.heartbeat.beacon</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/PolicyManagerService.java

@@ -17,7 +17,7 @@
 */
 
 
-package org.wso2.carbon.policy.mgt.core;
+package io.entgra.device.mgt.core.policy.mgt.core;
 
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
@@ -27,11 +27,11 @@ import org.wso2.carbon.device.mgt.common.PaginationResult;
 import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
 import org.wso2.carbon.device.mgt.common.policy.mgt.Profile;
 import org.wso2.carbon.device.mgt.common.policy.mgt.ProfileFeature;
-import org.wso2.carbon.policy.mgt.common.*;
+import io.entgra.device.mgt.core.policy.mgt.common.*;
 import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.NonComplianceData;
 import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.ComplianceFeature;
 import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.PolicyComplianceException;
-import org.wso2.carbon.policy.mgt.core.task.TaskScheduleService;
+import io.entgra.device.mgt.core.policy.mgt.core.task.TaskScheduleService;
 
 import java.util.List;
 

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/PolicyManagerServiceImpl.java

@@ -33,7 +33,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.policy.mgt.core;
+package io.entgra.device.mgt.core.policy.mgt.core;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -47,20 +47,20 @@ import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementExcept
 import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
 import org.wso2.carbon.device.mgt.common.policy.mgt.Profile;
 import org.wso2.carbon.device.mgt.common.policy.mgt.ProfileFeature;
-import org.wso2.carbon.policy.mgt.common.*;
+import io.entgra.device.mgt.core.policy.mgt.common.*;
 import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.NonComplianceData;
 import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.ComplianceFeature;
 import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.PolicyComplianceException;
-import org.wso2.carbon.policy.mgt.core.impl.PolicyAdministratorPointImpl;
-import org.wso2.carbon.policy.mgt.core.impl.PolicyInformationPointImpl;
-import org.wso2.carbon.policy.mgt.core.internal.PolicyManagementDataHolder;
-import org.wso2.carbon.policy.mgt.core.mgt.MonitoringManager;
-import org.wso2.carbon.policy.mgt.core.mgt.PolicyManager;
-import org.wso2.carbon.policy.mgt.core.mgt.impl.MonitoringManagerImpl;
-import org.wso2.carbon.policy.mgt.core.mgt.impl.PolicyManagerImpl;
-import org.wso2.carbon.policy.mgt.core.task.TaskScheduleService;
-import org.wso2.carbon.policy.mgt.core.task.TaskScheduleServiceImpl;
-import org.wso2.carbon.policy.mgt.core.util.PolicyManagerUtil;
+import io.entgra.device.mgt.core.policy.mgt.core.impl.PolicyAdministratorPointImpl;
+import io.entgra.device.mgt.core.policy.mgt.core.impl.PolicyInformationPointImpl;
+import io.entgra.device.mgt.core.policy.mgt.core.internal.PolicyManagementDataHolder;
+import io.entgra.device.mgt.core.policy.mgt.core.mgt.MonitoringManager;
+import io.entgra.device.mgt.core.policy.mgt.core.mgt.PolicyManager;
+import io.entgra.device.mgt.core.policy.mgt.core.mgt.impl.MonitoringManagerImpl;
+import io.entgra.device.mgt.core.policy.mgt.core.mgt.impl.PolicyManagerImpl;
+import io.entgra.device.mgt.core.policy.mgt.core.task.TaskScheduleService;
+import io.entgra.device.mgt.core.policy.mgt.core.task.TaskScheduleServiceImpl;
+import io.entgra.device.mgt.core.policy.mgt.core.util.PolicyManagerUtil;
 
 import java.util.ArrayList;
 import java.util.List;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/cache/PolicyCacheException.java

@@ -17,7 +17,7 @@
  */
 
 
-package org.wso2.carbon.policy.mgt.core.cache;
+package io.entgra.device.mgt.core.policy.mgt.core.cache;
 
 public class PolicyCacheException extends Exception {
 

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/cache/PolicyCacheManager.java

@@ -17,11 +17,11 @@
  */
 
 
-package org.wso2.carbon.policy.mgt.core.cache;
+package io.entgra.device.mgt.core.policy.mgt.core.cache;
 
 import org.wso2.carbon.device.mgt.common.DynamicTaskContext;
 import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
-import org.wso2.carbon.policy.mgt.common.PolicyManagementException;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyManagementException;
 
 import java.util.List;
 

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/cache/impl/PolicyCacheManagerImpl.java

@@ -17,18 +17,18 @@
  */
 
 
-package org.wso2.carbon.policy.mgt.core.cache.impl;
+package io.entgra.device.mgt.core.policy.mgt.core.cache.impl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.DynamicTaskContext;
 import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
-import org.wso2.carbon.policy.mgt.common.PolicyManagementException;
-import org.wso2.carbon.policy.mgt.core.cache.PolicyCacheManager;
-import org.wso2.carbon.policy.mgt.core.mgt.PolicyManager;
-import org.wso2.carbon.policy.mgt.core.mgt.impl.PolicyManagerImpl;
-import org.wso2.carbon.policy.mgt.core.util.PolicyManagementConstants;
-import org.wso2.carbon.policy.mgt.core.util.PolicyManagerUtil;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyManagementException;
+import io.entgra.device.mgt.core.policy.mgt.core.cache.PolicyCacheManager;
+import io.entgra.device.mgt.core.policy.mgt.core.mgt.PolicyManager;
+import io.entgra.device.mgt.core.policy.mgt.core.mgt.impl.PolicyManagerImpl;
+import io.entgra.device.mgt.core.policy.mgt.core.util.PolicyManagementConstants;
+import io.entgra.device.mgt.core.policy.mgt.core.util.PolicyManagerUtil;
 
 import javax.cache.Cache;
 import java.util.ArrayList;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/config/PolicyConfigurationManager.java

@@ -16,13 +16,13 @@
  * under the License.
  */
 
-package org.wso2.carbon.policy.mgt.core.config;
+package io.entgra.device.mgt.core.policy.mgt.core.config;
 
 import org.w3c.dom.Document;
-import org.wso2.carbon.policy.mgt.common.PolicyManagementException;
-import org.wso2.carbon.policy.mgt.core.config.datasource.DataSourceConfig;
-import org.wso2.carbon.policy.mgt.core.util.PolicyManagementConstants;
-import org.wso2.carbon.policy.mgt.core.util.PolicyManagerUtil;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyManagementException;
+import io.entgra.device.mgt.core.policy.mgt.core.config.datasource.DataSourceConfig;
+import io.entgra.device.mgt.core.policy.mgt.core.util.PolicyManagementConstants;
+import io.entgra.device.mgt.core.policy.mgt.core.util.PolicyManagerUtil;
 import org.wso2.carbon.utils.CarbonUtils;
 
 import javax.xml.bind.JAXBContext;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/config/PolicyManagementConfig.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.policy.mgt.core.config;
+package io.entgra.device.mgt.core.policy.mgt.core.config;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/config/PolicyManagementRepository.java

@@ -16,9 +16,9 @@
  * under the License.
  */
 
-package org.wso2.carbon.policy.mgt.core.config;
+package io.entgra.device.mgt.core.policy.mgt.core.config;
 
-import org.wso2.carbon.policy.mgt.core.config.datasource.DataSourceConfig;
+import io.entgra.device.mgt.core.policy.mgt.core.config.datasource.DataSourceConfig;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/config/datasource/DataSourceConfig.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.policy.mgt.core.config.datasource;
+package io.entgra.device.mgt.core.policy.mgt.core.config.datasource;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/config/datasource/JNDILookupDefinition.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.policy.mgt.core.config.datasource;
+package io.entgra.device.mgt.core.policy.mgt.core.config.datasource;
 
 import javax.xml.bind.annotation.*;
 import java.util.List;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/dao/FeatureDAO.java

@@ -17,7 +17,7 @@
 */
 
 
-package org.wso2.carbon.policy.mgt.core.dao;
+package io.entgra.device.mgt.core.policy.mgt.core.dao;
 
 import org.wso2.carbon.device.mgt.common.Feature;
 import org.wso2.carbon.device.mgt.common.policy.mgt.Profile;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/dao/FeatureManagerDAOException.java

@@ -16,7 +16,7 @@
 * under the License.
 */
 
-package org.wso2.carbon.policy.mgt.core.dao;
+package io.entgra.device.mgt.core.policy.mgt.core.dao;
 
 public class FeatureManagerDAOException extends Exception {
 

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/dao/MonitoringDAO.java

@@ -17,13 +17,13 @@
  */
 
 
-package org.wso2.carbon.policy.mgt.core.dao;
+package io.entgra.device.mgt.core.policy.mgt.core.dao;
 
 import org.wso2.carbon.device.mgt.common.PaginationRequest;
 import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.ComplianceData;
 import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.NonComplianceData;
 import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.ComplianceFeature;
-import org.wso2.carbon.policy.mgt.common.monitor.PolicyDeviceWrapper;
+import io.entgra.device.mgt.core.policy.mgt.common.monitor.PolicyDeviceWrapper;
 
 import java.util.List;
 import java.util.Map;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/dao/MonitoringDAOException.java

@@ -17,7 +17,7 @@
  */
 
 
-package org.wso2.carbon.policy.mgt.core.dao;
+package io.entgra.device.mgt.core.policy.mgt.core.dao;
 
 public class MonitoringDAOException extends Exception{
 

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/dao/PolicyDAO.java

@@ -33,12 +33,12 @@
  * under the License.
  */
 
-package org.wso2.carbon.policy.mgt.core.dao;
+package io.entgra.device.mgt.core.policy.mgt.core.dao;
 
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.PaginationRequest;
 import org.wso2.carbon.device.mgt.common.policy.mgt.CorrectiveAction;
-import org.wso2.carbon.policy.mgt.common.Criterion;
+import io.entgra.device.mgt.core.policy.mgt.common.Criterion;
 import org.wso2.carbon.device.mgt.common.policy.mgt.DeviceGroupWrapper;
 import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
 import org.wso2.carbon.device.mgt.common.policy.mgt.PolicyCriterion;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/dao/PolicyManagementDAOFactory.java

@@ -16,25 +16,25 @@
  * under the License.
  */
 
-package org.wso2.carbon.policy.mgt.core.dao;
+package io.entgra.device.mgt.core.policy.mgt.core.dao;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
 import org.wso2.carbon.device.mgt.common.exceptions.IllegalTransactionStateException;
 import org.wso2.carbon.device.mgt.common.exceptions.UnsupportedDatabaseEngineException;
-import org.wso2.carbon.policy.mgt.core.config.datasource.DataSourceConfig;
-import org.wso2.carbon.policy.mgt.core.config.datasource.JNDILookupDefinition;
-import org.wso2.carbon.policy.mgt.core.dao.impl.MonitoringDAOImpl;
-import org.wso2.carbon.policy.mgt.core.dao.impl.ProfileDAOImpl;
-import org.wso2.carbon.policy.mgt.core.dao.impl.feature.GenericFeatureDAOImpl;
-import org.wso2.carbon.policy.mgt.core.dao.impl.feature.OracleServerFeatureDAOImpl;
-import org.wso2.carbon.policy.mgt.core.dao.impl.feature.SQLServerFeatureDAOImpl;
-import org.wso2.carbon.policy.mgt.core.dao.impl.policy.GenericPolicyDAOImpl;
-import org.wso2.carbon.policy.mgt.core.dao.impl.policy.OraclePolicyDAOImpl;
-import org.wso2.carbon.policy.mgt.core.dao.impl.policy.PostgreSQLPolicyDAOImpl;
-import org.wso2.carbon.policy.mgt.core.dao.impl.policy.SQLServerPolicyDAOImpl;
-import org.wso2.carbon.policy.mgt.core.dao.util.PolicyManagementDAOUtil;
+import io.entgra.device.mgt.core.policy.mgt.core.config.datasource.DataSourceConfig;
+import io.entgra.device.mgt.core.policy.mgt.core.config.datasource.JNDILookupDefinition;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.impl.MonitoringDAOImpl;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.impl.ProfileDAOImpl;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.impl.feature.GenericFeatureDAOImpl;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.impl.feature.OracleServerFeatureDAOImpl;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.impl.feature.SQLServerFeatureDAOImpl;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.impl.policy.GenericPolicyDAOImpl;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.impl.policy.OraclePolicyDAOImpl;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.impl.policy.PostgreSQLPolicyDAOImpl;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.impl.policy.SQLServerPolicyDAOImpl;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.util.PolicyManagementDAOUtil;
 
 import javax.sql.DataSource;
 import java.sql.Connection;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/dao/PolicyManagerDAOException.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.policy.mgt.core.dao;
+package io.entgra.device.mgt.core.policy.mgt.core.dao;
 
 public class PolicyManagerDAOException extends Exception{
 

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/dao/ProfileDAO.java

@@ -17,7 +17,7 @@
 */
 
 
-package org.wso2.carbon.policy.mgt.core.dao;
+package io.entgra.device.mgt.core.policy.mgt.core.dao;
 
 import org.wso2.carbon.device.mgt.common.policy.mgt.Profile;
 

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/dao/ProfileManagerDAOException.java

@@ -16,7 +16,7 @@
 * under the License.
 */
 
-package org.wso2.carbon.policy.mgt.core.dao;
+package io.entgra.device.mgt.core.policy.mgt.core.dao;
 
 public class ProfileManagerDAOException extends Exception{
 

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/dao/dto/PolicyCriteriaDTO.java

@@ -17,7 +17,7 @@
  */
 
 
-package org.wso2.carbon.policy.mgt.core.dao.dto;
+package io.entgra.device.mgt.core.policy.mgt.core.dao.dto;
 
 public class PolicyCriteriaDTO {
 

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/dao/impl/MonitoringDAOImpl.java

@@ -17,7 +17,7 @@
  */
 
 
-package org.wso2.carbon.policy.mgt.core.dao.impl;
+package io.entgra.device.mgt.core.policy.mgt.core.dao.impl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -26,12 +26,12 @@ import org.wso2.carbon.device.mgt.common.PaginationRequest;
 import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.ComplianceData;
 import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.NonComplianceData;
 import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.ComplianceFeature;
-import org.wso2.carbon.policy.mgt.common.monitor.PolicyDeviceWrapper;
-import org.wso2.carbon.policy.mgt.core.dao.MonitoringDAO;
-import org.wso2.carbon.policy.mgt.core.dao.MonitoringDAOException;
-import org.wso2.carbon.policy.mgt.core.dao.PolicyManagementDAOFactory;
-import org.wso2.carbon.policy.mgt.core.dao.util.PolicyManagementDAOUtil;
-import org.wso2.carbon.policy.mgt.core.util.PolicyManagerUtil;
+import io.entgra.device.mgt.core.policy.mgt.common.monitor.PolicyDeviceWrapper;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.MonitoringDAO;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.MonitoringDAOException;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.PolicyManagementDAOFactory;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.util.PolicyManagementDAOUtil;
+import io.entgra.device.mgt.core.policy.mgt.core.util.PolicyManagerUtil;
 
 import java.sql.*;
 import java.util.*;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/dao/impl/ProfileDAOImpl.java

@@ -16,17 +16,17 @@
 * under the License.
 */
 
-package org.wso2.carbon.policy.mgt.core.dao.impl;
+package io.entgra.device.mgt.core.policy.mgt.core.dao.impl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.DynamicTaskContext;
 import org.wso2.carbon.device.mgt.common.policy.mgt.Profile;
-import org.wso2.carbon.policy.mgt.core.dao.PolicyManagementDAOFactory;
-import org.wso2.carbon.policy.mgt.core.dao.ProfileDAO;
-import org.wso2.carbon.policy.mgt.core.dao.ProfileManagerDAOException;
-import org.wso2.carbon.policy.mgt.core.dao.util.PolicyManagementDAOUtil;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.PolicyManagementDAOFactory;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.ProfileDAO;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.ProfileManagerDAOException;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.util.PolicyManagementDAOUtil;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/dao/impl/feature/AbstractFeatureDAO.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.policy.mgt.core.dao.impl.feature;
+package io.entgra.device.mgt.core.policy.mgt.core.dao.impl.feature;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -24,13 +24,12 @@ import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.Feature;
 import org.wso2.carbon.device.mgt.common.policy.mgt.Profile;
 import org.wso2.carbon.device.mgt.common.policy.mgt.ProfileFeature;
-import org.wso2.carbon.policy.mgt.core.dao.FeatureDAO;
-import org.wso2.carbon.policy.mgt.core.dao.FeatureManagerDAOException;
-import org.wso2.carbon.policy.mgt.core.dao.PolicyManagementDAOFactory;
-import org.wso2.carbon.policy.mgt.core.dao.util.PolicyManagementDAOUtil;
-import org.wso2.carbon.policy.mgt.core.util.PolicyManagerUtil;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.FeatureDAO;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.FeatureManagerDAOException;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.PolicyManagementDAOFactory;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.util.PolicyManagementDAOUtil;
+import io.entgra.device.mgt.core.policy.mgt.core.util.PolicyManagerUtil;
 
-import javax.naming.OperationNotSupportedException;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/dao/impl/feature/GenericFeatureDAOImpl.java

@@ -16,16 +16,16 @@
  * under the License.
  */
 
-package org.wso2.carbon.policy.mgt.core.dao.impl.feature;
+package io.entgra.device.mgt.core.policy.mgt.core.dao.impl.feature;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.policy.mgt.ProfileFeature;
-import org.wso2.carbon.policy.mgt.core.dao.FeatureManagerDAOException;
-import org.wso2.carbon.policy.mgt.core.dao.PolicyManagementDAOFactory;
-import org.wso2.carbon.policy.mgt.core.dao.util.PolicyManagementDAOUtil;
-import org.wso2.carbon.policy.mgt.core.util.PolicyManagerUtil;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.FeatureManagerDAOException;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.PolicyManagementDAOFactory;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.util.PolicyManagementDAOUtil;
+import io.entgra.device.mgt.core.policy.mgt.core.util.PolicyManagerUtil;
 
 import java.io.IOException;
 import java.sql.Connection;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/dao/impl/feature/OracleServerFeatureDAOImpl.java

@@ -15,14 +15,14 @@
 * under the License.
 *
 */
-package org.wso2.carbon.policy.mgt.core.dao.impl.feature;
+package io.entgra.device.mgt.core.policy.mgt.core.dao.impl.feature;
 
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.policy.mgt.ProfileFeature;
-import org.wso2.carbon.policy.mgt.core.dao.FeatureManagerDAOException;
-import org.wso2.carbon.policy.mgt.core.dao.PolicyManagementDAOFactory;
-import org.wso2.carbon.policy.mgt.core.dao.util.PolicyManagementDAOUtil;
-import org.wso2.carbon.policy.mgt.core.util.PolicyManagerUtil;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.FeatureManagerDAOException;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.PolicyManagementDAOFactory;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.util.PolicyManagementDAOUtil;
+import io.entgra.device.mgt.core.policy.mgt.core.util.PolicyManagerUtil;
 
 import java.io.IOException;
 import java.sql.Connection;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/dao/impl/feature/SQLServerFeatureDAOImpl.java

@@ -16,16 +16,16 @@
  * under the License.
  */
 
-package org.wso2.carbon.policy.mgt.core.dao.impl.feature;
+package io.entgra.device.mgt.core.policy.mgt.core.dao.impl.feature;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.policy.mgt.ProfileFeature;
-import org.wso2.carbon.policy.mgt.core.dao.FeatureManagerDAOException;
-import org.wso2.carbon.policy.mgt.core.dao.PolicyManagementDAOFactory;
-import org.wso2.carbon.policy.mgt.core.dao.util.PolicyManagementDAOUtil;
-import org.wso2.carbon.policy.mgt.core.util.PolicyManagerUtil;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.FeatureManagerDAOException;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.PolicyManagementDAOFactory;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.util.PolicyManagementDAOUtil;
+import io.entgra.device.mgt.core.policy.mgt.core.util.PolicyManagerUtil;
 
 import java.io.IOException;
 import java.sql.Connection;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/dao/impl/policy/AbstractPolicyDAOImpl.java

@@ -33,7 +33,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.policy.mgt.core.dao.impl.policy;
+package io.entgra.device.mgt.core.policy.mgt.core.dao.impl.policy;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -43,13 +43,13 @@ import org.wso2.carbon.device.mgt.common.policy.mgt.CorrectiveAction;
 import org.wso2.carbon.device.mgt.common.policy.mgt.DeviceGroupWrapper;
 import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
 import org.wso2.carbon.device.mgt.common.policy.mgt.PolicyCriterion;
-import org.wso2.carbon.policy.mgt.common.Criterion;
-import org.wso2.carbon.policy.mgt.core.dao.PolicyDAO;
-import org.wso2.carbon.policy.mgt.core.dao.PolicyManagementDAOFactory;
-import org.wso2.carbon.policy.mgt.core.dao.PolicyManagerDAOException;
-import org.wso2.carbon.policy.mgt.core.dao.util.PolicyManagementDAOUtil;
-import org.wso2.carbon.policy.mgt.core.util.PolicyManagerUtil;
-import org.wso2.carbon.policy.mgt.core.util.SetReferenceTransformer;
+import io.entgra.device.mgt.core.policy.mgt.common.Criterion;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.PolicyDAO;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.PolicyManagementDAOFactory;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.PolicyManagerDAOException;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.util.PolicyManagementDAOUtil;
+import io.entgra.device.mgt.core.policy.mgt.core.util.PolicyManagerUtil;
+import io.entgra.device.mgt.core.policy.mgt.core.util.SetReferenceTransformer;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/dao/impl/policy/GenericPolicyDAOImpl.java

@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package org.wso2.carbon.policy.mgt.core.dao.impl.policy;
+package io.entgra.device.mgt.core.policy.mgt.core.dao.impl.policy;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.PaginationRequest;
 import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
-import org.wso2.carbon.policy.mgt.core.dao.PolicyManagementDAOFactory;
-import org.wso2.carbon.policy.mgt.core.dao.PolicyManagerDAOException;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.PolicyManagementDAOFactory;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.PolicyManagerDAOException;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/dao/impl/policy/OraclePolicyDAOImpl.java

@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package org.wso2.carbon.policy.mgt.core.dao.impl.policy;
+package io.entgra.device.mgt.core.policy.mgt.core.dao.impl.policy;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.PaginationRequest;
 import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
-import org.wso2.carbon.policy.mgt.core.dao.PolicyManagementDAOFactory;
-import org.wso2.carbon.policy.mgt.core.dao.PolicyManagerDAOException;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.PolicyManagementDAOFactory;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.PolicyManagerDAOException;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/dao/impl/policy/PostgreSQLPolicyDAOImpl.java

@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package org.wso2.carbon.policy.mgt.core.dao.impl.policy;
+package io.entgra.device.mgt.core.policy.mgt.core.dao.impl.policy;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.PaginationRequest;
 import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
-import org.wso2.carbon.policy.mgt.core.dao.PolicyManagementDAOFactory;
-import org.wso2.carbon.policy.mgt.core.dao.PolicyManagerDAOException;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.PolicyManagementDAOFactory;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.PolicyManagerDAOException;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/dao/impl/policy/SQLServerPolicyDAOImpl.java

@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package org.wso2.carbon.policy.mgt.core.dao.impl.policy;
+package io.entgra.device.mgt.core.policy.mgt.core.dao.impl.policy;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.PaginationRequest;
 import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
-import org.wso2.carbon.policy.mgt.core.dao.PolicyManagementDAOFactory;
-import org.wso2.carbon.policy.mgt.core.dao.PolicyManagerDAOException;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.PolicyManagementDAOFactory;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.PolicyManagerDAOException;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/dao/util/PolicyManagementDAOUtil.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.policy.mgt.core.dao.util;
+package io.entgra.device.mgt.core.policy.mgt.core.dao.util;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/enforcement/DelegationTask.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.policy.mgt.core.enforcement;
+package io.entgra.device.mgt.core.policy.mgt.core.enforcement;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -27,12 +27,12 @@ import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager;
 import org.wso2.carbon.device.mgt.core.config.policy.PolicyConfiguration;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 import org.wso2.carbon.device.mgt.core.task.impl.DynamicPartitionedScheduleTask;
-import org.wso2.carbon.policy.mgt.common.PolicyManagementException;
-import org.wso2.carbon.policy.mgt.core.cache.impl.PolicyCacheManagerImpl;
-import org.wso2.carbon.policy.mgt.core.internal.PolicyManagementDataHolder;
-import org.wso2.carbon.policy.mgt.core.mgt.PolicyManager;
-import org.wso2.carbon.policy.mgt.core.mgt.bean.UpdatedPolicyDeviceListBean;
-import org.wso2.carbon.policy.mgt.core.mgt.impl.PolicyManagerImpl;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyManagementException;
+import io.entgra.device.mgt.core.policy.mgt.core.cache.impl.PolicyCacheManagerImpl;
+import io.entgra.device.mgt.core.policy.mgt.core.internal.PolicyManagementDataHolder;
+import io.entgra.device.mgt.core.policy.mgt.core.mgt.PolicyManager;
+import io.entgra.device.mgt.core.policy.mgt.core.mgt.bean.UpdatedPolicyDeviceListBean;
+import io.entgra.device.mgt.core.policy.mgt.core.mgt.impl.PolicyManagerImpl;
 
 import java.util.ArrayList;
 import java.util.List;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/enforcement/PolicyDelegationException.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.policy.mgt.core.enforcement;
+package io.entgra.device.mgt.core.policy.mgt.core.enforcement;
 
 public class PolicyDelegationException extends Exception {
 

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/enforcement/PolicyEnforcementDelegator.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.policy.mgt.core.enforcement;
+package io.entgra.device.mgt.core.policy.mgt.core.enforcement;
 
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/enforcement/PolicyEnforcementDelegatorImpl.java

@@ -32,7 +32,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.policy.mgt.core.enforcement;
+package io.entgra.device.mgt.core.policy.mgt.core.enforcement;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -46,13 +46,13 @@ import org.wso2.carbon.device.mgt.core.operation.mgt.CommandOperation;
 import org.wso2.carbon.device.mgt.core.operation.mgt.OperationMgtConstants;
 import org.wso2.carbon.device.mgt.core.operation.mgt.PolicyOperation;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
-import org.wso2.carbon.policy.mgt.common.PolicyAdministratorPoint;
-import org.wso2.carbon.policy.mgt.common.PolicyEvaluationException;
-import org.wso2.carbon.policy.mgt.common.PolicyManagementException;
-import org.wso2.carbon.policy.mgt.common.PolicyTransformException;
-import org.wso2.carbon.policy.mgt.core.PolicyManagerService;
-import org.wso2.carbon.policy.mgt.core.internal.PolicyManagementDataHolder;
-import org.wso2.carbon.policy.mgt.core.util.PolicyManagerUtil;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyAdministratorPoint;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyEvaluationException;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyManagementException;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyTransformException;
+import io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerService;
+import io.entgra.device.mgt.core.policy.mgt.core.internal.PolicyManagementDataHolder;
+import io.entgra.device.mgt.core.policy.mgt.core.util.PolicyManagerUtil;
 
 import java.util.ArrayList;
 import java.util.List;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/impl/ComplianceDecisionPointImpl.java

@@ -34,7 +34,7 @@
  */
 
 
-package org.wso2.carbon.policy.mgt.core.impl;
+package io.entgra.device.mgt.core.policy.mgt.core.impl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -49,11 +49,11 @@ import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
 import org.wso2.carbon.device.mgt.common.policy.mgt.ProfileFeature;
 import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.NonComplianceData;
-import org.wso2.carbon.policy.mgt.common.monitor.ComplianceDecisionPoint;
+import io.entgra.device.mgt.core.policy.mgt.common.monitor.ComplianceDecisionPoint;
 import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.ComplianceFeature;
 import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.PolicyComplianceException;
-import org.wso2.carbon.policy.mgt.core.internal.PolicyManagementDataHolder;
-import org.wso2.carbon.policy.mgt.core.util.PolicyManagementConstants;
+import io.entgra.device.mgt.core.policy.mgt.core.internal.PolicyManagementDataHolder;
+import io.entgra.device.mgt.core.policy.mgt.core.util.PolicyManagementConstants;
 
 import java.util.ArrayList;
 import java.util.List;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/impl/PolicyAdministratorPointImpl.java

@@ -16,7 +16,7 @@
 * under the License.
 */
 
-package org.wso2.carbon.policy.mgt.core.impl;
+package io.entgra.device.mgt.core.policy.mgt.core.impl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -32,15 +32,15 @@ import org.wso2.carbon.ntask.common.TaskException;
 import org.wso2.carbon.ntask.core.TaskInfo;
 import org.wso2.carbon.ntask.core.TaskManager;
 import org.wso2.carbon.ntask.core.service.TaskService;
-import org.wso2.carbon.policy.mgt.common.*;
-import org.wso2.carbon.policy.mgt.core.cache.PolicyCacheManager;
-import org.wso2.carbon.policy.mgt.core.cache.impl.PolicyCacheManagerImpl;
-import org.wso2.carbon.policy.mgt.core.internal.PolicyManagementDataHolder;
-import org.wso2.carbon.policy.mgt.core.mgt.PolicyManager;
-import org.wso2.carbon.policy.mgt.core.mgt.ProfileManager;
-import org.wso2.carbon.policy.mgt.core.mgt.impl.PolicyManagerImpl;
-import org.wso2.carbon.policy.mgt.core.mgt.impl.ProfileManagerImpl;
-import org.wso2.carbon.policy.mgt.core.util.PolicyManagementConstants;
+import io.entgra.device.mgt.core.policy.mgt.common.*;
+import io.entgra.device.mgt.core.policy.mgt.core.cache.PolicyCacheManager;
+import io.entgra.device.mgt.core.policy.mgt.core.cache.impl.PolicyCacheManagerImpl;
+import io.entgra.device.mgt.core.policy.mgt.core.internal.PolicyManagementDataHolder;
+import io.entgra.device.mgt.core.policy.mgt.core.mgt.PolicyManager;
+import io.entgra.device.mgt.core.policy.mgt.core.mgt.ProfileManager;
+import io.entgra.device.mgt.core.policy.mgt.core.mgt.impl.PolicyManagerImpl;
+import io.entgra.device.mgt.core.policy.mgt.core.mgt.impl.ProfileManagerImpl;
+import io.entgra.device.mgt.core.policy.mgt.core.util.PolicyManagementConstants;
 
 import java.util.HashMap;
 import java.util.List;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/impl/PolicyFilterImpl.java

@@ -34,15 +34,15 @@
  */
 
 
-package org.wso2.carbon.policy.mgt.core.impl;
+package io.entgra.device.mgt.core.policy.mgt.core.impl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroup;
 import org.wso2.carbon.device.mgt.common.policy.mgt.DeviceGroupWrapper;
 import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
-import org.wso2.carbon.policy.mgt.common.PolicyFilter;
-import org.wso2.carbon.policy.mgt.core.util.PolicyManagementConstants;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyFilter;
+import io.entgra.device.mgt.core.policy.mgt.core.util.PolicyManagementConstants;
 
 import java.util.ArrayList;
 import java.util.HashMap;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/impl/PolicyInformationPointImpl.java

@@ -33,7 +33,7 @@
 * under the License.
 */
 
-package org.wso2.carbon.policy.mgt.core.impl;
+package io.entgra.device.mgt.core.policy.mgt.core.impl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -48,16 +48,16 @@ import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
 import org.wso2.carbon.device.mgt.core.dto.DeviceType;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 import org.wso2.carbon.device.mgt.core.service.GroupManagementProviderService;
-import org.wso2.carbon.policy.mgt.common.FeatureManagementException;
-import org.wso2.carbon.policy.mgt.common.PIPDevice;
-import org.wso2.carbon.policy.mgt.common.PolicyFilter;
-import org.wso2.carbon.policy.mgt.common.PolicyInformationPoint;
-import org.wso2.carbon.policy.mgt.common.PolicyManagementException;
-import org.wso2.carbon.policy.mgt.core.internal.PolicyManagementDataHolder;
-import org.wso2.carbon.policy.mgt.core.mgt.FeatureManager;
-import org.wso2.carbon.policy.mgt.core.mgt.PolicyManager;
-import org.wso2.carbon.policy.mgt.core.mgt.impl.FeatureManagerImpl;
-import org.wso2.carbon.policy.mgt.core.mgt.impl.PolicyManagerImpl;
+import io.entgra.device.mgt.core.policy.mgt.common.FeatureManagementException;
+import io.entgra.device.mgt.core.policy.mgt.common.PIPDevice;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyFilter;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyInformationPoint;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyManagementException;
+import io.entgra.device.mgt.core.policy.mgt.core.internal.PolicyManagementDataHolder;
+import io.entgra.device.mgt.core.policy.mgt.core.mgt.FeatureManager;
+import io.entgra.device.mgt.core.policy.mgt.core.mgt.PolicyManager;
+import io.entgra.device.mgt.core.policy.mgt.core.mgt.impl.FeatureManagerImpl;
+import io.entgra.device.mgt.core.policy.mgt.core.mgt.impl.PolicyManagerImpl;
 import org.wso2.carbon.user.api.UserRealm;
 import org.wso2.carbon.user.api.UserStoreException;
 

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/internal/PolicyManagementDataHolder.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.policy.mgt.core.internal;
+package io.entgra.device.mgt.core.policy.mgt.core.internal;
 
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager;
@@ -24,11 +24,11 @@ import org.wso2.carbon.device.mgt.core.config.policy.PolicyConfiguration;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 import org.wso2.carbon.device.mgt.core.service.GroupManagementProviderService;
 import org.wso2.carbon.ntask.core.service.TaskService;
-import org.wso2.carbon.policy.mgt.common.PolicyEvaluationPoint;
-import org.wso2.carbon.policy.mgt.common.PolicyInformationPoint;
-import org.wso2.carbon.policy.mgt.core.PolicyManagerService;
-import org.wso2.carbon.policy.mgt.core.mgt.MonitoringManager;
-import org.wso2.carbon.policy.mgt.core.mgt.PolicyManager;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyEvaluationPoint;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyInformationPoint;
+import io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerService;
+import io.entgra.device.mgt.core.policy.mgt.core.mgt.MonitoringManager;
+import io.entgra.device.mgt.core.policy.mgt.core.mgt.PolicyManager;
 import org.wso2.carbon.user.core.service.RealmService;
 
 import java.util.HashMap;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/internal/PolicyManagementServiceComponent.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.policy.mgt.core.internal;
+package io.entgra.device.mgt.core.policy.mgt.core.internal;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -25,16 +25,16 @@ import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager;
 import org.wso2.carbon.device.mgt.core.config.policy.PolicyConfiguration;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 import org.wso2.carbon.ntask.core.service.TaskService;
-import org.wso2.carbon.policy.mgt.common.PolicyEvaluationPoint;
-import org.wso2.carbon.policy.mgt.core.PolicyManagerService;
-import org.wso2.carbon.policy.mgt.core.PolicyManagerServiceImpl;
-import org.wso2.carbon.policy.mgt.core.config.PolicyConfigurationManager;
-import org.wso2.carbon.policy.mgt.core.config.PolicyManagementConfig;
-import org.wso2.carbon.policy.mgt.core.config.datasource.DataSourceConfig;
-import org.wso2.carbon.policy.mgt.core.dao.PolicyManagementDAOFactory;
-import org.wso2.carbon.policy.mgt.core.task.TaskScheduleService;
-import org.wso2.carbon.policy.mgt.core.task.TaskScheduleServiceImpl;
-import org.wso2.carbon.policy.mgt.core.util.PolicyManagerUtil;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyEvaluationPoint;
+import io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerService;
+import io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerServiceImpl;
+import io.entgra.device.mgt.core.policy.mgt.core.config.PolicyConfigurationManager;
+import io.entgra.device.mgt.core.policy.mgt.core.config.PolicyManagementConfig;
+import io.entgra.device.mgt.core.policy.mgt.core.config.datasource.DataSourceConfig;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.PolicyManagementDAOFactory;
+import io.entgra.device.mgt.core.policy.mgt.core.task.TaskScheduleService;
+import io.entgra.device.mgt.core.policy.mgt.core.task.TaskScheduleServiceImpl;
+import io.entgra.device.mgt.core.policy.mgt.core.util.PolicyManagerUtil;
 import org.wso2.carbon.user.core.service.RealmService;
 
 /**
@@ -46,7 +46,7 @@ import org.wso2.carbon.user.core.service.RealmService;
  * bind="setRealmService"
  * unbind="unsetRealmService"
  * @scr.reference name="org.wso2.carbon.devicemgt.policy.evaluation.manager"
- * interface="org.wso2.carbon.policy.mgt.common.PolicyEvaluationPoint"
+ * interface="io.entgra.device.mgt.core.policy.mgt.common.PolicyEvaluationPoint"
  * cardinality="1..n"
  * policy="dynamic"
  * bind="setPEPService"

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/mgt/FeatureManager.java

@@ -17,13 +17,13 @@
 */
 
 
-package org.wso2.carbon.policy.mgt.core.mgt;
+package io.entgra.device.mgt.core.policy.mgt.core.mgt;
 
 
 import org.wso2.carbon.device.mgt.common.Feature;
 import org.wso2.carbon.device.mgt.common.policy.mgt.Profile;
 import org.wso2.carbon.device.mgt.common.policy.mgt.ProfileFeature;
-import org.wso2.carbon.policy.mgt.common.FeatureManagementException;
+import io.entgra.device.mgt.core.policy.mgt.common.FeatureManagementException;
 
 import java.util.List;
 

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/mgt/MonitoringManager.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.policy.mgt.core.mgt;
+package io.entgra.device.mgt.core.policy.mgt.core.mgt;
 
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/mgt/PolicyManager.java

@@ -15,15 +15,15 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.wso2.carbon.policy.mgt.core.mgt;
+package io.entgra.device.mgt.core.policy.mgt.core.mgt;
 
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.DynamicTaskContext;
 import org.wso2.carbon.device.mgt.common.PaginationRequest;
 import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
-import org.wso2.carbon.policy.mgt.common.PolicyManagementException;
-import org.wso2.carbon.policy.mgt.core.mgt.bean.UpdatedPolicyDeviceListBean;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyManagementException;
+import io.entgra.device.mgt.core.policy.mgt.core.mgt.bean.UpdatedPolicyDeviceListBean;
 
 import java.util.HashMap;
 import java.util.List;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/mgt/ProfileManager.java

@@ -17,10 +17,10 @@
 */
 
 
-package org.wso2.carbon.policy.mgt.core.mgt;
+package io.entgra.device.mgt.core.policy.mgt.core.mgt;
 
 import org.wso2.carbon.device.mgt.common.policy.mgt.Profile;
-import org.wso2.carbon.policy.mgt.common.ProfileManagementException;
+import io.entgra.device.mgt.core.policy.mgt.common.ProfileManagementException;
 
 import java.util.List;
 

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/mgt/bean/UpdatedPolicyDeviceListBean.java

@@ -15,7 +15,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.wso2.carbon.policy.mgt.core.mgt.bean;
+package io.entgra.device.mgt.core.policy.mgt.core.mgt.bean;
 
 import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
 

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/mgt/impl/FeatureManagerImpl.java

@@ -16,21 +16,21 @@
 * under the License.
 */
 
-package org.wso2.carbon.policy.mgt.core.mgt.impl;
+package io.entgra.device.mgt.core.policy.mgt.core.mgt.impl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.Feature;
 import org.wso2.carbon.device.mgt.common.policy.mgt.Profile;
 import org.wso2.carbon.device.mgt.common.policy.mgt.ProfileFeature;
-import org.wso2.carbon.policy.mgt.common.FeatureManagementException;
-import org.wso2.carbon.policy.mgt.core.dao.FeatureDAO;
-import org.wso2.carbon.policy.mgt.core.dao.FeatureManagerDAOException;
-import org.wso2.carbon.policy.mgt.core.dao.PolicyManagementDAOFactory;
-import org.wso2.carbon.policy.mgt.core.dao.PolicyManagerDAOException;
-import org.wso2.carbon.policy.mgt.core.dao.ProfileDAO;
-import org.wso2.carbon.policy.mgt.core.dao.ProfileManagerDAOException;
-import org.wso2.carbon.policy.mgt.core.mgt.FeatureManager;
+import io.entgra.device.mgt.core.policy.mgt.common.FeatureManagementException;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.FeatureDAO;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.FeatureManagerDAOException;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.PolicyManagementDAOFactory;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.PolicyManagerDAOException;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.ProfileDAO;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.ProfileManagerDAOException;
+import io.entgra.device.mgt.core.policy.mgt.core.mgt.FeatureManager;
 
 import java.sql.SQLException;
 import java.util.List;

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/mgt/impl/MonitoringManagerImpl.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.policy.mgt.core.mgt.impl;
+package io.entgra.device.mgt.core.policy.mgt.core.mgt.impl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -37,18 +37,18 @@ import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.NonComplianceData;
 import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.PolicyComplianceException;
 import org.wso2.carbon.device.mgt.core.operation.mgt.CommandOperation;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
-import org.wso2.carbon.policy.mgt.common.PolicyManagementException;
-import org.wso2.carbon.policy.mgt.common.monitor.ComplianceDecisionPoint;
-import org.wso2.carbon.policy.mgt.common.monitor.PolicyDeviceWrapper;
-import org.wso2.carbon.policy.mgt.core.dao.MonitoringDAO;
-import org.wso2.carbon.policy.mgt.core.dao.MonitoringDAOException;
-import org.wso2.carbon.policy.mgt.core.dao.PolicyDAO;
-import org.wso2.carbon.policy.mgt.core.dao.PolicyManagementDAOFactory;
-import org.wso2.carbon.policy.mgt.core.dao.PolicyManagerDAOException;
-import org.wso2.carbon.policy.mgt.core.impl.ComplianceDecisionPointImpl;
-import org.wso2.carbon.policy.mgt.core.internal.PolicyManagementDataHolder;
-import org.wso2.carbon.policy.mgt.core.mgt.MonitoringManager;
-import org.wso2.carbon.policy.mgt.core.mgt.PolicyManager;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyManagementException;
+import io.entgra.device.mgt.core.policy.mgt.common.monitor.ComplianceDecisionPoint;
+import io.entgra.device.mgt.core.policy.mgt.common.monitor.PolicyDeviceWrapper;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.MonitoringDAO;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.MonitoringDAOException;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.PolicyDAO;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.PolicyManagementDAOFactory;
+import io.entgra.device.mgt.core.policy.mgt.core.dao.PolicyManagerDAOException;
+import io.entgra.device.mgt.core.policy.mgt.core.impl.ComplianceDecisionPointImpl;
+import io.entgra.device.mgt.core.policy.mgt.core.internal.PolicyManagementDataHolder;
+import io.entgra.device.mgt.core.policy.mgt.core.mgt.MonitoringManager;
+import io.entgra.device.mgt.core.policy.mgt.core.mgt.PolicyManager;
 
 import java.sql.SQLException;
 import java.util.ArrayList;