refactored apimgt extension component

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

@@ -215,7 +215,7 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.apimgt.annotations</artifactId>
+            <artifactId>io.entgra.device.mgt.core.apimgt.annotations</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api/GrafanaAPIProxyService.java

@@ -25,8 +25,8 @@ import io.swagger.annotations.ExtensionProperty;
 import io.swagger.annotations.Info;
 import io.swagger.annotations.SwaggerDefinition;
 import io.swagger.annotations.Tag;
-import org.wso2.carbon.apimgt.annotations.api.Scope;
-import org.wso2.carbon.apimgt.annotations.api.Scopes;
+import io.entgra.device.mgt.core.apimgt.annotations.Scope;
+import io.entgra.device.mgt.core.apimgt.annotations.Scopes;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;

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

@@ -300,7 +300,7 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.apimgt.annotations</artifactId>
+            <artifactId>io.entgra.device.mgt.core.apimgt.annotations</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon.event-processing</groupId>

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

@@ -70,7 +70,7 @@
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
                         <Bundle-Description>API Management Application Bundle</Bundle-Description>
-                        <Private-Package>org.wso2.carbon.apimgt.application.extension.internal</Private-Package>
+                        <Private-Package>io.entgra.device.mgt.core.apimgt.application.extension.internal</Private-Package>
                         <Import-Packages>
                             io.entgra.device.mgt.core.apimgt.analytics.extension.dto,
                             org.apache.velocity,

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

@@ -27,7 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.apimgt.annotations</artifactId>
+    <artifactId>io.entgra.device.mgt.core.apimgt.annotations</artifactId>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - API Management Annotations</name>
     <description>WSO2 Carbon - API Management Custom Annotation Module</description>
@@ -69,7 +69,7 @@
                         <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
                         <Bundle-Description>API Management Extentions - Custom Annotations</Bundle-Description>
                         <Export-Package>
-                            org.wso2.carbon.apimgt.annotations.*
+                            io.entgra.device.mgt.core.apimgt.annotations.*
                         </Export-Package>
                         <Import-Package>
                             org.osgi.framework.*;version="${imp.package.version.osgi.framework}",

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.annotations/src/main/java/io/entgra/device/mgt/core/apimgt/annotations/Scope.java

@@ -1,4 +1,4 @@
-package org.wso2.carbon.apimgt.annotations.api;
+package io.entgra.device.mgt.core.apimgt.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.annotations/src/main/java/io/entgra/device/mgt/core/apimgt/annotations/Scopes.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.apimgt.annotations.api;
+package io.entgra.device.mgt.core.apimgt.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

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

@@ -26,7 +26,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.apimgt.application.extension.api</artifactId>
+    <artifactId>io.entgra.device.mgt.core.apimgt.application.extension.api</artifactId>
     <packaging>war</packaging>
     <name>WSO2 Carbon - API Application Management API</name>
     <description>This module provides capability to create api manager application.</description>
@@ -131,7 +131,7 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.apimgt.application.extension</artifactId>
+            <artifactId>io.entgra.device.mgt.core.apimgt.application.extension</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

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

@@ -16,9 +16,9 @@
  * under the License.
  */
 
-package org.wso2.carbon.apimgt.application.extension.api;
+package io.entgra.device.mgt.core.apimgt.application.extension.api;
 
-import org.wso2.carbon.apimgt.application.extension.api.util.RegistrationProfile;
+import io.entgra.device.mgt.core.apimgt.application.extension.api.util.RegistrationProfile;
 
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;

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

@@ -16,17 +16,17 @@
  * under the License.
  */
 
-package org.wso2.carbon.apimgt.application.extension.api;
+package io.entgra.device.mgt.core.apimgt.application.extension.api;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.apimgt.application.extension.APIManagementProviderService;
-import org.wso2.carbon.apimgt.application.extension.api.util.APIUtil;
-import org.wso2.carbon.apimgt.application.extension.api.util.RegistrationProfile;
-import org.wso2.carbon.apimgt.application.extension.constants.ApiApplicationConstants;
-import org.wso2.carbon.apimgt.application.extension.dto.ApiApplicationKey;
-import org.wso2.carbon.apimgt.application.extension.exception.APIManagerException;
+import io.entgra.device.mgt.core.apimgt.application.extension.APIManagementProviderService;
+import io.entgra.device.mgt.core.apimgt.application.extension.api.util.APIUtil;
+import io.entgra.device.mgt.core.apimgt.application.extension.api.util.RegistrationProfile;
+import io.entgra.device.mgt.core.apimgt.application.extension.constants.ApiApplicationConstants;
+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.base.MultitenantConstants;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;

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

@@ -15,11 +15,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.apimgt.application.extension.api.filter;
+package io.entgra.device.mgt.core.apimgt.application.extension.api.filter;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.apimgt.application.extension.api.util.APIUtil;
+import io.entgra.device.mgt.core.apimgt.application.extension.api.util.APIUtil;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.user.api.UserRealm;
 import org.wso2.carbon.user.api.UserStoreException;

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

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

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

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

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

@@ -16,11 +16,11 @@
  * under the License.
  */
 
-package org.wso2.carbon.apimgt.application.extension.api.util;
+package io.entgra.device.mgt.core.apimgt.application.extension.api.util;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.apimgt.application.extension.APIManagementProviderService;
+import io.entgra.device.mgt.core.apimgt.application.extension.APIManagementProviderService;
 import org.wso2.carbon.base.MultitenantConstants;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;

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

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.apimgt.application.extension.api.util;
+package io.entgra.device.mgt.core.apimgt.application.extension.api.util;
 
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
 

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension.api/src/main/webapp/WEB-INF/cxf-servlet.xml

@@ -27,7 +27,7 @@
     <jaxrs:server id="ApiApplicationRegistration" address="/">
         <jaxrs:serviceBeans>
             <bean id="ApiApplicationRegistrationService"
-                  class="org.wso2.carbon.apimgt.application.extension.api.ApiApplicationRegistrationServiceImpl">
+                  class="io.entgra.device.mgt.core.apimgt.application.extension.api.ApiApplicationRegistrationServiceImpl">
             </bean>
         </jaxrs:serviceBeans>
         <jaxrs:providers>

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension.api/src/main/webapp/WEB-INF/web.xml

@@ -61,7 +61,7 @@
 
     <filter>
         <filter-name>ApiPermissionFilter</filter-name>
-        <filter-class>org.wso2.carbon.apimgt.application.extension.api.filter.ApiPermissionFilter</filter-class>
+        <filter-class>io.entgra.device.mgt.core.apimgt.application.extension.api.filter.ApiPermissionFilter</filter-class>
     </filter>
 
     <filter>

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

@@ -27,7 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.apimgt.application.extension</artifactId>
+    <artifactId>io.entgra.device.mgt.core.apimgt.application.extension</artifactId>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - API Application Management</name>
     <description>This module provides capability to create api manager application.</description>
@@ -99,7 +99,7 @@
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
                         <Bundle-Description>API Management Application Bundle</Bundle-Description>
-                        <Private-Package>org.wso2.carbon.apimgt.application.extension.internal</Private-Package>
+                        <Private-Package>io.entgra.device.mgt.core.apimgt.application.extension.internal</Private-Package>
                         <Import-Packages>
                             org.apache.commons.lang;version="[2.6,3)",
                             org.apache.commons.logging;version="[1.2,2)",
@@ -109,9 +109,9 @@
                             org.wso2.carbon.apimgt.api;version="${carbon.api.mgt.version.range}",
                             org.wso2.carbon.apimgt.api.dto;version="${carbon.api.mgt.version.range}",
                             org.wso2.carbon.apimgt.api.model;version="${carbon.api.mgt.version.range}",
-                            org.wso2.carbon.apimgt.application.extension.bean,
-                            org.wso2.carbon.apimgt.application.extension.dto,
-                            org.wso2.carbon.apimgt.application.extension.exception,
+                            io.entgra.device.mgt.core.apimgt.application.extension.bean,
+                            io.entgra.device.mgt.core.apimgt.application.extension.dto,
+                            io.entgra.device.mgt.core.apimgt.application.extension.exception,
                             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}",
@@ -127,8 +127,8 @@
                             org.wso2.carbon.user.core.tenant;version="${carbon.kernel.version.range}"
                         </Import-Packages>
                         <Export-Package>
-                            !org.wso2.carbon.apimgt.application.extension.internal,
-                            org.wso2.carbon.apimgt.application.extension.*
+                            !io.entgra.device.mgt.core.apimgt.application.extension.internal,
+                            io.entgra.device.mgt.core.apimgt.application.extension.*
                         </Export-Package>
                     </instructions>
                 </configuration>

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

@@ -15,11 +15,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.apimgt.application.extension;
+package io.entgra.device.mgt.core.apimgt.application.extension;
 
 
-import org.wso2.carbon.apimgt.application.extension.dto.ApiApplicationKey;
-import org.wso2.carbon.apimgt.application.extension.exception.APIManagerException;
+import io.entgra.device.mgt.core.apimgt.application.extension.dto.ApiApplicationKey;
+import io.entgra.device.mgt.core.apimgt.application.extension.exception.APIManagerException;
 import org.wso2.carbon.identity.jwt.client.extension.dto.AccessTokenInfo;
 
 /**

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

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.apimgt.application.extension;
+package io.entgra.device.mgt.core.apimgt.application.extension;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
@@ -31,12 +31,12 @@ import org.wso2.carbon.apimgt.api.model.ApiTypeWrapper;
 import org.wso2.carbon.apimgt.api.model.Application;
 import org.wso2.carbon.apimgt.api.model.SubscribedAPI;
 import org.wso2.carbon.apimgt.api.model.Subscriber;
-import org.wso2.carbon.apimgt.application.extension.bean.APIRegistrationProfile;
-import org.wso2.carbon.apimgt.application.extension.constants.ApiApplicationConstants;
-import org.wso2.carbon.apimgt.application.extension.dto.ApiApplicationKey;
-import org.wso2.carbon.apimgt.application.extension.exception.APIManagerException;
-import org.wso2.carbon.apimgt.application.extension.internal.APIApplicationManagerExtensionDataHolder;
-import org.wso2.carbon.apimgt.application.extension.util.APIManagerUtil;
+import io.entgra.device.mgt.core.apimgt.application.extension.bean.APIRegistrationProfile;
+import io.entgra.device.mgt.core.apimgt.application.extension.constants.ApiApplicationConstants;
+import io.entgra.device.mgt.core.apimgt.application.extension.dto.ApiApplicationKey;
+import io.entgra.device.mgt.core.apimgt.application.extension.exception.APIManagerException;
+import io.entgra.device.mgt.core.apimgt.application.extension.internal.APIApplicationManagerExtensionDataHolder;
+import io.entgra.device.mgt.core.apimgt.application.extension.util.APIManagerUtil;
 import org.wso2.carbon.apimgt.impl.APIAdminImpl;
 import org.wso2.carbon.apimgt.impl.APIConstants;
 import org.wso2.carbon.apimgt.impl.APIManagerFactory;

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

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.apimgt.application.extension.bean;
+package io.entgra.device.mgt.core.apimgt.application.extension.bean;
 
 public class APIRegistrationProfile {
     private String applicationName;

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

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.apimgt.application.extension.constants;
+package io.entgra.device.mgt.core.apimgt.application.extension.constants;
 
 public class ApiApplicationConstants {
     public static final String DEFAULT_TOKEN_TYPE = "PRODUCTION";

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

@@ -16,10 +16,10 @@
  * under the License.
  */
 
-package org.wso2.carbon.apimgt.application.extension.dto;
+package io.entgra.device.mgt.core.apimgt.application.extension.dto;
 
 import org.json.simple.JSONObject;
-import org.wso2.carbon.apimgt.application.extension.constants.ApiApplicationConstants;
+import io.entgra.device.mgt.core.apimgt.application.extension.constants.ApiApplicationConstants;
 
 /**
  * This holds api application consumer key and secret.

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

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.apimgt.application.extension.exception;
+package io.entgra.device.mgt.core.apimgt.application.extension.exception;
 
 /**
  * Handles the exceptions related to API management.

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

@@ -15,9 +15,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.apimgt.application.extension.internal;
+package io.entgra.device.mgt.core.apimgt.application.extension.internal;
 
-import org.wso2.carbon.apimgt.application.extension.APIManagementProviderService;
+import io.entgra.device.mgt.core.apimgt.application.extension.APIManagementProviderService;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService;
 import org.wso2.carbon.registry.core.service.TenantRegistryLoader;

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

@@ -15,20 +15,20 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.apimgt.application.extension.internal;
+package io.entgra.device.mgt.core.apimgt.application.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.apimgt.application.extension.APIManagementProviderService;
-import org.wso2.carbon.apimgt.application.extension.APIManagementProviderServiceImpl;
+import io.entgra.device.mgt.core.apimgt.application.extension.APIManagementProviderService;
+import io.entgra.device.mgt.core.apimgt.application.extension.APIManagementProviderServiceImpl;
 import org.wso2.carbon.registry.core.service.TenantRegistryLoader;
 import org.wso2.carbon.registry.indexing.service.TenantIndexingLoader;
 import org.wso2.carbon.user.core.service.RealmService;
 
 /**
- * @scr.component name="org.wso2.carbon.apimgt.application.extension.internal.APIApplicationManagerExtensionServiceComponent"
+ * @scr.component name="io.entgra.device.mgt.core.apimgt.application.extension.internal.APIApplicationManagerExtensionServiceComponent"
  * @scr.reference name="tenant.registryloader"
  * interface="org.wso2.carbon.registry.core.service.TenantRegistryLoader"
  * cardinality="1..1"

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

@@ -15,12 +15,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.apimgt.application.extension.util;
+package io.entgra.device.mgt.core.apimgt.application.extension.util;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.apimgt.application.extension.exception.APIManagerException;
-import org.wso2.carbon.apimgt.application.extension.internal.APIApplicationManagerExtensionDataHolder;
+import io.entgra.device.mgt.core.apimgt.application.extension.exception.APIManagerException;
+import io.entgra.device.mgt.core.apimgt.application.extension.internal.APIApplicationManagerExtensionDataHolder;
 import org.wso2.carbon.base.MultitenantConstants;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.registry.core.exceptions.RegistryException;

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

@@ -7,7 +7,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.apimgt.keymgt.extension.api</artifactId>
+    <artifactId>io.entgra.device.mgt.core.apimgt.keymgt.extension.api</artifactId>
     <packaging>war</packaging>
     <name>WSO2 Carbon - API Key Management API</name>
     <description>This module extends the API manager's key management apis.</description>
@@ -49,7 +49,7 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.apimgt.keymgt.extension</artifactId>
+            <artifactId>io.entgra.device.mgt.core.apimgt.keymgt.extension</artifactId>
             <version>${carbon.device.mgt.version}</version>
             <scope>provided</scope>
         </dependency>

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension.api/src/main/java/io/entgra/device/mgt/core/apimgt/keymgt/extension/api/DCRRequest.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.apimgt.keymgt.extension.api;
+package io.entgra.device.mgt.core.apimgt.keymgt.extension.api;
 
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
 

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension.api/src/main/java/io/entgra/device/mgt/core/apimgt/keymgt/extension/api/KeyManagerService.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.apimgt.keymgt.extension.api;
+package io.entgra.device.mgt.core.apimgt.keymgt.extension.api;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.FormParam;

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension.api/src/main/java/io/entgra/device/mgt/core/apimgt/keymgt/extension/api/KeyManagerServiceImpl.java

@@ -16,16 +16,16 @@
  * under the License.
  */
 
-package org.wso2.carbon.apimgt.keymgt.extension.api;
+package io.entgra.device.mgt.core.apimgt.keymgt.extension.api;
 
 import com.google.gson.Gson;
-import org.wso2.carbon.apimgt.keymgt.extension.DCRResponse;
-import org.wso2.carbon.apimgt.keymgt.extension.TokenRequest;
-import org.wso2.carbon.apimgt.keymgt.extension.TokenResponse;
-import org.wso2.carbon.apimgt.keymgt.extension.exception.BadRequestException;
-import org.wso2.carbon.apimgt.keymgt.extension.exception.KeyMgtException;
-import org.wso2.carbon.apimgt.keymgt.extension.service.KeyMgtService;
-import org.wso2.carbon.apimgt.keymgt.extension.service.KeyMgtServiceImpl;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.DCRResponse;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.TokenRequest;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.TokenResponse;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.exception.BadRequestException;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.exception.KeyMgtException;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.service.KeyMgtService;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.service.KeyMgtServiceImpl;
 import org.wso2.carbon.device.mgt.common.exceptions.UnAuthorizedException;
 
 import javax.ws.rs.Consumes;

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension.api/src/main/webapp/WEB-INF/cxf-servlet.xml

@@ -32,6 +32,6 @@
         </jaxrs:providers>
     </jaxrs:server>
 
-    <bean id="keyManagerService" class="org.wso2.carbon.apimgt.keymgt.extension.api.KeyManagerServiceImpl"/>
+    <bean id="keyManagerService" class="io.entgra.device.mgt.core.apimgt.keymgt.extension.api.KeyManagerServiceImpl"/>
 
 </beans>

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

@@ -8,7 +8,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.apimgt.keymgt.extension</artifactId>
+    <artifactId>io.entgra.device.mgt.core.apimgt.keymgt.extension</artifactId>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - API Key Management</name>
     <description>This module extends the API manager's key management.</description>
@@ -51,16 +51,16 @@
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
                         <Bundle-Description>API Management Application Bundle</Bundle-Description>
-                        <Private-Package>org.wso2.carbon.apimgt.keymgt.extension.internal</Private-Package>
+                        <Private-Package>io.entgra.device.mgt.core.apimgt.keymgt.extension.internal</Private-Package>
                         <Import-Packages>
-                            org.wso2.carbon.apimgt.application.extension,
-                            org.wso2.carbon.apimgt.application.extension.*,
+                            io.entgra.device.mgt.core.apimgt.application.extension,
+                            io.entgra.device.mgt.core.apimgt.application.extension.*,
                             org.wso2.carbon.device.mgt.common.*,
                             org.wso2.carbon.device.mgt.core.*
                         </Import-Packages>
                         <Export-Package>
-                            !org.wso2.carbon.apimgt.keymgt.extension.internal,
-                            org.wso2.carbon.apimgt.keymgt.extension.*
+                            !io.entgra.device.mgt.core.apimgt.keymgt.extension.internal,
+                            io.entgra.device.mgt.core.apimgt.keymgt.extension.*
                         </Export-Package>
                     </instructions>
                 </configuration>

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension/src/main/java/io/entgra/device/mgt/core/apimgt/keymgt/extension/CustomKeyManager.java

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

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension/src/main/java/io/entgra/device/mgt/core/apimgt/keymgt/extension/DCRResponse.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.apimgt.keymgt.extension;
+package io.entgra.device.mgt.core.apimgt.keymgt.extension;
 
 public class DCRResponse {
     String client_id;

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension/src/main/java/io/entgra/device/mgt/core/apimgt/keymgt/extension/KeyManagerConnectorConfiguration.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.apimgt.keymgt.extension;
+package io.entgra.device.mgt.core.apimgt.keymgt.extension;
 
 import org.wso2.carbon.apimgt.api.model.ConfigurationDto;
 import org.wso2.carbon.apimgt.impl.APIConstants;
@@ -28,7 +28,7 @@ import java.util.Collections;
 import java.util.List;
 
 /**
- * @scr.component name="org.wso2.carbon.apimgt.keymgt.extension.customKeyManagerConfigComponent" immediate="true"
+ * @scr.component name="io.entgra.device.mgt.core.apimgt.keymgt.extension.customKeyManagerConfigComponent" immediate="true"
  */
 public class KeyManagerConnectorConfiguration extends DefaultKeyManagerConnectorConfiguration {
 

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension/src/main/java/io/entgra/device/mgt/core/apimgt/keymgt/extension/KeyManagerPayload.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.apimgt.keymgt.extension;
+package io.entgra.device.mgt.core.apimgt.keymgt.extension;
 
 import java.util.ArrayList;
 import java.util.HashMap;

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension/src/main/java/io/entgra/device/mgt/core/apimgt/keymgt/extension/KeyMgtConstants.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.apimgt.keymgt.extension;
+package io.entgra.device.mgt.core.apimgt.keymgt.extension;
 
 public class KeyMgtConstants {
     public static final String CUSTOM_TYPE = "CustomKeyManager";

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension/src/main/java/io/entgra/device/mgt/core/apimgt/keymgt/extension/KeyValidationHandler.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.apimgt.keymgt.extension;
+package io.entgra.device.mgt.core.apimgt.keymgt.extension;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension/src/main/java/io/entgra/device/mgt/core/apimgt/keymgt/extension/MatchingResource.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.apimgt.keymgt.extension;
+package io.entgra.device.mgt.core.apimgt.keymgt.extension;
 
 public class MatchingResource {
     private String urlPattern;

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension/src/main/java/io/entgra/device/mgt/core/apimgt/keymgt/extension/OAuthApplication.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.apimgt.keymgt.extension;
+package io.entgra.device.mgt.core.apimgt.keymgt.extension;
 
 public class OAuthApplication {
     private String clientName;

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension/src/main/java/io/entgra/device/mgt/core/apimgt/keymgt/extension/TokenRequest.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.apimgt.keymgt.extension;
+package io.entgra.device.mgt.core.apimgt.keymgt.extension;
 
 public class TokenRequest {
     private String clientId;

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension/src/main/java/io/entgra/device/mgt/core/apimgt/keymgt/extension/TokenResponse.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.apimgt.keymgt.extension;
+package io.entgra.device.mgt.core.apimgt.keymgt.extension;
 
 public class TokenResponse {
     private String access_token;

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension/src/main/java/io/entgra/device/mgt/core/apimgt/keymgt/extension/exception/BadRequestException.java

@@ -22,7 +22,7 @@
 /**
  * Custom exception class for handling bad request exceptions.
  */
-package org.wso2.carbon.apimgt.keymgt.extension.exception;
+package io.entgra.device.mgt.core.apimgt.keymgt.extension.exception;
 
 public class BadRequestException extends Exception {
 

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension/src/main/java/io/entgra/device/mgt/core/apimgt/keymgt/extension/exception/KeyMgtException.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.apimgt.keymgt.extension.exception;
+package io.entgra.device.mgt.core.apimgt.keymgt.extension.exception;
 
 /**
  * Custom exception class for key management service related exceptions.

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

@@ -16,9 +16,9 @@
  * under the License.
  */
 
-package org.wso2.carbon.apimgt.keymgt.extension.internal;
+package io.entgra.device.mgt.core.apimgt.keymgt.extension.internal;
 
-import org.wso2.carbon.apimgt.keymgt.extension.service.KeyMgtService;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.service.KeyMgtService;
 
 public class KeyMgtDataHolder {
 

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

@@ -16,17 +16,17 @@
  * under the License.
  */
 
-package org.wso2.carbon.apimgt.keymgt.extension.internal;
+package io.entgra.device.mgt.core.apimgt.keymgt.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.apimgt.keymgt.extension.service.KeyMgtService;
-import org.wso2.carbon.apimgt.keymgt.extension.service.KeyMgtServiceImpl;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.service.KeyMgtService;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.service.KeyMgtServiceImpl;
 
 /**
- * @scr.component name="org.wso2.carbon.apimgt.keymgt.extension.keyMgtServiceComponent" immediate="true"
+ * @scr.component name="io.entgra.device.mgt.core.apimgt.keymgt.extension.keyMgtServiceComponent" immediate="true"
  */
 public class KeyMgtServiceComponent {
 

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension/src/main/java/io/entgra/device/mgt/core/apimgt/keymgt/extension/service/KeyMgtService.java

@@ -16,13 +16,13 @@
  * under the License.
  */
 
-package org.wso2.carbon.apimgt.keymgt.extension.service;
+package io.entgra.device.mgt.core.apimgt.keymgt.extension.service;
 
-import org.wso2.carbon.apimgt.keymgt.extension.DCRResponse;
-import org.wso2.carbon.apimgt.keymgt.extension.TokenRequest;
-import org.wso2.carbon.apimgt.keymgt.extension.TokenResponse;
-import org.wso2.carbon.apimgt.keymgt.extension.exception.BadRequestException;
-import org.wso2.carbon.apimgt.keymgt.extension.exception.KeyMgtException;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.DCRResponse;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.TokenRequest;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.TokenResponse;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.exception.BadRequestException;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.exception.KeyMgtException;
 
 public interface KeyMgtService {
 

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension/src/main/java/io/entgra/device/mgt/core/apimgt/keymgt/extension/service/KeyMgtServiceImpl.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.apimgt.keymgt.extension.service;
+package io.entgra.device.mgt.core.apimgt.keymgt.extension.service;
 
 import com.google.gson.Gson;
 import okhttp3.Credentials;
@@ -34,14 +34,14 @@ import org.wso2.carbon.apimgt.api.APIManagementException;
 import org.wso2.carbon.apimgt.api.model.Application;
 import org.wso2.carbon.apimgt.impl.APIManagerFactory;
 import org.wso2.carbon.apimgt.impl.utils.APIUtil;
-import org.wso2.carbon.apimgt.keymgt.extension.DCRResponse;
-import org.wso2.carbon.apimgt.keymgt.extension.KeyManagerPayload;
-import org.wso2.carbon.apimgt.keymgt.extension.KeyMgtConstants;
-import org.wso2.carbon.apimgt.keymgt.extension.OAuthApplication;
-import org.wso2.carbon.apimgt.keymgt.extension.TokenRequest;
-import org.wso2.carbon.apimgt.keymgt.extension.TokenResponse;
-import org.wso2.carbon.apimgt.keymgt.extension.exception.BadRequestException;
-import org.wso2.carbon.apimgt.keymgt.extension.exception.KeyMgtException;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.DCRResponse;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.KeyManagerPayload;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.KeyMgtConstants;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.OAuthApplication;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.TokenRequest;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.TokenResponse;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.exception.BadRequestException;
+import io.entgra.device.mgt.core.apimgt.keymgt.extension.exception.KeyMgtException;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager;
 import org.wso2.carbon.device.mgt.core.config.DeviceManagementConfig;

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/pom.xml

@@ -27,7 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.apimgt.webapp.publisher</artifactId>
+    <artifactId>io.entgra.device.mgt.core.apimgt.webapp.publisher</artifactId>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - API Management Webapp Publisher</name>
     <description>WSO2 Carbon - API Management Webapp Publisher</description>
@@ -89,7 +89,7 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.apimgt.annotations</artifactId>
+            <artifactId>io.entgra.device.mgt.core.apimgt.annotations</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon.governance</groupId>
@@ -151,11 +151,11 @@
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
                         <Bundle-Description>API Management Webapp Publisher</Bundle-Description>
-                        <Private-Package>org.wso2.carbon.apimgt.webapp.publisher.internal
+                        <Private-Package>io.entgra.device.mgt.core.apimgt.webapp.publisher.internal
                         </Private-Package>
                         <Export-Package>
-                            !org.wso2.carbon.apimgt.webapp.publisher.internal,
-                            org.wso2.carbon.apimgt.webapp.publisher.*
+                            !io.entgra.device.mgt.core.apimgt.webapp.publisher.internal,
+                            io.entgra.device.mgt.core.apimgt.webapp.publisher.*
                         </Export-Package>
                         <Import-Package>
                             com.google.gson;version="[2.3,2.8.6)",
@@ -177,17 +177,17 @@
                             io.entgra.device.mgt.core.apimgt.extension.rest.api,
                             io.entgra.device.mgt.core.apimgt.extension.rest.api.dto,
                             io.entgra.device.mgt.core.apimgt.extension.rest.api.exceptions,
-                            org.wso2.carbon.apimgt.annotations.api,
+                            io.entgra.device.mgt.core.apimgt.annotations,
                             org.wso2.carbon.apimgt.api,
                             org.wso2.carbon.apimgt.api.model,
                             org.wso2.carbon.apimgt.impl,
                             org.wso2.carbon.apimgt.impl.utils,
-                            org.wso2.carbon.apimgt.webapp.publisher,
-                            org.wso2.carbon.apimgt.webapp.publisher.config,
-                            org.wso2.carbon.apimgt.webapp.publisher.dto,
-                            org.wso2.carbon.apimgt.webapp.publisher.exception,
-                            org.wso2.carbon.apimgt.webapp.publisher.lifecycle.listener,
-                            org.wso2.carbon.apimgt.webapp.publisher.lifecycle.util,
+                            io.entgra.device.mgt.core.apimgt.webapp.publisher,
+                            io.entgra.device.mgt.core.apimgt.webapp.publisher.config,
+                            io.entgra.device.mgt.core.apimgt.webapp.publisher.dto,
+                            io.entgra.device.mgt.core.apimgt.webapp.publisher.exception,
+                            io.entgra.device.mgt.core.apimgt.webapp.publisher.lifecycle.listener,
+                            io.entgra.device.mgt.core.apimgt.webapp.publisher.lifecycle.util,
                             org.wso2.carbon.base;version="1.0",
                             org.wso2.carbon.context;version="4.6",
                             org.wso2.carbon.core;version="4.6",

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/APIConfig.java

@@ -16,10 +16,10 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.apimgt.webapp.publisher;
+package io.entgra.device.mgt.core.apimgt.webapp.publisher;
 
-import org.wso2.carbon.apimgt.webapp.publisher.dto.ApiScope;
-import org.wso2.carbon.apimgt.webapp.publisher.dto.ApiUriTemplate;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.dto.ApiScope;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.dto.ApiUriTemplate;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/APIPublisherService.java

@@ -16,10 +16,10 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.apimgt.webapp.publisher;
+package io.entgra.device.mgt.core.apimgt.webapp.publisher;
 
 
-import org.wso2.carbon.apimgt.webapp.publisher.exception.APIManagerPublisherException;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.exception.APIManagerPublisherException;
 
 /**
  * This interface represents all methods related to API manipulation that's done as part of API-Management tasks.

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/APIPublisherServiceImpl.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.apimgt.webapp.publisher;
+package io.entgra.device.mgt.core.apimgt.webapp.publisher;
 
 import io.entgra.device.mgt.core.apimgt.extension.rest.api.APIApplicationServices;
 import io.entgra.device.mgt.core.apimgt.extension.rest.api.APIApplicationServicesImpl;
@@ -50,10 +50,10 @@ import org.wso2.carbon.apimgt.impl.APIConstants;
 import org.wso2.carbon.apimgt.impl.APIManagerFactory;
 import org.wso2.carbon.apimgt.impl.definitions.AsyncApiParser;
 import org.wso2.carbon.apimgt.impl.utils.APIUtil;
-import org.wso2.carbon.apimgt.webapp.publisher.config.WebappPublisherConfig;
-import org.wso2.carbon.apimgt.webapp.publisher.dto.ApiScope;
-import org.wso2.carbon.apimgt.webapp.publisher.dto.ApiUriTemplate;
-import org.wso2.carbon.apimgt.webapp.publisher.exception.APIManagerPublisherException;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.config.WebappPublisherConfig;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.dto.ApiScope;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.dto.ApiUriTemplate;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.exception.APIManagerPublisherException;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.user.api.UserStoreException;
 import org.wso2.carbon.user.core.service.RealmService;

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/APIPublisherStartupHandler.java

@@ -17,12 +17,12 @@
  *
  */
 
-package org.wso2.carbon.apimgt.webapp.publisher;
+package io.entgra.device.mgt.core.apimgt.webapp.publisher;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.apimgt.webapp.publisher.exception.APIManagerPublisherException;
-import org.wso2.carbon.apimgt.webapp.publisher.internal.APIPublisherDataHolder;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.exception.APIManagerPublisherException;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.internal.APIPublisherDataHolder;
 import org.wso2.carbon.core.ServerStartupObserver;
 
 import java.util.Stack;

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/APIPublisherUtil.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.apimgt.webapp.publisher;
+package io.entgra.device.mgt.core.apimgt.webapp.publisher;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
@@ -25,13 +25,13 @@ import com.google.gson.JsonObject;
 import com.google.gson.reflect.TypeToken;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.apimgt.annotations.api.Scope;
-import org.wso2.carbon.apimgt.webapp.publisher.config.APIResource;
-import org.wso2.carbon.apimgt.webapp.publisher.config.APIResourceConfiguration;
-import org.wso2.carbon.apimgt.webapp.publisher.config.WebappPublisherConfig;
-import org.wso2.carbon.apimgt.webapp.publisher.dto.ApiScope;
-import org.wso2.carbon.apimgt.webapp.publisher.dto.ApiUriTemplate;
-import org.wso2.carbon.apimgt.webapp.publisher.lifecycle.util.AnnotationProcessor;
+import io.entgra.device.mgt.core.apimgt.annotations.Scope;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.config.APIResource;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.config.APIResourceConfiguration;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.config.WebappPublisherConfig;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.dto.ApiScope;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.dto.ApiUriTemplate;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.lifecycle.util.AnnotationProcessor;
 import org.wso2.carbon.base.MultitenantConstants;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.core.util.Utils;

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/InvalidConfigurationStateException.java

@@ -17,7 +17,7 @@
  *
  */
 
-package org.wso2.carbon.apimgt.webapp.publisher;
+package io.entgra.device.mgt.core.apimgt.webapp.publisher;
 
 public class InvalidConfigurationStateException extends RuntimeException {
 

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/WebappPublisherConfigurationFailedException.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.apimgt.webapp.publisher;
+package io.entgra.device.mgt.core.apimgt.webapp.publisher;
 
 public class WebappPublisherConfigurationFailedException extends Exception {
 

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/WebappPublisherUtil.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.apimgt.webapp.publisher;
+package io.entgra.device.mgt.core.apimgt.webapp.publisher;
 
 import org.w3c.dom.Document;
 

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/config/APIResource.java

@@ -16,9 +16,9 @@
  * under the License.
  */
 
-package org.wso2.carbon.apimgt.webapp.publisher.config;
+package io.entgra.device.mgt.core.apimgt.webapp.publisher.config;
 
-import org.wso2.carbon.apimgt.webapp.publisher.dto.ApiScope;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.dto.ApiScope;
 
 public class APIResource {
 

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/config/APIResourceConfiguration.java

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

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/config/APIResourceManagementException.java

@@ -1,4 +1,4 @@
-package org.wso2.carbon.apimgt.webapp.publisher.config;
+package io.entgra.device.mgt.core.apimgt.webapp.publisher.config;
 
 public class APIResourceManagementException extends Exception {
     private static final long serialVersionUID = -3151279311929070297L;

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/config/Profiles.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.apimgt.webapp.publisher.config;
+package io.entgra.device.mgt.core.apimgt.webapp.publisher.config;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/config/Tenants.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.apimgt.webapp.publisher.config;
+package io.entgra.device.mgt.core.apimgt.webapp.publisher.config;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/config/WebappPublisherConfig.java

@@ -16,12 +16,12 @@
  * under the License.
  */
 
-package org.wso2.carbon.apimgt.webapp.publisher.config;
+package io.entgra.device.mgt.core.apimgt.webapp.publisher.config;
 
 import org.w3c.dom.Document;
-import org.wso2.carbon.apimgt.webapp.publisher.InvalidConfigurationStateException;
-import org.wso2.carbon.apimgt.webapp.publisher.WebappPublisherConfigurationFailedException;
-import org.wso2.carbon.apimgt.webapp.publisher.WebappPublisherUtil;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.InvalidConfigurationStateException;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.WebappPublisherConfigurationFailedException;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.WebappPublisherUtil;
 import org.wso2.carbon.utils.CarbonUtils;
 
 import javax.xml.bind.JAXBContext;

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/dto/ApiScope.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.apimgt.webapp.publisher.dto;
+package io.entgra.device.mgt.core.apimgt.webapp.publisher.dto;
 
 public class ApiScope {
 

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/dto/ApiUriTemplate.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.apimgt.webapp.publisher.dto;
+package io.entgra.device.mgt.core.apimgt.webapp.publisher.dto;
 
 /**
  * This hold the api uri template information.

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/exception/APIManagerPublisherException.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.apimgt.webapp.publisher.exception;
+package io.entgra.device.mgt.core.apimgt.webapp.publisher.exception;
 
 /**
  * Handles the exceptions related to API management.

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/internal/APIPublisherDataHolder.java

@@ -16,10 +16,10 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.apimgt.webapp.publisher.internal;
+package io.entgra.device.mgt.core.apimgt.webapp.publisher.internal;
 
-import org.wso2.carbon.apimgt.webapp.publisher.APIConfig;
-import org.wso2.carbon.apimgt.webapp.publisher.APIPublisherService;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.APIConfig;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.APIPublisherService;
 import org.wso2.carbon.registry.core.service.RegistryService;
 import org.wso2.carbon.user.core.service.RealmService;
 import org.wso2.carbon.user.core.tenant.TenantManager;

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/internal/APIPublisherServiceComponent.java

@@ -16,22 +16,22 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.apimgt.webapp.publisher.internal;
+package io.entgra.device.mgt.core.apimgt.webapp.publisher.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.apimgt.webapp.publisher.APIPublisherService;
-import org.wso2.carbon.apimgt.webapp.publisher.APIPublisherServiceImpl;
-import org.wso2.carbon.apimgt.webapp.publisher.APIPublisherStartupHandler;
-import org.wso2.carbon.apimgt.webapp.publisher.config.WebappPublisherConfig;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.APIPublisherService;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.APIPublisherServiceImpl;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.APIPublisherStartupHandler;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.config.WebappPublisherConfig;
 import org.wso2.carbon.core.ServerStartupObserver;
 import org.wso2.carbon.registry.core.service.RegistryService;
 import org.wso2.carbon.user.core.service.RealmService;
 
 /**
- * @scr.component name="org.wso2.carbon.apimgt.webapp.publisher" immediate="true"
+ * @scr.component name="io.entgra.device.mgt.core.apimgt.webapp.publisher" immediate="true"
  * @scr.reference name="user.realmservice.default"
  * interface="org.wso2.carbon.user.core.service.RealmService"
  * cardinality="1..1"

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/lifecycle/listener/APIPublisherLifecycleListener.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.apimgt.webapp.publisher.lifecycle.listener;
+package io.entgra.device.mgt.core.apimgt.webapp.publisher.lifecycle.listener;
 
 import org.apache.catalina.Lifecycle;
 import org.apache.catalina.LifecycleEvent;
@@ -24,13 +24,13 @@ import org.apache.catalina.LifecycleListener;
 import org.apache.catalina.core.StandardContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.apimgt.webapp.publisher.APIConfig;
-import org.wso2.carbon.apimgt.webapp.publisher.APIPublisherService;
-import org.wso2.carbon.apimgt.webapp.publisher.APIPublisherUtil;
-import org.wso2.carbon.apimgt.webapp.publisher.config.APIResourceConfiguration;
-import org.wso2.carbon.apimgt.webapp.publisher.config.WebappPublisherConfig;
-import org.wso2.carbon.apimgt.webapp.publisher.internal.APIPublisherDataHolder;
-import org.wso2.carbon.apimgt.webapp.publisher.lifecycle.util.AnnotationProcessor;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.APIConfig;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.APIPublisherService;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.APIPublisherUtil;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.config.APIResourceConfiguration;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.config.WebappPublisherConfig;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.internal.APIPublisherDataHolder;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.lifecycle.util.AnnotationProcessor;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.user.api.UserStoreException;
 

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/lifecycle/util/AnnotationProcessor.java

@@ -14,17 +14,19 @@
  * limitations under the License.
  */
 
-package org.wso2.carbon.apimgt.webapp.publisher.lifecycle.util;
+package io.entgra.device.mgt.core.apimgt.webapp.publisher.lifecycle.util;
 
+import io.entgra.device.mgt.core.apimgt.annotations.Scope;
+import io.entgra.device.mgt.core.apimgt.annotations.Scopes;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.SwaggerDefinition;
 import org.apache.catalina.core.StandardContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.apimgt.webapp.publisher.APIPublisherUtil;
-import org.wso2.carbon.apimgt.webapp.publisher.config.APIResource;
-import org.wso2.carbon.apimgt.webapp.publisher.config.APIResourceConfiguration;
-import org.wso2.carbon.apimgt.webapp.publisher.dto.ApiScope;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.APIPublisherUtil;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.config.APIResource;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.config.APIResourceConfiguration;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.dto.ApiScope;
 
 import javax.servlet.ServletContext;
 import javax.ws.rs.Consumes;
@@ -102,8 +104,8 @@ public class AnnotationProcessor {
     private Class<io.swagger.annotations.Extension> extensionClass;
     private Class<io.swagger.annotations.ExtensionProperty> extensionPropertyClass;
     private Class<ApiOperation> apiOperation;
-    private Class<org.wso2.carbon.apimgt.annotations.api.Scope> scopeClass;
-    private Class<org.wso2.carbon.apimgt.annotations.api.Scopes> scopesClass;
+    private Class<Scope> scopeClass;
+    private Class<Scopes> scopesClass;
     private Map<String, ApiScope> apiScopes;
 
     public AnnotationProcessor(final StandardContext context) {
@@ -122,10 +124,10 @@ public class AnnotationProcessor {
                     .loadClass((io.swagger.annotations.Extension.class.getName()));
             extensionPropertyClass = (Class<io.swagger.annotations.ExtensionProperty>) classLoader
                     .loadClass(io.swagger.annotations.ExtensionProperty.class.getName());
-            scopeClass = (Class<org.wso2.carbon.apimgt.annotations.api.Scope>) classLoader
-                    .loadClass(org.wso2.carbon.apimgt.annotations.api.Scope.class.getName());
-            scopesClass = (Class<org.wso2.carbon.apimgt.annotations.api.Scopes>) classLoader
-                    .loadClass(org.wso2.carbon.apimgt.annotations.api.Scopes.class.getName());
+            scopeClass = (Class<Scope>) classLoader
+                    .loadClass(Scope.class.getName());
+            scopesClass = (Class<Scopes>) classLoader
+                    .loadClass(Scopes.class.getName());
             apiOperation = (Class<ApiOperation>) classLoader
                     .loadClass((ApiOperation.class.getName()));
         } catch (ClassNotFoundException e) {

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/lifecycle/util/ExtendedAnnotationDB.java

@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.wso2.carbon.apimgt.webapp.publisher.lifecycle.util;
+package io.entgra.device.mgt.core.apimgt.webapp.publisher.lifecycle.util;
 
 import org.scannotation.AnnotationDB;
 import org.scannotation.archiveiterator.Filter;

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/lifecycle/util/ExtendedFileProtocolIteratorFactory.java

@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.wso2.carbon.apimgt.webapp.publisher.lifecycle.util;
+package io.entgra.device.mgt.core.apimgt.webapp.publisher.lifecycle.util;
 
 import org.scannotation.archiveiterator.*;
 

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/lifecycle/util/ExtendedIteratorFactory.java

@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.wso2.carbon.apimgt.webapp.publisher.lifecycle.util;
+package io.entgra.device.mgt.core.apimgt.webapp.publisher.lifecycle.util;
 
 
 import org.scannotation.archiveiterator.DirectoryIteratorFactory;

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

@@ -15,7 +15,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.wso2.carbon.apimgt.webapp.publisher;
+package io.entgra.device.mgt.core.apimgt.webapp.publisher;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -32,13 +32,13 @@ import org.wso2.carbon.apimgt.integration.generated.client.publisher.api.APIIndi
 import org.wso2.carbon.apimgt.integration.generated.client.publisher.model.API;
 import org.wso2.carbon.apimgt.integration.generated.client.publisher.model.APIInfo;
 import org.wso2.carbon.apimgt.integration.generated.client.publisher.model.APIList;
-import org.wso2.carbon.apimgt.webapp.publisher.config.WebappPublisherConfig;
-import org.wso2.carbon.apimgt.webapp.publisher.dto.ApiScope;
-import org.wso2.carbon.apimgt.webapp.publisher.exception.APIManagerPublisherException;
-import org.wso2.carbon.apimgt.webapp.publisher.internal.APIPublisherDataHolder;
-import org.wso2.carbon.apimgt.webapp.publisher.utils.MockAPICollectionApi;
-import org.wso2.carbon.apimgt.webapp.publisher.utils.MockAPIIndividualApi;
-import org.wso2.carbon.apimgt.webapp.publisher.utils.TestUtils;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.config.WebappPublisherConfig;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.dto.ApiScope;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.exception.APIManagerPublisherException;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.internal.APIPublisherDataHolder;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.utils.MockAPICollectionApi;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.utils.MockAPIIndividualApi;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.utils.TestUtils;
 
 import java.lang.reflect.Field;
 import java.util.*;

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

@@ -15,19 +15,19 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.wso2.carbon.apimgt.webapp.publisher;
+package io.entgra.device.mgt.core.apimgt.webapp.publisher;
 
 import org.testng.Assert;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
-import org.wso2.carbon.apimgt.webapp.publisher.config.APIResource;
-import org.wso2.carbon.apimgt.webapp.publisher.config.APIResourceConfiguration;
-import org.wso2.carbon.apimgt.webapp.publisher.config.WebappPublisherConfig;
-import org.wso2.carbon.apimgt.webapp.publisher.dto.ApiScope;
-import org.wso2.carbon.apimgt.webapp.publisher.dto.ApiUriTemplate;
-import org.wso2.carbon.apimgt.webapp.publisher.exception.APIManagerPublisherException;
-import org.wso2.carbon.apimgt.webapp.publisher.utils.MockServletContext;
-import org.wso2.carbon.apimgt.webapp.publisher.utils.TestUtils;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.config.APIResource;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.config.APIResourceConfiguration;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.config.WebappPublisherConfig;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.dto.ApiScope;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.dto.ApiUriTemplate;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.exception.APIManagerPublisherException;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.utils.MockServletContext;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.utils.TestUtils;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.registry.core.exceptions.RegistryException;
 import org.wso2.carbon.registry.core.jdbc.realm.InMemoryRealmService;
@@ -41,9 +41,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-import static org.wso2.carbon.apimgt.webapp.publisher.APIPublisherUtil.buildApiConfig;
-import static org.wso2.carbon.apimgt.webapp.publisher.APIPublisherUtil.getApiEndpointUrl;
-import static org.wso2.carbon.apimgt.webapp.publisher.APIPublisherUtil.setResourceAuthTypes;
+import static io.entgra.device.mgt.core.apimgt.webapp.publisher.APIPublisherUtil.buildApiConfig;
+import static io.entgra.device.mgt.core.apimgt.webapp.publisher.APIPublisherUtil.getApiEndpointUrl;
+import static io.entgra.device.mgt.core.apimgt.webapp.publisher.APIPublisherUtil.setResourceAuthTypes;
 
 /**
  * This is the test class for {@link APIPublisherUtil}

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

@@ -16,14 +16,14 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.apimgt.webapp.publisher;
+package io.entgra.device.mgt.core.apimgt.webapp.publisher;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.mockito.Mockito;
 import org.testng.annotations.BeforeSuite;
-import org.wso2.carbon.apimgt.webapp.publisher.internal.APIPublisherDataHolder;
-import org.wso2.carbon.apimgt.webapp.publisher.utils.MockAPIIndividualApi;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.internal.APIPublisherDataHolder;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.utils.MockAPIIndividualApi;
 import org.wso2.carbon.base.MultitenantConstants;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.context.internal.OSGiDataHolder;

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

@@ -15,7 +15,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.wso2.carbon.apimgt.webapp.publisher.utils;
+package io.entgra.device.mgt.core.apimgt.webapp.publisher.utils;
 
 import org.wso2.carbon.apimgt.integration.generated.client.publisher.api.APICollectionApi;
 import org.wso2.carbon.apimgt.integration.generated.client.publisher.model.APIList;

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

@@ -15,7 +15,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.wso2.carbon.apimgt.webapp.publisher.utils;
+package io.entgra.device.mgt.core.apimgt.webapp.publisher.utils;
 
 import feign.Param;
 import org.wso2.carbon.apimgt.integration.generated.client.publisher.api.APIIndividualApi;

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

@@ -15,7 +15,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.wso2.carbon.apimgt.webapp.publisher.utils;
+package io.entgra.device.mgt.core.apimgt.webapp.publisher.utils;
 
 import javax.servlet.*;
 import javax.servlet.descriptor.JspConfigDescriptor;

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

@@ -15,11 +15,11 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.wso2.carbon.apimgt.webapp.publisher.utils;
+package io.entgra.device.mgt.core.apimgt.webapp.publisher.utils;
 
-import org.wso2.carbon.apimgt.webapp.publisher.APIConfig;
-import org.wso2.carbon.apimgt.webapp.publisher.dto.ApiScope;
-import org.wso2.carbon.apimgt.webapp.publisher.dto.ApiUriTemplate;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.APIConfig;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.dto.ApiScope;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.dto.ApiUriTemplate;
 
 import java.util.LinkedHashSet;
 import java.util.Set;

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/test/resources/testng.xml

@@ -23,7 +23,7 @@
 
     <test name="DeviceType Manager Service Test Cases" preserve-order="true">
         <classes>
-           <class name="org.wso2.carbon.apimgt.webapp.publisher.APIPublisherServiceTest"/>
+           <class name="io.entgra.device.mgt.core.apimgt.webapp.publisher.APIPublisherServiceTest"/>
         </classes>
     </test>
 </suite>

components/apimgt-extensions/pom.xml

@@ -33,12 +33,12 @@
     <url>http://wso2.org</url>
 
     <modules>
-        <module>org.wso2.carbon.apimgt.webapp.publisher</module>
-        <module>org.wso2.carbon.apimgt.application.extension</module>
-        <module>org.wso2.carbon.apimgt.application.extension.api</module>
-        <module>org.wso2.carbon.apimgt.annotations</module>
-        <module>org.wso2.carbon.apimgt.keymgt.extension</module>
-        <module>org.wso2.carbon.apimgt.keymgt.extension.api</module>
+        <module>io.entgra.device.mgt.core.apimgt.webapp.publisher</module>
+        <module>io.entgra.device.mgt.core.apimgt.application.extension</module>
+        <module>io.entgra.device.mgt.core.apimgt.application.extension.api</module>
+        <module>io.entgra.device.mgt.core.apimgt.annotations</module>
+        <module>io.entgra.device.mgt.core.apimgt.keymgt.extension</module>
+        <module>io.entgra.device.mgt.core.apimgt.keymgt.extension.api</module>
         <module>io.entgra.device.mgt.core.apimgt.analytics.extension</module>
         <module>io.entgra.device.mgt.core.apimgt.extension.rest.api</module>
     </modules>

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

@@ -209,7 +209,7 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.apimgt.annotations</artifactId>
+            <artifactId>io.entgra.device.mgt.core.apimgt.annotations</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

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

@@ -80,7 +80,7 @@
                             org.wso2.carbon.base,
                             com.dd.*,
                             org.wso2.carbon.identity.jwt.client.extension.*,
-                            org.wso2.carbon.apimgt.application.extension.*,
+                            io.entgra.device.mgt.core.apimgt.application.extension.*,
                             org.apache.commons.httpclient,
                             org.apache.commons.httpclient.methods,
                             org.apache.commons.validator.routines
@@ -284,7 +284,7 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.apimgt.application.extension</artifactId>
+            <artifactId>io.entgra.device.mgt.core.apimgt.application.extension</artifactId>
             <exclusions>
                 <exclusion>
                     <artifactId>org.wso2.carbon.registry.servlet</artifactId>
@@ -356,6 +356,12 @@
             <groupId>io.entgra.device.mgt.core</groupId>
             <artifactId>org.wso2.carbon.identity.jwt.client.extension</artifactId>
         </dependency>
+        <!--nTask dependencies-->
+        <dependency>
+            <groupId>org.wso2.carbon.commons</groupId>
+            <artifactId>org.wso2.carbon.ntask.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>
 

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

@@ -29,8 +29,8 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.wso2.carbon.apimgt.application.extension.dto.ApiApplicationKey;
-import org.wso2.carbon.apimgt.application.extension.exception.APIManagerException;
+import io.entgra.device.mgt.core.apimgt.application.extension.dto.ApiApplicationKey;
+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.ApplicationInstallResponse;
 import io.entgra.device.mgt.core.application.mgt.common.ApplicationSubscriptionInfo;

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

@@ -20,9 +20,9 @@ package io.entgra.device.mgt.core.application.mgt.core.util;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.apimgt.application.extension.APIManagementProviderService;
-import org.wso2.carbon.apimgt.application.extension.dto.ApiApplicationKey;
-import org.wso2.carbon.apimgt.application.extension.exception.APIManagerException;
+import io.entgra.device.mgt.core.apimgt.application.extension.APIManagementProviderService;
+import io.entgra.device.mgt.core.apimgt.application.extension.dto.ApiApplicationKey;
+import io.entgra.device.mgt.core.apimgt.application.extension.exception.APIManagerException;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import io.entgra.device.mgt.core.application.mgt.common.dto.ApiRegistrationProfile;
 import org.wso2.carbon.identity.jwt.client.extension.JWTClient;

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

@@ -209,7 +209,7 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.apimgt.annotations</artifactId>
+            <artifactId>io.entgra.device.mgt.core.apimgt.annotations</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

components/application-mgt/io.entgra.device.mgt.core.application.mgt.publisher.api/src/main/java/io/entgra/device/mgt/core/application/mgt/publisher/api/ApplicationManagementPublisherAPI.java

@@ -28,8 +28,8 @@ import io.swagger.annotations.ExtensionProperty;
 import io.swagger.annotations.Info;
 import io.swagger.annotations.SwaggerDefinition;
 import io.swagger.annotations.Tag;
-import org.wso2.carbon.apimgt.annotations.api.Scope;
-import org.wso2.carbon.apimgt.annotations.api.Scopes;
+import io.entgra.device.mgt.core.apimgt.annotations.Scope;
+import io.entgra.device.mgt.core.apimgt.annotations.Scopes;
 import io.entgra.device.mgt.core.application.mgt.common.ApplicationList;
 import io.entgra.device.mgt.core.application.mgt.common.ErrorResponse;
 import io.entgra.device.mgt.core.application.mgt.common.Filter;

components/application-mgt/io.entgra.device.mgt.core.application.mgt.publisher.api/src/main/java/io/entgra/device/mgt/core/application/mgt/publisher/api/SPApplicationService.java

@@ -30,8 +30,8 @@ import io.swagger.annotations.ExtensionProperty;
 import io.swagger.annotations.Info;
 import io.swagger.annotations.SwaggerDefinition;
 import io.swagger.annotations.Tag;
-import org.wso2.carbon.apimgt.annotations.api.Scope;
-import org.wso2.carbon.apimgt.annotations.api.Scopes;
+import io.entgra.device.mgt.core.apimgt.annotations.Scope;
+import io.entgra.device.mgt.core.apimgt.annotations.Scopes;
 
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;