updated dmc components

components/device-types/pom.xml

@@ -27,7 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>io.entgra.device.mgt.plugins.device-types</artifactId>
+    <artifactId>device-types</artifactId>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - IoT Plugins</name>
     <url>http://wso2.org</url>

components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml

@@ -21,7 +21,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<artifactId>io.entgra.device.mgt.plugins.virtual-fire-alarm-plugin</artifactId>
+		<artifactId>virtual-fire-alarm-plugin</artifactId>
 		<groupId>io.entgra.device.mgt.plugins</groupId>
 		<version>6.0.17-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>

components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml

@@ -19,7 +19,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<parent>
-		<artifactId>io.entgra.device.mgt.plugins.virtual-fire-alarm-plugin</artifactId>
+		<artifactId>virtual-fire-alarm-plugin</artifactId>
 		<groupId>io.entgra.device.mgt.plugins</groupId>
 		<version>6.0.17-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
@@ -39,13 +39,13 @@
 	<dependencies>
 		<!-- CDM -->
 		<dependency>
-			<groupId>org.wso2.carbon.devicemgt</groupId>
+			<groupId>io.entgra.device.mgt.core</groupId>
-			<artifactId>org.wso2.carbon.device.mgt.common</artifactId>
+			<artifactId>io.entgra.device.mgt.core.device.mgt.common</artifactId>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.wso2.carbon.devicemgt</groupId>
+			<groupId>io.entgra.device.mgt.core</groupId>
-			<artifactId>org.wso2.carbon.device.mgt.core</artifactId>
+			<artifactId>io.entgra.device.mgt.core.device.mgt.core</artifactId>
 			<scope>provided</scope>
 			<exclusions>
 				<exclusion>
@@ -56,8 +56,8 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.wso2.carbon.devicemgt</groupId>
+			<groupId>io.entgra.device.mgt.core</groupId>
-			<artifactId>org.wso2.carbon.certificate.mgt.core</artifactId>
+			<artifactId>io.entgra.device.mgt.core.certificate.mgt.core</artifactId>
 			<scope>provided</scope>
 			<exclusions>
 				<exclusion>
@@ -203,13 +203,13 @@
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.wso2.carbon.devicemgt</groupId>
+			<groupId>io.entgra.device.mgt.core</groupId>
-			<artifactId>org.wso2.carbon.identity.jwt.client.extension</artifactId>
+			<artifactId>io.entgra.device.mgt.core.identity.jwt.client.extension</artifactId>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.wso2.carbon.devicemgt</groupId>
+			<groupId>io.entgra.device.mgt.core</groupId>
-			<artifactId>org.wso2.carbon.apimgt.application.extension</artifactId>
+			<artifactId>io.entgra.device.mgt.core.apimgt.application.extension</artifactId>
 			<scope>provided</scope>
 		</dependency>
 <!--		<dependency>-->
@@ -218,13 +218,13 @@
 <!--			<scope>provided</scope>-->
 <!--		</dependency>-->
 		<dependency>
-			<groupId>org.wso2.carbon.devicemgt</groupId>
+			<groupId>io.entgra.device.mgt.core</groupId>
-			<artifactId>org.wso2.carbon.device.mgt.extensions</artifactId>
+			<artifactId>io.entgra.device.mgt.core.device.mgt.extensions</artifactId>
 			<scope>provided</scope>
 		</dependency>
         <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.apimgt.annotations</artifactId>
+            <artifactId>io.entgra.device.mgt.core.apimgt.annotations</artifactId>
 			<scope>provided</scope>
         </dependency>
 		<dependency>

components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/VirtualFireAlarmService.java

@@ -19,8 +19,8 @@
 package io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl;
 
 import io.swagger.annotations.*;
-import org.wso2.carbon.apimgt.annotations.api.Scope;
+import io.entgra.device.mgt.core.apimgt.annotations.Scope;
-import org.wso2.carbon.apimgt.annotations.api.Scopes;
+import io.entgra.device.mgt.core.apimgt.annotations.Scopes;
 
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;

components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/VirtualFireAlarmServiceImpl.java

@@ -20,19 +20,19 @@ package io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.apimgt.application.extension.APIManagementProviderService;
+import io.entgra.device.mgt.core.apimgt.application.extension.APIManagementProviderService;
-import org.wso2.carbon.apimgt.application.extension.dto.ApiApplicationKey;
+import io.entgra.device.mgt.core.apimgt.application.extension.dto.ApiApplicationKey;
-import org.wso2.carbon.apimgt.application.extension.exception.APIManagerException;
+import io.entgra.device.mgt.core.apimgt.application.extension.exception.APIManagerException;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
+import io.entgra.device.mgt.core.device.mgt.common.EnrolmentInfo;
-import org.wso2.carbon.device.mgt.common.authorization.DeviceAccessAuthorizationException;
+import io.entgra.device.mgt.core.device.mgt.common.authorization.DeviceAccessAuthorizationException;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.exceptions.InvalidDeviceException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.InvalidDeviceException;
-import org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroupConstants;
+import io.entgra.device.mgt.core.device.mgt.common.group.mgt.DeviceGroupConstants;
-import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.OperationManagementException;
-import org.wso2.carbon.device.mgt.core.operation.mgt.ConfigOperation;
+import io.entgra.device.mgt.core.device.mgt.core.operation.mgt.ConfigOperation;
 import io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.constants.VirtualFireAlarmConstants;
 import io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.dao.DeviceEventsDAO;
 import io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.dao.DeviceEventsDAOImpl;
@@ -44,9 +44,9 @@ import io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.xmpp.Virtu
 import io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.xmpp.XmppAccount;
 import io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.xmpp.XmppConfig;
 import io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.xmpp.XmppServerClient;
-import org.wso2.carbon.identity.jwt.client.extension.JWTClient;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.JWTClient;
-import org.wso2.carbon.identity.jwt.client.extension.dto.AccessTokenInfo;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.AccessTokenInfo;
-import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException;
 import org.wso2.carbon.user.api.UserStoreException;
 
 import javax.ws.rs.*;

components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/dao/DeviceEventsDAOFactory.java

@@ -19,8 +19,8 @@
 
 package io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.dao;
 
-import org.wso2.carbon.device.mgt.common.exceptions.*;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.*;
-import org.wso2.carbon.device.mgt.core.dao.util.*;
+import io.entgra.device.mgt.core.device.mgt.core.dao.util.*;
 
 public class DeviceEventsDAOFactory {
 
@@ -107,7 +107,7 @@ public class DeviceEventsDAOFactory {
     public static void rollbackTransaction() {
         java.sql.Connection conn = currentConnection.get();
         if (conn == null) {
-            throw new org.wso2.carbon.device.mgt.common.exceptions.IllegalTransactionStateException("Database connection is not active. Hence, rollback is "
+            throw new io.entgra.device.mgt.core.device.mgt.common.exceptions.IllegalTransactionStateException("Database connection is not active. Hence, rollback is "
                     + "not attempted.");
         }
         try {

components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/dao/DeviceEventsDAOImpl.java

@@ -22,7 +22,7 @@ package io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.dao;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.dto.SensorRecord;
-import org.wso2.carbon.device.mgt.common.exceptions.*;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.*;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/util/APIUtil.java

@@ -2,12 +2,12 @@ package io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.util;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.apimgt.application.extension.APIManagementProviderService;
+import io.entgra.device.mgt.core.apimgt.application.extension.APIManagementProviderService;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.mgt.common.authorization.DeviceAccessAuthorizationService;
+import io.entgra.device.mgt.core.device.mgt.common.authorization.DeviceAccessAuthorizationService;
-import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfigurationManagementService;
+import io.entgra.device.mgt.core.device.mgt.common.configuration.mgt.PlatformConfigurationManagementService;
-import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
+import io.entgra.device.mgt.core.device.mgt.core.service.DeviceManagementProviderService;
-import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService;
 
 /**
  * This class provides utility functions used by REST-API.

components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/util/ZipUtil.java

@@ -23,12 +23,12 @@ import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.json.JSONObject;
-import org.wso2.carbon.apimgt.application.extension.constants.ApiApplicationConstants;
+import io.entgra.device.mgt.core.apimgt.application.extension.constants.ApiApplicationConstants;
 import org.wso2.carbon.core.util.Utils;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationEntry;
+import io.entgra.device.mgt.core.device.mgt.common.configuration.mgt.ConfigurationEntry;
-import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.configuration.mgt.ConfigurationManagementException;
-import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
+import io.entgra.device.mgt.core.device.mgt.common.configuration.mgt.PlatformConfiguration;
 import io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.xmpp.XmppConfig;
 import org.wso2.carbon.utils.CarbonUtils;
 

components/device-types/virtual-fire-alarm-plugin/pom.xml

@@ -21,13 +21,13 @@
 
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
-        <artifactId>io.entgra.device.mgt.plugins.device-types</artifactId>
+        <artifactId>device-types</artifactId>
         <version>6.0.17-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>io.entgra.device.mgt.plugins.virtual-fire-alarm-plugin</artifactId>
+    <artifactId>virtual-fire-alarm-plugin</artifactId>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Virtual Fire Alarm Plugin</name>
     <url>http://wso2.org</url>

components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml

@@ -19,7 +19,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
-        <artifactId>io.entgra.device.mgt.plugins.cdmf-transport-adapters</artifactId>
+        <artifactId>cdmf-transport-adapters</artifactId>
 		<version>6.0.17-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>

components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml

@@ -19,7 +19,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
-        <artifactId>io.entgra.device.mgt.plugins.cdmf-transport-adapters</artifactId>
+        <artifactId>cdmf-transport-adapters</artifactId>
         <version>6.0.17-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>

components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml

@@ -19,7 +19,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
-        <artifactId>io.entgra.device.mgt.plugins.cdmf-transport-adapters</artifactId>
+        <artifactId>cdmf-transport-adapters</artifactId>
         <version>6.0.17-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
@@ -77,12 +77,12 @@
             <artifactId>io.entgra.device.mgt.plugins.input.adapter.extension</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.identity.jwt.client.extension</artifactId>
+            <artifactId>io.entgra.device.mgt.core.identity.jwt.client.extension</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.apimgt.keymgt.extension</artifactId>
+            <artifactId>io.entgra.device.mgt.core.apimgt.keymgt.extension</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
@@ -141,7 +141,7 @@
                             org.apache.http.impl.client;version="${httpclient.version.range}",
                             org.json.simple.*,
                             com.jayway.jsonpath.*,
-                            org.wso2.carbon.identity.jwt.client.extension.*,
+                            io.entgra.device.mgt.core.identity.jwt.client.extension.*,
                             javax.net.ssl,
                             org.apache.commons.codec.binary,
                             org.apache.commons.logging,
@@ -156,9 +156,9 @@
                             org.apache.axis2.context,
                             org.wso2.carbon.core.multitenancy.utils,
                             org.wso2.carbon.utils,
-                            org.wso2.carbon.apimgt.keymgt.extension;version="[5.0,6)",
+                            io.entgra.device.mgt.core.apimgt.keymgt.extension;version="[5.0,6)",
-                            org.wso2.carbon.apimgt.keymgt.extension.exception;version="[5.0,6)",
+                            io.entgra.device.mgt.core.apimgt.keymgt.extension.exception;version="[5.0,6)",
-                            org.wso2.carbon.apimgt.keymgt.extension.service;version="[5.0,6)"
+                            io.entgra.device.mgt.core.apimgt.keymgt.extension.service;version="[5.0,6)"
                         </Import-Package>
                     </instructions>
                 </configuration>

components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/InputAdapterServiceComponent.java

@@ -25,7 +25,7 @@ import org.osgi.service.http.HttpService;
 import io.entgra.device.mgt.plugins.input.adapter.extension.InputAdapterExtensionService;
 import org.wso2.carbon.event.input.adapter.core.InputEventAdapterFactory;
 import org.wso2.carbon.event.input.adapter.core.InputEventAdapterService;
-import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService;
 import org.wso2.carbon.utils.ConfigurationContextService;
 
 /**
@@ -35,7 +35,7 @@ import org.wso2.carbon.utils.ConfigurationContextService;
  * policy="dynamic"
  * bind="setInputAdapterExtensionService"
  * unbind="unsetInputAdapterExtensionService"
- * @scr.reference name="jwt.client.service" interface="org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService"
+ * @scr.reference name="jwt.client.service" interface="io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService"
  * cardinality="1..1"
  * policy="dynamic"
  * bind="setJWTClientManagerService"

components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/InputAdapterServiceDataHolder.java

@@ -17,7 +17,7 @@ package io.entgra.device.mgt.plugins.input.adapter.mqtt;
 import org.apache.axis2.context.ConfigurationContext;
 import org.osgi.service.http.HttpService;
 import io.entgra.device.mgt.plugins.input.adapter.extension.InputAdapterExtensionService;
-import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService;
 import org.wso2.carbon.event.input.adapter.core.InputEventAdapterService;
 
 /**

components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/util/MQTTAdapterListener.java

@@ -22,13 +22,13 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.eclipse.paho.client.mqttv3.*;
 import org.eclipse.paho.client.mqttv3.persist.MqttDefaultFilePersistence;
-import org.wso2.carbon.apimgt.keymgt.extension.DCRResponse;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.DCRResponse;
-import org.wso2.carbon.apimgt.keymgt.extension.TokenRequest;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.TokenRequest;
-import org.wso2.carbon.apimgt.keymgt.extension.TokenResponse;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.TokenResponse;
-import org.wso2.carbon.apimgt.keymgt.extension.exception.BadRequestException;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.exception.BadRequestException;
-import org.wso2.carbon.apimgt.keymgt.extension.exception.KeyMgtException;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.exception.KeyMgtException;
-import org.wso2.carbon.apimgt.keymgt.extension.service.KeyMgtService;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.service.KeyMgtService;
-import org.wso2.carbon.apimgt.keymgt.extension.service.KeyMgtServiceImpl;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.service.KeyMgtServiceImpl;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.core.ServerStatus;
 import org.wso2.carbon.core.multitenancy.utils.TenantAxisUtils;
@@ -39,7 +39,7 @@ import io.entgra.device.mgt.plugins.input.adapter.mqtt.InputAdapterServiceDataHo
 import org.wso2.carbon.event.input.adapter.core.InputEventAdapterConfiguration;
 import org.wso2.carbon.event.input.adapter.core.InputEventAdapterListener;
 import org.wso2.carbon.event.input.adapter.core.exception.InputEventAdapterRuntimeException;
-import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException;
 import org.wso2.carbon.user.api.UserStoreException;
 import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
 

components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml

@@ -20,7 +20,7 @@
 
 	<parent>
 		<groupId>io.entgra.device.mgt.plugins</groupId>
-		<artifactId>io.entgra.device.mgt.plugins.cdmf-transport-adapters</artifactId>
+		<artifactId>cdmf-transport-adapters</artifactId>
 		<version>6.0.17-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>

components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml

@@ -19,7 +19,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
-        <artifactId>io.entgra.device.mgt.plugins.cdmf-transport-adapters</artifactId>
+        <artifactId>cdmf-transport-adapters</artifactId>
         <version>6.0.17-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml

@@ -19,7 +19,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
-        <artifactId>io.entgra.device.mgt.plugins.cdmf-transport-adapters</artifactId>
+        <artifactId>cdmf-transport-adapters</artifactId>
         <version>6.0.17-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
@@ -51,8 +51,8 @@
             <artifactId>httpclient</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.identity.jwt.client.extension</artifactId>
+            <artifactId>io.entgra.device.mgt.core.identity.jwt.client.extension</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
@@ -125,7 +125,7 @@
                             org.apache.http.client.entity,
                             org.apache.http.message,
                             org.apache.commons.ssl,
-                            org.wso2.carbon.identity.jwt.client.extension.*,
+                            io.entgra.device.mgt.core.identity.jwt.client.extension.*,
                             org.wso2.carbon.user.api,
                             javax.xml.namespace; version=0.0.0
                         </Import-Package>

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/src/main/java/io/entgra/device/mgt/plugins/output/adapter/http/HTTPEventAdapter.java

@@ -47,9 +47,9 @@ import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterConfiguration
 import org.wso2.carbon.event.output.adapter.core.exception.OutputEventAdapterException;
 import org.wso2.carbon.event.output.adapter.core.exception.OutputEventAdapterRuntimeException;
 import org.wso2.carbon.event.output.adapter.core.exception.TestConnectionNotSupportedException;
-import org.wso2.carbon.identity.jwt.client.extension.dto.AccessTokenInfo;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.AccessTokenInfo;
-import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException;
-import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService;
 import org.wso2.carbon.user.api.UserStoreException;
 
 import java.io.IOException;

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/src/main/java/io/entgra/device/mgt/plugins/output/adapter/http/internal/HTTPEventAdapterServiceComponent.java

@@ -22,11 +22,11 @@ import org.apache.commons.logging.LogFactory;
 import org.osgi.service.component.ComponentContext;
 import io.entgra.device.mgt.plugins.output.adapter.http.HTTPEventAdapterFactory;
 import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterFactory;
-import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService;
 
 /**
  * @scr.component component.name="output.Http.AdapterService.component" immediate="true"
- * @scr.reference name="jwt.client.service" interface="org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService"
+ * @scr.reference name="jwt.client.service" interface="io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService"
  * cardinality="1..1"
  * policy="dynamic"
  * bind="setJWTClientManagerService"

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/src/main/java/io/entgra/device/mgt/plugins/output/adapter/http/internal/OutputAdapterServiceDataHolder.java

@@ -14,7 +14,7 @@
  */
 package io.entgra.device.mgt.plugins.output.adapter.http.internal;
 
-import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService;
 
 /**
  * common place to hold some OSGI service references.

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml

@@ -19,7 +19,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
-        <artifactId>io.entgra.device.mgt.plugins.cdmf-transport-adapters</artifactId>
+        <artifactId>cdmf-transport-adapters</artifactId>
         <version>6.0.17-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
@@ -66,16 +66,16 @@
             <artifactId>json-simple</artifactId>
         </dependency>
 		<dependency>
-			<groupId>org.wso2.carbon.devicemgt</groupId>
+			<groupId>io.entgra.device.mgt.core</groupId>
-			<artifactId>org.wso2.carbon.identity.jwt.client.extension</artifactId>
+			<artifactId>io.entgra.device.mgt.core.identity.jwt.client.extension</artifactId>
 		</dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.user.api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.apimgt.keymgt.extension</artifactId>
+            <artifactId>io.entgra.device.mgt.core.apimgt.keymgt.extension</artifactId>
         </dependency>
     </dependencies>
     <build>
@@ -138,11 +138,11 @@
 							org.apache.http.client.entity,
 							org.apache.http.message,
 							org.apache.commons.ssl,
-							org.wso2.carbon.identity.jwt.client.extension.*,
+							io.entgra.device.mgt.core.identity.jwt.client.extension.*,
 							org.wso2.carbon.user.api,
-                            org.wso2.carbon.apimgt.keymgt.extension;version="[5.0,6)",
+                            io.entgra.device.mgt.core.apimgt.keymgt.extension;version="[5.0,6)",
-                            org.wso2.carbon.apimgt.keymgt.extension.exception;version="[5.0,6)",
+                            io.entgra.device.mgt.core.apimgt.keymgt.extension.exception;version="[5.0,6)",
-                            org.wso2.carbon.apimgt.keymgt.extension.service;version="[5.0,6)"
+                            io.entgra.device.mgt.core.apimgt.keymgt.extension.service;version="[5.0,6)"
                         </Import-Package>
                     </instructions>
                 </configuration>

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/output/adapter/mqtt/internal/MQTTEventAdapterServiceComponent.java

@@ -22,11 +22,11 @@ import org.apache.commons.logging.LogFactory;
 import org.osgi.service.component.ComponentContext;
 import io.entgra.device.mgt.plugins.output.adapter.mqtt.MQTTEventAdapterFactory;
 import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterFactory;
-import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService;
 
 /**
  * @scr.component component.name="output.Mqtt.AdapterService.component" immediate="true"
- * @scr.reference name="jwt.client.service" interface="org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService"
+ * @scr.reference name="jwt.client.service" interface="io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService"
  * cardinality="1..1"
  * policy="dynamic"
  * bind="setJWTClientManagerService"

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/output/adapter/mqtt/internal/OutputAdapterServiceDataHolder.java

@@ -14,7 +14,7 @@
  */
 package io.entgra.device.mgt.plugins.output.adapter.mqtt.internal;
 
-import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService;
 
 /**
  * common place to hold some OSGI service references.

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/output/adapter/mqtt/util/MQTTAdapterPublisher.java

@@ -34,20 +34,20 @@ import org.eclipse.paho.client.mqttv3.persist.MqttDefaultFilePersistence;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
-import org.wso2.carbon.apimgt.keymgt.extension.DCRResponse;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.DCRResponse;
-import org.wso2.carbon.apimgt.keymgt.extension.TokenRequest;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.TokenRequest;
-import org.wso2.carbon.apimgt.keymgt.extension.TokenResponse;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.TokenResponse;
-import org.wso2.carbon.apimgt.keymgt.extension.exception.BadRequestException;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.exception.BadRequestException;
-import org.wso2.carbon.apimgt.keymgt.extension.exception.KeyMgtException;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.exception.KeyMgtException;
-import org.wso2.carbon.apimgt.keymgt.extension.service.KeyMgtService;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.service.KeyMgtService;
-import org.wso2.carbon.apimgt.keymgt.extension.service.KeyMgtServiceImpl;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.service.KeyMgtServiceImpl;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.event.output.adapter.core.exception.ConnectionUnavailableException;
 import org.wso2.carbon.event.output.adapter.core.exception.OutputEventAdapterException;
 import org.wso2.carbon.event.output.adapter.core.exception.OutputEventAdapterRuntimeException;
-import org.wso2.carbon.identity.jwt.client.extension.dto.AccessTokenInfo;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.AccessTokenInfo;
-import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException;
-import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService;
 import org.wso2.carbon.user.api.UserStoreException;
 
 /**

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml

@@ -21,7 +21,7 @@
 
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
-        <artifactId>io.entgra.device.mgt.plugins.cdmf-transport-adapters</artifactId>
+        <artifactId>cdmf-transport-adapters</artifactId>
         <version>6.0.17-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml

@@ -20,7 +20,7 @@
 
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
-        <artifactId>io.entgra.device.mgt.plugins.cdmf-transport-adapters</artifactId>
+        <artifactId>cdmf-transport-adapters</artifactId>
         <version>6.0.17-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml

@@ -19,7 +19,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
-        <artifactId>io.entgra.device.mgt.plugins.cdmf-transport-adapters</artifactId>
+        <artifactId>cdmf-transport-adapters</artifactId>
         <version>6.0.17-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>

components/extensions/cdmf-transport-adapters/pom.xml

@@ -21,13 +21,13 @@
 
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
-        <artifactId>io.entgra.device.mgt.plugins.extensions</artifactId>
+        <artifactId>extensions</artifactId>
         <version>6.0.17-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>io.entgra.device.mgt.plugins.cdmf-transport-adapters</artifactId>
+    <artifactId>cdmf-transport-adapters</artifactId>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - IoT Base Plugin</name>
     <url>http://wso2.org</url>

components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml

@@ -20,7 +20,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
-        <artifactId>io.entgra.device.mgt.plugins.emqx-extensions</artifactId>
+        <artifactId>emqx-extensions</artifactId>
         <version>6.0.17-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -70,8 +70,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
+            <artifactId>io.entgra.device.mgt.core.device.mgt.core</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>

components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/src/main/java/io/entgra/device/mgt/plugins/emqx/exhook/ExServer.java

@@ -34,13 +34,13 @@ import org.apache.http.HttpStatus;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
-import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager;
+import io.entgra.device.mgt.core.device.mgt.core.config.DeviceConfigurationManager;
-import org.wso2.carbon.device.mgt.core.config.keymanager.KeyManagerConfigurations;
+import io.entgra.device.mgt.core.device.mgt.core.config.keymanager.KeyManagerConfigurations;
-import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder;
+import io.entgra.device.mgt.core.device.mgt.core.internal.DeviceManagementDataHolder;
-import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
+import io.entgra.device.mgt.core.device.mgt.core.service.DeviceManagementProviderService;
-import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
+import io.entgra.device.mgt.core.device.mgt.common.EnrolmentInfo;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.context.CarbonContext;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import java.io.IOException;

components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml

@@ -20,7 +20,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
-        <artifactId>io.entgra.device.mgt.plugins.emqx-extensions</artifactId>
+        <artifactId>emqx-extensions</artifactId>
         <version>6.0.17-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

components/extensions/emqx-extensions/pom.xml

@@ -21,13 +21,13 @@
 
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
-        <artifactId>io.entgra.device.mgt.plugins.extensions</artifactId>
+        <artifactId>extensions</artifactId>
         <version>6.0.17-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>io.entgra.device.mgt.plugins.emqx-extensions</artifactId>
+    <artifactId>emqx-extensions</artifactId>
     <packaging>pom</packaging>
     <name>EMQX Extensions</name>
 

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

@@ -174,13 +174,13 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
+            <artifactId>io.entgra.device.mgt.core.device.mgt.common</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
+            <artifactId>io.entgra.device.mgt.core.device.mgt.core</artifactId>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
@@ -198,8 +198,8 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <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>
@@ -233,8 +233,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.certificate.mgt.core</artifactId>
+            <artifactId>io.entgra.device.mgt.core.certificate.mgt.core</artifactId>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
@@ -289,8 +289,8 @@
             <!--<scope>provided</scope>-->
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.apimgt.annotations</artifactId>
+            <artifactId>io.entgra.device.mgt.core.apimgt.annotations</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.api/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/jaxrs/service/MQTTManagementAdminService.java

@@ -30,9 +30,9 @@ import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import io.swagger.annotations.ResponseHeader;
 import org.wso2.carbon.andes.extensions.device.mgt.jaxrs.beans.ErrorResponse;
-import org.wso2.carbon.apimgt.annotations.api.Scope;
+import io.entgra.device.mgt.core.apimgt.annotations.Scope;
-import org.wso2.carbon.apimgt.annotations.api.Scopes;
+import io.entgra.device.mgt.core.apimgt.annotations.Scopes;
-import org.wso2.carbon.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
 import org.wso2.carbon.andes.extensions.device.mgt.jaxrs.util.Constants;
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;

components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.api/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/jaxrs/util/MQTTMgtAPIUtils.java

@@ -22,7 +22,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.CarbonContext;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
 import org.wso2.carbon.user.api.AuthorizationManager;
 import org.wso2.carbon.user.api.UserRealm;
 import org.wso2.carbon.user.api.UserStoreException;

components/extensions/pom.xml

@@ -27,7 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>io.entgra.device.mgt.plugins.extensions</artifactId>
+    <artifactId>extensions</artifactId>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Mobile Plugins Extensions</name>
     <url>http://wso2.org</url>

components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml

@@ -21,7 +21,7 @@
 
 	<parent>
 		<groupId>io.entgra.device.mgt.plugins</groupId>
-		<artifactId>io.entgra.device.mgt.plugins.pull-notification-listeners</artifactId>
+		<artifactId>pull-notification-listeners</artifactId>
         <version>6.0.17-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
@@ -36,12 +36,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
+            <artifactId>io.entgra.device.mgt.core.device.mgt.common</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
+            <artifactId>io.entgra.device.mgt.core.device.mgt.core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon.analytics-common</groupId>
@@ -89,8 +89,8 @@
                             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.device.mgt.common.*,
+                            io.entgra.device.mgt.core.device.mgt.common.*,
-                            org.wso2.carbon.device.mgt.core.service,
+                            io.entgra.device.mgt.core.device.mgt.core.service,
 							com.google.gson,
 							org.wso2.carbon.context,
                             io.entgra.device.mgt.plugins.input.adapter.extension,
@@ -98,8 +98,8 @@
 							org.wso2.carbon.event.input.adapter.core.exception,
 							org.wso2.carbon.user.api,
 							org.wso2.carbon.core,
-							org.wso2.carbon.device.mgt.core.config,
+							io.entgra.device.mgt.core.device.mgt.core.config,
-							org.wso2.carbon.device.mgt.core.config.pull.notification,
+							io.entgra.device.mgt.core.device.mgt.core.config.pull.notification,
 							org.wso2.carbon.utils.multitenancy
                         </Import-Package>
                     </instructions>

components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/src/main/java/io/entgra/device/mgt/plugins/mqtt/notification/listener/DeviceTypeOperationAdapterSubscription.java

@@ -21,9 +21,9 @@ package io.entgra.device.mgt.plugins.mqtt.notification.listener;
 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.Device;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.pull.notification.PullNotificationExecutionFailedException;
+import io.entgra.device.mgt.core.device.mgt.common.pull.notification.PullNotificationExecutionFailedException;
 import io.entgra.device.mgt.plugins.mqtt.notification.listener.internal.MqttNotificationDataHolder;
 import org.wso2.carbon.event.input.adapter.core.InputEventAdapterSubscription;
 import org.wso2.carbon.user.api.UserStoreException;

components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/src/main/java/io/entgra/device/mgt/plugins/mqtt/notification/listener/NotificationMessage.java

@@ -18,8 +18,8 @@
  */
 package io.entgra.device.mgt.plugins.mqtt.notification.listener;
 
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Operation;
 
 public class NotificationMessage {
 

components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/src/main/java/io/entgra/device/mgt/plugins/mqtt/notification/listener/PullNotificationMqttContentTransformer.java

@@ -20,8 +20,8 @@ package io.entgra.device.mgt.plugins.mqtt.notification.listener;
 
 import com.google.gson.Gson;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Operation;
 import io.entgra.device.mgt.plugins.input.adapter.extension.ContentTransformer;
 
 import java.util.Map;

components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/src/main/java/io/entgra/device/mgt/plugins/mqtt/notification/listener/PullNotificationStartupListener.java

@@ -22,7 +22,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.core.ServerStartupObserver;
-import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager;
+import io.entgra.device.mgt.core.device.mgt.core.config.DeviceConfigurationManager;
 import io.entgra.device.mgt.plugins.mqtt.notification.listener.internal.MqttNotificationDataHolder;
 import io.entgra.device.mgt.plugins.mqtt.notification.listener.util.MqttNotificationListener;
 import org.wso2.carbon.utils.multitenancy.MultitenantConstants;

components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/src/main/java/io/entgra/device/mgt/plugins/mqtt/notification/listener/internal/MqttNotificationDataHolder.java

@@ -18,7 +18,7 @@
  */
 package io.entgra.device.mgt.plugins.mqtt.notification.listener.internal;
 
-import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
+import io.entgra.device.mgt.core.device.mgt.core.service.DeviceManagementProviderService;
 import org.wso2.carbon.event.input.adapter.core.InputEventAdapterService;
 
 public class MqttNotificationDataHolder {

components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/src/main/java/io/entgra/device/mgt/plugins/mqtt/notification/listener/internal/PullNotificationListenerServiceComponent.java

@@ -23,7 +23,7 @@ import org.apache.commons.logging.LogFactory;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.component.ComponentContext;
 import org.wso2.carbon.core.ServerStartupObserver;
-import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
+import io.entgra.device.mgt.core.device.mgt.core.service.DeviceManagementProviderService;
 import io.entgra.device.mgt.plugins.input.adapter.extension.ContentTransformer;
 import io.entgra.device.mgt.plugins.mqtt.notification.listener.PullNotificationMqttContentTransformer;
 import io.entgra.device.mgt.plugins.mqtt.notification.listener.PullNotificationStartupListener;
@@ -32,7 +32,7 @@ import org.wso2.carbon.event.input.adapter.core.InputEventAdapterService;
 /**
  * @scr.component name="io.entgra.device.mgt.plugins.mqtt.notification.listener.internal.PullNotificationListenerServiceComponent" immediate="true"
  * @scr.reference name="carbon.device.mgt.provider"
- * interface="org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService"
+ * interface="io.entgra.device.mgt.core.device.mgt.core.service.DeviceManagementProviderService"
  * cardinality="1..1"
  * policy="dynamic"
  * bind="setDeviceManagementProviderService"

components/extensions/pull-notification-listeners/pom.xml

@@ -21,13 +21,13 @@
 
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
-        <artifactId>io.entgra.device.mgt.plugins.extensions</artifactId>
+        <artifactId>extensions</artifactId>
         <version>6.0.17-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>io.entgra.device.mgt.plugins.pull-notification-listeners</artifactId>
+    <artifactId>pull-notification-listeners</artifactId>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Pull Notification Extension</name>
     <url>http://wso2.org</url>

components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml

@@ -19,7 +19,7 @@
 
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
-        <artifactId>io.entgra.device.mgt.plugins.siddhi-extensions</artifactId>
+        <artifactId>siddhi-extensions</artifactId>
         <version>6.0.17-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -36,12 +36,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
+            <artifactId>io.entgra.device.mgt.core.device.mgt.core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
+            <artifactId>io.entgra.device.mgt.core.device.mgt.common</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.siddhi</groupId>
@@ -60,8 +60,8 @@
             <artifactId>json</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.identity.jwt.client.extension</artifactId>
+            <artifactId>io.entgra.device.mgt.core.identity.jwt.client.extension</artifactId>
         </dependency>
         <dependency>
             <groupId>io.github.openfeign</groupId>
@@ -183,8 +183,8 @@
                             org.json;version="${orbit.version.json.range}",
                             org.wso2.siddhi.core.*,
                             org.wso2.siddhi.query.api.*,
-                            org.wso2.carbon.device.mgt.core.*,
+                            io.entgra.device.mgt.core.device.mgt.core.*,
-                            org.wso2.carbon.device.mgt.common.*,
+                            io.entgra.device.mgt.core.device.mgt.common.*,
                             org.wso2.carbon.identity.jwt.client.*,
                             org.apache.commons.logging,
                             org.wso2.carbon.context,

components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/AddNotificationFunctionProcessor.java

@@ -20,10 +20,10 @@ package io.entgra.device.mgt.plugins.extension.siddhi.device;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.notification.mgt.Notification;
+import io.entgra.device.mgt.core.device.mgt.common.notification.mgt.Notification;
-import org.wso2.carbon.device.mgt.common.notification.mgt.NotificationManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.notification.mgt.NotificationManagementException;
-import org.wso2.carbon.device.mgt.common.notification.mgt.NotificationManagementService;
+import io.entgra.device.mgt.core.device.mgt.common.notification.mgt.NotificationManagementService;
 import io.entgra.device.mgt.plugins.extension.siddhi.device.utils.DeviceUtils;
 import org.wso2.siddhi.core.config.ExecutionPlanContext;
 import org.wso2.siddhi.core.exception.ExecutionPlanRuntimeException;

components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/AddOperationFunctionProcessor.java

@@ -28,8 +28,8 @@ import feign.slf4j.Slf4jLogger;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.json.JSONArray;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Activity;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Operation;
 import io.entgra.device.mgt.plugins.extension.siddhi.device.client.OAuthRequestInterceptor;
 import io.entgra.device.mgt.plugins.extension.siddhi.device.client.configs.SiddhiExtensionConfigReader;
 import io.entgra.device.mgt.plugins.extension.siddhi.device.client.dto.OperationRequest;

components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/GetDevicesOfStatusFunctionExecutor.java

@@ -21,10 +21,10 @@ package io.entgra.device.mgt.plugins.extension.siddhi.device;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.json.JSONArray;
-import org.wso2.carbon.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
+import io.entgra.device.mgt.core.device.mgt.common.EnrolmentInfo;
-import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
+import io.entgra.device.mgt.core.device.mgt.core.service.DeviceManagementProviderService;
 import io.entgra.device.mgt.plugins.extension.siddhi.device.utils.DeviceUtils;
 import org.wso2.siddhi.core.config.ExecutionPlanContext;
 import org.wso2.siddhi.core.exception.ExecutionPlanRuntimeException;

components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/GetDevicesOfUserFunctionExecutor.java

@@ -21,9 +21,9 @@ package io.entgra.device.mgt.plugins.extension.siddhi.device;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.json.JSONArray;
-import org.wso2.carbon.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
+import io.entgra.device.mgt.core.device.mgt.core.service.DeviceManagementProviderService;
 import io.entgra.device.mgt.plugins.extension.siddhi.device.utils.DeviceUtils;
 import org.wso2.siddhi.core.config.ExecutionPlanContext;
 import org.wso2.siddhi.core.exception.ExecutionPlanRuntimeException;

components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/HasDevicesOfStatusFunctionExecutor.java

@@ -20,10 +20,10 @@ package io.entgra.device.mgt.plugins.extension.siddhi.device;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
+import io.entgra.device.mgt.core.device.mgt.common.EnrolmentInfo;
-import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
+import io.entgra.device.mgt.core.device.mgt.core.service.DeviceManagementProviderService;
 import io.entgra.device.mgt.plugins.extension.siddhi.device.utils.DeviceUtils;
 import org.wso2.siddhi.core.config.ExecutionPlanContext;
 import org.wso2.siddhi.core.exception.ExecutionPlanRuntimeException;

components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/HasDevicesOfUserFunctionExecutor.java

@@ -21,9 +21,9 @@ package io.entgra.device.mgt.plugins.extension.siddhi.device;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.json.JSONArray;
-import org.wso2.carbon.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
+import io.entgra.device.mgt.core.device.mgt.core.service.DeviceManagementProviderService;
 import io.entgra.device.mgt.plugins.extension.siddhi.device.utils.DeviceUtils;
 import org.wso2.siddhi.core.config.ExecutionPlanContext;
 import org.wso2.siddhi.core.exception.ExecutionPlanRuntimeException;

components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/IsEnrolledFunctionExecutor.java

@@ -20,11 +20,11 @@ package io.entgra.device.mgt.plugins.extension.siddhi.device;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.group.mgt.GroupManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.group.mgt.GroupManagementException;
-import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
+import io.entgra.device.mgt.core.device.mgt.core.service.DeviceManagementProviderService;
-import org.wso2.carbon.device.mgt.core.service.GroupManagementProviderService;
+import io.entgra.device.mgt.core.device.mgt.core.service.GroupManagementProviderService;
 import io.entgra.device.mgt.plugins.extension.siddhi.device.utils.DeviceUtils;
 import org.wso2.siddhi.core.config.ExecutionPlanContext;
 import org.wso2.siddhi.core.exception.ExecutionPlanRuntimeException;

components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/IsInGroupFunctionExecutor.java

@@ -20,9 +20,9 @@ package io.entgra.device.mgt.plugins.extension.siddhi.device;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.group.mgt.GroupManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.group.mgt.GroupManagementException;
-import org.wso2.carbon.device.mgt.core.service.GroupManagementProviderService;
+import io.entgra.device.mgt.core.device.mgt.core.service.GroupManagementProviderService;
 import io.entgra.device.mgt.plugins.extension.siddhi.device.utils.DeviceUtils;
 import org.wso2.siddhi.core.config.ExecutionPlanContext;
 import org.wso2.siddhi.core.exception.ExecutionPlanRuntimeException;

components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/OAuthRequestInterceptor.java

@@ -32,9 +32,9 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.base.MultitenantConstants;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.jwt.client.extension.JWTClient;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.JWTClient;
-import org.wso2.carbon.identity.jwt.client.extension.dto.AccessTokenInfo;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.AccessTokenInfo;
-import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException;
 import org.wso2.carbon.user.api.UserStoreException;
 import io.entgra.device.mgt.plugins.extension.siddhi.device.client.configs.SiddhiExtensionConfigReader;
 import io.entgra.device.mgt.plugins.extension.siddhi.device.client.dto.OAuthApplication;

components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/dto/OperationRequest.java

@@ -18,7 +18,7 @@
 
 package io.entgra.device.mgt.plugins.extension.siddhi.device.client.dto;
 
-import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Operation;
 
 import java.util.List;
 

components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/services/OperationService.java

@@ -18,7 +18,7 @@
 
 package io.entgra.device.mgt.plugins.extension.siddhi.device.client.services;
 
-import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Activity;
 import io.entgra.device.mgt.plugins.extension.siddhi.device.client.dto.OperationRequest;
 
 import javax.ws.rs.Consumes;

components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/utils/DeviceUtils.java

@@ -20,10 +20,10 @@ package io.entgra.device.mgt.plugins.extension.siddhi.device.utils;
 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.notification.mgt.NotificationManagementService;
+import io.entgra.device.mgt.core.device.mgt.common.notification.mgt.NotificationManagementService;
-import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
+import io.entgra.device.mgt.core.device.mgt.core.service.DeviceManagementProviderService;
-import org.wso2.carbon.device.mgt.core.service.GroupManagementProviderService;
+import io.entgra.device.mgt.core.device.mgt.core.service.GroupManagementProviderService;
-import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService;
 
 /**
  * This class holds utility methods to retrieve data.

components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/io/entgra/device/mgt/plugins/extension/siddhi/device/BaseDeviceManagementTest.java

@@ -24,13 +24,13 @@ import org.testng.annotations.BeforeSuite;
 import org.w3c.dom.Document;
 import org.wso2.carbon.base.MultitenantConstants;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOFactory;
+import io.entgra.device.mgt.core.device.mgt.core.dao.DeviceManagementDAOFactory;
-import org.wso2.carbon.device.mgt.core.dao.GroupManagementDAOFactory;
+import io.entgra.device.mgt.core.device.mgt.core.dao.GroupManagementDAOFactory;
-import org.wso2.carbon.device.mgt.core.metadata.mgt.dao.MetadataManagementDAOFactory;
+import io.entgra.device.mgt.core.device.mgt.core.metadata.mgt.dao.MetadataManagementDAOFactory;
-import org.wso2.carbon.device.mgt.core.notification.mgt.dao.NotificationManagementDAOFactory;
+import io.entgra.device.mgt.core.device.mgt.core.notification.mgt.dao.NotificationManagementDAOFactory;
-import org.wso2.carbon.device.mgt.core.operation.mgt.dao.OperationManagementDAOFactory;
+import io.entgra.device.mgt.core.device.mgt.core.operation.mgt.dao.OperationManagementDAOFactory;
-import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil;
+import io.entgra.device.mgt.core.device.mgt.core.util.DeviceManagerUtil;
 import io.entgra.device.mgt.plugins.extension.siddhi.device.util.DataSourceConfig;
 import io.entgra.device.mgt.plugins.extension.siddhi.device.util.TestUtils;
 

components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/io/entgra/device/mgt/plugins/extension/siddhi/device/ExtensionTestCase.java

@@ -22,22 +22,22 @@ import org.apache.log4j.Logger;
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
-import org.wso2.carbon.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceNotFoundException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceNotFoundException;
-import org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroup;
+import io.entgra.device.mgt.core.device.mgt.common.group.mgt.DeviceGroup;
-import org.wso2.carbon.device.mgt.common.group.mgt.GroupAlreadyExistException;
+import io.entgra.device.mgt.core.device.mgt.common.group.mgt.GroupAlreadyExistException;
-import org.wso2.carbon.device.mgt.common.group.mgt.GroupManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.group.mgt.GroupManagementException;
-import org.wso2.carbon.device.mgt.core.authorization.DeviceAccessAuthorizationServiceImpl;
+import io.entgra.device.mgt.core.device.mgt.core.authorization.DeviceAccessAuthorizationServiceImpl;
-import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager;
+import io.entgra.device.mgt.core.device.mgt.core.config.DeviceConfigurationManager;
-import org.wso2.carbon.device.mgt.core.config.cache.DeviceCacheConfiguration;
+import io.entgra.device.mgt.core.device.mgt.core.config.cache.DeviceCacheConfiguration;
-import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder;
+import io.entgra.device.mgt.core.device.mgt.core.internal.DeviceManagementDataHolder;
-import org.wso2.carbon.device.mgt.core.internal.DeviceManagementServiceComponent;
+import io.entgra.device.mgt.core.device.mgt.core.internal.DeviceManagementServiceComponent;
-import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
+import io.entgra.device.mgt.core.device.mgt.core.service.DeviceManagementProviderService;
-import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderServiceImpl;
+import io.entgra.device.mgt.core.device.mgt.core.service.DeviceManagementProviderServiceImpl;
-import org.wso2.carbon.device.mgt.core.service.GroupManagementProviderService;
+import io.entgra.device.mgt.core.device.mgt.core.service.GroupManagementProviderService;
-import org.wso2.carbon.device.mgt.core.service.GroupManagementProviderServiceImpl;
+import io.entgra.device.mgt.core.device.mgt.core.service.GroupManagementProviderServiceImpl;
 import org.wso2.carbon.registry.core.config.RegistryContext;
 import org.wso2.carbon.registry.core.exceptions.RegistryException;
 import org.wso2.carbon.registry.core.internal.RegistryDataHolder;
@@ -62,8 +62,8 @@ import java.lang.reflect.Field;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroupConstants.Permissions.DEFAULT_ADMIN_PERMISSIONS;
+import static io.entgra.device.mgt.core.device.mgt.common.group.mgt.DeviceGroupConstants.Permissions.DEFAULT_ADMIN_PERMISSIONS;
-import static org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroupConstants.Roles.DEFAULT_ADMIN_ROLE;
+import static io.entgra.device.mgt.core.device.mgt.common.group.mgt.DeviceGroupConstants.Roles.DEFAULT_ADMIN_ROLE;
 
 public class ExtensionTestCase extends BaseDeviceManagementTest {
     private static final Logger log = Logger.getLogger(ExtensionTestCase.class);

components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/io/entgra/device/mgt/plugins/extension/siddhi/device/util/TestDataHolder.java

@@ -15,13 +15,13 @@
 */
 package io.entgra.device.mgt.plugins.extension.siddhi.device.util;
 
-import org.wso2.carbon.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
+import io.entgra.device.mgt.core.device.mgt.common.EnrolmentInfo;
-import org.wso2.carbon.device.mgt.common.app.mgt.Application;
+import io.entgra.device.mgt.core.device.mgt.common.app.mgt.Application;
-import org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroup;
+import io.entgra.device.mgt.core.device.mgt.common.group.mgt.DeviceGroup;
-import org.wso2.carbon.device.mgt.common.notification.mgt.Notification;
+import io.entgra.device.mgt.core.device.mgt.common.notification.mgt.Notification;
-import org.wso2.carbon.device.mgt.core.dto.DeviceType;
+import io.entgra.device.mgt.core.device.mgt.core.dto.DeviceType;
 
 import java.util.ArrayList;
 import java.util.Date;

components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/io/entgra/device/mgt/plugins/extension/siddhi/device/util/TestDeviceManagementService.java

@@ -17,17 +17,17 @@
  */
 package io.entgra.device.mgt.plugins.extension.siddhi.device.util;
 
-import org.wso2.carbon.device.mgt.common.*;
+import io.entgra.device.mgt.core.device.mgt.common.*;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManager;
+import io.entgra.device.mgt.core.device.mgt.common.app.mgt.ApplicationManager;
-import org.wso2.carbon.device.mgt.common.general.GeneralConfig;
+import io.entgra.device.mgt.core.device.mgt.common.general.GeneralConfig;
-import org.wso2.carbon.device.mgt.common.invitation.mgt.DeviceEnrollmentInvitationDetails;
+import io.entgra.device.mgt.core.device.mgt.common.invitation.mgt.DeviceEnrollmentInvitationDetails;
-import org.wso2.carbon.device.mgt.common.license.mgt.License;
+import io.entgra.device.mgt.core.device.mgt.common.license.mgt.License;
-import org.wso2.carbon.device.mgt.common.policy.mgt.PolicyMonitoringManager;
+import io.entgra.device.mgt.core.device.mgt.common.policy.mgt.PolicyMonitoringManager;
-import org.wso2.carbon.device.mgt.common.pull.notification.PullNotificationSubscriber;
+import io.entgra.device.mgt.core.device.mgt.common.pull.notification.PullNotificationSubscriber;
-import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;
+import io.entgra.device.mgt.core.device.mgt.common.push.notification.PushNotificationConfig;
-import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService;
+import io.entgra.device.mgt.core.device.mgt.common.spi.DeviceManagementService;
-import org.wso2.carbon.device.mgt.common.type.mgt.DeviceTypePlatformDetails;
+import io.entgra.device.mgt.core.device.mgt.common.type.mgt.DeviceTypePlatformDetails;
 
 import java.util.ArrayList;
 import java.util.List;

components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/io/entgra/device/mgt/plugins/extension/siddhi/device/util/TestDeviceManager.java

@@ -15,15 +15,15 @@
 */
 package io.entgra.device.mgt.plugins.extension.siddhi.device.util;
 
-import org.wso2.carbon.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.DeviceManager;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceManager;
-import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
+import io.entgra.device.mgt.core.device.mgt.common.EnrolmentInfo;
-import org.wso2.carbon.device.mgt.common.FeatureManager;
+import io.entgra.device.mgt.core.device.mgt.common.FeatureManager;
-import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
+import io.entgra.device.mgt.core.device.mgt.common.configuration.mgt.PlatformConfiguration;
-import org.wso2.carbon.device.mgt.common.license.mgt.License;
+import io.entgra.device.mgt.core.device.mgt.common.license.mgt.License;
-import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.license.mgt.LicenseManagementException;
 
 import java.util.List;
 

components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/io/entgra/device/mgt/plugins/extension/siddhi/device/util/TestUtils.java

@@ -19,10 +19,10 @@ package io.entgra.device.mgt.plugins.extension.siddhi.device.util;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.GroupPaginationRequest;
+import io.entgra.device.mgt.core.device.mgt.common.GroupPaginationRequest;
-import org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroup;
+import io.entgra.device.mgt.core.device.mgt.common.group.mgt.DeviceGroup;
 
 import java.sql.Connection;
 import java.sql.ResultSet;

components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/resources/carbon-home/repository/conf/cdm-config.xml

@@ -31,11 +31,11 @@
         <SchedulerTaskInitialDelay>60000</SchedulerTaskInitialDelay>
         <SchedulerTaskEnabled>true</SchedulerTaskEnabled>
         <PushNotificationProviders>
-            <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider</Provider>
+            <Provider>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider</Provider>
             <!--<Provider>org.wso2.carbon.device.mgt.mobile.impl.ios.apns.APNSBasedPushNotificationProvider</Provider>-->
-            <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider</Provider>
+            <Provider>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider</Provider>
-			<Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider</Provider>
+			<Provider>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider</Provider>
-            <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider</Provider>
+            <Provider>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider</Provider>
         </PushNotificationProviders>
     </PushNotificationConfiguration>
 	<PullNotificationConfiguration>

components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml

@@ -19,7 +19,7 @@
 
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
-        <artifactId>io.entgra.device.mgt.plugins.siddhi-extensions</artifactId>
+        <artifactId>siddhi-extensions</artifactId>
         <version>6.0.17-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

components/extensions/siddhi-extensions/pom.xml

@@ -21,13 +21,13 @@
 
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
-        <artifactId>io.entgra.device.mgt.plugins.extensions</artifactId>
+        <artifactId>extensions</artifactId>
         <version>6.0.17-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>io.entgra.device.mgt.plugins.siddhi-extensions</artifactId>
+    <artifactId>siddhi-extensions</artifactId>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Siddhi Extension</name>
     <url>http://wso2.org</url>

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml

@@ -19,7 +19,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
-        <artifactId>io.entgra.device.mgt.plugins.android-plugin</artifactId>
+        <artifactId>android-plugin</artifactId>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <version>6.0.17-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
@@ -212,18 +212,18 @@
 
         <!--CDM Dependencies-->
         <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
+            <artifactId>io.entgra.device.mgt.core.device.mgt.common</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.apimgt.annotations</artifactId>
+            <artifactId>io.entgra.device.mgt.core.apimgt.annotations</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
+            <artifactId>io.entgra.device.mgt.core.device.mgt.core</artifactId>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
@@ -233,13 +233,13 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <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>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <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>
         </dependency>
         <dependency>

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/AndroidPlatformConfiguration.java

@@ -20,7 +20,7 @@ package io.entgra.device.mgt.plugins.mobile.android.api.bean;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationEntry;
+import io.entgra.device.mgt.core.device.mgt.common.configuration.mgt.ConfigurationEntry;
 import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 import javax.xml.bind.annotation.XmlAccessType;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/Disenrollment.java

@@ -20,7 +20,7 @@ package io.entgra.device.mgt.plugins.mobile.android.api.bean;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Operation;
 import java.io.Serializable;
 
 @ApiModel(value = "Disenrollment",

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/AndroidDevice.java

@@ -18,11 +18,11 @@
 package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper;
 
 import io.swagger.annotations.ApiModelProperty;
-import org.wso2.carbon.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
-import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
+import io.entgra.device.mgt.core.device.mgt.common.EnrolmentInfo;
-import org.wso2.carbon.device.mgt.common.Feature;
+import io.entgra.device.mgt.core.device.mgt.common.Feature;
-import org.wso2.carbon.device.mgt.common.app.mgt.Application;
+import io.entgra.device.mgt.core.device.mgt.common.app.mgt.Application;
-import org.wso2.carbon.device.mgt.common.device.details.DeviceInfo;
+import io.entgra.device.mgt.core.device.mgt.common.device.details.DeviceInfo;
 
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/AndroidDeviceInfo.java

@@ -3,8 +3,8 @@ package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.wso2.carbon.device.mgt.common.device.details.DeviceInfo;
+import io.entgra.device.mgt.core.device.mgt.common.device.details.DeviceInfo;
-import org.wso2.carbon.device.mgt.common.device.details.DeviceLocation;
+import io.entgra.device.mgt.core.device.mgt.common.device.details.DeviceLocation;
 
 import java.io.Serializable;
 import java.util.Date;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/DeviceEnrollmentInfo.java

@@ -19,8 +19,8 @@ package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.wso2.carbon.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
-import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
+import io.entgra.device.mgt.core.device.mgt.common.EnrolmentInfo;
 
 import java.io.Serializable;
 

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceManagementAdminService.java

@@ -32,9 +32,9 @@ import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import io.swagger.annotations.ResponseHeader;
-import org.wso2.carbon.apimgt.annotations.api.Scope;
+import io.entgra.device.mgt.core.apimgt.annotations.Scope;
-import org.wso2.carbon.apimgt.annotations.api.Scopes;
+import io.entgra.device.mgt.core.apimgt.annotations.Scopes;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Activity;
 
 import javax.validation.Valid;
 import javax.ws.rs.Consumes;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceManagementService.java

@@ -21,9 +21,9 @@ package io.entgra.device.mgt.plugins.mobile.android.api.services;
 import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidConstants;
 import io.swagger.annotations.*;
 
-import org.wso2.carbon.apimgt.annotations.api.Scope;
+import io.entgra.device.mgt.core.apimgt.annotations.Scope;
-import org.wso2.carbon.apimgt.annotations.api.Scopes;
+import io.entgra.device.mgt.core.apimgt.annotations.Scopes;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Operation;
 import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.AndroidApplication;
 import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.AndroidDevice;
 

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceTypeConfigurationService.java

@@ -31,9 +31,9 @@ import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import io.swagger.annotations.ResponseHeader;
-import org.wso2.carbon.apimgt.annotations.api.Scope;
+import io.entgra.device.mgt.core.apimgt.annotations.Scope;
-import org.wso2.carbon.apimgt.annotations.api.Scopes;
+import io.entgra.device.mgt.core.apimgt.annotations.Scopes;
-import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
+import io.entgra.device.mgt.core.device.mgt.common.configuration.mgt.PlatformConfiguration;
 import io.entgra.device.mgt.plugins.mobile.android.api.bean.AndroidPlatformConfiguration;
 
 import javax.validation.Valid;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/EventReceiverService.java

@@ -30,8 +30,8 @@ import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import io.swagger.annotations.ResponseHeader;
-import org.wso2.carbon.apimgt.annotations.api.Scope;
+import io.entgra.device.mgt.core.apimgt.annotations.Scope;
-import org.wso2.carbon.apimgt.annotations.api.Scopes;
+import io.entgra.device.mgt.core.apimgt.annotations.Scopes;
 import io.entgra.device.mgt.plugins.mobile.android.api.bean.DeviceState;
 import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.EventBeanWrapper;
 

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/impl/DeviceManagementAdminServiceImpl.java

@@ -26,13 +26,13 @@ import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidDeviceUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.json.JSONException;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.exceptions.InvalidDeviceException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.InvalidDeviceException;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Activity;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Operation;
-import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.OperationManagementException;
-import org.wso2.carbon.device.mgt.core.operation.mgt.CommandOperation;
+import io.entgra.device.mgt.core.device.mgt.core.operation.mgt.CommandOperation;
-import org.wso2.carbon.device.mgt.core.operation.mgt.ProfileOperation;
+import io.entgra.device.mgt.core.device.mgt.core.operation.mgt.ProfileOperation;
 import io.entgra.device.mgt.plugins.mobile.android.api.bean.ApplicationInstallation;
 import io.entgra.device.mgt.plugins.mobile.android.api.bean.ApplicationUninstallation;
 import io.entgra.device.mgt.plugins.mobile.android.api.bean.ApplicationUpdate;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/impl/DeviceManagementServiceImpl.java

@@ -28,26 +28,26 @@ import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidDeviceUtils;
 import io.entgra.device.mgt.plugins.mobile.android.api.util.Message;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceManagementConstants;
-import org.wso2.carbon.device.mgt.common.app.mgt.Application;
+import io.entgra.device.mgt.core.device.mgt.common.app.mgt.Application;
-import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.app.mgt.ApplicationManagementException;
-import org.wso2.carbon.device.mgt.common.device.details.DeviceLocation;
+import io.entgra.device.mgt.core.device.mgt.common.device.details.DeviceLocation;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.exceptions.InvalidDeviceException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.InvalidDeviceException;
-import org.wso2.carbon.device.mgt.common.notification.mgt.NotificationManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.notification.mgt.NotificationManagementException;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Operation;
-import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.OperationManagementException;
-import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.PolicyComplianceException;
+import io.entgra.device.mgt.core.device.mgt.common.policy.mgt.monitor.PolicyComplianceException;
-import org.wso2.carbon.device.mgt.core.device.details.mgt.DeviceDetailsMgtException;
+import io.entgra.device.mgt.core.device.mgt.core.device.details.mgt.DeviceDetailsMgtException;
-import org.wso2.carbon.device.mgt.core.device.details.mgt.DeviceInformationManager;
+import io.entgra.device.mgt.core.device.mgt.core.device.details.mgt.DeviceInformationManager;
-import org.wso2.carbon.device.mgt.core.operation.mgt.CommandOperation;
+import io.entgra.device.mgt.core.device.mgt.core.operation.mgt.CommandOperation;
 import io.entgra.device.mgt.plugins.mobile.android.api.bean.ErrorResponse;
 import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.AndroidApplication;
 import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.AndroidDevice;
-import org.wso2.carbon.policy.mgt.common.PolicyManagementException;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyManagementException;
-import org.wso2.carbon.policy.mgt.core.PolicyManagerService;
+import io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerService;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
@@ -230,10 +230,10 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
         for (Operation operation : operations) {
             AndroidDeviceUtils.updateOperation(device, operation);
             if (OPERATION_ERROR_STATUS.equals(operation.getStatus().toString())) {
-                org.wso2.carbon.device.mgt.common.notification.mgt.Notification notification = new
+                io.entgra.device.mgt.core.device.mgt.common.notification.mgt.Notification notification = new
-                        org.wso2.carbon.device.mgt.common.notification.mgt.Notification();
+                        io.entgra.device.mgt.core.device.mgt.common.notification.mgt.Notification();
                 notification.setOperationId(operation.getId());
-                notification.setStatus(org.wso2.carbon.device.mgt.common.notification.mgt.Notification.
+                notification.setStatus(io.entgra.device.mgt.core.device.mgt.common.notification.mgt.Notification.
                         Status.NEW.toString());
                 notification.setDescription(operation.getCode() + " operation failed to execute on device " +
                         deviceName + " (ID: " + device.getDeviceIdentifier() + ")");

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/impl/DeviceTypeConfigurationServiceImpl.java

@@ -25,17 +25,17 @@ import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidAPIUtils;
 import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceManagementConstants;
-import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
+import io.entgra.device.mgt.core.device.mgt.common.EnrolmentInfo;
-import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationEntry;
+import io.entgra.device.mgt.core.device.mgt.common.configuration.mgt.ConfigurationEntry;
-import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
+import io.entgra.device.mgt.core.device.mgt.common.configuration.mgt.PlatformConfiguration;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.exceptions.InvalidDeviceException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.InvalidDeviceException;
-import org.wso2.carbon.device.mgt.common.license.mgt.License;
+import io.entgra.device.mgt.core.device.mgt.common.license.mgt.License;
-import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.OperationManagementException;
-import org.wso2.carbon.device.mgt.core.operation.mgt.ProfileOperation;
+import io.entgra.device.mgt.core.device.mgt.core.operation.mgt.ProfileOperation;
 import io.entgra.device.mgt.plugins.mobile.android.api.bean.AndroidPlatformConfiguration;
 import io.entgra.device.mgt.plugins.mobile.android.api.bean.ErrorResponse;
 import io.entgra.device.mgt.plugins.mobile.android.api.bean.NotifierFrequency;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/impl/EventReceiverServiceImpl.java

@@ -25,11 +25,11 @@ import io.entgra.device.mgt.plugins.mobile.android.api.exception.UnexpectedServe
 import io.entgra.device.mgt.plugins.mobile.android.api.services.EventReceiverService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
+import io.entgra.device.mgt.core.device.mgt.common.EnrolmentInfo;
-import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil;
+import io.entgra.device.mgt.core.device.mgt.core.util.DeviceManagerUtil;
 import io.entgra.device.mgt.plugins.mobile.android.api.bean.ErrorResponse;
 import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.EventBeanWrapper;
 

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/util/AndroidAPIUtils.java

@@ -21,11 +21,11 @@ package io.entgra.device.mgt.plugins.mobile.android.api.util;
 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.notification.mgt.NotificationManagementService;
+import io.entgra.device.mgt.core.device.mgt.common.notification.mgt.NotificationManagementService;
-import org.wso2.carbon.device.mgt.core.app.mgt.ApplicationManagementProviderService;
+import io.entgra.device.mgt.core.device.mgt.core.app.mgt.ApplicationManagementProviderService;
-import org.wso2.carbon.device.mgt.core.device.details.mgt.DeviceInformationManager;
+import io.entgra.device.mgt.core.device.mgt.core.device.details.mgt.DeviceInformationManager;
-import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
+import io.entgra.device.mgt.core.device.mgt.core.service.DeviceManagementProviderService;
-import org.wso2.carbon.policy.mgt.core.PolicyManagerService;
+import io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerService;
 
 /**
  * AndroidAPIUtil class provides utility functions used by Android REST-API classes.

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/util/AndroidDeviceUtils.java

@@ -28,23 +28,23 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.CarbonContext;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceManagementConstants;
-import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
+import io.entgra.device.mgt.core.device.mgt.common.EnrolmentInfo;
-import org.wso2.carbon.device.mgt.common.app.mgt.Application;
+import io.entgra.device.mgt.core.device.mgt.common.app.mgt.Application;
-import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.app.mgt.ApplicationManagementException;
-import org.wso2.carbon.device.mgt.common.device.details.DeviceInfo;
+import io.entgra.device.mgt.core.device.mgt.common.device.details.DeviceInfo;
-import org.wso2.carbon.device.mgt.common.device.details.DeviceLocation;
+import io.entgra.device.mgt.core.device.mgt.common.device.details.DeviceLocation;
-import org.wso2.carbon.device.mgt.common.exceptions.InvalidDeviceException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.InvalidDeviceException;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Activity;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Operation;
-import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.OperationManagementException;
-import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.ComplianceFeature;
+import io.entgra.device.mgt.core.device.mgt.common.policy.mgt.monitor.ComplianceFeature;
-import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.PolicyComplianceException;
+import io.entgra.device.mgt.core.device.mgt.common.policy.mgt.monitor.PolicyComplianceException;
-import org.wso2.carbon.device.mgt.core.device.details.mgt.DeviceDetailsMgtException;
+import io.entgra.device.mgt.core.device.mgt.core.device.details.mgt.DeviceDetailsMgtException;
-import org.wso2.carbon.device.mgt.core.device.details.mgt.DeviceInformationManager;
+import io.entgra.device.mgt.core.device.mgt.core.device.details.mgt.DeviceInformationManager;
-import org.wso2.carbon.device.mgt.core.search.mgt.impl.Utils;
+import io.entgra.device.mgt.core.device.mgt.core.search.mgt.impl.Utils;
 import io.entgra.device.mgt.plugins.mobile.android.api.bean.ErrorListItem;
 import io.entgra.device.mgt.plugins.mobile.android.api.bean.ErrorResponse;
 import io.entgra.device.mgt.plugins.mobile.android.api.exception.BadRequestException;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/util/DeviceIDHolder.java

@@ -18,7 +18,7 @@
 
 package io.entgra.device.mgt.plugins.mobile.android.api.util;
 
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
 
 import java.util.List;
 

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/DeviceManagementAdminServiceTests.java

@@ -30,9 +30,9 @@ import org.testng.IObjectFactory;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.ObjectFactory;
 import org.testng.annotations.Test;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.exceptions.InvalidDeviceException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.InvalidDeviceException;
-import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.OperationManagementException;
 import io.entgra.device.mgt.plugins.mobile.android.api.mocks.DeviceManagementProviderServiceMock;
 import io.entgra.device.mgt.plugins.mobile.android.api.utils.TestUtils;
 

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/DeviceManagementServiceTests.java

@@ -31,10 +31,10 @@ import org.testng.IObjectFactory;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.ObjectFactory;
 import org.testng.annotations.Test;
-import org.wso2.carbon.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.exceptions.InvalidDeviceException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.InvalidDeviceException;
-import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.OperationManagementException;
 import io.entgra.device.mgt.plugins.mobile.android.api.mocks.ApplicationManagementProviderServiceMock;
 import io.entgra.device.mgt.plugins.mobile.android.api.mocks.DeviceInformationManagerServiceMock;
 import io.entgra.device.mgt.plugins.mobile.android.api.mocks.DeviceManagementProviderServiceMock;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/mocks/ApplicationManagementProviderServiceMock.java

@@ -18,13 +18,13 @@
 
 package io.entgra.device.mgt.plugins.mobile.android.api.mocks;
 
-import org.wso2.carbon.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.app.mgt.Application;
+import io.entgra.device.mgt.core.device.mgt.common.app.mgt.Application;
-import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.app.mgt.ApplicationManagementException;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Activity;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Operation;
-import org.wso2.carbon.device.mgt.core.app.mgt.ApplicationManagementProviderService;
+import io.entgra.device.mgt.core.device.mgt.core.app.mgt.ApplicationManagementProviderService;
 
 import java.util.List;
 

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/mocks/DeviceInformationManagerServiceMock.java

@@ -1,11 +1,11 @@
 package io.entgra.device.mgt.plugins.mobile.android.api.mocks;
 
-import org.wso2.carbon.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.device.details.DeviceInfo;
+import io.entgra.device.mgt.core.device.mgt.common.device.details.DeviceInfo;
-import org.wso2.carbon.device.mgt.common.device.details.DeviceLocation;
+import io.entgra.device.mgt.core.device.mgt.common.device.details.DeviceLocation;
-import org.wso2.carbon.device.mgt.core.device.details.mgt.DeviceDetailsMgtException;
+import io.entgra.device.mgt.core.device.mgt.core.device.details.mgt.DeviceDetailsMgtException;
-import org.wso2.carbon.device.mgt.core.device.details.mgt.DeviceInformationManager;
+import io.entgra.device.mgt.core.device.mgt.core.device.details.mgt.DeviceInformationManager;
 
 import java.util.List;
 

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/mocks/DeviceManagementProviderServiceMock.java

@@ -35,48 +35,48 @@
 
 package io.entgra.device.mgt.plugins.mobile.android.api.mocks;
 
-import org.wso2.carbon.device.mgt.common.ActivityPaginationRequest;
+import io.entgra.device.mgt.core.device.mgt.common.ActivityPaginationRequest;
-import org.wso2.carbon.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceTransferRequest;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceTransferRequest;
-import org.wso2.carbon.device.mgt.common.DynamicTaskContext;
+import io.entgra.device.mgt.core.device.mgt.common.DynamicTaskContext;
-import org.wso2.carbon.device.mgt.common.StartupOperationConfig;
+import io.entgra.device.mgt.core.device.mgt.common.StartupOperationConfig;
-import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.app.mgt.ApplicationManagementException;
-import org.wso2.carbon.device.mgt.common.configuration.mgt.AmbiguousConfigurationException;
+import io.entgra.device.mgt.core.device.mgt.common.configuration.mgt.AmbiguousConfigurationException;
-import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationEntry;
+import io.entgra.device.mgt.core.device.mgt.common.configuration.mgt.ConfigurationEntry;
-import org.wso2.carbon.device.mgt.common.configuration.mgt.DeviceConfiguration;
+import io.entgra.device.mgt.core.device.mgt.common.configuration.mgt.DeviceConfiguration;
-import org.wso2.carbon.device.mgt.common.device.details.DeviceData;
+import io.entgra.device.mgt.core.device.mgt.common.device.details.DeviceData;
-import org.wso2.carbon.device.mgt.common.device.details.DeviceLocationHistorySnapshot;
+import io.entgra.device.mgt.core.device.mgt.common.device.details.DeviceLocationHistorySnapshot;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
+import io.entgra.device.mgt.core.device.mgt.common.EnrolmentInfo;
-import org.wso2.carbon.device.mgt.common.FeatureManager;
+import io.entgra.device.mgt.core.device.mgt.common.FeatureManager;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceNotFoundException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceNotFoundException;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceTypeNotFoundException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceTypeNotFoundException;
-import org.wso2.carbon.device.mgt.common.exceptions.InvalidDeviceException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.InvalidDeviceException;
-import org.wso2.carbon.device.mgt.common.MonitoringOperation;
+import io.entgra.device.mgt.core.device.mgt.common.MonitoringOperation;
-import org.wso2.carbon.device.mgt.common.OperationMonitoringTaskConfig;
+import io.entgra.device.mgt.core.device.mgt.common.OperationMonitoringTaskConfig;
-import org.wso2.carbon.device.mgt.common.PaginationRequest;
+import io.entgra.device.mgt.core.device.mgt.common.PaginationRequest;
-import org.wso2.carbon.device.mgt.common.PaginationResult;
+import io.entgra.device.mgt.core.device.mgt.common.PaginationResult;
-import org.wso2.carbon.device.mgt.common.exceptions.UnauthorizedDeviceAccessException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.UnauthorizedDeviceAccessException;
-import org.wso2.carbon.device.mgt.common.exceptions.UserNotFoundException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.UserNotFoundException;
-import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.configuration.mgt.ConfigurationManagementException;
-import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
+import io.entgra.device.mgt.core.device.mgt.common.configuration.mgt.PlatformConfiguration;
-import org.wso2.carbon.device.mgt.common.geo.service.GeoCluster;
+import io.entgra.device.mgt.core.device.mgt.common.geo.service.GeoCluster;
-import org.wso2.carbon.device.mgt.common.geo.service.GeoQuery;
+import io.entgra.device.mgt.core.device.mgt.common.geo.service.GeoQuery;
-import org.wso2.carbon.device.mgt.common.invitation.mgt.DeviceEnrollmentInvitationDetails;
+import io.entgra.device.mgt.core.device.mgt.common.invitation.mgt.DeviceEnrollmentInvitationDetails;
-import org.wso2.carbon.device.mgt.common.license.mgt.License;
+import io.entgra.device.mgt.core.device.mgt.common.license.mgt.License;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Activity;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Operation;
-import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.OperationManagementException;
-import org.wso2.carbon.device.mgt.common.policy.mgt.PolicyMonitoringManager;
+import io.entgra.device.mgt.core.device.mgt.common.policy.mgt.PolicyMonitoringManager;
-import org.wso2.carbon.device.mgt.common.pull.notification.PullNotificationExecutionFailedException;
+import io.entgra.device.mgt.core.device.mgt.common.pull.notification.PullNotificationExecutionFailedException;
-import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy;
+import io.entgra.device.mgt.core.device.mgt.common.push.notification.NotificationStrategy;
-import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService;
+import io.entgra.device.mgt.core.device.mgt.common.spi.DeviceManagementService;
-import org.wso2.carbon.device.mgt.common.type.mgt.DeviceStatus;
+import io.entgra.device.mgt.core.device.mgt.common.type.mgt.DeviceStatus;
-import org.wso2.carbon.device.mgt.core.dto.DeviceType;
+import io.entgra.device.mgt.core.device.mgt.core.dto.DeviceType;
-import org.wso2.carbon.device.mgt.core.dto.DeviceTypeVersion;
+import io.entgra.device.mgt.core.device.mgt.core.dto.DeviceTypeVersion;
-import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
+import io.entgra.device.mgt.core.device.mgt.core.service.DeviceManagementProviderService;
-import org.wso2.carbon.device.mgt.core.service.EmailMetaInfo;
+import io.entgra.device.mgt.core.device.mgt.core.service.EmailMetaInfo;
 import io.entgra.device.mgt.plugins.mobile.android.api.utils.TestUtils;
 
 import org.apache.commons.collections.map.SingletonMap;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/mocks/NotificationManagementServiceMock.java

@@ -18,13 +18,13 @@
 
 package io.entgra.device.mgt.plugins.mobile.android.api.mocks;
 
-import org.wso2.carbon.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.PaginationRequest;
+import io.entgra.device.mgt.core.device.mgt.common.PaginationRequest;
-import org.wso2.carbon.device.mgt.common.PaginationResult;
+import io.entgra.device.mgt.core.device.mgt.common.PaginationResult;
-import org.wso2.carbon.device.mgt.common.notification.mgt.Notification;
+import io.entgra.device.mgt.core.device.mgt.common.notification.mgt.Notification;
-import org.wso2.carbon.device.mgt.common.notification.mgt.NotificationManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.notification.mgt.NotificationManagementException;
-import org.wso2.carbon.device.mgt.common.notification.mgt.NotificationManagementService;
+import io.entgra.device.mgt.core.device.mgt.common.notification.mgt.NotificationManagementService;
 
 import java.util.List;
 

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/mocks/PolicyManagerServiceMock.java

@@ -17,25 +17,25 @@
  */
 package io.entgra.device.mgt.plugins.mobile.android.api.mocks;
 
-import org.wso2.carbon.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.Feature;
+import io.entgra.device.mgt.core.device.mgt.common.Feature;
-import org.wso2.carbon.device.mgt.common.PaginationRequest;
+import io.entgra.device.mgt.core.device.mgt.common.PaginationRequest;
-import org.wso2.carbon.device.mgt.common.PaginationResult;
+import io.entgra.device.mgt.core.device.mgt.common.PaginationResult;
-import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
+import io.entgra.device.mgt.core.device.mgt.common.policy.mgt.Policy;
-import org.wso2.carbon.device.mgt.common.policy.mgt.Profile;
+import io.entgra.device.mgt.core.device.mgt.common.policy.mgt.Profile;
-import org.wso2.carbon.device.mgt.common.policy.mgt.ProfileFeature;
+import io.entgra.device.mgt.core.device.mgt.common.policy.mgt.ProfileFeature;
-import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.ComplianceFeature;
+import io.entgra.device.mgt.core.device.mgt.common.policy.mgt.monitor.ComplianceFeature;
-import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.NonComplianceData;
+import io.entgra.device.mgt.core.device.mgt.common.policy.mgt.monitor.NonComplianceData;
-import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.PolicyComplianceException;
+import io.entgra.device.mgt.core.device.mgt.common.policy.mgt.monitor.PolicyComplianceException;
-import org.wso2.carbon.policy.mgt.common.FeatureManagementException;
+import io.entgra.device.mgt.core.policy.mgt.common.FeatureManagementException;
-import org.wso2.carbon.policy.mgt.common.PolicyAdministratorPoint;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyAdministratorPoint;
-import org.wso2.carbon.policy.mgt.common.PolicyEvaluationPoint;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyEvaluationPoint;
-import org.wso2.carbon.policy.mgt.common.PolicyInformationPoint;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyInformationPoint;
-import org.wso2.carbon.policy.mgt.common.PolicyManagementException;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyManagementException;
-import org.wso2.carbon.policy.mgt.common.PolicyMonitoringTaskException;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyMonitoringTaskException;
-import org.wso2.carbon.policy.mgt.core.PolicyManagerService;
+import io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerService;
-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/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/utils/TestUtils.java

@@ -22,14 +22,14 @@ import io.entgra.device.mgt.plugins.mobile.android.api.bean.*;
 import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.*;
 import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidConstants;
 import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidDeviceUtils;
-import org.wso2.carbon.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
-import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceManagementConstants;
-import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
+import io.entgra.device.mgt.core.device.mgt.common.EnrolmentInfo;
-import org.wso2.carbon.device.mgt.common.app.mgt.Application;
+import io.entgra.device.mgt.core.device.mgt.common.app.mgt.Application;
-import org.wso2.carbon.device.mgt.common.device.details.DeviceInfo;
+import io.entgra.device.mgt.core.device.mgt.common.device.details.DeviceInfo;
-import org.wso2.carbon.device.mgt.common.device.details.DeviceLocation;
+import io.entgra.device.mgt.core.device.mgt.common.device.details.DeviceLocation;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Activity;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Operation;
 
 
 import java.util.ArrayList;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml

@@ -19,7 +19,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>io.entgra.device.mgt.plugins.android-plugin</artifactId>
+        <artifactId>android-plugin</artifactId>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <version>6.0.17-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml

@@ -21,7 +21,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
-        <artifactId>io.entgra.device.mgt.plugins.android-plugin</artifactId>
+        <artifactId>android-plugin</artifactId>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <version>6.0.17-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.js

@@ -196,7 +196,7 @@ function onRequest(context) {
         }
 
         var remoteSessionEndpoint = devicemgtProps["remoteSessionWSURL"].replace("https", "wss");
-        var jwtService = carbonServer.osgiService('org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService');
+        var jwtService = carbonServer.osgiService('io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService');
         var jwtClient = jwtService.getJWTClient();
         var encodedClientKeys = session.get(constants["ENCODED_TENANT_BASED_WEB_SOCKET_CLIENT_CREDENTIALS"]);
         var tokenPair = null;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml

@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>io.entgra.device.mgt.plugins.android-plugin</artifactId>
+        <artifactId>android-plugin</artifactId>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <version>6.0.17-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
@@ -68,14 +68,14 @@
                             javax.naming,
                             org.wso2.carbon.context,
                             org.wso2.carbon.utils.*,
-                            org.wso2.carbon.device.mgt.common.*,
+                            io.entgra.device.mgt.core.device.mgt.common.*,
                             org.wso2.carbon.ndatasource.core,
-                            org.wso2.carbon.policy.mgt.common.*,
+                            io.entgra.device.mgt.core.policy.mgt.common.*,
                             org.wso2.carbon.registry.core,
                             org.wso2.carbon.registry.core.session,
                             org.wso2.carbon.registry.core.service,
                             org.wso2.carbon.registry.api,
-                            org.wso2.carbon.device.mgt.extensions.license.mgt.registry,
+                            io.entgra.device.mgt.core.device.mgt.extensions.license.mgt.registry,
                             com.google.gson.*
                         </Import-Package>
                         <Export-Package>
@@ -136,24 +136,24 @@
             <artifactId>org.wso2.carbon.utils</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
+            <artifactId>io.entgra.device.mgt.core.device.mgt.common</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.device.mgt.extensions</artifactId>
+            <artifactId>io.entgra.device.mgt.core.device.mgt.extensions</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.ndatasource.core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <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>org.wso2.carbon.devicemgt</groupId>
+            <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>org.wso2.carbon</groupId>

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/AndroidDeviceManagementService.java

@@ -21,24 +21,24 @@ package io.entgra.device.mgt.plugins.mobile.android.impl;
 import io.entgra.device.mgt.plugins.mobile.android.impl.util.AndroidPluginConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.mgt.common.DeviceManager;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceManager;
-import org.wso2.carbon.device.mgt.common.OperationMonitoringTaskConfig;
+import io.entgra.device.mgt.core.device.mgt.common.OperationMonitoringTaskConfig;
-import org.wso2.carbon.device.mgt.common.ProvisioningConfig;
+import io.entgra.device.mgt.core.device.mgt.common.ProvisioningConfig;
-import org.wso2.carbon.device.mgt.common.InitialOperationConfig;
+import io.entgra.device.mgt.core.device.mgt.common.InitialOperationConfig;
-import org.wso2.carbon.device.mgt.common.DeviceStatusTaskPluginConfig;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceStatusTaskPluginConfig;
-import org.wso2.carbon.device.mgt.common.StartupOperationConfig;
+import io.entgra.device.mgt.core.device.mgt.common.StartupOperationConfig;
-import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManager;
+import io.entgra.device.mgt.core.device.mgt.common.app.mgt.ApplicationManager;
-import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationEntry;
+import io.entgra.device.mgt.core.device.mgt.common.configuration.mgt.ConfigurationEntry;
-import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
+import io.entgra.device.mgt.core.device.mgt.common.configuration.mgt.PlatformConfiguration;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.general.GeneralConfig;
+import io.entgra.device.mgt.core.device.mgt.common.general.GeneralConfig;
-import org.wso2.carbon.device.mgt.common.invitation.mgt.DeviceEnrollmentInvitationDetails;
+import io.entgra.device.mgt.core.device.mgt.common.invitation.mgt.DeviceEnrollmentInvitationDetails;
-import org.wso2.carbon.device.mgt.common.license.mgt.License;
+import io.entgra.device.mgt.core.device.mgt.common.license.mgt.License;
-import org.wso2.carbon.device.mgt.common.policy.mgt.PolicyMonitoringManager;
+import io.entgra.device.mgt.core.device.mgt.common.policy.mgt.PolicyMonitoringManager;
-import org.wso2.carbon.device.mgt.common.pull.notification.PullNotificationSubscriber;
+import io.entgra.device.mgt.core.device.mgt.common.pull.notification.PullNotificationSubscriber;
-import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;
+import io.entgra.device.mgt.core.device.mgt.common.push.notification.PushNotificationConfig;
-import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService;
+import io.entgra.device.mgt.core.device.mgt.common.spi.DeviceManagementService;
-import org.wso2.carbon.device.mgt.common.type.mgt.DeviceTypePlatformDetails;
+import io.entgra.device.mgt.core.device.mgt.common.type.mgt.DeviceTypePlatformDetails;
 import io.entgra.device.mgt.plugins.mobile.android.internal.AndroidDeviceManagementDataHolder;
 
 import java.util.HashMap;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/AndroidDeviceManager.java

@@ -26,18 +26,18 @@ import io.entgra.device.mgt.plugins.mobile.android.impl.util.AndroidPluginConsta
 import io.entgra.device.mgt.plugins.mobile.android.impl.util.AndroidPluginUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceManagementConstants;
-import org.wso2.carbon.device.mgt.common.DeviceManager;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceManager;
-import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
+import io.entgra.device.mgt.core.device.mgt.common.EnrolmentInfo;
-import org.wso2.carbon.device.mgt.common.FeatureManager;
+import io.entgra.device.mgt.core.device.mgt.common.FeatureManager;
-import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
+import io.entgra.device.mgt.core.device.mgt.common.configuration.mgt.PlatformConfiguration;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.license.mgt.License;
+import io.entgra.device.mgt.core.device.mgt.common.license.mgt.License;
-import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.license.mgt.LicenseManagementException;
-import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManager;
+import io.entgra.device.mgt.core.device.mgt.common.license.mgt.LicenseManager;
-import org.wso2.carbon.device.mgt.extensions.license.mgt.registry.RegistryBasedLicenseManager;
+import io.entgra.device.mgt.core.device.mgt.extensions.license.mgt.registry.RegistryBasedLicenseManager;
 import io.entgra.device.mgt.plugins.mobile.android.impl.dao.impl.AndroidDeviceMgtPluginException;
 import io.entgra.device.mgt.plugins.mobile.android.impl.util.MobileDeviceManagementUtil;
 import org.wso2.carbon.registry.api.RegistryException;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/AndroidFeatureManager.java

@@ -25,9 +25,9 @@ import io.entgra.device.mgt.plugins.mobile.android.impl.dao.MobileFeatureDAO;
 import io.entgra.device.mgt.plugins.mobile.android.impl.dto.MobileFeature;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.mgt.common.Feature;
+import io.entgra.device.mgt.core.device.mgt.common.Feature;
-import org.wso2.carbon.device.mgt.common.FeatureManager;
+import io.entgra.device.mgt.core.device.mgt.common.FeatureManager;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
 import io.entgra.device.mgt.plugins.mobile.android.impl.util.MobileDeviceManagementUtil;
 
 import java.util.ArrayList;