package name change - appmgt

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

@@ -112,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/FileStreamingOutput.java

@@ -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.api/pom.xml

@@ -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

@@ -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 io.entgra.application.mgt.common.ApplicationList;
-import org.wso2.carbon.device.application.mgt.common.ErrorResponse;
+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/webapp/WEB-INF/cxf-servlet.xml

@@ -48,7 +48,7 @@
         <property name="scan" value="true"/>
     </bean>
 
-    <bean id="org.wso2.carbon.device.application.mgt.addons.ValidationInterceptor" class="io.entgra.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" />
 

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

@@ -40,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}

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

@@ -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 io.entgra.application.mgt.common.SubscriptionType}}
- * @link org.wso2.carbon.device.application.mgt.common.SubAction}}
+ * @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.core/pom.xml

@@ -63,7 +63,7 @@
                             javax.naming,
                             javax.xml.bind.annotation; version="${javax.xml.bind.imp.pkg.version}",
                             javax.xml.bind; version="${javax.xml.bind.imp.pkg.version}",
-                            org.wso2.carbon.device.application.mgt.common.*,
+                            io.entgra.application.mgt.common.*,
                             org.wso2.carbon.device.mgt.core.*,
                             org.wso2.carbon.device.mgt.common.*,
                             org.wso2.carbon.user.core.*,
@@ -163,7 +163,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>org.wso2.carbon.devicemgt</groupId>

components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/ApplicationDAO.java

@@ -17,7 +17,7 @@
  */
 package io.entgra.application.mgt.core.dao;
 
-import org.wso2.carbon.device.application.mgt.common.*;
+import io.entgra.application.mgt.common.*;
 import io.entgra.application.mgt.common.dto.ApplicationDTO;
 import io.entgra.application.mgt.common.dto.CategoryDTO;
 import io.entgra.application.mgt.common.dto.TagDTO;

components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/ApplicationReleaseDAO.java

@@ -18,7 +18,7 @@
 package io.entgra.application.mgt.core.dao;
 
 import io.entgra.application.mgt.common.dto.ApplicationReleaseDTO;
-import org.wso2.carbon.device.application.mgt.common.Rating;
+import io.entgra.application.mgt.common.Rating;
 import io.entgra.application.mgt.core.exception.ApplicationManagementDAOException;
 
 import java.util.List;

components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/LifecycleStateDAO.java

@@ -17,7 +17,7 @@
  */
 package io.entgra.application.mgt.core.dao;
 
-import org.wso2.carbon.device.application.mgt.common.LifecycleState;
+import io.entgra.application.mgt.common.LifecycleState;
 import io.entgra.application.mgt.core.exception.LifeCycleManagementDAOException;
 
 import java.util.List;

components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/ReviewDAO.java

@@ -18,7 +18,7 @@
 package io.entgra.application.mgt.core.dao;
 
 import io.entgra.application.mgt.common.response.Review;
-import org.wso2.carbon.device.application.mgt.common.PaginationRequest;
+import io.entgra.application.mgt.common.PaginationRequest;
 import io.entgra.application.mgt.common.dto.ReviewDTO;
 import io.entgra.application.mgt.core.exception.ReviewManagementDAOException;
 

components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/SubscriptionDAO.java

@@ -17,7 +17,7 @@
  */
 package io.entgra.application.mgt.core.dao;
 
-import org.wso2.carbon.device.application.mgt.common.ExecutionStatus;
+import io.entgra.application.mgt.common.ExecutionStatus;
 import io.entgra.application.mgt.common.dto.ApplicationReleaseDTO;
 import io.entgra.application.mgt.common.dto.DeviceSubscriptionDTO;
 import io.entgra.application.mgt.common.dto.ScheduledSubscriptionDTO;

components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/GenericApplicationDAOImpl.java

@@ -20,10 +20,10 @@ package io.entgra.application.mgt.core.dao.impl.application;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.application.mgt.common.AppLifecycleState;
+import io.entgra.application.mgt.common.AppLifecycleState;
 import io.entgra.application.mgt.common.dto.ApplicationDTO;
 import io.entgra.application.mgt.common.dto.CategoryDTO;
-import org.wso2.carbon.device.application.mgt.common.Filter;
+import io.entgra.application.mgt.common.Filter;
 import io.entgra.application.mgt.common.dto.ReviewDTO;
 import io.entgra.application.mgt.common.dto.TagDTO;
 import io.entgra.application.mgt.common.exception.DBConnectionException;

components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/OracleApplicationDAOImpl.java

@@ -21,7 +21,7 @@ package io.entgra.application.mgt.core.dao.impl.application;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.application.mgt.common.Filter;
+import io.entgra.application.mgt.common.Filter;
 import io.entgra.application.mgt.common.dto.ApplicationDTO;
 import io.entgra.application.mgt.common.exception.DBConnectionException;
 import io.entgra.application.mgt.core.exception.ApplicationManagementDAOException;

components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/SQLServerApplicationDAOImpl.java

@@ -20,7 +20,7 @@ package io.entgra.application.mgt.core.dao.impl.application;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.application.mgt.common.Filter;
+import io.entgra.application.mgt.common.Filter;
 import io.entgra.application.mgt.common.dto.ApplicationDTO;
 import io.entgra.application.mgt.common.exception.DBConnectionException;
 import io.entgra.application.mgt.core.exception.ApplicationManagementDAOException;

components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/release/GenericApplicationReleaseDAOImpl.java

@@ -21,7 +21,7 @@ package io.entgra.application.mgt.core.dao.impl.application.release;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import io.entgra.application.mgt.common.dto.ApplicationReleaseDTO;
-import org.wso2.carbon.device.application.mgt.common.Rating;
+import io.entgra.application.mgt.common.Rating;
 import io.entgra.application.mgt.common.exception.DBConnectionException;
 import io.entgra.application.mgt.core.dao.ApplicationReleaseDAO;
 import io.entgra.application.mgt.core.util.DAOUtil;

components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/lifecyclestate/GenericLifecycleStateDAOImpl.java

@@ -19,8 +19,8 @@ package io.entgra.application.mgt.core.dao.impl.lifecyclestate;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.application.mgt.common.AppLifecycleState;
+import io.entgra.application.mgt.common.AppLifecycleState;
-import org.wso2.carbon.device.application.mgt.common.LifecycleState;
+import io.entgra.application.mgt.common.LifecycleState;
 import io.entgra.application.mgt.common.exception.DBConnectionException;
 import io.entgra.application.mgt.core.dao.LifecycleStateDAO;
 import io.entgra.application.mgt.core.util.DAOUtil;

components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/review/GenericReviewDAOImpl.java

@@ -20,7 +20,7 @@ package io.entgra.application.mgt.core.dao.impl.review;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.wso2.carbon.device.application.mgt.common.PaginationRequest;
+import io.entgra.application.mgt.common.PaginationRequest;
 import io.entgra.application.mgt.common.dto.ReviewDTO;
 import io.entgra.application.mgt.common.exception.DBConnectionException;
 import io.entgra.application.mgt.core.dao.ReviewDAO;

components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/review/OracleReviewDAOImpl.java

@@ -19,7 +19,7 @@ package io.entgra.application.mgt.core.dao.impl.review;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.application.mgt.common.PaginationRequest;
+import io.entgra.application.mgt.common.PaginationRequest;
 import io.entgra.application.mgt.common.dto.ReviewDTO;
 import io.entgra.application.mgt.common.exception.DBConnectionException;
 import io.entgra.application.mgt.core.exception.ReviewManagementDAOException;

components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/review/SQLServerReviewDAOImpl.java

@@ -19,7 +19,7 @@ package io.entgra.application.mgt.core.dao.impl.review;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.application.mgt.common.PaginationRequest;
+import io.entgra.application.mgt.common.PaginationRequest;
 import io.entgra.application.mgt.common.dto.ReviewDTO;
 import io.entgra.application.mgt.common.exception.DBConnectionException;
 import io.entgra.application.mgt.core.exception.ReviewManagementDAOException;

components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/subscription/GenericSubscriptionDAOImpl.java

@@ -19,9 +19,9 @@ package io.entgra.application.mgt.core.dao.impl.subscription;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.application.mgt.common.ExecutionStatus;
+import io.entgra.application.mgt.common.ExecutionStatus;
-import org.wso2.carbon.device.application.mgt.common.SubAction;
+import io.entgra.application.mgt.common.SubAction;
-import org.wso2.carbon.device.application.mgt.common.SubscriptionType;
+import io.entgra.application.mgt.common.SubscriptionType;
 import io.entgra.application.mgt.common.dto.DeviceSubscriptionDTO;
 import io.entgra.application.mgt.common.dto.ScheduledSubscriptionDTO;
 import io.entgra.application.mgt.common.exception.DBConnectionException;

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

@@ -27,21 +27,21 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.CarbonContext;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.application.mgt.common.ApplicationArtifact;
+import io.entgra.application.mgt.common.ApplicationArtifact;
-import org.wso2.carbon.device.application.mgt.common.ApplicationInstaller;
+import io.entgra.application.mgt.common.ApplicationInstaller;
-import org.wso2.carbon.device.application.mgt.common.DeviceTypes;
+import io.entgra.application.mgt.common.DeviceTypes;
-import org.wso2.carbon.device.application.mgt.common.LifecycleChanger;
+import io.entgra.application.mgt.common.LifecycleChanger;
-import org.wso2.carbon.device.application.mgt.common.Pagination;
+import io.entgra.application.mgt.common.Pagination;
 import io.entgra.application.mgt.common.config.RatingConfiguration;
 import io.entgra.application.mgt.common.dto.ApplicationDTO;
-import org.wso2.carbon.device.application.mgt.common.ApplicationList;
+import io.entgra.application.mgt.common.ApplicationList;
 import io.entgra.application.mgt.common.dto.ApplicationReleaseDTO;
-import org.wso2.carbon.device.application.mgt.common.ApplicationSubscriptionType;
+import io.entgra.application.mgt.common.ApplicationSubscriptionType;
-import org.wso2.carbon.device.application.mgt.common.ApplicationType;
+import io.entgra.application.mgt.common.ApplicationType;
 import io.entgra.application.mgt.common.dto.CategoryDTO;
-import org.wso2.carbon.device.application.mgt.common.Filter;
+import io.entgra.application.mgt.common.Filter;
 import io.entgra.application.mgt.common.dto.DeviceSubscriptionDTO;
-import org.wso2.carbon.device.application.mgt.common.LifecycleState;
+import io.entgra.application.mgt.common.LifecycleState;
 import io.entgra.application.mgt.common.dto.TagDTO;
 import io.entgra.application.mgt.common.exception.ApplicationManagementException;
 import io.entgra.application.mgt.common.exception.ApplicationStorageManagementException;

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

@@ -22,9 +22,9 @@ import net.dongliu.apk.parser.bean.ApkMeta;
 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.common.ApplicationInstaller;
+import io.entgra.application.mgt.common.ApplicationInstaller;
 import io.entgra.application.mgt.common.dto.ApplicationReleaseDTO;
-import org.wso2.carbon.device.application.mgt.common.DeviceTypes;
+import io.entgra.application.mgt.common.DeviceTypes;
 import io.entgra.application.mgt.common.exception.ApplicationStorageManagementException;
 import io.entgra.application.mgt.common.exception.ResourceManagementException;
 import io.entgra.application.mgt.common.services.ApplicationStorageManager;

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

@@ -20,10 +20,10 @@ package io.entgra.application.mgt.core.impl;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.application.mgt.common.Rating;
+import io.entgra.application.mgt.common.Rating;
-import org.wso2.carbon.device.application.mgt.common.ReviewNode;
+import io.entgra.application.mgt.common.ReviewNode;
-import org.wso2.carbon.device.application.mgt.common.PaginationRequest;
+import io.entgra.application.mgt.common.PaginationRequest;
-import org.wso2.carbon.device.application.mgt.common.PaginationResult;
+import io.entgra.application.mgt.common.PaginationResult;
 import io.entgra.application.mgt.common.dto.ApplicationDTO;
 import io.entgra.application.mgt.common.dto.ApplicationReleaseDTO;
 import io.entgra.application.mgt.common.dto.ReviewDTO;

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

@@ -30,15 +30,15 @@ import org.json.JSONObject;
 import org.wso2.carbon.apimgt.application.extension.dto.ApiApplicationKey;
 import org.wso2.carbon.apimgt.application.extension.exception.APIManagerException;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.application.mgt.common.ApplicationInstallResponse;
+import io.entgra.application.mgt.common.ApplicationInstallResponse;
-import org.wso2.carbon.device.application.mgt.common.ApplicationSubscriptionInfo;
+import io.entgra.application.mgt.common.ApplicationSubscriptionInfo;
-import org.wso2.carbon.device.application.mgt.common.ApplicationType;
+import io.entgra.application.mgt.common.ApplicationType;
-import org.wso2.carbon.device.application.mgt.common.DeviceSubscriptionData;
+import io.entgra.application.mgt.common.DeviceSubscriptionData;
-import org.wso2.carbon.device.application.mgt.common.DeviceTypes;
+import io.entgra.application.mgt.common.DeviceTypes;
-import org.wso2.carbon.device.application.mgt.common.ExecutionStatus;
+import io.entgra.application.mgt.common.ExecutionStatus;
-import org.wso2.carbon.device.application.mgt.common.SubAction;
+import io.entgra.application.mgt.common.SubAction;
-import org.wso2.carbon.device.application.mgt.common.SubscriptionType;
+import io.entgra.application.mgt.common.SubscriptionType;
-import org.wso2.carbon.device.application.mgt.common.SubscribingDeviceIdHolder;
+import io.entgra.application.mgt.common.SubscribingDeviceIdHolder;
 import io.entgra.application.mgt.common.dto.ApplicationDTO;
 import io.entgra.application.mgt.common.dto.ApplicationPolicyDTO;
 import io.entgra.application.mgt.common.dto.ApplicationReleaseDTO;

components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/task/ScheduledAppSubscriptionTask.java

@@ -24,8 +24,8 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.application.mgt.common.ExecutionStatus;
+import io.entgra.application.mgt.common.ExecutionStatus;
-import org.wso2.carbon.device.application.mgt.common.SubscriptionType;
+import io.entgra.application.mgt.common.SubscriptionType;
 import io.entgra.application.mgt.common.dto.ScheduledSubscriptionDTO;
 import io.entgra.application.mgt.common.exception.ApplicationManagementException;
 import io.entgra.application.mgt.common.exception.SubscriptionManagementException;

components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/task/ScheduledAppSubscriptionTaskManager.java

@@ -24,8 +24,8 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.quartz.CronExpression;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.application.mgt.common.SubAction;
+import io.entgra.application.mgt.common.SubAction;
-import org.wso2.carbon.device.application.mgt.common.SubscriptionType;
+import io.entgra.application.mgt.common.SubscriptionType;
 import io.entgra.application.mgt.common.dto.ScheduledSubscriptionDTO;
 import io.entgra.application.mgt.common.exception.SubscriptionManagementException;
 import io.entgra.application.mgt.common.services.SubscriptionManager;

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

@@ -23,7 +23,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.commons.validator.routines.UrlValidator;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.application.mgt.common.ApplicationType;
+import io.entgra.application.mgt.common.ApplicationType;
 import io.entgra.application.mgt.common.config.MDMConfig;
 import io.entgra.application.mgt.common.dto.ApplicationDTO;
 import io.entgra.application.mgt.common.dto.ApplicationReleaseDTO;
@@ -31,7 +31,7 @@ import io.entgra.application.mgt.common.exception.ApplicationManagementException
 import io.entgra.application.mgt.common.response.Application;
 import io.entgra.application.mgt.common.response.ApplicationRelease;
 import io.entgra.application.mgt.common.services.*;
-import org.wso2.carbon.device.application.mgt.common.ErrorResponse;
+import io.entgra.application.mgt.common.ErrorResponse;
 import io.entgra.application.mgt.common.wrapper.CustomAppReleaseWrapper;
 import io.entgra.application.mgt.common.wrapper.CustomAppWrapper;
 import io.entgra.application.mgt.common.wrapper.EntAppReleaseWrapper;

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

@@ -22,8 +22,8 @@ import com.google.gson.reflect.TypeToken;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.json.JSONException;
-import org.wso2.carbon.device.application.mgt.common.ExecutionStatus;
+import io.entgra.application.mgt.common.ExecutionStatus;
-import org.wso2.carbon.device.application.mgt.common.SubscriptionType;
+import io.entgra.application.mgt.common.SubscriptionType;
 import io.entgra.application.mgt.common.dto.ApplicationDTO;
 
 import io.entgra.application.mgt.common.dto.ApplicationReleaseDTO;

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

@@ -23,7 +23,7 @@ import org.apache.commons.codec.digest.DigestUtils;
 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.common.ImageArtifact;
+import io.entgra.application.mgt.common.ImageArtifact;
 import io.entgra.application.mgt.common.exception.ApplicationStorageManagementException;
 import io.entgra.application.mgt.common.exception.ResourceManagementException;
 

components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/BaseTestCase.java

@@ -130,7 +130,7 @@ public abstract class BaseTestCase {
         try {
             conn = this.getDataSource().getConnection();
             stmt = conn.createStatement();
-            stmt.executeUpdate("RUNSCRIPT FROM '../../../features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/h2.sql'");
+            stmt.executeUpdate("RUNSCRIPT FROM '../../../features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/h2.sql'");
             stmt.executeUpdate("RUNSCRIPT FROM '../../../features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/h2.sql'");
 
         } finally {

components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/dao/ApplicationManagementDAOTest.java

@@ -25,8 +25,8 @@ import org.testng.annotations.Test;
 import io.entgra.application.mgt.core.BaseTestCase;
 import io.entgra.application.mgt.core.config.ConfigurationManager;
 import io.entgra.application.mgt.core.dao.common.ApplicationManagementDAOFactory;
-import org.wso2.carbon.device.application.mgt.core.dto.ApplicationsDTO;
+import io.entgra.application.mgt.core.dto.ApplicationsDTO;
-import org.wso2.carbon.device.application.mgt.core.dto.DeviceTypeCreator;
+import io.entgra.application.mgt.core.dto.DeviceTypeCreator;
 import io.entgra.application.mgt.core.util.ConnectionManagerUtil;
 import org.wso2.carbon.device.mgt.common.exceptions.TransactionManagementException;
 import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOException;

components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/management/ApplicationManagementTest.java

@@ -21,7 +21,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.cxf.jaxrs.ext.multipart.Attachment;
 import org.testng.annotations.Test;
-import org.wso2.carbon.device.application.mgt.common.*;
+import io.entgra.application.mgt.common.*;
 import io.entgra.application.mgt.common.dto.ApplicationDTO;
 import io.entgra.application.mgt.common.exception.ApplicationManagementException;
 import io.entgra.application.mgt.common.exception.RequestValidatingException;
@@ -36,7 +36,7 @@ import io.entgra.application.mgt.common.wrapper.ApplicationWrapper;
 import io.entgra.application.mgt.core.BaseTestCase;
 import io.entgra.application.mgt.core.dao.ApplicationDAO;
 import io.entgra.application.mgt.core.dao.common.ApplicationManagementDAOFactory;
-import org.wso2.carbon.device.application.mgt.core.dto.ApplicationsDTO;
+import io.entgra.application.mgt.core.dto.ApplicationsDTO;
 import io.entgra.application.mgt.core.impl.ApplicationManagerImpl;
 import io.entgra.application.mgt.core.internal.DataHolder;
 import io.entgra.application.mgt.core.util.ConnectionManagerUtil;

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

@@ -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.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/ApplicationManagementPublisherAPI.java

@@ -31,10 +31,10 @@ import org.apache.cxf.jaxrs.ext.multipart.Attachment;
 import org.apache.cxf.jaxrs.ext.multipart.Multipart;
 import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.apimgt.annotations.api.Scopes;
-import org.wso2.carbon.device.application.mgt.common.ApplicationList;
+import io.entgra.application.mgt.common.ApplicationList;
-import org.wso2.carbon.device.application.mgt.common.ErrorResponse;
+import io.entgra.application.mgt.common.ErrorResponse;
-import org.wso2.carbon.device.application.mgt.common.Filter;
+import io.entgra.application.mgt.common.Filter;
-import org.wso2.carbon.device.application.mgt.common.LifecycleChanger;
+import io.entgra.application.mgt.common.LifecycleChanger;
 import io.entgra.application.mgt.common.dto.ApplicationDTO;
 import io.entgra.application.mgt.common.dto.ApplicationReleaseDTO;
 import io.entgra.application.mgt.common.response.ApplicationRelease;

components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/admin/ApplicationManagementPublisherAdminAPI.java

@@ -29,8 +29,8 @@ 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 org.wso2.carbon.device.application.mgt.common.ApplicationList;
+import io.entgra.application.mgt.common.ApplicationList;
-import org.wso2.carbon.device.application.mgt.common.ErrorResponse;
+import io.entgra.application.mgt.common.ErrorResponse;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;

components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/admin/ReviewManagementPublisherAdminAPI.java

@@ -28,8 +28,8 @@ 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 org.wso2.carbon.device.application.mgt.common.ErrorResponse;
+import io.entgra.application.mgt.common.ErrorResponse;
-import org.wso2.carbon.device.application.mgt.common.PaginationResult;
+import io.entgra.application.mgt.common.PaginationResult;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;

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

@@ -20,8 +20,8 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.cxf.jaxrs.ext.multipart.Attachment;
 import org.apache.cxf.jaxrs.ext.multipart.Multipart;
-import org.wso2.carbon.device.application.mgt.common.*;
+import io.entgra.application.mgt.common.*;
-import org.wso2.carbon.device.application.mgt.common.LifecycleState;
+import io.entgra.application.mgt.common.LifecycleState;
 import io.entgra.application.mgt.common.exception.LifecycleManagementException;
 import io.entgra.application.mgt.common.exception.RequestValidatingException;
 import io.entgra.application.mgt.common.response.Application;

components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/impl/admin/ReviewManagementPublisherAdminAPIImpl.java

@@ -18,9 +18,9 @@ package io.entgra.application.mgt.publisher.api.services.impl.admin;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.application.mgt.common.PaginationRequest;
+import io.entgra.application.mgt.common.PaginationRequest;
-import org.wso2.carbon.device.application.mgt.common.PaginationResult;
+import io.entgra.application.mgt.common.PaginationResult;
-import org.wso2.carbon.device.application.mgt.common.Rating;
+import io.entgra.application.mgt.common.Rating;
 import io.entgra.application.mgt.common.exception.ApplicationManagementException;
 import io.entgra.application.mgt.common.exception.ReviewManagementException;
 import io.entgra.application.mgt.common.services.ReviewManager;

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

@@ -50,7 +50,7 @@
         <property name="scan" value="true"/>
     </bean>
 
-    <bean id="org.wso2.carbon.device.application.mgt.addons.ValidationInterceptor" class="io.entgra.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" />
 

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

@@ -154,17 +154,17 @@
         </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>
             <groupId>org.wso2.carbon.devicemgt</groupId>
-            <artifactId>org.wso2.carbon.device.application.mgt.addons</artifactId>
+            <artifactId>io.entgra.application.mgt.addons</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon.devicemgt</groupId>

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

@@ -28,10 +28,10 @@ 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 org.wso2.carbon.device.application.mgt.common.ErrorResponse;
+import io.entgra.application.mgt.common.ErrorResponse;
-import org.wso2.carbon.device.application.mgt.common.Filter;
+import io.entgra.application.mgt.common.Filter;
 import io.entgra.application.mgt.common.dto.ApplicationDTO;
-import org.wso2.carbon.device.application.mgt.common.ApplicationList;
+import io.entgra.application.mgt.common.ApplicationList;
 
 import javax.validation.Valid;
 import javax.ws.rs.Consumes;

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

@@ -29,8 +29,8 @@ import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.apimgt.annotations.api.Scopes;
-import org.wso2.carbon.device.application.mgt.common.PaginationResult;
+import io.entgra.application.mgt.common.PaginationResult;
-import org.wso2.carbon.device.application.mgt.common.ErrorResponse;
+import io.entgra.application.mgt.common.ErrorResponse;
 import io.entgra.application.mgt.common.response.Review;
 import io.entgra.application.mgt.common.wrapper.ReviewWrapper;
 

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

@@ -29,7 +29,7 @@ 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 org.wso2.carbon.device.application.mgt.common.ErrorResponse;
+import io.entgra.application.mgt.common.ErrorResponse;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 
 import javax.validation.Valid;

components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/admin/ReviewManagementStoreAdminAPI.java

@@ -28,7 +28,7 @@ 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 org.wso2.carbon.device.application.mgt.common.ErrorResponse;
+import io.entgra.application.mgt.common.ErrorResponse;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;

components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/admin/SubscriptionManagementAdminAPI.java

@@ -29,7 +29,7 @@ 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 org.wso2.carbon.device.application.mgt.common.ErrorResponse;
+import io.entgra.application.mgt.common.ErrorResponse;
 
 import javax.validation.constraints.Size;
 import javax.ws.rs.Consumes;

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

@@ -18,8 +18,8 @@ package io.entgra.application.mgt.store.api.services.impl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.application.mgt.common.ApplicationList;
+import io.entgra.application.mgt.common.ApplicationList;
-import org.wso2.carbon.device.application.mgt.common.Filter;
+import io.entgra.application.mgt.common.Filter;
 import io.entgra.application.mgt.common.exception.ApplicationManagementException;
 import io.entgra.application.mgt.common.response.Application;
 import io.entgra.application.mgt.common.services.ApplicationManager;

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

@@ -20,8 +20,8 @@ package io.entgra.application.mgt.store.api.services.impl;
 import io.swagger.annotations.ApiParam;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.application.mgt.common.PaginationResult;
+import io.entgra.application.mgt.common.PaginationResult;
-import org.wso2.carbon.device.application.mgt.common.Rating;
+import io.entgra.application.mgt.common.Rating;
 import io.entgra.application.mgt.common.response.Review;
 import io.entgra.application.mgt.common.services.ReviewManager;
 import io.entgra.application.mgt.common.wrapper.ReviewWrapper;
@@ -29,7 +29,7 @@ import io.entgra.application.mgt.core.exception.BadRequestException;
 import io.entgra.application.mgt.core.exception.ForbiddenException;
 import io.entgra.application.mgt.core.exception.NotFoundException;
 import io.entgra.application.mgt.store.api.services.ReviewManagementAPI;
-import org.wso2.carbon.device.application.mgt.common.PaginationRequest;
+import io.entgra.application.mgt.common.PaginationRequest;
 import io.entgra.application.mgt.common.exception.ApplicationManagementException;
 import io.entgra.application.mgt.common.exception.ReviewManagementException;
 import io.entgra.application.mgt.core.util.APIUtil;

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

@@ -21,18 +21,18 @@ package io.entgra.application.mgt.store.api.services.impl;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.application.mgt.common.ApplicationInstallResponse;
+import io.entgra.application.mgt.common.ApplicationInstallResponse;
-import org.wso2.carbon.device.application.mgt.common.ErrorResponse;
+import io.entgra.application.mgt.common.ErrorResponse;
-import org.wso2.carbon.device.application.mgt.common.SubAction;
+import io.entgra.application.mgt.common.SubAction;
-import org.wso2.carbon.device.application.mgt.common.SubscriptionType;
+import io.entgra.application.mgt.common.SubscriptionType;
 import io.entgra.application.mgt.common.exception.ApplicationManagementException;
 import io.entgra.application.mgt.common.services.SubscriptionManager;
 import io.entgra.application.mgt.core.exception.ApplicationOperationTaskException;
-import org.wso2.carbon.device.application.mgt.common.DeviceList;
+import io.entgra.application.mgt.common.DeviceList;
-import org.wso2.carbon.device.application.mgt.common.BasicUserInfo;
+import io.entgra.application.mgt.common.BasicUserInfo;
-import org.wso2.carbon.device.application.mgt.common.BasicUserInfoList;
+import io.entgra.application.mgt.common.BasicUserInfoList;
-import org.wso2.carbon.device.application.mgt.common.RoleList;
+import io.entgra.application.mgt.common.RoleList;
-import org.wso2.carbon.device.application.mgt.common.DeviceGroupList;
+import io.entgra.application.mgt.common.DeviceGroupList;
 import io.entgra.application.mgt.store.api.services.impl.util.RequestValidationUtil;
 import io.entgra.application.mgt.core.exception.BadRequestException;
 import io.entgra.application.mgt.core.exception.ForbiddenException;
@@ -260,9 +260,9 @@ public class SubscriptionManagementAPIImpl implements SubscriptionManagementAPI{
      *                        either {@link org.wso2.carbon.device.mgt.common.DeviceIdentifier} if {@param subType} is
      *                        equal to DEVICE or {@link String} if {@param subType} is USER, ROLE or GROUP
      * @param subType         subscription type. E.g. <code>DEVICE, USER, ROLE, GROUP</code>
-     *                        {@see {@link org.wso2.carbon.device.application.mgt.common.SubscriptionType}}
+     *                        {@see {@link io.entgra.application.mgt.common.SubscriptionType}}
      * @param subAction       action subscription action. E.g. <code>INSTALL/UNINSTALL</code>
-     *                        {@see {@link org.wso2.carbon.device.application.mgt.common.SubAction}}
+     *                        {@see {@link io.entgra.application.mgt.common.SubAction}}
      * @param timestamp       timestamp to schedule the application subscription
      * @return {@link Response} of the operation
      */

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

@@ -51,7 +51,7 @@
         <property name="scan" value="true"/>
     </bean>
 
-    <bean id="org.wso2.carbon.device.application.mgt.addons.ValidationInterceptor" class="io.entgra.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" />
 

components/application-mgt/io.entgra.application.mgt.store.api/src/test/java/io/entgra/application/mgt/store/api/services/ReviewManagementAPITest.java

@@ -29,7 +29,7 @@ import io.entgra.application.mgt.core.util.APIUtil;
 
 @PowerMockIgnore("javax.ws.rs.*")
 @SuppressStaticInitializationFor({
-    "org.wso2.carbon.device.application.mgt.api.APIUtil" })
+    "io.entgra.application.mgt.api.APIUtil" })
 @PrepareForTest({ APIUtil.class, ReviewManager.class,
     ReviewManagementAPITest.class})
 @Ignore("Since comment manager logic is invalid temporarily added Ignore annotation to skip running comment management test cases") public class ReviewManagementAPITest

components/application-mgt/pom.xml

@@ -34,12 +34,12 @@
     <url>http://wso2.org</url>
 
     <modules>
-        <module>org.wso2.carbon.device.application.mgt.core</module>
+        <module>io.entgra.application.mgt.common</module>
-        <module>org.wso2.carbon.device.application.mgt.common</module>
+        <module>io.entgra.application.mgt.core</module>
-        <module>org.wso2.carbon.device.application.mgt.addons</module>
+        <module>io.entgra.application.mgt.addons</module>
-        <module>org.wso2.carbon.device.application.mgt.publisher.api</module>
+        <module>io.entgra.application.mgt.publisher.api</module>
-        <module>org.wso2.carbon.device.application.mgt.store.api</module>
+        <module>io.entgra.application.mgt.store.api</module>
-        <module>org.wso2.carbon.device.application.mgt.api</module>
+        <module>io.entgra.application.mgt.api</module>
     </modules>
 
     <build>

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.pull.notification/pom.xml

@@ -56,7 +56,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>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -91,7 +91,7 @@
                             org.wso2.carbon.policy.mgt.core,
                             com.google.gson,
                             org.wso2.carbon.device.mgt.core.service.*,
-                            org.wso2.carbon.device.application.mgt.common.*,
+                            io.entgra.application.mgt.common.*,
                             io.entgra.application.mgt.common.services.*
                         </Import-Package>
                     </instructions>

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.pull.notification/src/main/java/org/wso2/carbon/device/mgt/extensions/pull/notification/internal/PullNotificationServiceComponent.java

@@ -40,7 +40,7 @@ import org.wso2.carbon.policy.mgt.core.PolicyManagerService;
  * bind="setPolicyManagerService"
  * unbind="unsetPolicyManagerService"
  * @scr.reference name="org.wso2.carbon.application.mgt.service"
- * interface="org.wso2.carbon.device.application.mgt.common.services.ApplicationManager"
+ * interface="io.entgra.application.mgt.common.services.ApplicationManager"
  * cardinality="1..1"
  * policy="dynamic"
  * bind="setApplicationManagerService"

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/pom.xml

@@ -113,7 +113,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>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -160,7 +160,7 @@
                             org.wso2.carbon.event.output.adapter.core.exception,
                             org.wso2.carbon.device.mgt.core.operation.mgt,
                             org.wso2.carbon.core,
-                            org.wso2.carbon.device.application.mgt.common.*,
+                            io.entgra.application.mgt.common.*,
                             io.entgra.application.mgt.common.services.*
                         </Import-Package>
                     </instructions>

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

@@ -406,12 +406,12 @@
         </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>
             <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>
     </dependencies>

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

@@ -43,8 +43,8 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.CarbonContext;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.application.mgt.common.ApplicationInstallResponse;
+import io.entgra.application.mgt.common.ApplicationInstallResponse;
-import org.wso2.carbon.device.application.mgt.common.SubscriptionType;
+import io.entgra.application.mgt.common.SubscriptionType;
 import io.entgra.application.mgt.common.exception.SubscriptionManagementException;
 import io.entgra.application.mgt.common.services.SubscriptionManager;
 import io.entgra.application.mgt.core.util.HelperUtil;

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

@@ -83,7 +83,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>
             <scope>test</scope>
         </dependency>
         <dependency>

components/ui-request-interceptor/io.entgra.ui.request.interceptor/pom.xml

@@ -144,7 +144,7 @@
         </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>
             <exclusions>
                 <exclusion>

features/application-mgt/io.entgra.application.mgt.api.feature/pom.xml

@@ -27,9 +27,9 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.device.application.mgt.api.feature</artifactId>
+    <artifactId>io.entgra.application.mgt.api.feature</artifactId>
     <packaging>pom</packaging>
-    <name>WSO2 Carbon - Application Management API Feature</name>
+    <name>Entgra - Application Management API Feature</name>
     <url>https://entgra.io</url>
     <description>This feature contains the APIs required for Application Management console UI</description>
 
@@ -49,7 +49,7 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>org.wso2.carbon.devicemgt</groupId>
-                                    <artifactId>org.wso2.carbon.device.application.mgt.publisher.api
+                                    <artifactId>io.entgra.application.mgt.publisher.api
                                     </artifactId>
                                     <version>${project.version}</version>
                                     <type>war</type>
@@ -72,7 +72,7 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>org.wso2.carbon.devicemgt</groupId>
-                                    <artifactId>org.wso2.carbon.device.application.mgt.store.api
+                                    <artifactId>io.entgra.application.mgt.store.api
                                     </artifactId>
                                     <version>${project.version}</version>
                                     <type>war</type>
@@ -95,7 +95,7 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>org.wso2.carbon.devicemgt</groupId>
-                                    <artifactId>org.wso2.carbon.device.application.mgt.api
+                                    <artifactId>io.entgra.application.mgt.api
                                     </artifactId>
                                     <version>${project.version}</version>
                                     <type>war</type>
@@ -146,7 +146,7 @@
                             <goal>p2-feature-gen</goal>
                         </goals>
                         <configuration>
-                            <id>org.wso2.carbon.device.application.mgt.api</id>
+                            <id>io.entgra.application.mgt.api</id>
                             <propertiesFile>../../../features/etc/feature.properties
                             </propertiesFile>
                             <adviceFile>

features/application-mgt/io.entgra.application.mgt.api.feature/src/main/resources/p2.inf

@@ -0,0 +1,5 @@
+instructions.configure = \
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.application.mgt.api_${feature.version}/webapps/api#application-mgt-publisher#v1.0.war,target:${installFolder}/../../deployment/server/webapps/api#application-mgt-publisher#v1.0.war,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.application.mgt.api_${feature.version}/webapps/api#application-mgt-store#v1.0.war,target:${installFolder}/../../deployment/server/webapps/api#application-mgt-store#v1.0.war,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.application.mgt.api_${feature.version}/webapps/api#application-mgt#v1.0.war,target:${installFolder}/../../deployment/server/webapps/api#application-mgt#v1.0.war,overwrite:true);\

features/application-mgt/io.entgra.application.mgt.server.feature/pom.xml

@@ -27,10 +27,10 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.device.application.mgt.server.feature</artifactId>
+    <artifactId>io.entgra.application.mgt.server.feature</artifactId>
     <packaging>pom</packaging>
 
-    <name>WSO2 Carbon - Application Management Server Feature</name>
+    <name>Entgra - Application Management Server Feature</name>
     <url>https://entgra.io</url>
     <description>This feature contains the core bundles required for Back-end Application Management functionality
     </description>
@@ -38,11 +38,11 @@
     <dependencies>
         <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>org.wso2.carbon.devicemgt</groupId>
-            <artifactId>org.wso2.carbon.device.application.mgt.core</artifactId>
+            <artifactId>io.entgra.application.mgt.core</artifactId>
         </dependency>
         <dependency>
             <groupId>com.googlecode.plist</groupId>
@@ -63,25 +63,6 @@
             <groupId>com.h2database.wso2</groupId>
             <artifactId>h2-database-engine</artifactId>
         </dependency>
-
-        <!--<dependency>-->
-            <!--<groupId>javax.servlet.jsp</groupId>-->
-            <!--<artifactId>javax.servlet.jsp-api</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.wso2.orbit.org.scannotation</groupId>-->
-            <!--<artifactId>scannotation</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.wso2.carbon.devicemgt</groupId>-->
-            <!--<artifactId>org.wso2.carbon.device.application.mgt.api.feature</artifactId>-->
-            <!--<type>zip</type>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.wso2.carbon.devicemgt</groupId>-->
-            <!--<artifactId>org.wso2.carbon.device.application.mgt.auth.handler.feature</artifactId>-->
-            <!--<type>zip</type>-->
-        <!--</dependency>-->
     </dependencies>
 
     <build>
@@ -156,7 +137,7 @@
                             <goal>p2-feature-gen</goal>
                         </goals>
                         <configuration>
-                            <id>org.wso2.carbon.device.application.mgt.server</id>
+                            <id>io.entgra.application.mgt.server</id>
                             <propertiesFile>../../../features/etc/feature.properties</propertiesFile>
                             <adviceFile>
                                 <properties>
@@ -164,16 +145,12 @@
                                     <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef>
                                 </properties>
                             </adviceFile>
-                            <!--<includedFeatures>-->
-                                <!--<includedFeatureDef>org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.api.feature:${carbon.device.mgt.version}</includedFeatureDef>-->
-                                <!--<includedFeatureDef>org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.auth.handler.feature:${carbon.device.mgt.version}</includedFeatureDef>-->
-                            <!--</includedFeatures>-->
                             <bundles>
                                 <bundleDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.common:${carbon.device.mgt.version}
+                                    org.wso2.carbon.devicemgt:io.entgra.application.mgt.common:${carbon.device.mgt.version}
                                 </bundleDef>
                                 <bundleDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.core:${carbon.device.mgt.version}
+                                    org.wso2.carbon.devicemgt:io.entgra.application.mgt.core:${carbon.device.mgt.version}
                                 </bundleDef>
                                 <bundleDef>
                                     com.googlecode.plist:dd-plist:${googlecode.plist.version}
@@ -181,17 +158,9 @@
                                 <bundleDef>
                                     commons-validator:commons-validator:${commons-validator.version}
                                 </bundleDef>
-                                <!--<bundleDef>-->
-                                    <!--org.apache.cxf:cxf-rt-frontend-jaxrs:${cxf.version}-->
-                                <!--</bundleDef>-->
-                                <!--<bundleDef>javax.servlet.jsp:javax.servlet.jsp-api</bundleDef>-->
-                                <!--<bundleDef>org.wso2.orbit.org.scannotation:scannotation:${scannotation.version}</bundleDef>-->
                             </bundles>
                             <importBundles>
                             </importBundles>
-                            <!--<importFeatures>-->
-                                <!--<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}</importFeatureDef>-->
-                            <!--</importFeatures>-->
                         </configuration>
                     </execution>
                 </executions>

features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/conf_templates/templates/repository/conf/application-mgt.xml.j2

@@ -26,28 +26,28 @@
         {% if application_mgt_conf.extension.application_manager is defined %}
             <ClassName>{{application_mgt_conf.extension.application_manager}}</ClassName>
         {% else %}
-            <ClassName>org.wso2.carbon.device.application.mgt.core.impl.ApplicationManagerImpl</ClassName>
+            <ClassName>io.entgra.application.mgt.core.impl.ApplicationManagerImpl</ClassName>
         {% endif %}
         </Extension>
         <Extension name="ReviewManager">
         {% if application_mgt_conf.extension.review_manager is defined %}
             <ClassName>{{application_mgt_conf.extension.review_manager}}</ClassName>
         {% else %}
-            <ClassName>org.wso2.carbon.device.application.mgt.core.impl.ReviewManagerImpl</ClassName>
+            <ClassName>io.entgra.application.mgt.core.impl.ReviewManagerImpl</ClassName>
         {% endif %}
         </Extension>
         <Extension name="LifecycleStateManager">
         {% if application_mgt_conf.extension.life_cycle_state_manager is defined %}
             <ClassName>{{application_mgt_conf.extension.life_cycle_state_manager}}</ClassName>
         {% else %}
-            <ClassName>org.wso2.carbon.device.application.mgt.core.lifecycle.LifecycleStateManager</ClassName>
+            <ClassName>io.entgra.application.mgt.core.lifecycle.LifecycleStateManager</ClassName>
         {% endif %}
         </Extension>
         <Extension name="SubscriptionManager">
          {% if application_mgt_conf.extension.subscription_manager is defined %}
             <ClassName>{{application_mgt_conf.extension.subscription_manager}}</ClassName>
          {% else %}
-            <ClassName>org.wso2.carbon.device.application.mgt.core.impl.SubscriptionManagerImpl</ClassName>
+            <ClassName>io.entgra.application.mgt.core.impl.SubscriptionManagerImpl</ClassName>
          {% endif %}
         </Extension>
         <Extension name="ApplicationStorageManager">
@@ -61,7 +61,7 @@
             </Parameters>
             {% endif %}
          {% else %}
-            <ClassName>org.wso2.carbon.device.application.mgt.core.impl.ApplicationStorageManagerImpl</ClassName>
+            <ClassName>io.entgra.application.mgt.core.impl.ApplicationStorageManagerImpl</ClassName>
             <Parameters>
                 <Parameter name="StoragePath">repository/resources/apps/</Parameter>
                 <Parameter name="MaxScreenShotCount">6</Parameter>

features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/p2.inf

@@ -0,0 +1,10 @@
+instructions.configure = \
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.application.mgt.server_${feature.version}/database/,target:${installFolder}/../../../repository/database/,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.application.mgt.server_${feature.version}/conf/application-mgt.xml,target:${installFolder}/../../conf/application-mgt.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.application.mgt.server_${feature.version}/conf/datasources/application-mgt-datasources.xml,target:${installFolder}/../../conf/datasources/application-mgt-datasources.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.application.mgt.server_${feature.version}/dbscripts/cdm/application-mgt,target:${installFolder}/../../../dbscripts/cdm/application-mgt,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.application.mgt.server_${feature.version}/conf_templates/,target:${installFolder}/../../resources/conf/,overwrite:true);\
+
+instructions.unconfigure = \
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../conf/datasources/application-mgt-datasources.xml);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../dbscripts/cdm/application-mgt);\

features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/src/main/resources/p2.inf

@@ -1,5 +0,0 @@
-instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.application.mgt.api_${feature.version}/webapps/api#application-mgt-publisher#v1.0.war,target:${installFolder}/../../deployment/server/webapps/api#application-mgt-publisher#v1.0.war,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.application.mgt.api_${feature.version}/webapps/api#application-mgt-store#v1.0.war,target:${installFolder}/../../deployment/server/webapps/api#application-mgt-store#v1.0.war,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.application.mgt.api_${feature.version}/webapps/api#application-mgt#v1.0.war,target:${installFolder}/../../deployment/server/webapps/api#application-mgt#v1.0.war,overwrite:true);\

features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/p2.inf

@@ -1,10 +0,0 @@
-instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.application.mgt.server_${feature.version}/database/,target:${installFolder}/../../../repository/database/,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.application.mgt.server_${feature.version}/conf/application-mgt.xml,target:${installFolder}/../../conf/application-mgt.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.application.mgt.server_${feature.version}/conf/datasources/application-mgt-datasources.xml,target:${installFolder}/../../conf/datasources/application-mgt-datasources.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.application.mgt.server_${feature.version}/dbscripts/cdm/application-mgt,target:${installFolder}/../../../dbscripts/cdm/application-mgt,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.application.mgt.server_${feature.version}/conf_templates/,target:${installFolder}/../../resources/conf/,overwrite:true);\
-
-instructions.unconfigure = \
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../conf/datasources/application-mgt-datasources.xml);\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../dbscripts/cdm/application-mgt);\

features/application-mgt/pom.xml

@@ -33,7 +33,7 @@
     <url>https://entgra.io</url>
 
     <modules>
-        <module>org.wso2.carbon.device.application.mgt.api.feature</module>
+        <module>io.entgra.application.mgt.api.feature</module>
-        <module>org.wso2.carbon.device.application.mgt.server.feature</module>
+        <module>io.entgra.application.mgt.server.feature</module>
     </modules>
 </project>

pom.xml

@@ -175,44 +175,44 @@
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt</groupId>
-                <artifactId>org.wso2.carbon.device.application.mgt.addons</artifactId>
+                <artifactId>io.entgra.application.mgt.addons</artifactId>
-                <version>${carbon.device.mgt.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon.devicemgt</groupId>
-                <artifactId>org.wso2.carbon.device.application.mgt.authhandler</artifactId>
-                <version>${carbon.device.mgt.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon.devicemgt</groupId>
-                <artifactId>org.wso2.carbon.device.application.mgt.core</artifactId>
-                <version>${carbon.device.mgt.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon.devicemgt</groupId>
-                <artifactId>org.wso2.carbon.device.application.mgt.common</artifactId>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
+            <!--<dependency>-->
+                <!--<groupId>org.wso2.carbon.devicemgt</groupId>-->
+                <!--<artifactId>io.entgra.application.mgt.authhandler</artifactId>-->
+                <!--<version>${carbon.device.mgt.version}</version>-->
+            <!--</dependency>-->
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt</groupId>
-                <artifactId>org.wso2.carbon.device.application.mgt.publisher.api</artifactId>
+                <artifactId>io.entgra.application.mgt.core</artifactId>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt</groupId>
-                <artifactId>org.wso2.carbon.device.application.mgt.store.api</artifactId>
+                <artifactId>io.entgra.application.mgt.common</artifactId>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt</groupId>
-                <artifactId>org.wso2.carbon.device.application.mgt.publisher.ui</artifactId>
+                <artifactId>io.entgra.application.mgt.publisher.api</artifactId>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt</groupId>
-                <artifactId>org.wso2.carbon.device.application.mgt.store.ui</artifactId>
+                <artifactId>io.entgra.application.mgt.store.api</artifactId>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
+            <!--<dependency>-->
+                <!--<groupId>org.wso2.carbon.devicemgt</groupId>-->
+                <!--<artifactId>io.entgra.application.mgt.publisher.ui</artifactId>-->
+                <!--<version>${carbon.device.mgt.version}</version>-->
+            <!--</dependency>-->
+            <!--<dependency>-->
+                <!--<groupId>org.wso2.carbon.devicemgt</groupId>-->
+                <!--<artifactId>io.entgra.application.mgt.store.ui</artifactId>-->
+                <!--<version>${carbon.device.mgt.version}</version>-->
+            <!--</dependency>-->
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt</groupId>
                 <artifactId>org.wso2.carbon.policy.mgt.common</artifactId>
@@ -304,46 +304,46 @@
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt</groupId>
-                <artifactId>org.wso2.carbon.device.application.mgt.server.feature</artifactId>
+                <artifactId>io.entgra.application.mgt.server.feature</artifactId>
-                <type>zip</type>
-                <version>${carbon.device.mgt.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon.devicemgt</groupId>
-                <artifactId>org.wso2.carbon.device.application.mgt.extensions.feature</artifactId>
-                <type>zip</type>
-                <version>${carbon.device.mgt.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon.devicemgt</groupId>
-                <artifactId>org.wso2.carbon.device.application.mgt.api.feature</artifactId>
-                <type>zip</type>
-                <version>${carbon.device.mgt.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon.devicemgt</groupId>
-                <artifactId>org.wso2.carbon.device.application.mgt.auth.handler.feature</artifactId>
-                <type>zip</type>
-                <version>${carbon.device.mgt.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon.devicemgt</groupId>
-                <artifactId>org.wso2.carbon.device.application.mgt.publisher.ui.feature</artifactId>
-                <type>zip</type>
-                <version>${carbon.device.mgt.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon.devicemgt</groupId>
-                <artifactId>org.wso2.carbon.device.application.mgt.store.ui.feature</artifactId>
                 <type>zip</type>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
+            <!--<dependency>-->
+                <!--<groupId>org.wso2.carbon.devicemgt</groupId>-->
+                <!--<artifactId>io.entgra.application.mgt.extensions.feature</artifactId>-->
+                <!--<type>zip</type>-->
+                <!--<version>${carbon.device.mgt.version}</version>-->
+            <!--</dependency>-->
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt</groupId>
-                <artifactId>org.wso2.carbon.device.application.mgt.feature</artifactId>
+                <artifactId>io.entgra.application.mgt.api.feature</artifactId>
                 <type>zip</type>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
+            <!--<dependency>-->
+                <!--<groupId>org.wso2.carbon.devicemgt</groupId>-->
+                <!--<artifactId>io.entgra.application.mgt.auth.handler.feature</artifactId>-->
+                <!--<type>zip</type>-->
+                <!--<version>${carbon.device.mgt.version}</version>-->
+            <!--</dependency>-->
+            <!--<dependency>-->
+                <!--<groupId>org.wso2.carbon.devicemgt</groupId>-->
+                <!--<artifactId>io.entgra.application.mgt.publisher.ui.feature</artifactId>-->
+                <!--<type>zip</type>-->
+                <!--<version>${carbon.device.mgt.version}</version>-->
+            <!--</dependency>-->
+            <!--<dependency>-->
+                <!--<groupId>org.wso2.carbon.devicemgt</groupId>-->
+                <!--<artifactId>io.entgra.application.mgt.store.ui.feature</artifactId>-->
+                <!--<type>zip</type>-->
+                <!--<version>${carbon.device.mgt.version}</version>-->
+            <!--</dependency>-->
+            <!--<dependency>-->
+                <!--<groupId>org.wso2.carbon.devicemgt</groupId>-->
+                <!--<artifactId>io.entgra.application.mgt.feature</artifactId>-->
+                <!--<type>zip</type>-->
+                <!--<version>${carbon.device.mgt.version}</version>-->
+            <!--</dependency>-->
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt</groupId>
                 <artifactId>io.entgra.server.bootup.heartbeat.beacon</artifactId>