diff --git a/components/device-types/pom.xml b/components/device-types/pom.xml
index b34c7323f..504cde055 100644
--- a/components/device-types/pom.xml
+++ b/components/device-types/pom.xml
@@ -27,7 +27,7 @@
4.0.0
- io.entgra.device.mgt.plugins.device-types
+ device-types
pom
WSO2 Carbon - IoT Plugins
http://wso2.org
diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml
index 47b731025..aa164edda 100644
--- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml
+++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml
@@ -21,7 +21,7 @@
4.0.0
- io.entgra.device.mgt.plugins.virtual-fire-alarm-plugin
+ virtual-fire-alarm-plugin
io.entgra.device.mgt.plugins
6.0.17-SNAPSHOT
../pom.xml
diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml
index 69b80e339..598be9ad6 100644
--- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml
+++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml
@@ -19,7 +19,7 @@
- io.entgra.device.mgt.plugins.virtual-fire-alarm-plugin
+ virtual-fire-alarm-plugin
io.entgra.device.mgt.plugins
6.0.17-SNAPSHOT
../pom.xml
@@ -39,13 +39,13 @@
- org.wso2.carbon.devicemgt
- org.wso2.carbon.device.mgt.common
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.device.mgt.common
provided
- org.wso2.carbon.devicemgt
- org.wso2.carbon.device.mgt.core
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.device.mgt.core
provided
@@ -56,8 +56,8 @@
- org.wso2.carbon.devicemgt
- org.wso2.carbon.certificate.mgt.core
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.certificate.mgt.core
provided
@@ -203,13 +203,13 @@
provided
- org.wso2.carbon.devicemgt
- org.wso2.carbon.identity.jwt.client.extension
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.identity.jwt.client.extension
provided
- org.wso2.carbon.devicemgt
- org.wso2.carbon.apimgt.application.extension
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.apimgt.application.extension
provided
@@ -218,13 +218,13 @@
- org.wso2.carbon.devicemgt
- org.wso2.carbon.device.mgt.extensions
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.device.mgt.extensions
provided
- org.wso2.carbon.devicemgt
- org.wso2.carbon.apimgt.annotations
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.apimgt.annotations
provided
diff --git a/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 b/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
index d677210fe..2dc782089 100644
--- a/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
+++ b/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 org.wso2.carbon.apimgt.annotations.api.Scopes;
+import io.entgra.device.mgt.core.apimgt.annotations.Scope;
+import io.entgra.device.mgt.core.apimgt.annotations.Scopes;
import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
diff --git a/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 b/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
index c38015053..6b7959a53 100644
--- a/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
+++ b/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 org.wso2.carbon.apimgt.application.extension.dto.ApiApplicationKey;
-import org.wso2.carbon.apimgt.application.extension.exception.APIManagerException;
+import io.entgra.device.mgt.core.apimgt.application.extension.APIManagementProviderService;
+import io.entgra.device.mgt.core.apimgt.application.extension.dto.ApiApplicationKey;
+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 org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
-import org.wso2.carbon.device.mgt.common.authorization.DeviceAccessAuthorizationException;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.exceptions.InvalidDeviceException;
-import org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroupConstants;
-import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
-import org.wso2.carbon.device.mgt.core.operation.mgt.ConfigOperation;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.EnrolmentInfo;
+import io.entgra.device.mgt.core.device.mgt.common.authorization.DeviceAccessAuthorizationException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.InvalidDeviceException;
+import io.entgra.device.mgt.core.device.mgt.common.group.mgt.DeviceGroupConstants;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.OperationManagementException;
+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 org.wso2.carbon.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.JWTClient;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.AccessTokenInfo;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException;
import org.wso2.carbon.user.api.UserStoreException;
import javax.ws.rs.*;
diff --git a/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 b/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
index a70d40cb3..4ee359f0d 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.core.dao.util.*;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.*;
+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 {
diff --git a/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 b/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
index f4a980259..b702d3f80 100644
--- a/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
+++ b/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;
diff --git a/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 b/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
index 0dfef38cd..208025281 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfigurationManagementService;
-import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
-import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService;
+import io.entgra.device.mgt.core.device.mgt.common.authorization.DeviceAccessAuthorizationService;
+import io.entgra.device.mgt.core.device.mgt.common.configuration.mgt.PlatformConfigurationManagementService;
+import io.entgra.device.mgt.core.device.mgt.core.service.DeviceManagementProviderService;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService;
/**
* This class provides utility functions used by REST-API.
diff --git a/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 b/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
index 3a47f6f31..1b8a80261 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationEntry;
-import org.wso2.carbon.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.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.configuration.mgt.ConfigurationEntry;
+import io.entgra.device.mgt.core.device.mgt.common.configuration.mgt.ConfigurationManagementException;
+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;
diff --git a/components/device-types/virtual-fire-alarm-plugin/pom.xml b/components/device-types/virtual-fire-alarm-plugin/pom.xml
index 34cb4dd00..fc0ca1ab1 100644
--- a/components/device-types/virtual-fire-alarm-plugin/pom.xml
+++ b/components/device-types/virtual-fire-alarm-plugin/pom.xml
@@ -21,13 +21,13 @@
io.entgra.device.mgt.plugins
- io.entgra.device.mgt.plugins.device-types
+ device-types
6.0.17-SNAPSHOT
../pom.xml
4.0.0
- io.entgra.device.mgt.plugins.virtual-fire-alarm-plugin
+ virtual-fire-alarm-plugin
pom
WSO2 Carbon - Virtual Fire Alarm Plugin
http://wso2.org
diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml
index 24e2cb1e9..0f6343256 100644
--- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml
@@ -19,7 +19,7 @@
io.entgra.device.mgt.plugins
- io.entgra.device.mgt.plugins.cdmf-transport-adapters
+ cdmf-transport-adapters
6.0.17-SNAPSHOT
../../pom.xml
diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml
index 723c1f6ca..380b65d46 100644
--- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml
@@ -19,7 +19,7 @@
io.entgra.device.mgt.plugins
- io.entgra.device.mgt.plugins.cdmf-transport-adapters
+ cdmf-transport-adapters
6.0.17-SNAPSHOT
../../pom.xml
diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml
index 43b13789c..e2d044d98 100644
--- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml
@@ -19,7 +19,7 @@
io.entgra.device.mgt.plugins
- io.entgra.device.mgt.plugins.cdmf-transport-adapters
+ cdmf-transport-adapters
6.0.17-SNAPSHOT
../../pom.xml
@@ -77,12 +77,12 @@
io.entgra.device.mgt.plugins.input.adapter.extension
- org.wso2.carbon.devicemgt
- org.wso2.carbon.identity.jwt.client.extension
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.identity.jwt.client.extension
- org.wso2.carbon.devicemgt
- org.wso2.carbon.apimgt.keymgt.extension
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.apimgt.keymgt.extension
org.wso2.carbon
@@ -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)",
- org.wso2.carbon.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;version="[5.0,6)",
+ io.entgra.device.mgt.core.apimgt.keymgt.extension.exception;version="[5.0,6)",
+ io.entgra.device.mgt.core.apimgt.keymgt.extension.service;version="[5.0,6)"
diff --git a/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 b/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
index 942f78d04..c83c04284 100644
--- a/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
+++ b/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"
diff --git a/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 b/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
index 1bc87ce58..601e2235a 100644
--- a/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
+++ b/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;
/**
diff --git a/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 b/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
index d9ceaf6e4..10293bc8c 100644
--- a/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
+++ b/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 org.wso2.carbon.apimgt.keymgt.extension.TokenRequest;
-import org.wso2.carbon.apimgt.keymgt.extension.TokenResponse;
-import org.wso2.carbon.apimgt.keymgt.extension.exception.BadRequestException;
-import org.wso2.carbon.apimgt.keymgt.extension.exception.KeyMgtException;
-import org.wso2.carbon.apimgt.keymgt.extension.service.KeyMgtService;
-import org.wso2.carbon.apimgt.keymgt.extension.service.KeyMgtServiceImpl;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.DCRResponse;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.TokenRequest;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.TokenResponse;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.exception.BadRequestException;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.exception.KeyMgtException;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.service.KeyMgtService;
+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;
diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml
index b67262d2f..b3a7c7042 100644
--- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml
@@ -20,7 +20,7 @@
io.entgra.device.mgt.plugins
- io.entgra.device.mgt.plugins.cdmf-transport-adapters
+ cdmf-transport-adapters
6.0.17-SNAPSHOT
../../pom.xml
diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml
index 663dcf051..3a2e46591 100644
--- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml
@@ -19,7 +19,7 @@
io.entgra.device.mgt.plugins
- io.entgra.device.mgt.plugins.cdmf-transport-adapters
+ cdmf-transport-adapters
6.0.17-SNAPSHOT
../../pom.xml
diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml
index 41179b1e7..bc18bdd74 100644
--- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml
@@ -19,7 +19,7 @@
io.entgra.device.mgt.plugins
- io.entgra.device.mgt.plugins.cdmf-transport-adapters
+ cdmf-transport-adapters
6.0.17-SNAPSHOT
../../pom.xml
@@ -51,8 +51,8 @@
httpclient
- org.wso2.carbon.devicemgt
- org.wso2.carbon.identity.jwt.client.extension
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.identity.jwt.client.extension
org.wso2.carbon
@@ -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
diff --git a/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 b/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
index ab8de0f7f..ea4cfd1e7 100644
--- a/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
+++ b/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 org.wso2.carbon.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.dto.AccessTokenInfo;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService;
import org.wso2.carbon.user.api.UserStoreException;
import java.io.IOException;
diff --git a/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 b/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
index a0afbe008..d0196c7f6 100644
--- a/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
+++ b/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"
diff --git a/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 b/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
index 4586d17d3..4fad2cb8f 100644
--- a/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
+++ b/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.
diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml
index 86af4f653..270b6a477 100644
--- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml
@@ -19,7 +19,7 @@
io.entgra.device.mgt.plugins
- io.entgra.device.mgt.plugins.cdmf-transport-adapters
+ cdmf-transport-adapters
6.0.17-SNAPSHOT
../../pom.xml
@@ -66,16 +66,16 @@
json-simple
- org.wso2.carbon.devicemgt
- org.wso2.carbon.identity.jwt.client.extension
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.identity.jwt.client.extension
org.wso2.carbon
org.wso2.carbon.user.api
- org.wso2.carbon.devicemgt
- org.wso2.carbon.apimgt.keymgt.extension
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.apimgt.keymgt.extension
@@ -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)",
- org.wso2.carbon.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;version="[5.0,6)",
+ io.entgra.device.mgt.core.apimgt.keymgt.extension.exception;version="[5.0,6)",
+ io.entgra.device.mgt.core.apimgt.keymgt.extension.service;version="[5.0,6)"
diff --git a/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 b/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
index 408fc54f7..ec38c4050 100644
--- a/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
+++ b/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"
diff --git a/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 b/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
index 5cfada466..6b6f767d6 100644
--- a/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
+++ b/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.
diff --git a/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 b/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
index 100b360c2..d352cf105 100644
--- a/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
+++ b/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 org.wso2.carbon.apimgt.keymgt.extension.TokenRequest;
-import org.wso2.carbon.apimgt.keymgt.extension.TokenResponse;
-import org.wso2.carbon.apimgt.keymgt.extension.exception.BadRequestException;
-import org.wso2.carbon.apimgt.keymgt.extension.exception.KeyMgtException;
-import org.wso2.carbon.apimgt.keymgt.extension.service.KeyMgtService;
-import org.wso2.carbon.apimgt.keymgt.extension.service.KeyMgtServiceImpl;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.DCRResponse;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.TokenRequest;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.TokenResponse;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.exception.BadRequestException;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.exception.KeyMgtException;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.service.KeyMgtService;
+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 org.wso2.carbon.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.dto.AccessTokenInfo;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService;
import org.wso2.carbon.user.api.UserStoreException;
/**
diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml
index 1087d73dd..90f98aa1d 100644
--- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml
@@ -21,7 +21,7 @@
io.entgra.device.mgt.plugins
- io.entgra.device.mgt.plugins.cdmf-transport-adapters
+ cdmf-transport-adapters
6.0.17-SNAPSHOT
../../pom.xml
diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml
index 8edfa67fb..762eecfe3 100644
--- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml
@@ -20,7 +20,7 @@
io.entgra.device.mgt.plugins
- io.entgra.device.mgt.plugins.cdmf-transport-adapters
+ cdmf-transport-adapters
6.0.17-SNAPSHOT
../../pom.xml
diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml
index 1f130f7e8..a99f72e45 100644
--- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml
@@ -19,7 +19,7 @@
io.entgra.device.mgt.plugins
- io.entgra.device.mgt.plugins.cdmf-transport-adapters
+ cdmf-transport-adapters
6.0.17-SNAPSHOT
../../pom.xml
diff --git a/components/extensions/cdmf-transport-adapters/pom.xml b/components/extensions/cdmf-transport-adapters/pom.xml
index 029667456..1b90ea40c 100644
--- a/components/extensions/cdmf-transport-adapters/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/pom.xml
@@ -21,13 +21,13 @@
io.entgra.device.mgt.plugins
- io.entgra.device.mgt.plugins.extensions
+ extensions
6.0.17-SNAPSHOT
../pom.xml
4.0.0
- io.entgra.device.mgt.plugins.cdmf-transport-adapters
+ cdmf-transport-adapters
pom
WSO2 Carbon - IoT Base Plugin
http://wso2.org
diff --git a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml
index 6024d6530..7cf763921 100644
--- a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml
+++ b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml
@@ -20,7 +20,7 @@
io.entgra.device.mgt.plugins
- io.entgra.device.mgt.plugins.emqx-extensions
+ emqx-extensions
6.0.17-SNAPSHOT
../pom.xml
@@ -70,8 +70,8 @@
provided
- org.wso2.carbon.devicemgt
- org.wso2.carbon.device.mgt.core
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.device.mgt.core
provided
diff --git a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/src/main/java/io/entgra/device/mgt/plugins/emqx/exhook/ExServer.java b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/src/main/java/io/entgra/device/mgt/plugins/emqx/exhook/ExServer.java
index 1951a7bfa..0e2233ee6 100644
--- a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/src/main/java/io/entgra/device/mgt/plugins/emqx/exhook/ExServer.java
+++ b/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 org.wso2.carbon.device.mgt.core.config.keymanager.KeyManagerConfigurations;
-import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder;
-import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
-import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.core.config.DeviceConfigurationManager;
+import io.entgra.device.mgt.core.device.mgt.core.config.keymanager.KeyManagerConfigurations;
+import io.entgra.device.mgt.core.device.mgt.core.internal.DeviceManagementDataHolder;
+import io.entgra.device.mgt.core.device.mgt.core.service.DeviceManagementProviderService;
+import io.entgra.device.mgt.core.device.mgt.common.EnrolmentInfo;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
+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;
diff --git a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml
index 8d6f49850..89a939f37 100644
--- a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml
+++ b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml
@@ -20,7 +20,7 @@
io.entgra.device.mgt.plugins
- io.entgra.device.mgt.plugins.emqx-extensions
+ emqx-extensions
6.0.17-SNAPSHOT
../pom.xml
diff --git a/components/extensions/emqx-extensions/pom.xml b/components/extensions/emqx-extensions/pom.xml
index 0558d1cb7..09fb8d5e4 100644
--- a/components/extensions/emqx-extensions/pom.xml
+++ b/components/extensions/emqx-extensions/pom.xml
@@ -21,13 +21,13 @@
io.entgra.device.mgt.plugins
- io.entgra.device.mgt.plugins.extensions
+ extensions
6.0.17-SNAPSHOT
../pom.xml
4.0.0
- io.entgra.device.mgt.plugins.emqx-extensions
+ emqx-extensions
pom
EMQX Extensions
diff --git a/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.api/pom.xml b/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.api/pom.xml
index f4edea155..330656a18 100644
--- a/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.api/pom.xml
+++ b/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.api/pom.xml
@@ -174,13 +174,13 @@
provided
- org.wso2.carbon.devicemgt
- org.wso2.carbon.device.mgt.common
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.device.mgt.common
provided
- org.wso2.carbon.devicemgt
- org.wso2.carbon.device.mgt.core
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.device.mgt.core
provided
@@ -198,8 +198,8 @@
- org.wso2.carbon.devicemgt
- org.wso2.carbon.policy.mgt.core
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.policy.mgt.core
provided
@@ -233,8 +233,8 @@
provided
- org.wso2.carbon.devicemgt
- org.wso2.carbon.certificate.mgt.core
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.certificate.mgt.core
provided
@@ -289,8 +289,8 @@
- org.wso2.carbon.devicemgt
- org.wso2.carbon.apimgt.annotations
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.apimgt.annotations
provided
diff --git a/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 b/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
index 614b30f20..96dfbaa0e 100644
--- a/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
+++ b/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 org.wso2.carbon.apimgt.annotations.api.Scopes;
-import org.wso2.carbon.device.mgt.common.Device;
+import io.entgra.device.mgt.core.apimgt.annotations.Scope;
+import io.entgra.device.mgt.core.apimgt.annotations.Scopes;
+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;
diff --git a/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 b/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
index 53f999a7b..f512c75e3 100644
--- a/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
+++ b/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;
diff --git a/components/extensions/pom.xml b/components/extensions/pom.xml
index 2b52e3348..3bca24271 100644
--- a/components/extensions/pom.xml
+++ b/components/extensions/pom.xml
@@ -27,7 +27,7 @@
4.0.0
- io.entgra.device.mgt.plugins.extensions
+ extensions
pom
WSO2 Carbon - Mobile Plugins Extensions
http://wso2.org
diff --git a/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml b/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml
index 2f13ac2c7..558f17567 100644
--- a/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml
+++ b/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml
@@ -21,7 +21,7 @@
io.entgra.device.mgt.plugins
- io.entgra.device.mgt.plugins.pull-notification-listeners
+ pull-notification-listeners
6.0.17-SNAPSHOT
../pom.xml
@@ -36,12 +36,12 @@
- org.wso2.carbon.devicemgt
- org.wso2.carbon.device.mgt.common
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.device.mgt.common
- org.wso2.carbon.devicemgt
- org.wso2.carbon.device.mgt.core
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.device.mgt.core
org.wso2.carbon.analytics-common
@@ -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.*,
- org.wso2.carbon.device.mgt.core.service,
+ io.entgra.device.mgt.core.device.mgt.common.*,
+ 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,
- org.wso2.carbon.device.mgt.core.config.pull.notification,
+ io.entgra.device.mgt.core.device.mgt.core.config,
+ io.entgra.device.mgt.core.device.mgt.core.config.pull.notification,
org.wso2.carbon.utils.multitenancy
diff --git a/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 b/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
index 0df46d3cb..64eefdea1 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.pull.notification.PullNotificationExecutionFailedException;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
+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;
diff --git a/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 b/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
index 19012572e..c2acb5c7e 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Operation;
public class NotificationMessage {
diff --git a/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 b/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
index 144e58dc5..34088ae8a 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
+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;
diff --git a/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 b/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
index c9496360b..6809bf4c1 100644
--- a/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
+++ b/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;
diff --git a/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 b/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
index 9eae9c369..118a06fa7 100644
--- a/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
+++ b/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 {
diff --git a/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 b/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
index 437c0031c..fc7ef0c0e 100644
--- a/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
+++ b/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"
diff --git a/components/extensions/pull-notification-listeners/pom.xml b/components/extensions/pull-notification-listeners/pom.xml
index 3c2cfc957..64051d973 100644
--- a/components/extensions/pull-notification-listeners/pom.xml
+++ b/components/extensions/pull-notification-listeners/pom.xml
@@ -21,13 +21,13 @@
io.entgra.device.mgt.plugins
- io.entgra.device.mgt.plugins.extensions
+ extensions
6.0.17-SNAPSHOT
../pom.xml
4.0.0
- io.entgra.device.mgt.plugins.pull-notification-listeners
+ pull-notification-listeners
pom
WSO2 Carbon - Pull Notification Extension
http://wso2.org
diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml
index b5baaacd5..a019dfa43 100644
--- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml
+++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml
@@ -19,7 +19,7 @@
io.entgra.device.mgt.plugins
- io.entgra.device.mgt.plugins.siddhi-extensions
+ siddhi-extensions
6.0.17-SNAPSHOT
../pom.xml
@@ -36,12 +36,12 @@
- org.wso2.carbon.devicemgt
- org.wso2.carbon.device.mgt.core
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.device.mgt.core
- org.wso2.carbon.devicemgt
- org.wso2.carbon.device.mgt.common
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.device.mgt.common
org.wso2.siddhi
@@ -60,8 +60,8 @@
json
- org.wso2.carbon.devicemgt
- org.wso2.carbon.identity.jwt.client.extension
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.identity.jwt.client.extension
io.github.openfeign
@@ -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.*,
- org.wso2.carbon.device.mgt.common.*,
+ io.entgra.device.mgt.core.device.mgt.core.*,
+ io.entgra.device.mgt.core.device.mgt.common.*,
org.wso2.carbon.identity.jwt.client.*,
org.apache.commons.logging,
org.wso2.carbon.context,
diff --git a/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 b/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
index c3ef314ba..077076a66 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.common.notification.mgt.Notification;
-import org.wso2.carbon.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.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.notification.mgt.Notification;
+import io.entgra.device.mgt.core.device.mgt.common.notification.mgt.NotificationManagementException;
+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;
diff --git a/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 b/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
index 533b7b5e4..d4d93d4fc 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Activity;
+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;
diff --git a/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 b/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
index 3131258a3..a692c08c4 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
-import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.EnrolmentInfo;
+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;
diff --git a/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 b/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
index 930113de3..177916bfc 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
+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;
diff --git a/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 b/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
index 55131dab8..8b42e0b0b 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
-import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.EnrolmentInfo;
+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;
diff --git a/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 b/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
index 5b3ffe0f9..54bb1aff6 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
+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;
diff --git a/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 b/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
index 845a3e039..17bb36390 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.group.mgt.GroupManagementException;
-import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
-import org.wso2.carbon.device.mgt.core.service.GroupManagementProviderService;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.group.mgt.GroupManagementException;
+import io.entgra.device.mgt.core.device.mgt.core.service.DeviceManagementProviderService;
+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;
diff --git a/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 b/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
index a43d1bf41..bd8a86556 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.common.group.mgt.GroupManagementException;
-import org.wso2.carbon.device.mgt.core.service.GroupManagementProviderService;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.group.mgt.GroupManagementException;
+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;
diff --git a/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 b/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
index a7df140f7..9f0f18946 100755
--- a/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
+++ b/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 org.wso2.carbon.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.JWTClient;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.AccessTokenInfo;
+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;
diff --git a/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 b/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
index 6b81f5a25..fa7da7d56 100644
--- a/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
+++ b/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;
diff --git a/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 b/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
index 179bf39d6..994219d6e 100644
--- a/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
+++ b/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;
diff --git a/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 b/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
index 1dc859c6a..1ad2f1f98 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
-import org.wso2.carbon.device.mgt.core.service.GroupManagementProviderService;
-import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService;
+import io.entgra.device.mgt.core.device.mgt.common.notification.mgt.NotificationManagementService;
+import io.entgra.device.mgt.core.device.mgt.core.service.DeviceManagementProviderService;
+import io.entgra.device.mgt.core.device.mgt.core.service.GroupManagementProviderService;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService;
/**
* This class holds utility methods to retrieve data.
diff --git a/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 b/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
index 860114ea6..c3b35b98b 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOFactory;
-import org.wso2.carbon.device.mgt.core.dao.GroupManagementDAOFactory;
-import org.wso2.carbon.device.mgt.core.metadata.mgt.dao.MetadataManagementDAOFactory;
-import org.wso2.carbon.device.mgt.core.notification.mgt.dao.NotificationManagementDAOFactory;
-import org.wso2.carbon.device.mgt.core.operation.mgt.dao.OperationManagementDAOFactory;
-import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.core.dao.DeviceManagementDAOFactory;
+import io.entgra.device.mgt.core.device.mgt.core.dao.GroupManagementDAOFactory;
+import io.entgra.device.mgt.core.device.mgt.core.metadata.mgt.dao.MetadataManagementDAOFactory;
+import io.entgra.device.mgt.core.device.mgt.core.notification.mgt.dao.NotificationManagementDAOFactory;
+import io.entgra.device.mgt.core.device.mgt.core.operation.mgt.dao.OperationManagementDAOFactory;
+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;
diff --git a/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 b/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
index cc7b77ca8..fead18ac6 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceNotFoundException;
-import org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroup;
-import org.wso2.carbon.device.mgt.common.group.mgt.GroupAlreadyExistException;
-import org.wso2.carbon.device.mgt.common.group.mgt.GroupManagementException;
-import org.wso2.carbon.device.mgt.core.authorization.DeviceAccessAuthorizationServiceImpl;
-import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager;
-import org.wso2.carbon.device.mgt.core.config.cache.DeviceCacheConfiguration;
-import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder;
-import org.wso2.carbon.device.mgt.core.internal.DeviceManagementServiceComponent;
-import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
-import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderServiceImpl;
-import org.wso2.carbon.device.mgt.core.service.GroupManagementProviderService;
-import org.wso2.carbon.device.mgt.core.service.GroupManagementProviderServiceImpl;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceNotFoundException;
+import io.entgra.device.mgt.core.device.mgt.common.group.mgt.DeviceGroup;
+import io.entgra.device.mgt.core.device.mgt.common.group.mgt.GroupAlreadyExistException;
+import io.entgra.device.mgt.core.device.mgt.common.group.mgt.GroupManagementException;
+import io.entgra.device.mgt.core.device.mgt.core.authorization.DeviceAccessAuthorizationServiceImpl;
+import io.entgra.device.mgt.core.device.mgt.core.config.DeviceConfigurationManager;
+import io.entgra.device.mgt.core.device.mgt.core.config.cache.DeviceCacheConfiguration;
+import io.entgra.device.mgt.core.device.mgt.core.internal.DeviceManagementDataHolder;
+import io.entgra.device.mgt.core.device.mgt.core.internal.DeviceManagementServiceComponent;
+import io.entgra.device.mgt.core.device.mgt.core.service.DeviceManagementProviderService;
+import io.entgra.device.mgt.core.device.mgt.core.service.DeviceManagementProviderServiceImpl;
+import io.entgra.device.mgt.core.device.mgt.core.service.GroupManagementProviderService;
+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 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.Permissions.DEFAULT_ADMIN_PERMISSIONS;
+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);
diff --git a/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 b/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
index b1bf12e98..637facab5 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
-import org.wso2.carbon.device.mgt.common.app.mgt.Application;
-import org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroup;
-import org.wso2.carbon.device.mgt.common.notification.mgt.Notification;
-import org.wso2.carbon.device.mgt.core.dto.DeviceType;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.EnrolmentInfo;
+import io.entgra.device.mgt.core.device.mgt.common.app.mgt.Application;
+import io.entgra.device.mgt.core.device.mgt.common.group.mgt.DeviceGroup;
+import io.entgra.device.mgt.core.device.mgt.common.notification.mgt.Notification;
+import io.entgra.device.mgt.core.device.mgt.core.dto.DeviceType;
import java.util.ArrayList;
import java.util.Date;
diff --git a/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 b/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
index 396c50e7a..59d7799d3 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManager;
-import org.wso2.carbon.device.mgt.common.general.GeneralConfig;
-import org.wso2.carbon.device.mgt.common.invitation.mgt.DeviceEnrollmentInvitationDetails;
-import org.wso2.carbon.device.mgt.common.license.mgt.License;
-import org.wso2.carbon.device.mgt.common.policy.mgt.PolicyMonitoringManager;
-import org.wso2.carbon.device.mgt.common.pull.notification.PullNotificationSubscriber;
-import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;
-import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService;
-import org.wso2.carbon.device.mgt.common.type.mgt.DeviceTypePlatformDetails;
+import io.entgra.device.mgt.core.device.mgt.common.*;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.app.mgt.ApplicationManager;
+import io.entgra.device.mgt.core.device.mgt.common.general.GeneralConfig;
+import io.entgra.device.mgt.core.device.mgt.common.invitation.mgt.DeviceEnrollmentInvitationDetails;
+import io.entgra.device.mgt.core.device.mgt.common.license.mgt.License;
+import io.entgra.device.mgt.core.device.mgt.common.policy.mgt.PolicyMonitoringManager;
+import io.entgra.device.mgt.core.device.mgt.common.pull.notification.PullNotificationSubscriber;
+import io.entgra.device.mgt.core.device.mgt.common.push.notification.PushNotificationConfig;
+import io.entgra.device.mgt.core.device.mgt.common.spi.DeviceManagementService;
+import io.entgra.device.mgt.core.device.mgt.common.type.mgt.DeviceTypePlatformDetails;
import java.util.ArrayList;
import java.util.List;
diff --git a/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 b/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
index d2248d54e..857a15b2c 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.DeviceManager;
-import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
-import org.wso2.carbon.device.mgt.common.FeatureManager;
-import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
-import org.wso2.carbon.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.Device;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceManager;
+import io.entgra.device.mgt.core.device.mgt.common.EnrolmentInfo;
+import io.entgra.device.mgt.core.device.mgt.common.FeatureManager;
+import io.entgra.device.mgt.core.device.mgt.common.configuration.mgt.PlatformConfiguration;
+import io.entgra.device.mgt.core.device.mgt.common.license.mgt.License;
+import io.entgra.device.mgt.core.device.mgt.common.license.mgt.LicenseManagementException;
import java.util.List;
diff --git a/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 b/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
index 95ca58da0..9995042fb 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.GroupPaginationRequest;
-import org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroup;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.GroupPaginationRequest;
+import io.entgra.device.mgt.core.device.mgt.common.group.mgt.DeviceGroup;
import java.sql.Connection;
import java.sql.ResultSet;
diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/resources/carbon-home/repository/conf/cdm-config.xml b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/resources/carbon-home/repository/conf/cdm-config.xml
index 9097a645c..b45bf2622 100644
--- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/resources/carbon-home/repository/conf/cdm-config.xml
+++ b/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 @@
60000
true
- org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider
+ io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider
- org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider
- org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider
- org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider
+ io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider
+ io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider
+ io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider
diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml
index b00d7815b..aeaa74256 100644
--- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml
+++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml
@@ -19,7 +19,7 @@
io.entgra.device.mgt.plugins
- io.entgra.device.mgt.plugins.siddhi-extensions
+ siddhi-extensions
6.0.17-SNAPSHOT
../pom.xml
diff --git a/components/extensions/siddhi-extensions/pom.xml b/components/extensions/siddhi-extensions/pom.xml
index 9a7686c63..87418eeaa 100644
--- a/components/extensions/siddhi-extensions/pom.xml
+++ b/components/extensions/siddhi-extensions/pom.xml
@@ -21,13 +21,13 @@
io.entgra.device.mgt.plugins
- io.entgra.device.mgt.plugins.extensions
+ extensions
6.0.17-SNAPSHOT
../pom.xml
4.0.0
- io.entgra.device.mgt.plugins.siddhi-extensions
+ siddhi-extensions
pom
WSO2 Carbon - Siddhi Extension
http://wso2.org
diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml
index 6104b6695..12c34c66d 100644
--- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml
+++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml
@@ -19,7 +19,7 @@
- io.entgra.device.mgt.plugins.android-plugin
+ android-plugin
io.entgra.device.mgt.plugins
6.0.17-SNAPSHOT
../pom.xml
@@ -212,18 +212,18 @@
- org.wso2.carbon.devicemgt
- org.wso2.carbon.device.mgt.common
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.device.mgt.common
provided
- org.wso2.carbon.devicemgt
- org.wso2.carbon.apimgt.annotations
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.apimgt.annotations
provided
- org.wso2.carbon.devicemgt
- org.wso2.carbon.device.mgt.core
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.device.mgt.core
provided
@@ -233,13 +233,13 @@
- org.wso2.carbon.devicemgt
- org.wso2.carbon.policy.mgt.common
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.policy.mgt.common
provided
- org.wso2.carbon.devicemgt
- org.wso2.carbon.policy.mgt.core
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.policy.mgt.core
provided
diff --git a/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 b/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
index 143fa85af..c3f98a575 100644
--- a/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
+++ b/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;
diff --git a/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 b/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
index 05250e27c..e91b62704 100644
--- a/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
+++ b/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",
diff --git a/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 b/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
index ffbfdec36..9cceaeb7a 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.common.EnrolmentInfo;
-import org.wso2.carbon.device.mgt.common.Feature;
-import org.wso2.carbon.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;
+import io.entgra.device.mgt.core.device.mgt.common.EnrolmentInfo;
+import io.entgra.device.mgt.core.device.mgt.common.Feature;
+import io.entgra.device.mgt.core.device.mgt.common.app.mgt.Application;
+import io.entgra.device.mgt.core.device.mgt.common.device.details.DeviceInfo;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
diff --git a/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 b/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
index c5924104b..30a1df9a3 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.common.device.details.DeviceLocation;
+import io.entgra.device.mgt.core.device.mgt.common.device.details.DeviceInfo;
+import io.entgra.device.mgt.core.device.mgt.common.device.details.DeviceLocation;
import java.io.Serializable;
import java.util.Date;
diff --git a/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 b/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
index 91428aab4..722e690ab 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.common.EnrolmentInfo;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.EnrolmentInfo;
import java.io.Serializable;
diff --git a/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 b/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
index 5542c9459..29a2b03f5 100644
--- a/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
+++ b/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 org.wso2.carbon.apimgt.annotations.api.Scopes;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;
+import io.entgra.device.mgt.core.apimgt.annotations.Scope;
+import io.entgra.device.mgt.core.apimgt.annotations.Scopes;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Activity;
import javax.validation.Valid;
import javax.ws.rs.Consumes;
diff --git a/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 b/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
index ab2826027..aa010c399 100644
--- a/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
+++ b/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 org.wso2.carbon.apimgt.annotations.api.Scopes;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
+import io.entgra.device.mgt.core.apimgt.annotations.Scope;
+import io.entgra.device.mgt.core.apimgt.annotations.Scopes;
+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;
diff --git a/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 b/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
index a46457b78..28665d340 100644
--- a/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
+++ b/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 org.wso2.carbon.apimgt.annotations.api.Scopes;
-import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
+import io.entgra.device.mgt.core.apimgt.annotations.Scope;
+import io.entgra.device.mgt.core.apimgt.annotations.Scopes;
+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;
diff --git a/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 b/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
index 40c831e0f..7fa858c07 100644
--- a/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
+++ b/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 org.wso2.carbon.apimgt.annotations.api.Scopes;
+import io.entgra.device.mgt.core.apimgt.annotations.Scope;
+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;
diff --git a/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 b/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
index e670acab0..db483f820 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.common.exceptions.InvalidDeviceException;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
-import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
-import org.wso2.carbon.device.mgt.core.operation.mgt.CommandOperation;
-import org.wso2.carbon.device.mgt.core.operation.mgt.ProfileOperation;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.InvalidDeviceException;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Activity;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Operation;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.OperationManagementException;
+import io.entgra.device.mgt.core.device.mgt.core.operation.mgt.CommandOperation;
+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;
diff --git a/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 b/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
index cf6f75211..071ed9d6f 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
-import org.wso2.carbon.device.mgt.common.app.mgt.Application;
-import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManagementException;
-import org.wso2.carbon.device.mgt.common.device.details.DeviceLocation;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.exceptions.InvalidDeviceException;
-import org.wso2.carbon.device.mgt.common.notification.mgt.NotificationManagementException;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
-import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
-import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.PolicyComplianceException;
-import org.wso2.carbon.device.mgt.core.device.details.mgt.DeviceDetailsMgtException;
-import org.wso2.carbon.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.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceManagementConstants;
+import io.entgra.device.mgt.core.device.mgt.common.app.mgt.Application;
+import io.entgra.device.mgt.core.device.mgt.common.app.mgt.ApplicationManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.device.details.DeviceLocation;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.InvalidDeviceException;
+import io.entgra.device.mgt.core.device.mgt.common.notification.mgt.NotificationManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Operation;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.OperationManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.policy.mgt.monitor.PolicyComplianceException;
+import io.entgra.device.mgt.core.device.mgt.core.device.details.mgt.DeviceDetailsMgtException;
+import io.entgra.device.mgt.core.device.mgt.core.device.details.mgt.DeviceInformationManager;
+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 org.wso2.carbon.policy.mgt.core.PolicyManagerService;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyManagementException;
+import io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerService;
import 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
- org.wso2.carbon.device.mgt.common.notification.mgt.Notification();
+ io.entgra.device.mgt.core.device.mgt.common.notification.mgt.Notification notification = new
+ 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() + ")");
diff --git a/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 b/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
index 50f7fcf22..3c3fd2174 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
-import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
-import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationEntry;
-import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.exceptions.InvalidDeviceException;
-import org.wso2.carbon.device.mgt.common.license.mgt.License;
-import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
-import org.wso2.carbon.device.mgt.core.operation.mgt.ProfileOperation;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceManagementConstants;
+import io.entgra.device.mgt.core.device.mgt.common.EnrolmentInfo;
+import io.entgra.device.mgt.core.device.mgt.common.configuration.mgt.ConfigurationEntry;
+import io.entgra.device.mgt.core.device.mgt.common.configuration.mgt.PlatformConfiguration;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.InvalidDeviceException;
+import io.entgra.device.mgt.core.device.mgt.common.license.mgt.License;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.OperationManagementException;
+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;
diff --git a/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 b/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
index 0367340b8..02f6ba074 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
-import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.EnrolmentInfo;
+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;
diff --git a/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 b/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
index 7f9808321..c9c61acd5 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.core.app.mgt.ApplicationManagementProviderService;
-import org.wso2.carbon.device.mgt.core.device.details.mgt.DeviceInformationManager;
-import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
-import org.wso2.carbon.policy.mgt.core.PolicyManagerService;
+import io.entgra.device.mgt.core.device.mgt.common.notification.mgt.NotificationManagementService;
+import io.entgra.device.mgt.core.device.mgt.core.app.mgt.ApplicationManagementProviderService;
+import io.entgra.device.mgt.core.device.mgt.core.device.details.mgt.DeviceInformationManager;
+import io.entgra.device.mgt.core.device.mgt.core.service.DeviceManagementProviderService;
+import io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerService;
/**
* AndroidAPIUtil class provides utility functions used by Android REST-API classes.
diff --git a/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 b/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
index 01b4c7dcc..b89e265e3 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
-import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
-import org.wso2.carbon.device.mgt.common.app.mgt.Application;
-import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManagementException;
-import org.wso2.carbon.device.mgt.common.device.details.DeviceInfo;
-import org.wso2.carbon.device.mgt.common.device.details.DeviceLocation;
-import org.wso2.carbon.device.mgt.common.exceptions.InvalidDeviceException;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
-import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
-import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.ComplianceFeature;
-import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.PolicyComplianceException;
-import org.wso2.carbon.device.mgt.core.device.details.mgt.DeviceDetailsMgtException;
-import org.wso2.carbon.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.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceManagementConstants;
+import io.entgra.device.mgt.core.device.mgt.common.EnrolmentInfo;
+import io.entgra.device.mgt.core.device.mgt.common.app.mgt.Application;
+import io.entgra.device.mgt.core.device.mgt.common.app.mgt.ApplicationManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.device.details.DeviceInfo;
+import io.entgra.device.mgt.core.device.mgt.common.device.details.DeviceLocation;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.InvalidDeviceException;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Activity;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Operation;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.OperationManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.policy.mgt.monitor.ComplianceFeature;
+import io.entgra.device.mgt.core.device.mgt.common.policy.mgt.monitor.PolicyComplianceException;
+import io.entgra.device.mgt.core.device.mgt.core.device.details.mgt.DeviceDetailsMgtException;
+import io.entgra.device.mgt.core.device.mgt.core.device.details.mgt.DeviceInformationManager;
+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;
diff --git a/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 b/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
index f917148d2..5cee789dc 100644
--- a/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
+++ b/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;
diff --git a/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 b/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
index 8880cf616..664682d76 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.common.exceptions.InvalidDeviceException;
-import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.InvalidDeviceException;
+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;
diff --git a/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 b/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
index 8ea0c558f..dbf363077 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.exceptions.InvalidDeviceException;
-import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.InvalidDeviceException;
+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;
diff --git a/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 b/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
index 2f7bb13ae..99f97d90f 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.app.mgt.Application;
-import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManagementException;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
-import org.wso2.carbon.device.mgt.core.app.mgt.ApplicationManagementProviderService;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.app.mgt.Application;
+import io.entgra.device.mgt.core.device.mgt.common.app.mgt.ApplicationManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Activity;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Operation;
+import io.entgra.device.mgt.core.device.mgt.core.app.mgt.ApplicationManagementProviderService;
import java.util.List;
diff --git a/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 b/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
index 8c3d81347..e1ac1c273 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.device.details.DeviceInfo;
-import org.wso2.carbon.device.mgt.common.device.details.DeviceLocation;
-import org.wso2.carbon.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.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.device.details.DeviceInfo;
+import io.entgra.device.mgt.core.device.mgt.common.device.details.DeviceLocation;
+import io.entgra.device.mgt.core.device.mgt.core.device.details.mgt.DeviceDetailsMgtException;
+import io.entgra.device.mgt.core.device.mgt.core.device.details.mgt.DeviceInformationManager;
import java.util.List;
diff --git a/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 b/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
index 4765433ac..9d12455c5 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.common.Device;
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceTransferRequest;
-import org.wso2.carbon.device.mgt.common.DynamicTaskContext;
-import org.wso2.carbon.device.mgt.common.StartupOperationConfig;
-import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManagementException;
-import org.wso2.carbon.device.mgt.common.configuration.mgt.AmbiguousConfigurationException;
-import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationEntry;
-import org.wso2.carbon.device.mgt.common.configuration.mgt.DeviceConfiguration;
-import org.wso2.carbon.device.mgt.common.device.details.DeviceData;
-import org.wso2.carbon.device.mgt.common.device.details.DeviceLocationHistorySnapshot;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
-import org.wso2.carbon.device.mgt.common.FeatureManager;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceNotFoundException;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceTypeNotFoundException;
-import org.wso2.carbon.device.mgt.common.exceptions.InvalidDeviceException;
-import org.wso2.carbon.device.mgt.common.MonitoringOperation;
-import org.wso2.carbon.device.mgt.common.OperationMonitoringTaskConfig;
-import org.wso2.carbon.device.mgt.common.PaginationRequest;
-import org.wso2.carbon.device.mgt.common.PaginationResult;
-import org.wso2.carbon.device.mgt.common.exceptions.UnauthorizedDeviceAccessException;
-import org.wso2.carbon.device.mgt.common.exceptions.UserNotFoundException;
-import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationManagementException;
-import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
-import org.wso2.carbon.device.mgt.common.geo.service.GeoCluster;
-import org.wso2.carbon.device.mgt.common.geo.service.GeoQuery;
-import org.wso2.carbon.device.mgt.common.invitation.mgt.DeviceEnrollmentInvitationDetails;
-import org.wso2.carbon.device.mgt.common.license.mgt.License;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
-import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
-import org.wso2.carbon.device.mgt.common.policy.mgt.PolicyMonitoringManager;
-import org.wso2.carbon.device.mgt.common.pull.notification.PullNotificationExecutionFailedException;
-import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy;
-import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService;
-import org.wso2.carbon.device.mgt.common.type.mgt.DeviceStatus;
-import org.wso2.carbon.device.mgt.core.dto.DeviceType;
-import org.wso2.carbon.device.mgt.core.dto.DeviceTypeVersion;
-import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
-import org.wso2.carbon.device.mgt.core.service.EmailMetaInfo;
+import io.entgra.device.mgt.core.device.mgt.common.ActivityPaginationRequest;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceTransferRequest;
+import io.entgra.device.mgt.core.device.mgt.common.DynamicTaskContext;
+import io.entgra.device.mgt.core.device.mgt.common.StartupOperationConfig;
+import io.entgra.device.mgt.core.device.mgt.common.app.mgt.ApplicationManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.configuration.mgt.AmbiguousConfigurationException;
+import io.entgra.device.mgt.core.device.mgt.common.configuration.mgt.ConfigurationEntry;
+import io.entgra.device.mgt.core.device.mgt.common.configuration.mgt.DeviceConfiguration;
+import io.entgra.device.mgt.core.device.mgt.common.device.details.DeviceData;
+import io.entgra.device.mgt.core.device.mgt.common.device.details.DeviceLocationHistorySnapshot;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.EnrolmentInfo;
+import io.entgra.device.mgt.core.device.mgt.common.FeatureManager;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceNotFoundException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceTypeNotFoundException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.InvalidDeviceException;
+import io.entgra.device.mgt.core.device.mgt.common.MonitoringOperation;
+import io.entgra.device.mgt.core.device.mgt.common.OperationMonitoringTaskConfig;
+import io.entgra.device.mgt.core.device.mgt.common.PaginationRequest;
+import io.entgra.device.mgt.core.device.mgt.common.PaginationResult;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.UnauthorizedDeviceAccessException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.UserNotFoundException;
+import io.entgra.device.mgt.core.device.mgt.common.configuration.mgt.ConfigurationManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.configuration.mgt.PlatformConfiguration;
+import io.entgra.device.mgt.core.device.mgt.common.geo.service.GeoCluster;
+import io.entgra.device.mgt.core.device.mgt.common.geo.service.GeoQuery;
+import io.entgra.device.mgt.core.device.mgt.common.invitation.mgt.DeviceEnrollmentInvitationDetails;
+import io.entgra.device.mgt.core.device.mgt.common.license.mgt.License;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Activity;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Operation;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.OperationManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.policy.mgt.PolicyMonitoringManager;
+import io.entgra.device.mgt.core.device.mgt.common.pull.notification.PullNotificationExecutionFailedException;
+import io.entgra.device.mgt.core.device.mgt.common.push.notification.NotificationStrategy;
+import io.entgra.device.mgt.core.device.mgt.common.spi.DeviceManagementService;
+import io.entgra.device.mgt.core.device.mgt.common.type.mgt.DeviceStatus;
+import io.entgra.device.mgt.core.device.mgt.core.dto.DeviceType;
+import io.entgra.device.mgt.core.device.mgt.core.dto.DeviceTypeVersion;
+import io.entgra.device.mgt.core.device.mgt.core.service.DeviceManagementProviderService;
+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;
diff --git a/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 b/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
index 7f8a74e6b..1b1574341 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.PaginationRequest;
-import org.wso2.carbon.device.mgt.common.PaginationResult;
-import org.wso2.carbon.device.mgt.common.notification.mgt.Notification;
-import org.wso2.carbon.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.Device;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.PaginationRequest;
+import io.entgra.device.mgt.core.device.mgt.common.PaginationResult;
+import io.entgra.device.mgt.core.device.mgt.common.notification.mgt.Notification;
+import io.entgra.device.mgt.core.device.mgt.common.notification.mgt.NotificationManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.notification.mgt.NotificationManagementService;
import java.util.List;
diff --git a/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 b/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
index f53cdb05c..18f439f7e 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.Feature;
-import org.wso2.carbon.device.mgt.common.PaginationRequest;
-import org.wso2.carbon.device.mgt.common.PaginationResult;
-import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
-import org.wso2.carbon.device.mgt.common.policy.mgt.Profile;
-import org.wso2.carbon.device.mgt.common.policy.mgt.ProfileFeature;
-import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.ComplianceFeature;
-import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.NonComplianceData;
-import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.PolicyComplianceException;
-import org.wso2.carbon.policy.mgt.common.FeatureManagementException;
-import org.wso2.carbon.policy.mgt.common.PolicyAdministratorPoint;
-import org.wso2.carbon.policy.mgt.common.PolicyEvaluationPoint;
-import org.wso2.carbon.policy.mgt.common.PolicyInformationPoint;
-import org.wso2.carbon.policy.mgt.common.PolicyManagementException;
-import org.wso2.carbon.policy.mgt.common.PolicyMonitoringTaskException;
-import org.wso2.carbon.policy.mgt.core.PolicyManagerService;
-import org.wso2.carbon.policy.mgt.core.task.TaskScheduleService;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.Feature;
+import io.entgra.device.mgt.core.device.mgt.common.PaginationRequest;
+import io.entgra.device.mgt.core.device.mgt.common.PaginationResult;
+import io.entgra.device.mgt.core.device.mgt.common.policy.mgt.Policy;
+import io.entgra.device.mgt.core.device.mgt.common.policy.mgt.Profile;
+import io.entgra.device.mgt.core.device.mgt.common.policy.mgt.ProfileFeature;
+import io.entgra.device.mgt.core.device.mgt.common.policy.mgt.monitor.ComplianceFeature;
+import io.entgra.device.mgt.core.device.mgt.common.policy.mgt.monitor.NonComplianceData;
+import io.entgra.device.mgt.core.device.mgt.common.policy.mgt.monitor.PolicyComplianceException;
+import io.entgra.device.mgt.core.policy.mgt.common.FeatureManagementException;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyAdministratorPoint;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyEvaluationPoint;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyInformationPoint;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyManagementException;
+import io.entgra.device.mgt.core.policy.mgt.common.PolicyMonitoringTaskException;
+import io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerService;
+import io.entgra.device.mgt.core.policy.mgt.core.task.TaskScheduleService;
import java.util.List;
diff --git a/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 b/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
index d946471fb..5c4cf1b2b 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
-import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
-import org.wso2.carbon.device.mgt.common.app.mgt.Application;
-import org.wso2.carbon.device.mgt.common.device.details.DeviceInfo;
-import org.wso2.carbon.device.mgt.common.device.details.DeviceLocation;
-import org.wso2.carbon.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.Device;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceManagementConstants;
+import io.entgra.device.mgt.core.device.mgt.common.EnrolmentInfo;
+import io.entgra.device.mgt.core.device.mgt.common.app.mgt.Application;
+import io.entgra.device.mgt.core.device.mgt.common.device.details.DeviceInfo;
+import io.entgra.device.mgt.core.device.mgt.common.device.details.DeviceLocation;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Activity;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Operation;
import java.util.ArrayList;
diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml
index 28ea5a011..0d3a4c23f 100644
--- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml
+++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml
@@ -19,7 +19,7 @@
- io.entgra.device.mgt.plugins.android-plugin
+ android-plugin
io.entgra.device.mgt.plugins
6.0.17-SNAPSHOT
../pom.xml
diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml
index 2b8394bde..2e5516667 100644
--- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml
+++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml
@@ -21,7 +21,7 @@
- io.entgra.device.mgt.plugins.android-plugin
+ android-plugin
io.entgra.device.mgt.plugins
6.0.17-SNAPSHOT
../pom.xml
diff --git a/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 b/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
index da2574458..7482caa9b 100644
--- a/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
+++ b/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;
diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml
index 8c674d970..11849a6a7 100644
--- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml
+++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml
@@ -20,7 +20,7 @@
- io.entgra.device.mgt.plugins.android-plugin
+ android-plugin
io.entgra.device.mgt.plugins
6.0.17-SNAPSHOT
../pom.xml
@@ -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.*
@@ -136,24 +136,24 @@
org.wso2.carbon.utils
- org.wso2.carbon.devicemgt
- org.wso2.carbon.device.mgt.common
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.device.mgt.common
- org.wso2.carbon.devicemgt
- org.wso2.carbon.device.mgt.extensions
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.device.mgt.extensions
org.wso2.carbon
org.wso2.carbon.ndatasource.core
- org.wso2.carbon.devicemgt
- org.wso2.carbon.policy.mgt.common
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.policy.mgt.common
- org.wso2.carbon.devicemgt
- org.wso2.carbon.policy.mgt.core
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.policy.mgt.core
org.wso2.carbon
diff --git a/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 b/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
index 216dd8832..dd2d8d381 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.common.OperationMonitoringTaskConfig;
-import org.wso2.carbon.device.mgt.common.ProvisioningConfig;
-import org.wso2.carbon.device.mgt.common.InitialOperationConfig;
-import org.wso2.carbon.device.mgt.common.DeviceStatusTaskPluginConfig;
-import org.wso2.carbon.device.mgt.common.StartupOperationConfig;
-import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManager;
-import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationEntry;
-import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.general.GeneralConfig;
-import org.wso2.carbon.device.mgt.common.invitation.mgt.DeviceEnrollmentInvitationDetails;
-import org.wso2.carbon.device.mgt.common.license.mgt.License;
-import org.wso2.carbon.device.mgt.common.policy.mgt.PolicyMonitoringManager;
-import org.wso2.carbon.device.mgt.common.pull.notification.PullNotificationSubscriber;
-import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;
-import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService;
-import org.wso2.carbon.device.mgt.common.type.mgt.DeviceTypePlatformDetails;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceManager;
+import io.entgra.device.mgt.core.device.mgt.common.OperationMonitoringTaskConfig;
+import io.entgra.device.mgt.core.device.mgt.common.ProvisioningConfig;
+import io.entgra.device.mgt.core.device.mgt.common.InitialOperationConfig;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceStatusTaskPluginConfig;
+import io.entgra.device.mgt.core.device.mgt.common.StartupOperationConfig;
+import io.entgra.device.mgt.core.device.mgt.common.app.mgt.ApplicationManager;
+import io.entgra.device.mgt.core.device.mgt.common.configuration.mgt.ConfigurationEntry;
+import io.entgra.device.mgt.core.device.mgt.common.configuration.mgt.PlatformConfiguration;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.general.GeneralConfig;
+import io.entgra.device.mgt.core.device.mgt.common.invitation.mgt.DeviceEnrollmentInvitationDetails;
+import io.entgra.device.mgt.core.device.mgt.common.license.mgt.License;
+import io.entgra.device.mgt.core.device.mgt.common.policy.mgt.PolicyMonitoringManager;
+import io.entgra.device.mgt.core.device.mgt.common.pull.notification.PullNotificationSubscriber;
+import io.entgra.device.mgt.core.device.mgt.common.push.notification.PushNotificationConfig;
+import io.entgra.device.mgt.core.device.mgt.common.spi.DeviceManagementService;
+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;
diff --git a/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 b/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
index e2cc81b87..84fc34ad7 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
-import org.wso2.carbon.device.mgt.common.DeviceManager;
-import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
-import org.wso2.carbon.device.mgt.common.FeatureManager;
-import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.license.mgt.License;
-import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManagementException;
-import org.wso2.carbon.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.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceManagementConstants;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceManager;
+import io.entgra.device.mgt.core.device.mgt.common.EnrolmentInfo;
+import io.entgra.device.mgt.core.device.mgt.common.FeatureManager;
+import io.entgra.device.mgt.core.device.mgt.common.configuration.mgt.PlatformConfiguration;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.license.mgt.License;
+import io.entgra.device.mgt.core.device.mgt.common.license.mgt.LicenseManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.license.mgt.LicenseManager;
+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;
diff --git a/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 b/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
index 087d7895c..47dd7c85a 100644
--- a/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
+++ b/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 org.wso2.carbon.device.mgt.common.FeatureManager;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.Feature;
+import io.entgra.device.mgt.core.device.mgt.common.FeatureManager;
+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;
diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/AndroidPolicyMonitoringManager.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/AndroidPolicyMonitoringManager.java
index 1cbf90313..d276be1bb 100644
--- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/AndroidPolicyMonitoringManager.java
+++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/AndroidPolicyMonitoringManager.java
@@ -25,12 +25,12 @@ import com.google.gson.JsonElement;
import com.google.gson.JsonParser;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.policy.mgt.PolicyMonitoringManager;
-import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
-import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.NonComplianceData;
-import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.ComplianceFeature;
-import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.PolicyComplianceException;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.policy.mgt.PolicyMonitoringManager;
+import io.entgra.device.mgt.core.device.mgt.common.policy.mgt.Policy;
+import io.entgra.device.mgt.core.device.mgt.common.policy.mgt.monitor.NonComplianceData;
+import io.entgra.device.mgt.core.device.mgt.common.policy.mgt.monitor.ComplianceFeature;
+import io.entgra.device.mgt.core.device.mgt.common.policy.mgt.monitor.PolicyComplianceException;
import java.util.ArrayList;
import java.util.List;
diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/config/MobileDeviceConfigurationManager.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/config/MobileDeviceConfigurationManager.java
index 815ff8b47..bd40150b3 100644
--- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/config/MobileDeviceConfigurationManager.java
+++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/config/MobileDeviceConfigurationManager.java
@@ -19,7 +19,7 @@
package io.entgra.device.mgt.plugins.mobile.android.impl.config;
import org.w3c.dom.Document;
-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 org.wso2.carbon.utils.CarbonUtils;
diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/AndroidDAOFactory.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/AndroidDAOFactory.java
index 3238a20df..8df512f86 100644
--- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/AndroidDAOFactory.java
+++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/AndroidDAOFactory.java
@@ -20,7 +20,7 @@ package io.entgra.device.mgt.plugins.mobile.android.impl.dao;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceManagementConstants;
import io.entgra.device.mgt.plugins.mobile.android.impl.dao.impl.AndroidDeviceDAOImpl;
import io.entgra.device.mgt.plugins.mobile.android.impl.dao.impl.AndroidFeatureDAOImpl;
diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/impl/AndroidFeatureDAOImpl.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/impl/AndroidFeatureDAOImpl.java
index 35478e43b..7681cbb66 100644
--- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/impl/AndroidFeatureDAOImpl.java
+++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/dao/impl/AndroidFeatureDAOImpl.java
@@ -27,7 +27,7 @@ import io.entgra.device.mgt.plugins.mobile.android.impl.dto.MobileFeature;
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.DeviceManagementConstants;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceManagementConstants;
import java.sql.Connection;
import java.sql.PreparedStatement;
diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/util/AndroidPluginUtils.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/util/AndroidPluginUtils.java
index 211c87132..4a580edef 100644
--- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/util/AndroidPluginUtils.java
+++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/util/AndroidPluginUtils.java
@@ -18,7 +18,7 @@
package io.entgra.device.mgt.plugins.mobile.android.impl.util;
-import org.wso2.carbon.device.mgt.common.license.mgt.License;
+import io.entgra.device.mgt.core.device.mgt.common.license.mgt.License;
import io.entgra.device.mgt.plugins.mobile.android.impl.AndroidDeviceManagementService;
/**
diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/util/MobileDeviceManagementUtil.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/util/MobileDeviceManagementUtil.java
index 462753098..511f0cddb 100644
--- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/util/MobileDeviceManagementUtil.java
+++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/util/MobileDeviceManagementUtil.java
@@ -26,11 +26,11 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.w3c.dom.Document;
import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.mgt.common.Device;
-import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
-import org.wso2.carbon.device.mgt.common.Feature;
-import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceManagementConstants;
+import io.entgra.device.mgt.core.device.mgt.common.Feature;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Operation;
import io.entgra.device.mgt.plugins.mobile.android.impl.dto.MobileDeviceOperationMapping;
import io.entgra.device.mgt.plugins.mobile.android.impl.dto.MobileOperationProperty;
import io.entgra.device.mgt.plugins.mobile.android.internal.AndroidDeviceManagementDataHolder;
diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/internal/AndroidDeviceManagementDataHolder.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/internal/AndroidDeviceManagementDataHolder.java
index d84753628..aa15a46cc 100644
--- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/internal/AndroidDeviceManagementDataHolder.java
+++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/internal/AndroidDeviceManagementDataHolder.java
@@ -18,7 +18,7 @@
package io.entgra.device.mgt.plugins.mobile.android.internal;
-import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService;
+import io.entgra.device.mgt.core.device.mgt.common.spi.DeviceManagementService;
import org.wso2.carbon.registry.core.service.RegistryService;
/**
diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/internal/AndroidDeviceManagementServiceComponent.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/internal/AndroidDeviceManagementServiceComponent.java
index ac2e108fb..f61c14a92 100644
--- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/internal/AndroidDeviceManagementServiceComponent.java
+++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/internal/AndroidDeviceManagementServiceComponent.java
@@ -22,7 +22,7 @@ import io.entgra.device.mgt.plugins.mobile.android.impl.AndroidDeviceManagementS
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.osgi.service.component.ComponentContext;
-import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService;
+import io.entgra.device.mgt.core.device.mgt.common.spi.DeviceManagementService;
import org.wso2.carbon.ndatasource.core.DataSourceService;
import org.wso2.carbon.registry.core.service.RegistryService;
diff --git a/components/mobile-plugins/android-plugin/pom.xml b/components/mobile-plugins/android-plugin/pom.xml
index 258ce191c..d0f00dea3 100644
--- a/components/mobile-plugins/android-plugin/pom.xml
+++ b/components/mobile-plugins/android-plugin/pom.xml
@@ -21,13 +21,13 @@
io.entgra.device.mgt.plugins
- io.entgra.device.mgt.plugins.mobile-plugins
+ mobile-plugins
6.0.17-SNAPSHOT
../pom.xml
4.0.0
- io.entgra.device.mgt.plugins.android-plugin
+ android-plugin
pom
WSO2 Carbon - Mobile Plugins
http://wso2.org
diff --git a/components/mobile-plugins/pom.xml b/components/mobile-plugins/pom.xml
index 34efb071f..00143b615 100644
--- a/components/mobile-plugins/pom.xml
+++ b/components/mobile-plugins/pom.xml
@@ -27,7 +27,7 @@
4.0.0
- io.entgra.device.mgt.plugins.mobile-plugins
+ mobile-plugins
pom
WSO2 Carbon - Mobile Plugins
http://wso2.org
diff --git a/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml b/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml
index 15b809cb1..f254e06ad 100644
--- a/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml
+++ b/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml
@@ -22,7 +22,7 @@
io.entgra.device.mgt.plugins
- io.entgra.device.mgt.plugins.analytics-feature
+ analytics-feature
6.0.17-SNAPSHOT
../pom.xml
diff --git a/features/analytics-feature/pom.xml b/features/analytics-feature/pom.xml
index 5dd8a1f5d..2111e1966 100644
--- a/features/analytics-feature/pom.xml
+++ b/features/analytics-feature/pom.xml
@@ -27,7 +27,7 @@
4.0.0
- io.entgra.device.mgt.plugins.analytics-feature
+ analytics-feature
pom
WSO2 Carbon - IoT Server IoT Analytics Feature
http://wso2.org
diff --git a/features/device-types-feature/pom.xml b/features/device-types-feature/pom.xml
index 38ff1d127..6d7b503a2 100644
--- a/features/device-types-feature/pom.xml
+++ b/features/device-types-feature/pom.xml
@@ -27,7 +27,7 @@
4.0.0
- io.entgra.device.mgt.plugins.device-types-feature
+ device-types-feature
pom
WSO2 Carbon - Device Management IoT Plugins Feature
http://wso2.org
diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml b/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml
index 2a5de1caa..a207e8990 100644
--- a/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml
+++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml
@@ -22,7 +22,7 @@
io.entgra.device.mgt.plugins
- io.entgra.device.mgt.plugins.virtual-fire-alarm-plugin-feature
+ virtual-fire-alarm-plugin-feature
6.0.17-SNAPSHOT
../pom.xml
diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml b/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml
index fac7e6e91..106e099c5 100644
--- a/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml
+++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml
@@ -21,13 +21,13 @@
io.entgra.device.mgt.plugins
- io.entgra.device.mgt.plugins.device-types-feature
+ device-types-feature
6.0.17-SNAPSHOT
../pom.xml
4.0.0
- io.entgra.device.mgt.plugins.virtual-fire-alarm-plugin-feature
+ virtual-fire-alarm-plugin-feature
pom
WSO2 Carbon - IoT Server VirtualFireAlarm Device Feature
http://wso2.org
diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml
index 41be0d658..910ed20ce 100644
--- a/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml
+++ b/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml
@@ -22,7 +22,7 @@
io.entgra.device.mgt.plugins
- io.entgra.device.mgt.plugins.extensions-feature
+ extensions-feature
6.0.17-SNAPSHOT
../pom.xml
diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml
index b2ee58feb..a10008a8f 100644
--- a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml
+++ b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml
@@ -19,7 +19,7 @@
io.entgra.device.mgt.plugins
- io.entgra.device.mgt.plugins.extensions-feature
+ extensions-feature
6.0.17-SNAPSHOT
../pom.xml
diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml
index 3fb9b1cbf..0866ef5a4 100644
--- a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml
+++ b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml
@@ -19,7 +19,7 @@
io.entgra.device.mgt.plugins
- io.entgra.device.mgt.plugins.extensions-feature
+ extensions-feature
6.0.17-SNAPSHOT
../pom.xml
diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml
index ec69767a0..3df7b77d4 100644
--- a/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml
+++ b/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml
@@ -2,7 +2,7 @@
io.entgra.device.mgt.plugins
- io.entgra.device.mgt.plugins.extensions-feature
+ extensions-feature
6.0.17-SNAPSHOT
../pom.xml
diff --git a/features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.api.feature/pom.xml b/features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.api.feature/pom.xml
index 6ab992a7e..87086b3cc 100644
--- a/features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.api.feature/pom.xml
+++ b/features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.api.feature/pom.xml
@@ -22,7 +22,7 @@
io.entgra.device.mgt.plugins
- io.entgra.device.mgt.plugins.extensions-feature
+ extensions-feature
6.0.0-SNAPSHOT
../pom.xml
diff --git a/features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml b/features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml
index 5e63f0e3d..47fc8da54 100644
--- a/features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml
+++ b/features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml
@@ -22,7 +22,7 @@
io.entgra.device.mgt.plugins
- io.entgra.device.mgt.plugins.extensions-feature
+ extensions-feature
6.0.0-SNAPSHOT
../pom.xml
diff --git a/features/extensions-feature/pom.xml b/features/extensions-feature/pom.xml
index 0ac6e1fa3..d6e0895f6 100644
--- a/features/extensions-feature/pom.xml
+++ b/features/extensions-feature/pom.xml
@@ -27,7 +27,7 @@
4.0.0
- io.entgra.device.mgt.plugins.extensions-feature
+ extensions-feature
pom
WSO2 Carbon - Device Management Extensions
http://wso2.org
diff --git a/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml b/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml
index 386f42d78..c77991eed 100644
--- a/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml
+++ b/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml
@@ -21,7 +21,7 @@
io.entgra.device.mgt.plugins
- io.entgra.device.mgt.plugins.android-plugin-feature
+ android-plugin-feature
6.0.17-SNAPSHOT
../pom.xml
@@ -45,17 +45,17 @@
h2
- org.wso2.carbon.devicemgt
- org.wso2.carbon.device.mgt.common
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.device.mgt.common
- org.wso2.carbon.devicemgt
- org.wso2.carbon.device.mgt.server.feature
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.device.mgt.server.feature
zip
- org.wso2.carbon.devicemgt
- org.wso2.carbon.device.mgt.extensions.feature
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.device.mgt.extensions.feature
zip
diff --git a/features/mobile-plugins-feature/android-plugin-feature/pom.xml b/features/mobile-plugins-feature/android-plugin-feature/pom.xml
index 344cb0716..e5b336a35 100644
--- a/features/mobile-plugins-feature/android-plugin-feature/pom.xml
+++ b/features/mobile-plugins-feature/android-plugin-feature/pom.xml
@@ -21,13 +21,13 @@
io.entgra.device.mgt.plugins
- io.entgra.device.mgt.plugins.mobile-plugins-feature
+ mobile-plugins-feature
6.0.17-SNAPSHOT
../pom.xml
4.0.0
- io.entgra.device.mgt.plugins.android-plugin-feature
+ android-plugin-feature
pom
WSO2 Carbon - Device Management Android Plugin Feature
http://wso2.org
diff --git a/features/mobile-plugins-feature/pom.xml b/features/mobile-plugins-feature/pom.xml
index c2a2570ec..29ad442ed 100644
--- a/features/mobile-plugins-feature/pom.xml
+++ b/features/mobile-plugins-feature/pom.xml
@@ -27,7 +27,7 @@
4.0.0
- io.entgra.device.mgt.plugins.mobile-plugins-feature
+ mobile-plugins-feature
pom
WSO2 Carbon - Device Management EMM Plugins Feature
http://wso2.org
diff --git a/pom.xml b/pom.xml
index 9c8f35f38..df5903f12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -251,28 +251,28 @@
- org.wso2.carbon.devicemgt
- org.wso2.carbon.device.mgt.core
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.device.mgt.core
${carbon.devicemgt.version}
- org.wso2.carbon.devicemgt
- org.wso2.carbon.device.mgt.common
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.device.mgt.common
${carbon.devicemgt.version}
- org.wso2.carbon.devicemgt
- org.wso2.carbon.device.mgt.extensions
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.device.mgt.extensions
${carbon.devicemgt.version}
- org.wso2.carbon.devicemgt
- org.wso2.carbon.policy.mgt.common
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.policy.mgt.common
${carbon.devicemgt.version}
- org.wso2.carbon.devicemgt
- org.wso2.carbon.policy.mgt.core
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.policy.mgt.core
${carbon.devicemgt.version}
@@ -282,50 +282,40 @@
- org.wso2.carbon.devicemgt
- org.wso2.carbon.device.mgt.server.feature
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.device.mgt.server.feature
zip
${carbon.devicemgt.version}
- org.wso2.carbon.devicemgt
- org.wso2.carbon.device.mgt.extensions.feature
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.device.mgt.extensions.feature
zip
${carbon.devicemgt.version}
- org.wso2.carbon.devicemgt
- org.wso2.carbon.certificate.mgt.core
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.certificate.mgt.core
${carbon.devicemgt.version}
- org.wso2.carbon.devicemgt
- org.wso2.carbon.identity.jwt.client.extension
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.identity.jwt.client.extension
${carbon.devicemgt.version}
- org.wso2.carbon.devicemgt
- org.wso2.carbon.apimgt.keymgt.extension
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.apimgt.keymgt.extension
${carbon.devicemgt.version}
- org.wso2.carbon.devicemgt
- org.wso2.carbon.apimgt.application.extension
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.apimgt.application.extension
${carbon.devicemgt.version}
- org.wso2.carbon.devicemgt
- org.wso2.carbon.apimgt.webapp.publisher
- ${carbon.devicemgt.version}
-
-
- org.wso2.carbon.devicemgt
- org.wso2.carbon.apimgt.annotations
- ${carbon.devicemgt.version}
-
-
- org.wso2.carbon.devicemgt
- org.wso2.carbon.webapp.authenticator.framework
+ io.entgra.device.mgt.core
+ io.entgra.device.mgt.core.apimgt.annotations
${carbon.devicemgt.version}
@@ -460,7 +450,7 @@
io.entgra.device.mgt.plugins
- org.wso2.carbon.device.mgt.extensions.remote.session
+ io.entgra.device.mgt.core.device.mgt.extensions.remote.session
${carbon.devicemgt.plugins.version}
@@ -503,13 +493,6 @@
${carbon.devicemgt.plugins.version}
-
-
- org.wso2.carbon.devicemgt
- org.wso2.carbon.device.application.mgt.common
- ${carbon.devicemgt.version}
-
-
org.eclipse.osgi
@@ -1183,7 +1166,7 @@
- 5.0.25
+ 5.0.26-SNAPSHOT
[5.0.0, 6.0.0)