refactored heart beat, notification logger, identity extensions component

components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/pom.xml

@@ -248,7 +248,7 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.identity.jwt.client.extension</artifactId>
+            <artifactId>io.entgra.device.mgt.core.identity.jwt.client.extension</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/pom.xml

@@ -156,7 +156,7 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.identity.jwt.client.extension</artifactId>
+            <artifactId>io.entgra.device.mgt.core.identity.jwt.client.extension</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -316,7 +316,7 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>io.entgra.server.bootup.heartbeat.beacon</artifactId>
+            <artifactId>io.entgra.device.mgt.core.server.bootup.heartbeat.beacon</artifactId>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/pom.xml

@@ -69,7 +69,7 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.identity.jwt.client.extension</artifactId>
+            <artifactId>io.entgra.device.mgt.core.identity.jwt.client.extension</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -115,10 +115,10 @@
                             org.wso2.carbon.apimgt.impl;version="${carbon.api.mgt.version.range}",
                             org.wso2.carbon.apimgt.impl.utils;version="${carbon.api.mgt.version.range}",
                             org.wso2.carbon.context;version="${carbon.kernel.version.range}",
-                            org.wso2.carbon.identity.jwt.client.extension,
+                            io.entgra.device.mgt.core.identity.jwt.client.extension,
-                            org.wso2.carbon.identity.jwt.client.extension.dto,
+                            io.entgra.device.mgt.core.identity.jwt.client.extension.dto,
-                            org.wso2.carbon.identity.jwt.client.extension.exception,
+                            io.entgra.device.mgt.core.identity.jwt.client.extension.exception,
-                            org.wso2.carbon.identity.jwt.client.extension.service,
+                            io.entgra.device.mgt.core.identity.jwt.client.extension.service,
                             org.wso2.carbon.registry.core.exceptions;version="[1.0,2)",
                             org.wso2.carbon.registry.core.service;version="[1.0,2)",
                             org.wso2.carbon.registry.indexing.service;version="${carbon.registry.imp.pkg.version.range}",

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/src/main/java/io/entgra/device/mgt/core/apimgt/application/extension/APIManagementProviderService.java

@@ -20,7 +20,7 @@ package io.entgra.device.mgt.core.apimgt.application.extension;
 
 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.identity.jwt.client.extension.dto.AccessTokenInfo;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.AccessTokenInfo;
 
 /**
  * This comprise on operation that is been done with api manager from CDMF. This service needs to be implemented in APIM.

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/src/main/java/io/entgra/device/mgt/core/apimgt/application/extension/APIManagementProviderServiceImpl.java

@@ -42,10 +42,10 @@ import org.wso2.carbon.apimgt.impl.APIConstants;
 import org.wso2.carbon.apimgt.impl.APIManagerFactory;
 import org.wso2.carbon.apimgt.impl.utils.APIUtil;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.jwt.client.extension.JWTClient;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.JWTClient;
-import org.wso2.carbon.identity.jwt.client.extension.dto.AccessTokenInfo;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.AccessTokenInfo;
-import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException;
-import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService;
 import org.wso2.carbon.user.api.UserStoreException;
 import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
 

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/src/main/java/io/entgra/device/mgt/core/apimgt/application/extension/internal/APIApplicationManagerExtensionDataHolder.java

@@ -19,7 +19,7 @@ package io.entgra.device.mgt.core.apimgt.application.extension.internal;
 
 import io.entgra.device.mgt.core.apimgt.application.extension.APIManagementProviderService;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-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.registry.core.service.TenantRegistryLoader;
 import org.wso2.carbon.registry.indexing.service.TenantIndexingLoader;
 import org.wso2.carbon.user.core.service.RealmService;

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/test/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/BaseAPIPublisherTest.java

@@ -34,7 +34,7 @@ import org.wso2.carbon.registry.core.jdbc.realm.InMemoryRealmService;
 import org.wso2.carbon.registry.core.service.RegistryService;
 import org.wso2.carbon.user.api.UserStoreException;
 import org.wso2.carbon.user.core.service.RealmService;
-import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException;
 
 import java.io.File;
 import java.io.InputStream;

components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/pom.xml

@@ -183,7 +183,7 @@
 		</dependency>
 		<dependency>
 			<groupId>io.entgra.device.mgt.core</groupId>
-			<artifactId>org.wso2.carbon.identity.jwt.client.extension</artifactId>
+			<artifactId>io.entgra.device.mgt.core.identity.jwt.client.extension</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>io.entgra.device.mgt.core</groupId>

components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/OAuthRequestInterceptor.java

@@ -35,9 +35,9 @@ import org.wso2.carbon.apimgt.integration.client.model.OAuthApplication;
 import org.wso2.carbon.apimgt.integration.client.util.Utils;
 import org.wso2.carbon.base.MultitenantConstants;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.jwt.client.extension.JWTClient;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.JWTClient;
-import org.wso2.carbon.identity.jwt.client.extension.dto.AccessTokenInfo;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.AccessTokenInfo;
-import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException;
 
 import java.util.HashMap;
 import java.util.Map;

components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/internal/APIIntegrationClientDataHolder.java

@@ -19,7 +19,7 @@
 package org.wso2.carbon.apimgt.integration.client.internal;
 
 
-import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService;
 
 /**
  * This holds the required service for this component

components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/internal/APIIntegrationClientServiceComponent.java

@@ -25,12 +25,12 @@ import org.osgi.service.component.ComponentContext;
 import org.wso2.carbon.apimgt.integration.client.IntegrationClientServiceImpl;
 import org.wso2.carbon.apimgt.integration.client.configs.APIMConfigReader;
 import org.wso2.carbon.apimgt.integration.client.service.IntegrationClientService;
-import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService;
 
 /**
  * @scr.component name="org.wso2.carbon.api.integration.client" immediate="true"
  * @scr.reference name="api.integration.client.service"
- * interface="org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService"
+ * interface="io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService"
  * cardinality="1..1"
  * policy="dynamic"
  * bind="setJWTClientManagerService"

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

@@ -79,7 +79,7 @@
                             org.apache.commons.codec.digest;version="${commons-codec.wso2.osgi.version.range}",
                             org.wso2.carbon.base,
                             com.dd.*,
-                            org.wso2.carbon.identity.jwt.client.extension.*,
+                            io.entgra.device.mgt.core.identity.jwt.client.extension.*,
                             io.entgra.device.mgt.core.apimgt.application.extension.*,
                             org.apache.commons.httpclient,
                             org.apache.commons.httpclient.methods,
@@ -354,7 +354,7 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.identity.jwt.client.extension</artifactId>
+            <artifactId>io.entgra.device.mgt.core.identity.jwt.client.extension</artifactId>
         </dependency>
         <!--nTask dependencies-->
         <dependency>

components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/impl/SubscriptionManagerImpl.java

@@ -84,7 +84,7 @@ import org.wso2.carbon.device.mgt.core.service.GroupManagementProviderService;
 import org.wso2.carbon.device.mgt.core.util.MDMAndroidOperationUtil;
 import org.wso2.carbon.device.mgt.core.util.MDMIOSOperationUtil;
 import org.wso2.carbon.device.mgt.core.util.MDMWindowsOperationUtil;
-import org.wso2.carbon.identity.jwt.client.extension.dto.AccessTokenInfo;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.AccessTokenInfo;
 import org.wso2.carbon.user.api.UserStoreException;
 
 import javax.ws.rs.core.MediaType;

components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/OAuthUtils.java

@@ -25,10 +25,10 @@ import io.entgra.device.mgt.core.apimgt.application.extension.dto.ApiApplication
 import io.entgra.device.mgt.core.apimgt.application.extension.exception.APIManagerException;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import io.entgra.device.mgt.core.application.mgt.common.dto.ApiRegistrationProfile;
-import org.wso2.carbon.identity.jwt.client.extension.JWTClient;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.JWTClient;
-import org.wso2.carbon.identity.jwt.client.extension.dto.AccessTokenInfo;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.AccessTokenInfo;
-import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException;
-import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService;
 import org.wso2.carbon.user.api.UserStoreException;
 import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
 

components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/pom.xml

@@ -175,7 +175,7 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.identity.jwt.client.extension</artifactId>
+            <artifactId>io.entgra.device.mgt.core.identity.jwt.client.extension</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/impl/CertificateManagementAdminServiceImpl.java

@@ -47,8 +47,8 @@ import io.entgra.device.mgt.core.certificate.mgt.core.service.PaginationResult;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
-import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException;
-import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService;
 
 import javax.ws.rs.core.Response;
 import java.security.cert.X509Certificate;

components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/util/CertificateMgtAPIUtils.java

@@ -24,7 +24,7 @@ import io.entgra.device.mgt.core.certificate.mgt.core.scep.SCEPManager;
 import io.entgra.device.mgt.core.certificate.mgt.core.service.CertificateManagementService;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.core.search.mgt.SearchManagerService;
-import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService;
 
 import javax.ws.rs.core.MediaType;
 

components/device-mgt/io.entgra.carbon.device.mgt.config.api/pom.xml

@@ -260,7 +260,7 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.identity.jwt.client.extension</artifactId>
+            <artifactId>io.entgra.device.mgt.core.identity.jwt.client.extension</artifactId>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>

components/device-mgt/io.entgra.carbon.device.mgt.config.api/src/main/java/io/entgra/carbon/device/mgt/config/jaxrs/service/impl/DeviceManagementConfigServiceImpl.java

@@ -46,8 +46,8 @@ import org.wso2.carbon.device.mgt.core.config.ui.UIConfigurationManager;
 import org.wso2.carbon.device.mgt.core.permission.mgt.PermissionUtils;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil;
-import org.wso2.carbon.identity.jwt.client.extension.dto.AccessTokenInfo;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.AccessTokenInfo;
-import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException;
 import org.wso2.carbon.user.api.Tenant;
 import org.wso2.carbon.user.api.UserStoreException;
 import org.wso2.carbon.user.core.service.RealmService;

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

@@ -355,7 +355,7 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.identity.jwt.client.extension</artifactId>
+            <artifactId>io.entgra.device.mgt.core.identity.jwt.client.extension</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

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

@@ -45,7 +45,7 @@ import org.wso2.carbon.event.receiver.stub.types.EventReceiverConfigurationDto;
 import org.wso2.carbon.event.stream.stub.EventStreamAdminServiceStub;
 import org.wso2.carbon.event.stream.stub.types.EventStreamAttributeDto;
 import org.wso2.carbon.event.stream.stub.types.EventStreamDefinitionDto;
-import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException;
 import org.wso2.carbon.user.api.UserStoreException;
 
 import org.apache.axis2.AxisFault;

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

@@ -48,7 +48,7 @@ import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtAPIUtils;
 import org.wso2.carbon.event.stream.stub.EventStreamAdminServiceStub;
 import org.wso2.carbon.event.stream.stub.types.EventStreamAttributeDto;
 import org.wso2.carbon.event.stream.stub.types.EventStreamDefinitionDto;
-import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException;
 import io.entgra.device.mgt.core.policy.mgt.common.PolicyAdministratorPoint;
 import io.entgra.device.mgt.core.policy.mgt.common.PolicyManagementException;
 import org.wso2.carbon.user.api.UserStoreException;

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

@@ -46,7 +46,7 @@ import org.wso2.carbon.event.stream.core.exception.EventStreamConfigurationExcep
 import org.wso2.carbon.event.stream.stub.EventStreamAdminServiceStub;
 import org.wso2.carbon.event.stream.stub.types.EventStreamAttributeDto;
 import org.wso2.carbon.event.stream.stub.types.EventStreamDefinitionDto;
-import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException;
 import org.wso2.carbon.user.api.UserStoreException;
 
 import javax.validation.Valid;

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

@@ -103,10 +103,10 @@ import org.wso2.carbon.device.mgt.jaxrs.service.impl.util.InputValidationExcepti
 import org.wso2.carbon.device.mgt.jaxrs.service.impl.util.RequestValidationUtil;
 import org.wso2.carbon.device.mgt.jaxrs.util.Constants;
 import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtAPIUtils;
-import org.wso2.carbon.identity.jwt.client.extension.JWTClient;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.JWTClient;
-import org.wso2.carbon.identity.jwt.client.extension.dto.AccessTokenInfo;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.AccessTokenInfo;
-import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException;
-import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService;
 import io.entgra.device.mgt.core.policy.mgt.common.PolicyManagementException;
 import io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerService;
 import org.wso2.carbon.user.api.UserStoreException;

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

@@ -39,8 +39,8 @@ import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.core.util.Utils;
 import org.wso2.carbon.device.mgt.jaxrs.service.api.admin.DeviceAnalyticsArtifactUploaderAdminService;
 import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtAPIUtils;
-import org.wso2.carbon.identity.jwt.client.extension.JWTClient;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.JWTClient;
-import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException;
 import org.wso2.carbon.registry.core.exceptions.RegistryException;
 import org.wso2.carbon.user.api.UserStoreException;
 import org.wso2.carbon.utils.CarbonUtils;

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

@@ -101,9 +101,9 @@ import org.wso2.carbon.event.receiver.stub.EventReceiverAdminServiceStub;
 import org.wso2.carbon.event.stream.core.EventStreamService;
 import org.wso2.carbon.event.stream.stub.EventStreamAdminServiceStub;
 import org.wso2.carbon.identity.claim.metadata.mgt.dto.ClaimPropertyDTO;
-import org.wso2.carbon.identity.jwt.client.extension.JWTClient;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.JWTClient;
-import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException;
-import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService;
 import org.wso2.carbon.identity.user.store.count.AbstractCountRetrieverFactory;
 import org.wso2.carbon.identity.user.store.count.UserStoreCountRetriever;
 import org.wso2.carbon.identity.user.store.count.exception.UserStoreCounterException;

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

@@ -53,7 +53,7 @@ import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtAPIUtils;
 import org.wso2.carbon.event.stream.stub.EventStreamAdminServiceStub;
 import org.wso2.carbon.event.stream.stub.types.EventStreamAttributeDto;
 import org.wso2.carbon.event.stream.stub.types.EventStreamDefinitionDto;
-import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException;
 import io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerService;
 import io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerServiceImpl;
 import org.wso2.carbon.user.api.UserStoreException;

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

@@ -109,13 +109,13 @@
                             io.swagger.annotations.*;resolution:=optional,
                             org.wso2.carbon,
                             org.wso2.carbon.base,
-							org.scannotation.*,
+                            org.scannotation.*,
                             org.wso2.carbon.event.processor.stub,
-                            org.wso2.carbon.identity.jwt.client.extension.service,
+                            io.entgra.device.mgt.core.identity.jwt.client.extension.service,
                             org.apache.commons.codec.binary,
-                            io.entgra.server.bootup.heartbeat.beacon,
+                            io.entgra.device.mgt.core.server.bootup.heartbeat.beacon,
                             io.entgra.device.mgt.core.device.mgt.extensions.logger.*,
-                            io.entgra.notification.logger.*
+                            io.entgra.device.mgt.core.notification.logger.*
                         </Import-Package>
                         <Export-Package>
                             !org.wso2.carbon.device.mgt.core.internal,
@@ -304,7 +304,7 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.identity.jwt.client.extension</artifactId>
+            <artifactId>io.entgra.device.mgt.core.identity.jwt.client.extension</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -339,7 +339,7 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>io.entgra.server.bootup.heartbeat.beacon</artifactId>
+            <artifactId>io.entgra.device.mgt.core.server.bootup.heartbeat.beacon</artifactId>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -360,7 +360,7 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>io.entgra.notification.logger</artifactId>
+            <artifactId>io.entgra.device.mgt.core.notification.logger</artifactId>
         </dependency>
     </dependencies>
 

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/geo/service/GeoLocationProviderServiceImpl.java

@@ -61,9 +61,9 @@ import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder;
 import org.wso2.carbon.device.mgt.core.operation.mgt.OperationMgtConstants;
 import org.wso2.carbon.event.processor.stub.EventProcessorAdminServiceStub;
 import org.wso2.carbon.event.processor.stub.types.ExecutionPlanConfigurationDto;
-import org.wso2.carbon.identity.jwt.client.extension.JWTClient;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.JWTClient;
-import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException;
-import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService;
 import org.wso2.carbon.registry.api.Registry;
 import org.wso2.carbon.registry.api.RegistryException;
 import org.wso2.carbon.registry.api.Resource;

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementDataHolder.java

@@ -18,7 +18,7 @@
 
 package org.wso2.carbon.device.mgt.core.internal;
 
-import io.entgra.server.bootup.heartbeat.beacon.service.HeartBeatManagementService;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.service.HeartBeatManagementService;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.DeviceStatusTaskPluginConfig;
 import org.wso2.carbon.device.mgt.common.OperationMonitoringTaskConfig;

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java

@@ -17,7 +17,7 @@
  */
 package org.wso2.carbon.device.mgt.core.internal;
 
-import io.entgra.server.bootup.heartbeat.beacon.service.HeartBeatManagementService;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.service.HeartBeatManagementService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.osgi.framework.BundleContext;
@@ -145,7 +145,7 @@ import java.util.concurrent.TimeUnit;
  * bind="setDeviceTypeGeneratorService"
  * unbind="unsetDeviceTypeGeneratorService"
  * @scr.reference name="entgra.heart.beat.service"
- * interface="io.entgra.server.bootup.heartbeat.beacon.service.HeartBeatManagementService"
+ * interface="io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.service.HeartBeatManagementService"
  * cardinality="0..1"
  * policy="dynamic"
  * bind="setHeartBeatService"

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

@@ -19,8 +19,8 @@
 package org.wso2.carbon.device.mgt.core.notification.mgt;
 
 import io.entgra.device.mgt.core.device.mgt.extensions.logger.spi.EntgraLogger;
-import io.entgra.notification.logger.DeviceLogContext;
+import io.entgra.device.mgt.core.notification.logger.DeviceLogContext;
-import io.entgra.notification.logger.impl.EntgraDeviceLoggerImpl;
+import io.entgra.device.mgt.core.notification.logger.impl.EntgraDeviceLoggerImpl;
 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;

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/task/impl/DynamicPartitionedScheduleTask.java

@@ -18,7 +18,7 @@
 
 package org.wso2.carbon.device.mgt.core.task.impl;
 
-import io.entgra.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException;
 import io.entgra.device.mgt.core.task.mgt.common.constant.TaskMgtConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/task/impl/RandomlyAssignedScheduleTask.java

@@ -18,7 +18,7 @@
 
 package org.wso2.carbon.device.mgt.core.task.impl;
 
-import io.entgra.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder;

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java

@@ -94,10 +94,10 @@ import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder;
 import org.wso2.carbon.device.mgt.core.operation.mgt.util.DeviceIDHolder;
 import org.wso2.carbon.device.mgt.core.report.mgt.Constants;
 import org.wso2.carbon.device.mgt.core.service.GroupManagementProviderService;
-import org.wso2.carbon.identity.jwt.client.extension.JWTClient;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.JWTClient;
-import org.wso2.carbon.identity.jwt.client.extension.dto.AccessTokenInfo;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.AccessTokenInfo;
-import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException;
-import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService;
 import org.wso2.carbon.user.api.RealmConfiguration;
 import org.wso2.carbon.user.api.TenantManager;
 import org.wso2.carbon.user.api.UserRealm;

components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/TestHeartBeatManagementService.java

@@ -18,10 +18,10 @@
 
 package org.wso2.carbon.device.mgt.core;
 
-import io.entgra.server.bootup.heartbeat.beacon.dto.HeartBeatEvent;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto.HeartBeatEvent;
-import io.entgra.server.bootup.heartbeat.beacon.dto.ServerContext;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto.ServerContext;
-import io.entgra.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException;
-import io.entgra.server.bootup.heartbeat.beacon.service.HeartBeatManagementService;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.service.HeartBeatManagementService;
 import org.wso2.carbon.device.mgt.common.ServerCtxInfo;
 
 import java.util.Map;

components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/geo/service/GeoLocationProviderServiceTest.java

@@ -36,10 +36,8 @@ import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 import org.wso2.carbon.event.processor.stub.EventProcessorAdminServiceStub;
 import org.wso2.carbon.event.processor.stub.types.ExecutionPlanConfigurationDto;
-import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException;
 import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
 
-import java.rmi.RemoteException;
 import java.util.List;
 
 public class GeoLocationProviderServiceTest {

components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/task/DeviceTaskManagerTest.java

@@ -17,7 +17,7 @@
  */
 package org.wso2.carbon.device.mgt.core.task;
 
-import io.entgra.server.bootup.heartbeat.beacon.service.HeartBeatManagementService;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.service.HeartBeatManagementService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.powermock.api.mockito.PowerMockito;

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

@@ -402,7 +402,7 @@ deviceModule = function () {
 				config.clientSecret = app["client_secret"];
 				if (config.clientId && config.clientSecret) {
 					var JWTClientManagerServicePackagePath =
-						"org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService";
+						"io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService";
 					//noinspection JSUnresolvedFunction, JSUnresolvedVariable
 					var JWTClientManagerService = carbon.server.osgiService(JWTClientManagerServicePackagePath);
 					//noinspection JSUnresolvedFunction

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/oauth/token-handler-utils.js

@@ -290,7 +290,7 @@ var utils = function () {
 			}
 			var endUsername = ssoLoginUser.user.username + "@" + ssoLoginUser.user.domain;
 			var JWTClientManagerServicePackagePath =
-				"org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService";
+				"io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService";
 			//noinspection JSUnresolvedFunction, JSUnresolvedVariable
 			var JWTClientManagerService = carbon.server.osgiService(JWTClientManagerServicePackagePath);
 			//noinspection JSUnresolvedFunction
@@ -353,7 +353,7 @@ var utils = function () {
             return null;
         } else {
             var JWTClientManagerServicePackagePath =
-                "org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService";
+                "io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService";
             //noinspection JSUnresolvedFunction, JSUnresolvedVariable
             var JWTClientManagerService = carbon.server.osgiService(JWTClientManagerServicePackagePath);
             //noinspection JSUnresolvedFunction
@@ -370,7 +370,7 @@ var utils = function () {
             return null;
         } else {
             var JWTClientManagerServicePackagePath =
-                "org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService";
+                "io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService";
             //noinspection JSUnresolvedFunction, JSUnresolvedVariable
             var JWTClientManagerService = carbon.server.osgiService(JWTClientManagerServicePackagePath);
             //noinspection JSUnresolvedFunction

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.realtime.analytics-view/analytics-view.js

@@ -29,7 +29,7 @@ function onRequest(context) {
     var constants = require("/app/modules/constants.js");
     var websocketEndpoint = devicemgtProps["wssURL"].replace("https", "wss");
     var jwtService = carbonServer.osgiService(
-        'org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService');
+        '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 token = "";

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.js

@@ -25,7 +25,7 @@ function onRequest(context) {
     var constants = require("/app/modules/constants.js");
     var wsEndpoint = null;
     var jwtService = carbonServer.osgiService(
-        'org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService');
+        'io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService');
     var jwtClient = jwtService.getJWTClient();
     var encodedClientKeys = session.get(constants["ENCODED_TENANT_BASED_WEB_SOCKET_CLIENT_CREDENTIALS"]);
     var tokenPair = null;

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-devices/geo-devices.js

@@ -26,7 +26,7 @@ function onRequest(context) {
     var constants = require("/app/modules/constants.js");
     var wsEndpoint = null;
     var jwtService = carbonServer.osgiService(
-        'org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService');
+        'io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService');
     var jwtClient = jwtService.getJWTClient();
     var encodedClientKeys = session.get(constants["ENCODED_TENANT_BASED_WEB_SOCKET_CLIENT_CREDENTIALS"]);
     var tokenPair = null;

components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/pom.xml

@@ -27,7 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>io.entgra.server.bootup.heartbeat.beacon</artifactId>
+    <artifactId>io.entgra.device.mgt.core.server.bootup.heartbeat.beacon</artifactId>
     <packaging>bundle</packaging>
     <name>Entgra - Heartbeat Beacon</name>
     <description>Entgra - Server Startup and Heartbeat Monitoring Component</description>
@@ -49,7 +49,7 @@
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
                         <Bundle-Description>Server Startup Heart Beat Beacon Bundle</Bundle-Description>
-                        <Private-Package>io.entgra.server.bootup.heartbeat.beacon.internal</Private-Package>
+                        <Private-Package>io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.internal</Private-Package>
                         <Import-Package>
                             org.apache.axis2.*;version="${axis2.osgi.version.range}",
                             org.apache.axiom.*; version="${axiom.osgi.version.range}",
@@ -67,8 +67,8 @@
                             org.wso2.carbon.device.mgt.common.*
                         </Import-Package>
                         <Export-Package>
-                            !io.entgra.server.bootup.heartbeat.beacon.internal,
+                            !io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.internal,
-                            io.entgra.server.bootup.heartbeat.beacon.*
+                            io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.*
                         </Export-Package>
                     </instructions>
                 </configuration>

components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/HeartBeatBeaconConfigurationException.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.entgra.server.bootup.heartbeat.beacon;
+package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon;
 
 public class HeartBeatBeaconConfigurationException extends Exception {
 

components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/HeartBeatBeaconUtils.java

@@ -16,10 +16,10 @@
  * under the License.
  */
 
-package io.entgra.server.bootup.heartbeat.beacon;
+package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon;
 
-import io.entgra.server.bootup.heartbeat.beacon.config.HeartBeatBeaconConfig;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.config.HeartBeatBeaconConfig;
-import io.entgra.server.bootup.heartbeat.beacon.dto.ServerContext;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto.ServerContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.w3c.dom.Document;

components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/config/HeartBeatBeaconConfig.java

@@ -16,12 +16,12 @@
  * under the License.
  */
 
-package io.entgra.server.bootup.heartbeat.beacon.config;
+package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.config;
 
-import io.entgra.server.bootup.heartbeat.beacon.HeartBeatBeaconConfigurationException;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.HeartBeatBeaconConfigurationException;
-import io.entgra.server.bootup.heartbeat.beacon.HeartBeatBeaconUtils;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.HeartBeatBeaconUtils;
-import io.entgra.server.bootup.heartbeat.beacon.config.datasource.DataSourceConfig;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.config.datasource.DataSourceConfig;
-import io.entgra.server.bootup.heartbeat.beacon.exception.InvalidConfigurationStateException;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.exception.InvalidConfigurationStateException;
 import org.w3c.dom.Document;
 import org.wso2.carbon.utils.CarbonUtils;
 

components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/config/datasource/DataSourceConfig.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.entgra.server.bootup.heartbeat.beacon.config.datasource;
+package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.config.datasource;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;

components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/config/datasource/JNDILookupDefinition.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.entgra.server.bootup.heartbeat.beacon.config.datasource;
+package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.config.datasource;
 
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;

components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/dao/HeartBeatBeaconDAOFactory.java

@@ -16,12 +16,12 @@
  * under the License.
  */
 
-package io.entgra.server.bootup.heartbeat.beacon.dao;
+package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dao;
 
-import io.entgra.server.bootup.heartbeat.beacon.HeartBeatBeaconUtils;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.HeartBeatBeaconUtils;
-import io.entgra.server.bootup.heartbeat.beacon.config.datasource.DataSourceConfig;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.config.datasource.DataSourceConfig;
-import io.entgra.server.bootup.heartbeat.beacon.config.datasource.JNDILookupDefinition;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.config.datasource.JNDILookupDefinition;
-import io.entgra.server.bootup.heartbeat.beacon.dao.impl.GenericHeartBeatDAOImpl;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dao.impl.GenericHeartBeatDAOImpl;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;

components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/dao/HeartBeatDAO.java

@@ -16,12 +16,12 @@
  * under the License.
  */
 
-package io.entgra.server.bootup.heartbeat.beacon.dao;
+package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dao;
 
-import io.entgra.server.bootup.heartbeat.beacon.dao.exception.HeartBeatDAOException;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dao.exception.HeartBeatDAOException;
-import io.entgra.server.bootup.heartbeat.beacon.dto.ElectedCandidate;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto.ElectedCandidate;
-import io.entgra.server.bootup.heartbeat.beacon.dto.HeartBeatEvent;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto.HeartBeatEvent;
-import io.entgra.server.bootup.heartbeat.beacon.dto.ServerContext;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto.ServerContext;
 
 import java.util.List;
 import java.util.Map;

components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/dao/exception/HeartBeatDAOException.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.entgra.server.bootup.heartbeat.beacon.dao.exception;
+package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dao.exception;
 
 /**
  * Custom exception class for group management data access related exceptions.

components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/dao/impl/GenericHeartBeatDAOImpl.java

@@ -16,15 +16,15 @@
  * under the License.
  */
 
-package io.entgra.server.bootup.heartbeat.beacon.dao.impl;
+package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dao.impl;
-
+
-import io.entgra.server.bootup.heartbeat.beacon.dao.HeartBeatBeaconDAOFactory;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dao.HeartBeatBeaconDAOFactory;
-import io.entgra.server.bootup.heartbeat.beacon.dao.HeartBeatDAO;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dao.HeartBeatDAO;
-import io.entgra.server.bootup.heartbeat.beacon.dao.exception.HeartBeatDAOException;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dao.exception.HeartBeatDAOException;
-import io.entgra.server.bootup.heartbeat.beacon.dao.util.HeartBeatBeaconDAOUtil;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dao.util.HeartBeatBeaconDAOUtil;
-import io.entgra.server.bootup.heartbeat.beacon.dto.ElectedCandidate;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto.ElectedCandidate;
-import io.entgra.server.bootup.heartbeat.beacon.dto.HeartBeatEvent;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto.HeartBeatEvent;
-import io.entgra.server.bootup.heartbeat.beacon.dto.ServerContext;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto.ServerContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/dao/util/HeartBeatBeaconDAOUtil.java

@@ -16,10 +16,10 @@
  * under the License.
  */
 
-package io.entgra.server.bootup.heartbeat.beacon.dao.util;
+package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dao.util;
 
-import io.entgra.server.bootup.heartbeat.beacon.dto.ElectedCandidate;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto.ElectedCandidate;
-import io.entgra.server.bootup.heartbeat.beacon.dto.ServerContext;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto.ServerContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -28,7 +28,6 @@ import javax.sql.DataSource;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Statement;
 import java.util.Arrays;
 import java.util.Hashtable;
 

components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/dto/ElectedCandidate.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.entgra.server.bootup.heartbeat.beacon.dto;
+package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto;
 
 import java.sql.Timestamp;
 import java.util.ArrayList;

components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/dto/HeartBeatEvent.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.entgra.server.bootup.heartbeat.beacon.dto;
+package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto;
 
 import java.sql.Timestamp;
 

components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/dto/ServerContext.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.entgra.server.bootup.heartbeat.beacon.dto;
+package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto;
 
 public class ServerContext {
 

components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/exception/HeartBeatManagementException.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.entgra.server.bootup.heartbeat.beacon.exception;
+package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.exception;
 
 public class HeartBeatManagementException extends Exception {
 

components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/exception/InvalidConfigurationStateException.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.entgra.server.bootup.heartbeat.beacon.exception;
+package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.exception;
 
 public class InvalidConfigurationStateException extends RuntimeException {
 

components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/exception/ServerStatusUpdationFailedException.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.entgra.server.bootup.heartbeat.beacon.exception;
+package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.exception;
 
 public class ServerStatusUpdationFailedException extends Exception {
 

components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/internal/HeartBeatBeaconComponent.java

@@ -16,21 +16,21 @@
  * under the License.
  */
 
-package io.entgra.server.bootup.heartbeat.beacon.internal;
+package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.internal;
 
-import io.entgra.server.bootup.heartbeat.beacon.HeartBeatBeaconUtils;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.HeartBeatBeaconUtils;
-import io.entgra.server.bootup.heartbeat.beacon.config.HeartBeatBeaconConfig;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.config.HeartBeatBeaconConfig;
-import io.entgra.server.bootup.heartbeat.beacon.config.datasource.DataSourceConfig;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.config.datasource.DataSourceConfig;
-import io.entgra.server.bootup.heartbeat.beacon.dao.HeartBeatBeaconDAOFactory;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dao.HeartBeatBeaconDAOFactory;
-import io.entgra.server.bootup.heartbeat.beacon.service.HeartBeatManagementService;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.service.HeartBeatManagementService;
-import io.entgra.server.bootup.heartbeat.beacon.service.HeartBeatManagementServiceImpl;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.service.HeartBeatManagementServiceImpl;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.osgi.service.component.ComponentContext;
 import org.wso2.carbon.ndatasource.core.DataSourceService;
 
 /**
- * @scr.component name="io.entgra.server.bootup.heartbeat.beacon.heartbeatBeaconComponent"
+ * @scr.component name="io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.heartbeatBeaconComponent"
  * immediate="true"
  * @scr.reference name="org.wso2.carbon.ndatasource"
  * interface="org.wso2.carbon.ndatasource.core.DataSourceService"

components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/internal/HeartBeatBeaconDataHolder.java

@@ -16,9 +16,9 @@
  * under the License.
  */
 
-package io.entgra.server.bootup.heartbeat.beacon.internal;
+package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.internal;
 
-import io.entgra.server.bootup.heartbeat.beacon.service.HeartBeatManagementService;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.service.HeartBeatManagementService;
 
 public class HeartBeatBeaconDataHolder {
 

components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/internal/HeartBeatExecutor.java

@@ -16,14 +16,14 @@
  * under the License.
  */
 
-package io.entgra.server.bootup.heartbeat.beacon.internal;
+package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.internal;
 
-import io.entgra.server.bootup.heartbeat.beacon.HeartBeatBeaconConfigurationException;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.HeartBeatBeaconConfigurationException;
-import io.entgra.server.bootup.heartbeat.beacon.HeartBeatBeaconUtils;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.HeartBeatBeaconUtils;
-import io.entgra.server.bootup.heartbeat.beacon.config.HeartBeatBeaconConfig;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.config.HeartBeatBeaconConfig;
-import io.entgra.server.bootup.heartbeat.beacon.dto.HeartBeatEvent;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto.HeartBeatEvent;
-import io.entgra.server.bootup.heartbeat.beacon.dto.ServerContext;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto.ServerContext;
-import io.entgra.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/service/HeartBeatManagementService.java

@@ -16,11 +16,11 @@
  * under the License.
  */
 
-package io.entgra.server.bootup.heartbeat.beacon.service;
+package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.service;
 
-import io.entgra.server.bootup.heartbeat.beacon.dto.HeartBeatEvent;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto.HeartBeatEvent;
-import io.entgra.server.bootup.heartbeat.beacon.dto.ServerContext;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto.ServerContext;
-import io.entgra.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException;
 import org.wso2.carbon.device.mgt.common.ServerCtxInfo;
 
 import java.util.Map;

components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/service/HeartBeatManagementServiceImpl.java

@@ -16,17 +16,17 @@
  * under the License.
  */
 
-package io.entgra.server.bootup.heartbeat.beacon.service;
+package io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.service;
 
-import io.entgra.server.bootup.heartbeat.beacon.config.HeartBeatBeaconConfig;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.config.HeartBeatBeaconConfig;
-import io.entgra.server.bootup.heartbeat.beacon.dao.HeartBeatBeaconDAOFactory;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dao.HeartBeatBeaconDAOFactory;
-import io.entgra.server.bootup.heartbeat.beacon.dao.HeartBeatDAO;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dao.HeartBeatDAO;
-import io.entgra.server.bootup.heartbeat.beacon.dao.exception.HeartBeatDAOException;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dao.exception.HeartBeatDAOException;
-import io.entgra.server.bootup.heartbeat.beacon.dto.ElectedCandidate;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto.ElectedCandidate;
-import io.entgra.server.bootup.heartbeat.beacon.dto.HeartBeatEvent;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto.HeartBeatEvent;
-import io.entgra.server.bootup.heartbeat.beacon.dto.ServerContext;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.dto.ServerContext;
-import io.entgra.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException;
-import io.entgra.server.bootup.heartbeat.beacon.internal.HeartBeatBeaconDataHolder;
+import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.internal.HeartBeatBeaconDataHolder;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.ServerCtxInfo;

components/heartbeat-management/pom.xml

@@ -33,7 +33,7 @@
     <url>http://entgra.io</url>
 
     <modules>
-        <module>io.entgra.server.bootup.heartbeat.beacon</module>
+        <module>io.entgra.device.mgt.core.server.bootup.heartbeat.beacon</module>
     </modules>
 
 </project>

components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/pom.xml

@@ -27,7 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.identity.jwt.client.extension</artifactId>
+    <artifactId>io.entgra.device.mgt.core.identity.jwt.client.extension</artifactId>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Device Management JWT Client Extensions</name>
     <description>WSO2 Carbon - Device Management JWT Client Extensions</description>
@@ -179,10 +179,10 @@
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
                         <Bundle-Description>Device Management JWT Client Bundle</Bundle-Description>
-                        <Private-Package>org.wso2.carbon.identity.jwt.client.extension.internal</Private-Package>
+                        <Private-Package>io.entgra.device.mgt.core.identity.jwt.client.extension.internal</Private-Package>
                         <Export-Package>
-                            !org.wso2.carbon.identity.jwt.client.extension.internal,
+                            !io.entgra.device.mgt.core.identity.jwt.client.extension.internal,
-                            org.wso2.carbon.identity.jwt.client.extension.*
+                            io.entgra.device.mgt.core.identity.jwt.client.extension.*
                         </Export-Package>
                         <Import-Package>
                             org.osgi.framework.*;version="${imp.package.version.osgi.framework}",

components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/JWTClient.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.identity.jwt.client.extension;
+package io.entgra.device.mgt.core.identity.jwt.client.extension;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.logging.Log;
@@ -30,11 +30,11 @@ import org.apache.http.message.BasicNameValuePair;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
-import org.wso2.carbon.identity.jwt.client.extension.constant.JWTConstants;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.constant.JWTConstants;
-import org.wso2.carbon.identity.jwt.client.extension.dto.AccessTokenInfo;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.AccessTokenInfo;
-import org.wso2.carbon.identity.jwt.client.extension.dto.JWTConfig;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.JWTConfig;
-import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException;
-import org.wso2.carbon.identity.jwt.client.extension.util.JWTClientUtil;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.util.JWTClientUtil;
 
 import java.io.IOException;
 import java.net.MalformedURLException;

components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/constant/JWTConstants.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.identity.jwt.client.extension.constant;
+package io.entgra.device.mgt.core.identity.jwt.client.extension.constant;
 
 /**
  * This holds the constants related JWT client component.

components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/dto/AccessTokenInfo.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.identity.jwt.client.extension.dto;
+package io.entgra.device.mgt.core.identity.jwt.client.extension.dto;
 
 /**
  * This holds the token information that return from the token endpoint.

components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/dto/JWTConfig.java

@@ -1,7 +1,7 @@
-package org.wso2.carbon.identity.jwt.client.extension.dto;
+package io.entgra.device.mgt.core.identity.jwt.client.extension.dto;
 
 import org.wso2.carbon.core.util.Utils;
-import org.wso2.carbon.identity.jwt.client.extension.constant.JWTConstants;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.constant.JWTConstants;
 
 import java.util.ArrayList;
 import java.util.List;

components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/exception/JWTClientAlreadyExistsException.java

@@ -17,7 +17,7 @@
  *
  */
 
-package org.wso2.carbon.identity.jwt.client.extension.exception;
+package io.entgra.device.mgt.core.identity.jwt.client.extension.exception;
 
 public class JWTClientAlreadyExistsException extends  Exception {
 	public JWTClientAlreadyExistsException() {

components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/exception/JWTClientConfigurationException.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.identity.jwt.client.extension.exception;
+package io.entgra.device.mgt.core.identity.jwt.client.extension.exception;
 
 public class JWTClientConfigurationException extends Exception {
 	public JWTClientConfigurationException() {

components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/exception/JWTClientException.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.identity.jwt.client.extension.exception;
+package io.entgra.device.mgt.core.identity.jwt.client.extension.exception;
 
 public class JWTClientException extends Exception{
 	public JWTClientException() {

components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/internal/JWTClientExtensionDataHolder.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.identity.jwt.client.extension.internal;
+package io.entgra.device.mgt.core.identity.jwt.client.extension.internal;
 
 import org.wso2.carbon.registry.core.service.RegistryService;
 import org.wso2.carbon.registry.core.service.TenantRegistryLoader;

components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/internal/JWTClientExtensionServiceComponent.java

@@ -16,16 +16,16 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.identity.jwt.client.extension.internal;
+package io.entgra.device.mgt.core.identity.jwt.client.extension.internal;
 
 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.identity.jwt.client.extension.exception.JWTClientConfigurationException;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientConfigurationException;
-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.identity.jwt.client.extension.service.JWTClientManagerServiceImpl;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerServiceImpl;
-import org.wso2.carbon.identity.jwt.client.extension.util.JWTClientUtil;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.util.JWTClientUtil;
 import org.wso2.carbon.registry.core.exceptions.RegistryException;
 import org.wso2.carbon.registry.core.service.RegistryService;
 import org.wso2.carbon.registry.core.service.TenantRegistryLoader;
@@ -34,7 +34,7 @@ import org.wso2.carbon.user.core.service.RealmService;
 import java.io.IOException;
 
 /**
- * @scr.component name="org.wso2.carbon.identity.jwt.client.extension.internal.JWTClientExtensionServiceComponent"
+ * @scr.component name="io.entgra.device.mgt.core.identity.jwt.client.extension.internal.JWTClientExtensionServiceComponent"
  * immediate="true"
  * @scr.reference name="registry.service"
  * interface="org.wso2.carbon.registry.core.service.RegistryService"

components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/service/JWTClientManagerService.java

@@ -14,11 +14,11 @@
 * limitations under the License.
 */
 
-package org.wso2.carbon.identity.jwt.client.extension.service;
+package io.entgra.device.mgt.core.identity.jwt.client.extension.service;
 
-import org.wso2.carbon.identity.jwt.client.extension.JWTClient;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.JWTClient;
-import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientConfigurationException;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientConfigurationException;
-import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException;
 
 import java.util.Properties;
 

components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/service/JWTClientManagerServiceImpl.java

@@ -16,20 +16,20 @@
  * under the License.
  */
 
-package org.wso2.carbon.identity.jwt.client.extension.service;
+package io.entgra.device.mgt.core.identity.jwt.client.extension.service;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.base.MultitenantConstants;
 import org.wso2.carbon.context.CarbonContext;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.jwt.client.extension.JWTClient;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.JWTClient;
-import org.wso2.carbon.identity.jwt.client.extension.constant.JWTConstants;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.constant.JWTConstants;
-import org.wso2.carbon.identity.jwt.client.extension.dto.JWTConfig;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.JWTConfig;
-import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientAlreadyExistsException;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientAlreadyExistsException;
-import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientConfigurationException;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientConfigurationException;
-import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException;
-import org.wso2.carbon.identity.jwt.client.extension.util.JWTClientUtil;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.util.JWTClientUtil;
 import org.wso2.carbon.registry.core.Resource;
 import org.wso2.carbon.registry.core.exceptions.RegistryException;
 

components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/main/java/io/entgra/device/mgt/core/identity/jwt/client/extension/util/JWTClientUtil.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.identity.jwt.client.extension.util;
+package io.entgra.device.mgt.core.identity.jwt.client.extension.util;
 
 import com.nimbusds.jose.JOSEException;
 import com.nimbusds.jose.JWSAlgorithm;
@@ -36,11 +36,11 @@ import org.apache.http.util.EntityUtils;
 import org.wso2.carbon.base.MultitenantConstants;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.core.util.KeyStoreManager;
-import org.wso2.carbon.identity.jwt.client.extension.dto.JWTConfig;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.JWTConfig;
-import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientConfigurationException;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientConfigurationException;
-import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException;
-import org.wso2.carbon.identity.jwt.client.extension.internal.JWTClientExtensionDataHolder;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.internal.JWTClientExtensionDataHolder;
-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.registry.core.Registry;
 import org.wso2.carbon.registry.core.Resource;
 import org.wso2.carbon.registry.core.exceptions.RegistryException;

components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/java/io/entgra/device/mgt/core/identity/jwt/client/extension/service/JWTClientManagerServiceTest.java

@@ -15,16 +15,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.identity.jwt.client.extension.service;
+package io.entgra.device.mgt.core.identity.jwt.client.extension.service;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
-import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientConfigurationException;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientConfigurationException;
-import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException;
-import org.wso2.carbon.identity.jwt.client.extension.service.common.BaseJWTClientManagerExtTest;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.service.common.BaseJWTClientManagerExtTest;
 
 import java.util.Properties;
 

components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/java/io/entgra/device/mgt/core/identity/jwt/client/extension/service/JWTClientTest.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.identity.jwt.client.extension.service;
+package io.entgra.device.mgt.core.identity.jwt.client.extension.service;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -30,11 +30,11 @@ import org.testng.IObjectFactory;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.ObjectFactory;
 import org.testng.annotations.Test;
-import org.wso2.carbon.identity.jwt.client.extension.JWTClient;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.JWTClient;
-import org.wso2.carbon.identity.jwt.client.extension.dto.AccessTokenInfo;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.AccessTokenInfo;
-import org.wso2.carbon.identity.jwt.client.extension.dto.JWTConfig;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.JWTConfig;
-import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException;
-import org.wso2.carbon.identity.jwt.client.extension.util.JWTClientUtil;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.util.JWTClientUtil;
 
 import java.io.IOException;
 import java.security.KeyManagementException;

components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/java/io/entgra/device/mgt/core/identity/jwt/client/extension/service/JWTClientUtilTest.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.identity.jwt.client.extension.service;
+package io.entgra.device.mgt.core.identity.jwt.client.extension.service;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
@@ -29,9 +29,9 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.ObjectFactory;
 import org.testng.annotations.Test;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.jwt.client.extension.dto.JWTConfig;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.JWTConfig;
-import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException;
-import org.wso2.carbon.identity.jwt.client.extension.util.JWTClientUtil;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.util.JWTClientUtil;
 import org.wso2.carbon.registry.core.exceptions.RegistryException;
 
 import java.io.ByteArrayInputStream;

components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/java/io/entgra/device/mgt/core/identity/jwt/client/extension/service/common/BaseJWTClientManagerExtTest.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.identity.jwt.client.extension.service.common;
+package io.entgra.device.mgt.core.identity.jwt.client.extension.service.common;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -24,7 +24,7 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeSuite;
 import org.wso2.carbon.base.MultitenantConstants;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.jwt.client.extension.internal.JWTClientExtensionDataHolder;
+import io.entgra.device.mgt.core.identity.jwt.client.extension.internal.JWTClientExtensionDataHolder;
 import org.wso2.carbon.registry.core.config.RegistryContext;
 import org.wso2.carbon.registry.core.exceptions.RegistryException;
 import org.wso2.carbon.registry.core.internal.RegistryDataHolder;

components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/src/test/java/io/entgra/device/mgt/core/identity/jwt/client/extension/service/common/DataSourceConfig.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.identity.jwt.client.extension.service.common;
+package io.entgra.device.mgt.core.identity.jwt.client.extension.service.common;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;