Merge branch 'kernel-4.6.2' into 'kernel-4.6.x'

Bug fixes and package name change in appmgt

See merge request entgra/carbon-device-mgt!791

components/application-mgt/io.entgra.application.mgt.addons/pom.xml

@@ -1,5 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<!--
+~ Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved.
+~
+~ Entgra (pvt) Ltd. licenses this file to you under the Apache License,
+~ Version 2.0 (the "License"); you may not use this file except
+~ in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing,
+~ software distributed under the License is distributed on an
+~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~ KIND, either express or implied.  See the License for the
+~ specific language governing permissions and limitations
+~ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>application-mgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
@@ -8,9 +26,9 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.device.application.mgt.addons</artifactId>
-    <name>WSO2 Carbon - Application Management Add-Ons</name>
-    <description>WSO2 Carbon - Application Management Add-Ons</description>
+    <artifactId>io.entgra.application.mgt.addons</artifactId>
+    <name>Entgra - Application Management Add-Ons</name>
+    <description>Entgra - Application Management Add-Ons</description>
     <url>https://entgra.io</url>
 
     <build>
@@ -35,7 +53,7 @@
                             io.swagger.annotations.*;resolution:=optional
                         </Import-Package>
                         <Export-Package>
-                            org.wso2.carbon.device.application.mgt.addons.*
+                            io.entgra.application.mgt.addons.*
                         </Export-Package>
                     </instructions>
                 </configuration>
@@ -94,7 +112,7 @@
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon.devicemgt</groupId>
-            <artifactId>org.wso2.carbon.device.application.mgt.common</artifactId>
+            <artifactId>io.entgra.application.mgt.common</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>

components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/ApiOriginFilter.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.addons;
+package io.entgra.application.mgt.addons;
 
 
 import javax.servlet.Filter;

components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/FileStreamingOutput.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.addons;
+package io.entgra.application.mgt.addons;
 
 
 import javax.ws.rs.WebApplicationException;
@@ -24,7 +24,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 
 /**
- * org.wso2.carbon.device.application.mgt.addons.FileStreamingOutput to allow the user to send the files as Stream.
+ * io.entgra.application.mgt.addons.FileStreamingOutput to allow the user to send the files as Stream.
  */
 public class FileStreamingOutput implements StreamingOutput {
     private InputStream inputStream;

components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/JSONMessageHandler.java

@@ -14,11 +14,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.addons;
+package io.entgra.application.mgt.addons;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import org.wso2.carbon.device.application.mgt.addons.jaxrs.AnnotationExclusionStrategy;
+import io.entgra.application.mgt.addons.jaxrs.AnnotationExclusionStrategy;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.Produces;

components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/MultipartCustomProvider.java

@@ -14,14 +14,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.addons;
+package io.entgra.application.mgt.addons;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import org.apache.cxf.jaxrs.ext.multipart.Attachment;
-import org.wso2.carbon.device.application.mgt.addons.jaxrs.AnnotationExclusionStrategy;
+import io.entgra.application.mgt.addons.jaxrs.AnnotationExclusionStrategy;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.WebApplicationException;

components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/ValidationInterceptor.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.addons;
+package io.entgra.application.mgt.addons;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/jaxrs/AnnotationExclusionStrategy.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.addons.jaxrs;
+package io.entgra.application.mgt.addons.jaxrs;
 
 import com.google.gson.ExclusionStrategy;
 import com.google.gson.FieldAttributes;

components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/jaxrs/Exclude.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.addons.jaxrs;
+package io.entgra.application.mgt.addons.jaxrs;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

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

@@ -27,10 +27,10 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.device.application.mgt.api</artifactId>
+    <artifactId>io.entgra.application.mgt.api</artifactId>
     <packaging>war</packaging>
-    <name>WSO2 Carbon - Application Management API</name>
-    <description>WSO2 Carbon - Application Management API</description>
+    <name>Entgra - Application Management API</name>
+    <description>Entgra - Application Management API</description>
     <url>https://entgra.io</url>
 
     <build>
@@ -154,12 +154,12 @@
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon.devicemgt</groupId>
-            <artifactId>org.wso2.carbon.device.application.mgt.core</artifactId>
+            <artifactId>io.entgra.application.mgt.core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon.devicemgt</groupId>
-            <artifactId>org.wso2.carbon.device.application.mgt.common</artifactId>
+            <artifactId>io.entgra.application.mgt.common</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -218,7 +218,7 @@
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon.devicemgt</groupId>
-            <artifactId>org.wso2.carbon.device.application.mgt.addons</artifactId>
+            <artifactId>io.entgra.application.mgt.addons</artifactId>
         </dependency>
     </dependencies>
 </project>

components/application-mgt/io.entgra.application.mgt.api/src/main/java/io/entgra/application/mgt/api/services/ArtifactDownloadAPI.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.application.mgt.api.services;
+package io.entgra.application.mgt.api.services;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -26,8 +26,8 @@ import io.swagger.annotations.Extension;
 import io.swagger.annotations.ExtensionProperty;
 import io.swagger.annotations.Info;
 import io.swagger.annotations.SwaggerDefinition;
-import org.wso2.carbon.device.application.mgt.common.ApplicationList;
-import org.wso2.carbon.device.application.mgt.common.ErrorResponse;
+import io.entgra.application.mgt.common.ApplicationList;
+import io.entgra.application.mgt.common.ErrorResponse;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;

components/application-mgt/io.entgra.application.mgt.api/src/main/java/io/entgra/application/mgt/api/services/impl/ArtifactDownloadAPIImpl.java

@@ -15,19 +15,19 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.application.mgt.api.services.impl;
+package io.entgra.application.mgt.api.services.impl;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.application.mgt.api.services.ArtifactDownloadAPI;
-import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException;
-import org.wso2.carbon.device.application.mgt.common.services.ApplicationManager;
-import org.wso2.carbon.device.application.mgt.common.services.AppmDataHandler;
-import org.wso2.carbon.device.application.mgt.core.exception.BadRequestException;
-import org.wso2.carbon.device.application.mgt.core.exception.NotFoundException;
-import org.wso2.carbon.device.application.mgt.core.util.APIUtil;
-import org.wso2.carbon.device.application.mgt.core.util.Constants;
+import io.entgra.application.mgt.api.services.ArtifactDownloadAPI;
+import io.entgra.application.mgt.common.exception.ApplicationManagementException;
+import io.entgra.application.mgt.common.services.ApplicationManager;
+import io.entgra.application.mgt.common.services.AppmDataHandler;
+import io.entgra.application.mgt.core.exception.BadRequestException;
+import io.entgra.application.mgt.core.exception.NotFoundException;
+import io.entgra.application.mgt.core.util.APIUtil;
+import io.entgra.application.mgt.core.util.Constants;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

components/application-mgt/io.entgra.application.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml

@@ -36,7 +36,7 @@
     </jaxrs:server>
 
     <bean id="swaggerConfig" class="io.swagger.jaxrs.config.BeanConfig">
-        <property name="resourcePackage" value="org.wso2.carbon.device.application.mgt.publisher.api"/>
+        <property name="resourcePackage" value="io.entgra.application.mgt.api"/>
         <property name="version" value="1.0"/>
         <property name="host" value="localhost:9443"/>
         <property name="schemes" value="https" />
@@ -48,17 +48,17 @@
         <property name="scan" value="true"/>
     </bean>
 
-    <bean id="org.wso2.carbon.device.application.mgt.addons.ValidationInterceptor" class="org.wso2.carbon.device.application.mgt.addons.ValidationInterceptor"/>
+    <bean id="io.entgra.application.mgt.addons.ValidationInterceptor" class="io.entgra.application.mgt.addons.ValidationInterceptor"/>
     <bean id="swaggerWriter" class="io.swagger.jaxrs.listing.SwaggerSerializers" />
     <bean id="swaggerResource" class="io.swagger.jaxrs.listing.ApiListingResource" />
 
-    <bean id="applicationMgtArtifactService" class="org.wso2.carbon.device.application.mgt.api.services.impl.ArtifactDownloadAPIImpl"/>
-    <bean id="jsonProvider" class="org.wso2.carbon.device.application.mgt.addons.JSONMessageHandler"/>
-    <bean id="multipartProvider" class="org.wso2.carbon.device.application.mgt.addons.MultipartCustomProvider"/>
+    <bean id="applicationMgtArtifactService" class="io.entgra.application.mgt.api.services.impl.ArtifactDownloadAPIImpl"/>
+    <bean id="jsonProvider" class="io.entgra.application.mgt.addons.JSONMessageHandler"/>
+    <bean id="multipartProvider" class="io.entgra.application.mgt.addons.MultipartCustomProvider"/>
 
     <cxf:bus>
         <cxf:inInterceptors>
-            <ref bean="org.wso2.carbon.device.application.mgt.addons.ValidationInterceptor"/>
+            <ref bean="io.entgra.application.mgt.addons.ValidationInterceptor"/>
         </cxf:inInterceptors>
     </cxf:bus>
 

components/application-mgt/io.entgra.application.mgt.api/src/main/webapp/WEB-INF/web.xml

@@ -74,7 +74,7 @@
 
     <filter>
         <filter-name>ApiOriginFilter</filter-name>
-        <filter-class>org.wso2.carbon.device.application.mgt.addons.ApiOriginFilter</filter-class>
+        <filter-class>io.entgra.application.mgt.addons.ApiOriginFilter</filter-class>
     </filter>
 
     <filter>

components/application-mgt/io.entgra.application.mgt.common/pom.xml

@@ -26,10 +26,10 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.device.application.mgt.common</artifactId>
+    <artifactId>io.entgra.application.mgt.common</artifactId>
     <packaging>bundle</packaging>
-    <name>WSO2 Carbon - Application Management Common</name>
-    <description>WSO2 Carbon - Application Management Common</description>
+    <name>Entgra - Application Management Common</name>
+    <description>Entgra - Application Management Common</description>
     <url>https://entgra.io</url>
 
     <build>
@@ -58,7 +58,7 @@
                             javax.xml.bind.annotation; version="${javax.xml.bind.imp.pkg.version}",
                         </Import-Package>
                         <Export-Package>
-                            org.wso2.carbon.device.application.mgt.common.*
+                            io.entgra.application.mgt.common.*
                         </Export-Package>
                     </instructions>
                 </configuration>

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/AppLifecycleState.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common;
+package io.entgra.application.mgt.common;
 
 
 /**

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/AppOperation.java

@@ -14,9 +14,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common;
+package io.entgra.application.mgt.common;
 
-import org.wso2.carbon.device.application.mgt.common.dto.ApplicationDTO;
+import io.entgra.application.mgt.common.dto.ApplicationDTO;
 
 public class AppOperation {
 

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationArtifact.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common;
+package io.entgra.application.mgt.common;
 
 import java.io.InputStream;
 import java.util.Map;

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationInstallResponse.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.application.mgt.common;
+package io.entgra.application.mgt.common;
 
 import io.swagger.annotations.ApiModelProperty;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationInstaller.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common;
+package io.entgra.application.mgt.common;
 
 public class ApplicationInstaller {
 

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationList.java

@@ -14,10 +14,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common;
+package io.entgra.application.mgt.common;
 
-import org.wso2.carbon.device.application.mgt.common.dto.ApplicationDTO;
-import org.wso2.carbon.device.application.mgt.common.response.Application;
+import io.entgra.application.mgt.common.dto.ApplicationDTO;
+import io.entgra.application.mgt.common.response.Application;
 
 import java.util.List;
 

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationSubscriptionInfo.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.application.mgt.common;
+package io.entgra.application.mgt.common;
 
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationSubscriptionType.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.application.mgt.common;
+package io.entgra.application.mgt.common;
 
 /**
  * Possible Subscription Type of the application.

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationType.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common;
+package io.entgra.application.mgt.common;
 
 
 /**

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/BasePaginatedResult.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common;
+package io.entgra.application.mgt.common;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/BasicUserInfo.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common;
+package io.entgra.application.mgt.common;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/BasicUserInfoList.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common;
+package io.entgra.application.mgt.common;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/DeviceGroupList.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common;
+package io.entgra.application.mgt.common;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/DeviceList.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common;
+package io.entgra.application.mgt.common;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/DeviceSubscriptionData.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.application.mgt.common;
+package io.entgra.application.mgt.common;
 
 import org.wso2.carbon.device.mgt.common.Device;
 

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/DeviceTypes.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common;
+package io.entgra.application.mgt.common;
 
 public enum DeviceTypes {
     ANDROID, IOS, WINDOWS

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/EnterpriseInstallationDetails.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.application.mgt.common;
+package io.entgra.application.mgt.common;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ErrorListItem.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common;
+package io.entgra.application.mgt.common;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ErrorResponse.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common;
+package io.entgra.application.mgt.common;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ExecutionStatus.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.application.mgt.common;
+package io.entgra.application.mgt.common;
 
 public enum ExecutionStatus {
     PENDING, EXECUTED, FAILED

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/Filter.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common;
+package io.entgra.application.mgt.common;
 
 import java.util.List;
 

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ImageArtifact.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.application.mgt.common;
+package io.entgra.application.mgt.common;
 
 /**
  * This represents a image artifact of a application. Icon, Screen-shot or Banner.

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/InstallationDetails.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common;
+package io.entgra.application.mgt.common;
 
 import io.swagger.annotations.ApiModelProperty;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/LifecycleChanger.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.application.mgt.common;
+package io.entgra.application.mgt.common;
 
 public class LifecycleChanger {
 

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/LifecycleState.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common;
+package io.entgra.application.mgt.common;
 
 import java.sql.Timestamp;
 import io.swagger.annotations.ApiModel;

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/Pagination.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common;
+package io.entgra.application.mgt.common;
 
 /**
  * This class represents the pagination details that will be used when fetching application details from database.

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/PaginationRequest.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.application.mgt.common;
+package io.entgra.application.mgt.common;
 
 /**
  * This class holds required parameters for a querying a paginated device response.

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/PaginationResult.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.application.mgt.common;
+package io.entgra.application.mgt.common;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/Rating.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common;
+package io.entgra.application.mgt.common;
 
 import java.util.TreeMap;
 

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ReviewNode.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.application.mgt.common;
+package io.entgra.application.mgt.common;
 
 import java.util.ArrayList;
 import java.util.List;

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/RoleList.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common;
+package io.entgra.application.mgt.common;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/SortingOrder.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common;
+package io.entgra.application.mgt.common;
 
 
 /**

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/SubAction.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.application.mgt.common;
+package io.entgra.application.mgt.common;
 
 public enum SubAction {
     INSTALL, UNINSTALL

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/SubscribingDeviceIdHolder.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.application.mgt.common;
+package io.entgra.application.mgt.common;
 
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/SubscriptionType.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.application.mgt.common;
+package io.entgra.application.mgt.common;
 
 public enum SubscriptionType {
     USER, ROLE, GROUP, DEVICE

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/User.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common;
+package io.entgra.application.mgt.common;
 
 /**
  * Represents an user.

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/config/ErrorCallback.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common.config;
+package io.entgra.application.mgt.common.config;
 
 import javax.xml.bind.annotation.XmlElement;
 

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/config/LifecycleState.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common.config;
+package io.entgra.application.mgt.common.config;
 
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/config/MDMConfig.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.application.mgt.common.config;
+package io.entgra.application.mgt.common.config;
 
 import javax.xml.bind.annotation.XmlElement;
 

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/config/RatingConfiguration.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.application.mgt.common.config;
+package io.entgra.application.mgt.common.config;
 
 import javax.xml.bind.annotation.XmlElement;
 

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ApiRegistrationProfile.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.application.mgt.common.dto;
+package io.entgra.application.mgt.common.dto;
 
 public class ApiRegistrationProfile {
 

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ApplicationDTO.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common.dto;
+package io.entgra.application.mgt.common.dto;
 
 
 import io.swagger.annotations.ApiModel;

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ApplicationPolicyDTO.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common.dto;
+package io.entgra.application.mgt.common.dto;
 
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ApplicationReleaseDTO.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common.dto;
+package io.entgra.application.mgt.common.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/CategoryDTO.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common.dto;
+package io.entgra.application.mgt.common.dto;
 
 public class CategoryDTO {
     int id;

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/DeviceSubscriptionDTO.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.application.mgt.common.dto;
+package io.entgra.application.mgt.common.dto;
 
 import java.sql.Timestamp;
 

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/GroupSubscriptionDTO.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.application.mgt.common.dto;
+package io.entgra.application.mgt.common.dto;
 
 import java.sql.Timestamp;
 

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ReviewDTO.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.application.mgt.common.dto;
+package io.entgra.application.mgt.common.dto;
 
 import java.sql.Timestamp;
 

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/RoleSubscriptionDTO.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.application.mgt.common.dto;
+package io.entgra.application.mgt.common.dto;
 
 import java.sql.Timestamp;
 

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ScheduledSubscriptionDTO.java

@@ -16,13 +16,12 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.application.mgt.common.dto;
+package io.entgra.application.mgt.common.dto;
 
 import com.google.gson.Gson;
-import org.wso2.carbon.device.application.mgt.common.ExecutionStatus;
-import org.wso2.carbon.device.application.mgt.common.SubscriptionType;
+import io.entgra.application.mgt.common.ExecutionStatus;
+import io.entgra.application.mgt.common.SubscriptionType;
 
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -41,7 +40,7 @@ public class ScheduledSubscriptionDTO {
      * Task name is a generated field and in the following pattern:
      * {@code <SUBSCRIPTION-TYPE>_<ACTION>_<HASH-VALUE>}
      * {@code SUBSCRIPTION-TYPE} - {@see {@linkplain SubscriptionType}}
-     * {@code ACTION} - {@see {@linkplain org.wso2.carbon.device.application.mgt.common.SubAction}
+     * {@code ACTION} - {@see {@linkplain io.entgra.application.mgt.common.SubAction}
      * {@code HASH-VALUE} - this is a hash value of the combination of application uuid and the subscriber list.
      *
      * Example: {@code DEVICE_INSTALL_e593e00e8ef55efc764295b6aa9ad56b}
@@ -50,7 +49,7 @@ public class ScheduledSubscriptionDTO {
 
     /**
      * UUID of the application release which is subscribed to.
-     * {@see {@link org.wso2.carbon.device.application.mgt.common.response.ApplicationRelease}}
+     * {@see {@link io.entgra.application.mgt.common.response.ApplicationRelease}}
      */
     private String applicationUUID;
 

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/TagDTO.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.application.mgt.common.dto;
+package io.entgra.application.mgt.common.dto;
 
 public class TagDTO {
 

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/UserSubscriptionDTO.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.application.mgt.common.dto;
+package io.entgra.application.mgt.common.dto;
 
 import java.sql.Timestamp;
 

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ApplicationCategoryManagementException.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.application.mgt.common.exception;
+package io.entgra.application.mgt.common.exception;
 
 /**
  * Exception that will be thrown during Application Category Management.

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ApplicationManagementException.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common.exception;
+package io.entgra.application.mgt.common.exception;
 
 /**
  * Represents the exception thrown during application management.

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ApplicationStorageManagementException.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.application.mgt.common.exception;
+package io.entgra.application.mgt.common.exception;
 
 /**
  * Represents the exception thrown during storing and retrieving the artifacts.

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/DBConnectionException.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common.exception;
+package io.entgra.application.mgt.common.exception;
 
 /**
  * Exception thrown due to Database Connection issues.

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/DeviceConnectorException.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common.exception;
+package io.entgra.application.mgt.common.exception;
 
 /**
  * Represents the exception thrown during device connections.

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/IllegalTransactionStateException.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common.exception;
+package io.entgra.application.mgt.common.exception;
 
 /**
  * Exception thrown due to an issue in database transactions.

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/InvalidConfigurationException.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common.exception;
+package io.entgra.application.mgt.common.exception;
 
 /**
  * Exception thrown due to invalid configurations provided for Application Management.

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/LifecycleManagementException.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common.exception;
+package io.entgra.application.mgt.common.exception;
 
 /**
  * Exception caused during the lifecycle management.

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/RequestValidatingException.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.application.mgt.common.exception;
+package io.entgra.application.mgt.common.exception;
 
 /**
  * Represents the exception thrown during validating the request.

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ResourceManagementException.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.application.mgt.common.exception;
+package io.entgra.application.mgt.common.exception;
 
 /**
  * Represents the exception that will be thrown when there is an issue while managing the resources.

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ReviewDoesNotExistException.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common.exception;
+package io.entgra.application.mgt.common.exception;
 
 public class ReviewDoesNotExistException extends Exception {
     private String message;

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ReviewManagementException.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common.exception;
+package io.entgra.application.mgt.common.exception;
 
 public class ReviewManagementException extends Exception {
     private String message;

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/SubscriptionManagementException.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.application.mgt.common.exception;
+package io.entgra.application.mgt.common.exception;
 
 public class SubscriptionManagementException extends Exception {
     private String message;

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/TransactionManagementException.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common.exception;
+package io.entgra.application.mgt.common.exception;
 
 /**
  * Exception thrown due to an issue in TransactionManagement of Database.

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/UnsupportedDatabaseEngineException.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.application.mgt.common.exception;
+package io.entgra.application.mgt.common.exception;
 
 /**
  * This runtime exception will be thrown if the server has configured with unsupported DB engine.

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/VisibilityManagementException.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common.exception;
+package io.entgra.application.mgt.common.exception;
 
 /**
  * This specialized exception is thrown by the Visibility Manager during unexpected behaviour

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/response/Application.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common.response;
+package io.entgra.application.mgt.common.response;
 
 import io.swagger.annotations.ApiModelProperty;
 

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/response/ApplicationRelease.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common.response;
+package io.entgra.application.mgt.common.response;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/response/Category.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.application.mgt.common.response;
+package io.entgra.application.mgt.common.response;
 
 public class Category {
 

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/response/Review.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.application.mgt.common.response;
+package io.entgra.application.mgt.common.response;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/response/Tag.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.application.mgt.common.response;
+package io.entgra.application.mgt.common.response;
 
 public class Tag {
 

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/ApplicationManager.java

@@ -14,30 +14,30 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common.services;
+package io.entgra.application.mgt.common.services;
 
 import org.apache.cxf.jaxrs.ext.multipart.Attachment;
-import org.wso2.carbon.device.application.mgt.common.ApplicationArtifact;
-import org.wso2.carbon.device.application.mgt.common.LifecycleChanger;
-import org.wso2.carbon.device.application.mgt.common.ApplicationList;
-import org.wso2.carbon.device.application.mgt.common.dto.ApplicationReleaseDTO;
-import org.wso2.carbon.device.application.mgt.common.Filter;
-import org.wso2.carbon.device.application.mgt.common.LifecycleState;
-import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException;
-import org.wso2.carbon.device.application.mgt.common.exception.RequestValidatingException;
-import org.wso2.carbon.device.application.mgt.common.response.Application;
-import org.wso2.carbon.device.application.mgt.common.response.ApplicationRelease;
-import org.wso2.carbon.device.application.mgt.common.response.Category;
-import org.wso2.carbon.device.application.mgt.common.response.Tag;
-import org.wso2.carbon.device.application.mgt.common.wrapper.CustomAppReleaseWrapper;
-import org.wso2.carbon.device.application.mgt.common.wrapper.CustomAppWrapper;
-import org.wso2.carbon.device.application.mgt.common.wrapper.EntAppReleaseWrapper;
-import org.wso2.carbon.device.application.mgt.common.wrapper.ApplicationUpdateWrapper;
-import org.wso2.carbon.device.application.mgt.common.wrapper.ApplicationWrapper;
-import org.wso2.carbon.device.application.mgt.common.wrapper.PublicAppReleaseWrapper;
-import org.wso2.carbon.device.application.mgt.common.wrapper.PublicAppWrapper;
-import org.wso2.carbon.device.application.mgt.common.wrapper.WebAppReleaseWrapper;
-import org.wso2.carbon.device.application.mgt.common.wrapper.WebAppWrapper;
+import io.entgra.application.mgt.common.ApplicationArtifact;
+import io.entgra.application.mgt.common.LifecycleChanger;
+import io.entgra.application.mgt.common.ApplicationList;
+import io.entgra.application.mgt.common.dto.ApplicationReleaseDTO;
+import io.entgra.application.mgt.common.Filter;
+import io.entgra.application.mgt.common.LifecycleState;
+import io.entgra.application.mgt.common.exception.ApplicationManagementException;
+import io.entgra.application.mgt.common.exception.RequestValidatingException;
+import io.entgra.application.mgt.common.response.Application;
+import io.entgra.application.mgt.common.response.ApplicationRelease;
+import io.entgra.application.mgt.common.response.Category;
+import io.entgra.application.mgt.common.response.Tag;
+import io.entgra.application.mgt.common.wrapper.CustomAppReleaseWrapper;
+import io.entgra.application.mgt.common.wrapper.CustomAppWrapper;
+import io.entgra.application.mgt.common.wrapper.EntAppReleaseWrapper;
+import io.entgra.application.mgt.common.wrapper.ApplicationUpdateWrapper;
+import io.entgra.application.mgt.common.wrapper.ApplicationWrapper;
+import io.entgra.application.mgt.common.wrapper.PublicAppReleaseWrapper;
+import io.entgra.application.mgt.common.wrapper.PublicAppWrapper;
+import io.entgra.application.mgt.common.wrapper.WebAppReleaseWrapper;
+import io.entgra.application.mgt.common.wrapper.WebAppWrapper;
 
 import java.util.List;
 

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/ApplicationStorageManager.java

@@ -15,13 +15,13 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.application.mgt.common.services;
+package io.entgra.application.mgt.common.services;
 
-import org.wso2.carbon.device.application.mgt.common.ApplicationInstaller;
-import org.wso2.carbon.device.application.mgt.common.dto.ApplicationReleaseDTO;
-import org.wso2.carbon.device.application.mgt.common.exception.ApplicationStorageManagementException;
-import org.wso2.carbon.device.application.mgt.common.exception.RequestValidatingException;
-import org.wso2.carbon.device.application.mgt.common.exception.ResourceManagementException;
+import io.entgra.application.mgt.common.ApplicationInstaller;
+import io.entgra.application.mgt.common.dto.ApplicationReleaseDTO;
+import io.entgra.application.mgt.common.exception.ApplicationStorageManagementException;
+import io.entgra.application.mgt.common.exception.RequestValidatingException;
+import io.entgra.application.mgt.common.exception.ResourceManagementException;
 
 import java.io.InputStream;
 import java.util.List;

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/AppmDataHandler.java

@@ -15,11 +15,11 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.application.mgt.common.services;
+package io.entgra.application.mgt.common.services;
 
-import org.wso2.carbon.device.application.mgt.common.config.LifecycleState;
-import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException;
-import org.wso2.carbon.device.application.mgt.common.exception.LifecycleManagementException;
+import io.entgra.application.mgt.common.config.LifecycleState;
+import io.entgra.application.mgt.common.exception.ApplicationManagementException;
+import io.entgra.application.mgt.common.exception.LifecycleManagementException;
 
 import java.io.InputStream;
 import java.util.Map;

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/DeviceConnector.java

@@ -14,10 +14,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common.services;
+package io.entgra.application.mgt.common.services;
 
-import org.wso2.carbon.device.application.mgt.common.AppOperation;
-import org.wso2.carbon.device.application.mgt.common.exception.DeviceConnectorException;
+import io.entgra.application.mgt.common.AppOperation;
+import io.entgra.application.mgt.common.exception.DeviceConnectorException;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 
 import java.util.List;

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/ReviewManager.java

@@ -14,15 +14,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common.services;
+package io.entgra.application.mgt.common.services;
 
-import org.wso2.carbon.device.application.mgt.common.Rating;
-import org.wso2.carbon.device.application.mgt.common.response.Review;
-import org.wso2.carbon.device.application.mgt.common.PaginationRequest;
-import org.wso2.carbon.device.application.mgt.common.PaginationResult;
-import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException;
-import org.wso2.carbon.device.application.mgt.common.exception.ReviewManagementException;
-import org.wso2.carbon.device.application.mgt.common.wrapper.ReviewWrapper;
+import io.entgra.application.mgt.common.Rating;
+import io.entgra.application.mgt.common.response.Review;
+import io.entgra.application.mgt.common.PaginationRequest;
+import io.entgra.application.mgt.common.PaginationResult;
+import io.entgra.application.mgt.common.exception.ApplicationManagementException;
+import io.entgra.application.mgt.common.exception.ReviewManagementException;
+import io.entgra.application.mgt.common.wrapper.ReviewWrapper;
 
 /**
  * ReviewManager is responsible for handling all the add/update/delete/get operations related with

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/SubscriptionManager.java

@@ -14,13 +14,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common.services;
+package io.entgra.application.mgt.common.services;
 
-import org.wso2.carbon.device.application.mgt.common.ApplicationInstallResponse;
-import org.wso2.carbon.device.application.mgt.common.ExecutionStatus;
-import org.wso2.carbon.device.application.mgt.common.dto.ScheduledSubscriptionDTO;
-import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException;
-import org.wso2.carbon.device.application.mgt.common.exception.SubscriptionManagementException;
+import io.entgra.application.mgt.common.ApplicationInstallResponse;
+import io.entgra.application.mgt.common.ExecutionStatus;
+import io.entgra.application.mgt.common.dto.ScheduledSubscriptionDTO;
+import io.entgra.application.mgt.common.exception.ApplicationManagementException;
+import io.entgra.application.mgt.common.exception.SubscriptionManagementException;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.PaginationRequest;
 import org.wso2.carbon.device.mgt.common.PaginationResult;
@@ -45,8 +45,8 @@ public interface SubscriptionManager {
  * @param <T>             generic type of the method.
  * @return {@link ApplicationInstallResponse}
  * @throws ApplicationManagementException if error occurs when subscribing to the given application
- * @link org.wso2.carbon.device.application.mgt.common.SubscriptionType}}
- * @link org.wso2.carbon.device.application.mgt.common.SubAction}}
+ * @link io.entgra.application.mgt.common.SubscriptionType}}
+ * @link io.entgra.application.mgt.common.SubAction}}
      * @param properties
      */
     <T> ApplicationInstallResponse performBulkAppOperation(String applicationUUID, List<T> params, String subType,
@@ -109,7 +109,7 @@ public interface SubscriptionManager {
      * @return {@link ApplicationInstallResponse}
      * @throws ApplicationManagementException ApplicationManagementException if error occurs when subscribing to the
      * given application
-     * @link org.wso2.carbon.device.application.mgt.common.SubscriptionType}}
+     * @link io.entgra.application.mgt.common.SubscriptionType}}
      */
     <T> void performEntAppSubscription(String applicationUUID, List<T> params, String subType, String action,
                                        boolean requiresUpdatingExternal) throws ApplicationManagementException;

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/ApplicationUpdateWrapper.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common.wrapper;
+package io.entgra.application.mgt.common.wrapper;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/ApplicationWrapper.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common.wrapper;
+package io.entgra.application.mgt.common.wrapper;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/CustomAppReleaseWrapper.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common.wrapper;
+package io.entgra.application.mgt.common.wrapper;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/CustomAppWrapper.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common.wrapper;
+package io.entgra.application.mgt.common.wrapper;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/EntAppReleaseWrapper.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.common.wrapper;
+package io.entgra.application.mgt.common.wrapper;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;