refactored device-mgt extension component

components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml

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

components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml

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

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/pom.xml

@@ -28,7 +28,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>io.entgra.device.mgt.extensions.defaultrole.manager</artifactId>
+    <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager</artifactId>
     <packaging>bundle</packaging>
     <name>Entgra IoT - Default User Roles Management Module</name>
     <description>Entgra IoT - Default User Roles Management Module Implementation</description>
@@ -59,7 +59,7 @@
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
                         <Bundle-Description>IoT - User Roles Management Bundle</Bundle-Description>
-                        <Private-Package>io.entgra.device.mgt.extensions.defaultrole.manager.internal</Private-Package>
+                        <Private-Package>io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.internal</Private-Package>
                         <Import-Package>
                             org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
                             org.osgi.service.*;version="${imp.package.version.osgi.service}",
@@ -79,8 +79,8 @@
                             org.wso2.carbon.user.mgt.common
                         </Import-Package>
                         <Export-Package>
-                            !io.entgra.device.mgt.extensions.defaultrole.manager.internal,
-                            io.entgra.device.mgt.extensions.defaultrole.manager.*;version="${project.version}"
+                            !io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.internal,
+                            io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.*;version="${project.version}"
                         </Export-Package>
                     </instructions>
                 </configuration>

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/DefaultRolesConfigManager.java

@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package io.entgra.device.mgt.extensions.defaultrole.manager;
+package io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager;
 
-import io.entgra.device.mgt.extensions.defaultrole.manager.bean.DefaultRolesConfig;
-import io.entgra.device.mgt.extensions.defaultrole.manager.exception.DefaultRoleManagerException;
+import io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.bean.DefaultRolesConfig;
+import io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.exception.DefaultRoleManagerException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.w3c.dom.Document;

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/IoTSStartupHandler.java

@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package io.entgra.device.mgt.extensions.defaultrole.manager;
+package io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager;
 
-import io.entgra.device.mgt.extensions.defaultrole.manager.bean.DefaultRolesConfig;
-import io.entgra.device.mgt.extensions.defaultrole.manager.bean.Role;
-import io.entgra.device.mgt.extensions.defaultrole.manager.internal.RoleManagerDataHolder;
+import io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.bean.DefaultRolesConfig;
+import io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.bean.Role;
+import io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.internal.RoleManagerDataHolder;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.CarbonConstants;

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/bean/DefaultRolesConfig.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package io.entgra.device.mgt.extensions.defaultrole.manager.bean;
+package io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.bean;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/bean/Role.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package io.entgra.device.mgt.extensions.defaultrole.manager.bean;
+package io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.bean;
 
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/exception/DefaultRoleManagerException.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package io.entgra.device.mgt.extensions.defaultrole.manager.exception;
+package io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.exception;
 
 public class DefaultRoleManagerException extends Exception {
 

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/internal/RoleManagerDataHolder.java

@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.device.mgt.extensions.defaultrole.manager.internal;
+package io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.internal;
 
-import io.entgra.device.mgt.extensions.defaultrole.manager.DefaultRolesConfigManager;
+import io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.DefaultRolesConfigManager;
 import org.wso2.carbon.context.CarbonContext;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.user.api.UserRealm;

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/internal/RoleManagerServiceComponent.java

@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package io.entgra.device.mgt.extensions.defaultrole.manager.internal;
+package io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.internal;
 
-import io.entgra.device.mgt.extensions.defaultrole.manager.DefaultRolesConfigManager;
+import io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.DefaultRolesConfigManager;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.component.ComponentContext;
 import org.wso2.carbon.core.ServerStartupObserver;
-import io.entgra.device.mgt.extensions.defaultrole.manager.IoTSStartupHandler;
+import io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.IoTSStartupHandler;
 import org.wso2.carbon.user.core.service.RealmService;
 import org.wso2.carbon.utils.ConfigurationContextService;
 

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/BaseTest.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.device.mgt.extensions.defaultrole.manager.test;
+package io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager;
 
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeSuite;

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/DefaultRoleReadingTest.java

@@ -16,12 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.device.mgt.extensions.defaultrole.manager.test;
+package io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager;
 
 import com.google.gson.Gson;
-import io.entgra.device.mgt.extensions.defaultrole.manager.DefaultRolesConfigManager;
-import io.entgra.device.mgt.extensions.defaultrole.manager.bean.DefaultRolesConfig;
-import io.entgra.device.mgt.extensions.defaultrole.manager.internal.RoleManagerDataHolder;
+import io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.bean.DefaultRolesConfig;
+import io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.internal.RoleManagerDataHolder;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.testng.Assert;

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/cdm-config.xml

@@ -33,16 +33,16 @@
         <SchedulerTaskEnabled>true</SchedulerTaskEnabled>
         <PushNotificationProviders>
             <Provider>
-                org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider
+                io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider
             </Provider>
             <Provider>
-                org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider
+                io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider
             </Provider>
             <Provider>
-                org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider
+                io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider
             </Provider>
             <Provider>
-                org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider
+                io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider
             </Provider>
         </PushNotificationProviders>
     </PushNotificationConfiguration>

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/testng.xml

@@ -24,7 +24,7 @@
 
     <test name="Unit Tests" preserve-order="true">
         <classes>
-            <class name="io.entgra.device.mgt.extensions.defaultrole.manager.test.DefaultRoleReadingTest"/>
+            <class name="io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.DefaultRoleReadingTest"/>
         </classes>
     </test>
 </suite>

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/pom.xml

@@ -27,7 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.device.mgt.extensions.device.type.deployer</artifactId>
+    <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer</artifactId>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Device Type Deployer</name>
     <description>WSO2 Carbon - Device Type Deployer Implementation</description>
@@ -126,8 +126,8 @@
                         <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
                         <Bundle-Description>Device Type Deployer Bundle</Bundle-Description>
                         <Export-Package>
-                            !org.wso2.carbon.device.mgt.extensions.device.type.deployer.internal,
-                            org.wso2.carbon.device.mgt.extensions.device.type.deployer.*
+                            !io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.internal,
+                            io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.*
                         </Export-Package>
                         <Import-Package>
                             javax.naming,

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/DeviceTypeCAppDeployer.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.extensions.device.type.deployer;
+package io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer;
 
 import org.apache.axis2.deployment.Deployer;
 import org.apache.axis2.deployment.DeploymentException;
@@ -30,7 +30,7 @@ import org.wso2.carbon.application.deployer.CarbonApplication;
 import org.wso2.carbon.application.deployer.config.Artifact;
 import org.wso2.carbon.application.deployer.config.CappFile;
 import org.wso2.carbon.application.deployer.handler.AppDeploymentHandler;
-import org.wso2.carbon.device.mgt.extensions.device.type.deployer.util.DeviceTypePluginConstants;
+import io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.util.DeviceTypePluginConstants;
 
 import java.io.File;
 import java.util.ArrayList;

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/DeviceTypePluginDeployer.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.extensions.device.type.deployer;
+package io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer;
 
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.deployment.AbstractDeployer;
@@ -29,8 +29,8 @@ import org.osgi.framework.ServiceRegistration;
 import org.w3c.dom.Document;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService;
-import org.wso2.carbon.device.mgt.extensions.device.type.deployer.internal.DeviceTypeManagementDataHolder;
-import org.wso2.carbon.device.mgt.extensions.device.type.deployer.util.DeviceTypeConfigUtil;
+import io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.internal.DeviceTypeManagementDataHolder;
+import io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.util.DeviceTypeConfigUtil;
 import org.wso2.carbon.device.mgt.extensions.device.type.template.DeviceTypeConfigIdentifier;
 import org.wso2.carbon.device.mgt.extensions.device.type.template.DeviceTypeManagerService;
 import org.wso2.carbon.device.mgt.extensions.device.type.template.config.DeviceTypeConfiguration;

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/internal/DeviceTypeManagementDataHolder.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.extensions.device.type.deployer.internal;
+package io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.internal;
 
 import org.osgi.framework.BundleContext;
 import org.wso2.carbon.registry.core.service.RegistryService;

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/internal/DeviceTypeManagementServiceComponent.java

@@ -16,13 +16,12 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.mgt.extensions.device.type.deployer.internal;
+package io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.internal;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.osgi.service.component.ComponentContext;
 import org.wso2.carbon.application.deployer.handler.AppDeploymentHandler;
-import org.wso2.carbon.device.mgt.extensions.device.type.deployer.DeviceTypeCAppDeployer;
 import org.wso2.carbon.ndatasource.core.DataSourceService;
 import org.wso2.carbon.registry.core.service.RegistryService;
 import org.wso2.carbon.utils.ConfigurationContextService;

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/util/DeviceTypeConfigUtil.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.extensions.device.type.deployer.util;
+package io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.util;
 
 import org.w3c.dom.Document;
 import org.wso2.carbon.device.mgt.extensions.device.type.template.config.exception.DeviceTypeConfigurationException;

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/util/DeviceTypePluginConstants.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.extensions.device.type.deployer.util;
+package io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.util;
 
 /**
  * This holds the constants used for this bundle.

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/resources/META-INF/component.xml

@@ -17,11 +17,11 @@
         <deployer>
             <directory>devicetypes</directory>
             <extension>xml</extension>
-            <class>org.wso2.carbon.device.mgt.extensions.device.type.deployer.DeviceTypePluginDeployer</class>
+            <class>io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.DeviceTypePluginDeployer</class>
         </deployer>
 		<!--<deployer>-->
 			<!--<directory>devicetypes-ui</directory>-->
-			<!--<class>org.wso2.carbon.device.mgt.extensions.device.type.deployer.DeviceTypeUIDeployer</class>-->
+			<!--<class>io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.DeviceTypeUIDeployer</class>-->
 		<!--</deployer>-->
     </deployers>
 </component>

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/test/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/DeviceTypeCAppDeployerTest.java

@@ -16,8 +16,9 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.mgt.extensions.device.type.deployer;
+package io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer;
 
+import io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.DeviceTypeCAppDeployer;
 import org.apache.axis2.deployment.DeploymentException;
 import org.apache.axis2.engine.AxisConfiguration;
 import org.mockito.Mockito;
@@ -28,7 +29,7 @@ import org.wso2.carbon.application.deployer.config.ApplicationConfiguration;
 import org.wso2.carbon.application.deployer.config.Artifact;
 import org.wso2.carbon.application.deployer.config.CappFile;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.mgt.extensions.device.type.deployer.util.DeviceTypePluginConstants;
+import io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.util.DeviceTypePluginConstants;
 import org.wso2.carbon.registry.core.exceptions.RegistryException;
 import java.io.File;
 import java.io.IOException;

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/test/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/DeviceTypePluginDeployerTest.java

@@ -16,8 +16,9 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.mgt.extensions.device.type.deployer;
+package io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer;
 
+import io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.DeviceTypePluginDeployer;
 import org.apache.axis2.deployment.DeploymentException;
 import org.apache.axis2.deployment.repository.util.DeploymentFileData;
 import org.junit.Assert;

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/test/resources/testng.xml

@@ -22,8 +22,8 @@
     <parameter name="useDefaultListeners" value="false"/>
     <test name="Extension Unit Tests" preserve-order="true">
         <classes>
-            <class name="org.wso2.carbon.device.mgt.extensions.device.type.deployer.DeviceTypePluginDeployerTest"/>
-            <class name="org.wso2.carbon.device.mgt.extensions.device.type.deployer.DeviceTypeCAppDeployerTest"/>
+            <class name="io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.DeviceTypePluginDeployerTest"/>
+            <class name="io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.DeviceTypeCAppDeployerTest"/>
         </classes>
     </test>
 </suite>

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger/pom.xml

@@ -27,7 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>io.entgra.device.mgt.extensions.logger</artifactId>
+    <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.logger</artifactId>
     <packaging>bundle</packaging>
     <name>Entgra IoT - Logger Impl</name>
     <description>Entgra IoT - Entgra Logger Implementation</description>
@@ -50,11 +50,11 @@
                         <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
                         <Bundle-Description>Entgra Logger Bundle</Bundle-Description>
                         <Import-Package>
-                            io.entgra.device.mgt.extensions.logger,
+                            io.entgra.device.mgt.core.device.mgt.extensions.logger,
                             org.apache.commons.logging
                         </Import-Package>
                         <Export-Package>
-                            io.entgra.device.mgt.extensions.logger.*
+                            io.entgra.device.mgt.core.device.mgt.extensions.logger.*
                         </Export-Package>
                     </instructions>
                 </configuration>

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/logger/LogContext.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package io.entgra.device.mgt.extensions.logger;
+package io.entgra.device.mgt.core.device.mgt.extensions.logger;
 
 public class LogContext {
 }

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/logger/spi/EntgraLogger.java

@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package io.entgra.device.mgt.extensions.logger.spi;
+package io.entgra.device.mgt.core.device.mgt.extensions.logger.spi;
 
-import io.entgra.device.mgt.extensions.logger.LogContext;
+import io.entgra.device.mgt.core.device.mgt.extensions.logger.LogContext;
 import org.apache.commons.logging.Log;
 
 public interface EntgraLogger extends Log {

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.pull.notification/pom.xml

@@ -27,7 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.device.mgt.extensions.pull.notification</artifactId>
+    <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.pull.notification</artifactId>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Pull Notification Provider Implementation</name>
     <description>WSO2 Carbon - Pull Notification Provider Implementation</description>
@@ -78,8 +78,8 @@
                         <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
                         <Bundle-Description>Pull Notification Provider Bundle</Bundle-Description>
                         <Export-Package>
-                            !org.wso2.carbon.device.mgt.extensions.pull.notification.internal,
-                            org.wso2.carbon.device.mgt.extensions.pull.notification.*
+                            !io.entgra.device.mgt.core.device.mgt.extensions.pull.notification.internal,
+                            io.entgra.device.mgt.core.device.mgt.extensions.pull.notification.*
                         </Export-Package>
                         <Import-Package>
                             org.osgi.framework.*;version="${imp.package.version.osgi.framework}",

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.pull.notification/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/pull/notification/PullNotificationSubscriberImpl.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.extensions.pull.notification;
+package io.entgra.device.mgt.core.device.mgt.extensions.pull.notification;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
@@ -33,7 +33,7 @@ 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.common.pull.notification.PullNotificationExecutionFailedException;
 import org.wso2.carbon.device.mgt.common.pull.notification.PullNotificationSubscriber;
-import org.wso2.carbon.device.mgt.extensions.pull.notification.internal.PullNotificationDataHolder;
+import io.entgra.device.mgt.core.device.mgt.extensions.pull.notification.internal.PullNotificationDataHolder;
 
 import java.util.ArrayList;
 import java.util.List;

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.pull.notification/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/pull/notification/internal/PullNotificationDataHolder.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.extensions.pull.notification.internal;
+package io.entgra.device.mgt.core.device.mgt.extensions.pull.notification.internal;
 
 import io.entgra.device.mgt.core.application.mgt.common.services.ApplicationManager;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.pull.notification/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/pull/notification/internal/PullNotificationServiceComponent.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.extensions.pull.notification.internal;
+package io.entgra.device.mgt.core.device.mgt.extensions.pull.notification.internal;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -26,7 +26,7 @@ import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 import io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerService;
 
 /**
- * @scr.component name="org.wso2.carbon.device.mgt.extensions.pull.notification.internal.PullNotificationServiceComponent" immediate="true"
+ * @scr.component name="io.entgra.device.mgt.core.device.mgt.extensions.pull.notification.internal.PullNotificationServiceComponent" immediate="true"
  * @scr.reference name="carbon.device.mgt.provider"
  * interface="org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService"
  * cardinality="1..1"

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm/pom.xml

@@ -27,7 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm</artifactId>
+    <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm</artifactId>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - FCM Based Push Notification Provider Implementation</name>
     <description>WSO2 Carbon - FCM Based Push Notification Provider Implementation</description>
@@ -130,8 +130,8 @@
                         <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
                         <Bundle-Description>FCM Based Push Notification Provider Bundle</Bundle-Description>
                         <Export-Package>
-                            !org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.internal,
-                            org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.*
+                            !io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.internal,
+                            io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.*
                         </Export-Package>
                         <Import-Package>
                             com.google.gson,

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/fcm/FCMBasedPushNotificationProvider.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm;
+package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm;
 
 import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy;
 import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/fcm/FCMNotificationStrategy.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm;
+package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
@@ -29,7 +29,7 @@ import org.wso2.carbon.device.mgt.common.push.notification.NotificationContext;
 import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy;
 import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;
 import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationExecutionFailedException;
-import org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.internal.FCMDataHolder;
+import io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.internal.FCMDataHolder;
 
 import java.io.IOException;
 import java.io.OutputStream;

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/fcm/internal/FCMDataHolder.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.internal;
+package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.internal;
 
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/fcm/internal/FCMPushNotificationServiceComponent.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.internal;
+package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.internal;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -24,7 +24,7 @@ import org.osgi.service.component.ComponentContext;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 
 /**
- * @scr.component name="org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.internal.FCMPushNotificationServiceComponent" immediate="true"
+ * @scr.component name="io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.internal.FCMPushNotificationServiceComponent" immediate="true"
  * @scr.reference name="carbon.device.mgt.provider"
  * interface="org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService"
  * cardinality="1..1"

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http/pom.xml

@@ -27,7 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http</artifactId>
+    <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http</artifactId>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - HTTP Based Push Notification Provider Implementation</name>
     <description>WSO2 Carbon - HTTP Based Push Notification Provider Implementation</description>
@@ -121,8 +121,8 @@
                         <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
                         <Bundle-Description>MQTT Based Push Notification Provider Bundle</Bundle-Description>
                         <Export-Package>
-                            !org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.internal,
-                            org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.*
+                            !io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.internal,
+                            io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.*
                         </Export-Package>
                         <Import-Package>
                             org.apache.commons.logging,

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/http/HTTPBasedPushNotificationProvider.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.extensions.push.notification.provider.http;
+package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http;
 
 import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy;
 import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/http/HTTPMessageExecutor.java

@@ -1,4 +1,4 @@
-package org.wso2.carbon.device.mgt.extensions.push.notification.provider.http;
+package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http;
 
 import com.google.gson.Gson;
 import org.apache.commons.httpclient.HostConfiguration;

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/http/HTTPNotificationStrategy.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.extensions.push.notification.provider.http;
+package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http;
 
 import org.apache.commons.httpclient.HostConfiguration;
 import org.apache.commons.httpclient.HttpClient;

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/http/internal/HTTPPushNotificationServiceComponent.java

@@ -16,14 +16,14 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.internal;
+package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.internal;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.osgi.service.component.ComponentContext;
 
 /**
- * @scr.component name="org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.internal.HTTPPushNotificationServiceComponent" immediate="true"
+ * @scr.component name="io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.internal.HTTPPushNotificationServiceComponent" immediate="true"
  */
 public class HTTPPushNotificationServiceComponent {
 

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/pom.xml

@@ -27,7 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt</artifactId>
+    <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt</artifactId>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - MQTT Based Push Notification Provider Implementation</name>
     <description>WSO2 Carbon - MQTT Based Push Notification Provider Implementation</description>
@@ -143,8 +143,8 @@
                         <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
                         <Bundle-Description>MQTT Based Push Notification Provider Bundle</Bundle-Description>
                         <Export-Package>
-                            !org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.internal,
-                            org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.*
+                            !io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.internal,
+                            io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.*
                         </Export-Package>
                         <Import-Package>
                             org.apache.commons.logging,

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/MQTTBasedPushNotificationProvider.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt;
+package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt;
 
 import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy;
 import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/MQTTNotificationStrategy.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt;
+package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -28,8 +28,8 @@ import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy;
 import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;
 import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationExecutionFailedException;
 import org.wso2.carbon.device.mgt.core.operation.mgt.ProfileOperation;
-import org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.internal.MQTTDataHolder;
-import org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.internal.util.MQTTAdapterConstants;
+import io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.internal.MQTTDataHolder;
+import io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.internal.util.MQTTAdapterConstants;
 import org.wso2.carbon.event.output.adapter.core.MessageType;
 import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterConfiguration;
 import org.wso2.carbon.event.output.adapter.core.exception.OutputEventAdapterException;

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/internal/MQTTDataHolder.java

@@ -16,15 +16,12 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.internal;
+package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.internal;
 
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterConfiguration;
 import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterService;
 
-import java.util.List;
-import java.util.Stack;
-
 public class MQTTDataHolder {
 
     private OutputEventAdapterService outputEventAdapterService;

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/internal/MQTTPushNotificationServiceComponent.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.internal;
+package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.internal;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -25,7 +25,7 @@ import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterService;
 
 /**
- * @scr.component name="org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.internal.MQTTPushNotificationServiceComponent" immediate="true"
+ * @scr.component name="io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.internal.MQTTPushNotificationServiceComponent" immediate="true"
  * @scr.reference name="carbon.device.mgt.provider"
  * interface="org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService"
  * cardinality="1..1"

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/internal/util/MQTTAdapterConstants.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.internal.util;
+package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.internal.util;
 
 public final class MQTTAdapterConstants {
 

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/test/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/CarbonContextInitializationUtil.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt;
+package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt;
 
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/test/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/MQTTBasedPushNotificationProviderTest.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt;
+package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt;
 
 import org.mockito.Mockito;
 import org.testng.Assert;
@@ -25,12 +25,12 @@ import org.testng.annotations.Test;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy;
 import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;
-import org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.internal.MQTTDataHolder;
-import org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.internal.util.MQTTAdapterConstants;
+import io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.internal.MQTTDataHolder;
+import io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.internal.util.MQTTAdapterConstants;
 import org.wso2.carbon.event.output.adapter.core.exception.OutputEventAdapterException;
 import org.wso2.carbon.event.output.adapter.core.internal.CarbonOutputEventAdapterService;
 import org.wso2.carbon.registry.core.exceptions.RegistryException;
-import java.io.File;
+
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/test/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/MQTTNotificationStrategyTest.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt;
+package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt;
 
 import org.mockito.Mockito;
 import org.testng.Assert;
@@ -29,14 +29,14 @@ import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfi
 import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationExecutionFailedException;
 import org.wso2.carbon.device.mgt.core.operation.mgt.PolicyOperation;
 import org.wso2.carbon.device.mgt.core.operation.mgt.ProfileOperation;
-import org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.internal.MQTTDataHolder;
-import org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.internal.util.MQTTAdapterConstants;
+import io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.internal.MQTTDataHolder;
+import io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.internal.util.MQTTAdapterConstants;
 import org.wso2.carbon.event.output.adapter.core.exception.OutputEventAdapterException;
 import org.wso2.carbon.event.output.adapter.core.internal.CarbonOutputEventAdapterService;
 import org.wso2.carbon.registry.core.exceptions.RegistryException;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
 import static org.wso2.carbon.device.mgt.core.operation.mgt.PolicyOperation.POLICY_OPERATION_CODE;
-import java.io.File;
+
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.ArrayList;

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/test/resources/testng.xml

@@ -22,8 +22,8 @@
     <parameter name="useDefaultListeners" value="false"/>
     <test name="Extension Unit Tests" preserve-order="true">
         <classes>
-            <class name="org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProviderTest"/>
-            <class name="org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTNotificationStrategyTest"/>
+            <class name="io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProviderTest"/>
+            <class name="io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.MQTTNotificationStrategyTest"/>
         </classes>
     </test>
 </suite>

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/pom.xml

@@ -27,7 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp</artifactId>
+    <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp</artifactId>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - XMPP Based Push Notification Provider Implementation</name>
     <description>WSO2 Carbon - XMPP Based Push Notification Provider Implementation</description>
@@ -130,8 +130,8 @@
                         <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
                         <Bundle-Description>XMPP Based Push Notification Provider Bundle</Bundle-Description>
                         <Export-Package>
-                            !org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.internal,
-                            org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.*
+                            !io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.internal,
+                            io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.*
                         </Export-Package>
                         <Import-Package>
                             org.apache.commons.logging,

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/xmpp/XMPPBasedPushNotificationProvider.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp;
+package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp;
 
 import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy;
 import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/xmpp/XMPPNotificationStrategy.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp;
+package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -25,8 +25,8 @@ import org.wso2.carbon.device.mgt.common.push.notification.NotificationContext;
 import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy;
 import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;
 import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationExecutionFailedException;
-import org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.internal.XMPPDataHolder;
-import org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.internal.util.XMPPAdapterConstants;
+import io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.internal.XMPPDataHolder;
+import io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.internal.util.XMPPAdapterConstants;
 import org.wso2.carbon.event.output.adapter.core.MessageType;
 import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterConfiguration;
 import org.wso2.carbon.event.output.adapter.core.exception.OutputEventAdapterException;

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/xmpp/internal/XMPPDataHolder.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.internal;
+package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.internal;
 
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterService;

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/xmpp/internal/XMPPPushNotificationServiceComponent.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.internal;
+package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.internal;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -25,7 +25,7 @@ import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterService;
 
 /**
- * @scr.component name="org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.internal.XMPPPushNotificationServiceComponent" immediate="true"
+ * @scr.component name="io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.internal.XMPPPushNotificationServiceComponent" immediate="true"
  * @scr.reference name="carbon.device.mgt.provider"
  * interface="org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService"
  * cardinality="1..1"

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/xmpp/internal/util/XMPPAdapterConstants.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.internal.util;
+package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.internal.util;
 
 public final class XMPPAdapterConstants {
 

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine/pom.xml

@@ -28,7 +28,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>io.entgra.device.mgt.extensions.stateengine</artifactId>
+    <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.stateengine</artifactId>
     <packaging>bundle</packaging>
     <name>Entgra IoT - State Engine </name>
     <description>Entgra IoT - State Engine Components</description>
@@ -64,7 +64,7 @@
                             org.wso2.carbon.device.mgt.common.*
                         </Import-Package>
                         <Export-Package>
-                            io.entgra.device.mgt.extensions.stateengine.*,
+                            io.entgra.device.mgt.core.device.mgt.extensions.stateengine.*,
                             org.wso2.carbon.logging
                         </Export-Package>
                     </instructions>

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/stateengine/dto/StateUpdateResult.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package io.entgra.device.mgt.extensions.stateengine.dto;
+package io.entgra.device.mgt.core.device.mgt.extensions.stateengine.dto;
 
 import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
 

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/stateengine/exception/StateValidationException.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package io.entgra.device.mgt.extensions.stateengine.exception;
+package io.entgra.device.mgt.core.device.mgt.extensions.stateengine.exception;
 
 public class StateValidationException extends Exception {
 

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/stateengine/spi/DeviceStateMachine.java

@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package io.entgra.device.mgt.extensions.stateengine.spi;
+package io.entgra.device.mgt.core.device.mgt.extensions.stateengine.spi;
 
-import io.entgra.device.mgt.extensions.stateengine.dto.StateUpdateResult;
-import io.entgra.device.mgt.extensions.stateengine.exception.StateValidationException;
+import io.entgra.device.mgt.core.device.mgt.extensions.stateengine.dto.StateUpdateResult;
+import io.entgra.device.mgt.core.device.mgt.extensions.stateengine.exception.StateValidationException;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
 

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/stateengine/util/StateEngineUtil.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package io.entgra.device.mgt.extensions.stateengine.util;
+package io.entgra.device.mgt.core.device.mgt.extensions.stateengine.util;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

components/device-mgt-extensions/pom.xml

@@ -34,15 +34,15 @@
     <url>http://wso2.org</url>
 
     <modules>
-		<module>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http</module>
-        <module>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm</module>
-        <module>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt</module>
-        <module>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp</module>
-        <module>org.wso2.carbon.device.mgt.extensions.device.type.deployer</module>
-		<module>org.wso2.carbon.device.mgt.extensions.pull.notification</module>
-        <module>io.entgra.device.mgt.extensions.logger</module>
-        <module>io.entgra.device.mgt.extensions.defaultrole.manager</module>
-        <module>io.entgra.device.mgt.extensions.stateengine</module>
+		<module>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http</module>
+        <module>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm</module>
+        <module>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt</module>
+        <module>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp</module>
+        <module>io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer</module>
+		<module>io.entgra.device.mgt.core.device.mgt.extensions.pull.notification</module>
+        <module>io.entgra.device.mgt.core.device.mgt.extensions.logger</module>
+        <module>io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager</module>
+        <module>io.entgra.device.mgt.core.device.mgt.extensions.stateengine</module>
     </modules>
 
 </project>

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

@@ -114,7 +114,7 @@
                             org.wso2.carbon.identity.jwt.client.extension.service,
                             org.apache.commons.codec.binary,
                             io.entgra.server.bootup.heartbeat.beacon,
-                            io.entgra.device.mgt.extensions.logger.*,
+                            io.entgra.device.mgt.core.device.mgt.extensions.logger.*,
                             io.entgra.notification.logger.*
                         </Import-Package>
                         <Export-Package>
@@ -354,6 +354,10 @@
             <groupId>io.entgra.device.mgt.core</groupId>
             <artifactId>io.entgra.device.mgt.core.task.mgt.common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.entgra.device.mgt.core</groupId>
+            <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.logger</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
             <artifactId>io.entgra.notification.logger</artifactId>

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/notification/mgt/NotificationManagementServiceImpl.java

@@ -18,7 +18,7 @@
 
 package org.wso2.carbon.device.mgt.core.notification.mgt;
 
-import io.entgra.device.mgt.extensions.logger.spi.EntgraLogger;
+import io.entgra.device.mgt.core.device.mgt.extensions.logger.spi.EntgraLogger;
 import io.entgra.notification.logger.DeviceLogContext;
 import io.entgra.notification.logger.impl.EntgraDeviceLoggerImpl;
 import org.wso2.carbon.device.mgt.common.Device;

components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml

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

components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/config/operation/cdm-config.xml

@@ -31,10 +31,10 @@
         <SchedulerTaskInitialDelay>2000</SchedulerTaskInitialDelay>
         <SchedulerTaskEnabled>true</SchedulerTaskEnabled>
         <PushNotificationProviders>
-            <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider</Provider>
-            <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider</Provider>
-            <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider</Provider>
-            <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider</Provider>
+            <Provider>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider</Provider>
+            <Provider>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider</Provider>
+            <Provider>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider</Provider>
+            <Provider>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider</Provider>
         </PushNotificationProviders>
     </PushNotificationConfiguration>
 	<PullNotificationConfiguration>