From 4503ab77c7c7e1be85783e151b0c82a0137b36f0 Mon Sep 17 00:00:00 2001 From: Amalka Subasinghe Date: Tue, 10 Aug 2021 17:30:48 +0530 Subject: [PATCH] package name change - appmgt --- .../io.entgra.application.mgt.addons/pom.xml | 2 +- .../mgt/addons/FileStreamingOutput.java | 2 +- .../io.entgra.application.mgt.api/pom.xml | 6 +- .../mgt/api/services/ArtifactDownloadAPI.java | 4 +- .../src/main/webapp/WEB-INF/cxf-servlet.xml | 2 +- .../common/dto/ScheduledSubscriptionDTO.java | 2 +- .../common/services/SubscriptionManager.java | 6 +- .../io.entgra.application.mgt.core/pom.xml | 4 +- .../mgt/core/dao/ApplicationDAO.java | 2 +- .../mgt/core/dao/ApplicationReleaseDAO.java | 2 +- .../mgt/core/dao/LifecycleStateDAO.java | 2 +- .../application/mgt/core/dao/ReviewDAO.java | 2 +- .../mgt/core/dao/SubscriptionDAO.java | 2 +- .../GenericApplicationDAOImpl.java | 4 +- .../application/OracleApplicationDAOImpl.java | 2 +- .../SQLServerApplicationDAOImpl.java | 2 +- .../GenericApplicationReleaseDAOImpl.java | 2 +- .../GenericLifecycleStateDAOImpl.java | 4 +- .../dao/impl/review/GenericReviewDAOImpl.java | 2 +- .../dao/impl/review/OracleReviewDAOImpl.java | 2 +- .../impl/review/SQLServerReviewDAOImpl.java | 2 +- .../GenericSubscriptionDAOImpl.java | 6 +- .../mgt/core/impl/ApplicationManagerImpl.java | 20 ++-- .../impl/ApplicationStorageManagerImpl.java | 4 +- .../mgt/core/impl/ReviewManagerImpl.java | 8 +- .../core/impl/SubscriptionManagerImpl.java | 18 +-- .../task/ScheduledAppSubscriptionTask.java | 4 +- .../ScheduledAppSubscriptionTaskManager.java | 4 +- .../application/mgt/core/util/APIUtil.java | 4 +- .../application/mgt/core/util/DAOUtil.java | 4 +- .../mgt/core/util/StorageManagementUtil.java | 2 +- .../application/mgt/core/BaseTestCase.java | 2 +- .../dao/ApplicationManagementDAOTest.java | 4 +- .../management/ApplicationManagementTest.java | 4 +- .../pom.xml | 6 +- .../ApplicationManagementPublisherAPI.java | 8 +- ...pplicationManagementPublisherAdminAPI.java | 4 +- .../ReviewManagementPublisherAdminAPI.java | 4 +- ...ApplicationManagementPublisherAPIImpl.java | 4 +- ...ReviewManagementPublisherAdminAPIImpl.java | 6 +- .../src/main/webapp/WEB-INF/cxf-servlet.xml | 2 +- .../pom.xml | 6 +- .../services/ApplicationManagementAPI.java | 6 +- .../api/services/ReviewManagementAPI.java | 4 +- .../services/SubscriptionManagementAPI.java | 2 +- .../admin/ReviewManagementStoreAdminAPI.java | 2 +- .../admin/SubscriptionManagementAdminAPI.java | 2 +- .../impl/ApplicationManagementAPIImpl.java | 4 +- .../impl/ReviewManagementAPIImpl.java | 6 +- .../impl/SubscriptionManagementAPIImpl.java | 22 ++-- .../ReviewManagementStoreAdminAPIImpl.java | 0 .../SubscriptionManagementAdminAPIImpl.java | 0 .../impl/util/RequestValidationUtil.java | 0 .../mgt/store/api/util/Constants.java | 0 .../src/main/webapp/META-INF/permissions.xml | 0 .../webapp/META-INF/webapp-classloading.xml | 0 .../src/main/webapp/WEB-INF/cxf-servlet.xml | 2 +- .../src/main/webapp/WEB-INF/web.xml | 0 .../api/services/CommentMgtTestHelper.java | 0 .../api/services/ReviewManagementAPITest.java | 2 +- .../src/test/resources/log4j.properties | 0 .../src/test/resources/testng.xml | 0 components/application-mgt/pom.xml | 12 +- .../pom.xml | 4 +- .../PullNotificationServiceComponent.java | 2 +- .../pom.xml | 4 +- .../org.wso2.carbon.device.mgt.api/pom.xml | 4 +- .../impl/DeviceManagementServiceImpl.java | 4 +- .../pom.xml | 2 +- .../io.entgra.ui.request.interceptor/pom.xml | 2 +- .../pom.xml | 12 +- .../src/main/resources/build.properties | 0 .../src/main/resources/p2.inf | 5 + .../pom.xml | 45 ++------ .../src/main/resources/build.properties | 0 .../main/resources/conf/application-mgt.xml | 0 .../application-mgt-datasources.xml | 0 .../repository/conf/application-mgt.xml.j2 | 10 +- .../application-mgt-datasources.xml.j2 | 0 .../dbscripts/cdm/application-mgt/h2.sql | 0 .../dbscripts/cdm/application-mgt/mssql.sql | 0 .../dbscripts/cdm/application-mgt/mysql.sql | 0 .../dbscripts/cdm/application-mgt/oracle.sql | 0 .../cdm/application-mgt/postgresql.sql | 0 .../src/main/resources/p2.inf | 10 ++ .../src/main/resources/p2.inf | 5 - .../src/main/resources/p2.inf | 10 -- features/application-mgt/pom.xml | 4 +- pom.xml | 104 +++++++++--------- 89 files changed, 221 insertions(+), 252 deletions(-) rename components/application-mgt/{io.entgra.application.store.api => io.entgra.application.mgt.store.api}/pom.xml (97%) rename components/application-mgt/{io.entgra.application.store.api => io.entgra.application.mgt.store.api}/src/main/java/io/entgra/application/mgt/store/api/services/ApplicationManagementAPI.java (96%) rename components/application-mgt/{io.entgra.application.store.api => io.entgra.application.mgt.store.api}/src/main/java/io/entgra/application/mgt/store/api/services/ReviewManagementAPI.java (99%) rename components/application-mgt/{io.entgra.application.store.api => io.entgra.application.mgt.store.api}/src/main/java/io/entgra/application/mgt/store/api/services/SubscriptionManagementAPI.java (99%) rename components/application-mgt/{io.entgra.application.store.api => io.entgra.application.mgt.store.api}/src/main/java/io/entgra/application/mgt/store/api/services/admin/ReviewManagementStoreAdminAPI.java (98%) rename components/application-mgt/{io.entgra.application.store.api => io.entgra.application.mgt.store.api}/src/main/java/io/entgra/application/mgt/store/api/services/admin/SubscriptionManagementAdminAPI.java (98%) rename components/application-mgt/{io.entgra.application.store.api => io.entgra.application.mgt.store.api}/src/main/java/io/entgra/application/mgt/store/api/services/impl/ApplicationManagementAPIImpl.java (97%) rename components/application-mgt/{io.entgra.application.store.api => io.entgra.application.mgt.store.api}/src/main/java/io/entgra/application/mgt/store/api/services/impl/ReviewManagementAPIImpl.java (98%) rename components/application-mgt/{io.entgra.application.store.api => io.entgra.application.mgt.store.api}/src/main/java/io/entgra/application/mgt/store/api/services/impl/SubscriptionManagementAPIImpl.java (96%) rename components/application-mgt/{io.entgra.application.store.api => io.entgra.application.mgt.store.api}/src/main/java/io/entgra/application/mgt/store/api/services/impl/admin/ReviewManagementStoreAdminAPIImpl.java (100%) rename components/application-mgt/{io.entgra.application.store.api => io.entgra.application.mgt.store.api}/src/main/java/io/entgra/application/mgt/store/api/services/impl/admin/SubscriptionManagementAdminAPIImpl.java (100%) rename components/application-mgt/{io.entgra.application.store.api => io.entgra.application.mgt.store.api}/src/main/java/io/entgra/application/mgt/store/api/services/impl/util/RequestValidationUtil.java (100%) rename components/application-mgt/{io.entgra.application.store.api => io.entgra.application.mgt.store.api}/src/main/java/io/entgra/application/mgt/store/api/util/Constants.java (100%) rename components/application-mgt/{io.entgra.application.store.api => io.entgra.application.mgt.store.api}/src/main/webapp/META-INF/permissions.xml (100%) rename components/application-mgt/{io.entgra.application.store.api => io.entgra.application.mgt.store.api}/src/main/webapp/META-INF/webapp-classloading.xml (100%) rename components/application-mgt/{io.entgra.application.store.api => io.entgra.application.mgt.store.api}/src/main/webapp/WEB-INF/cxf-servlet.xml (96%) rename components/application-mgt/{io.entgra.application.store.api => io.entgra.application.mgt.store.api}/src/main/webapp/WEB-INF/web.xml (100%) rename components/application-mgt/{io.entgra.application.store.api => io.entgra.application.mgt.store.api}/src/test/java/io/entgra/application/mgt/store/api/services/CommentMgtTestHelper.java (100%) rename components/application-mgt/{io.entgra.application.store.api => io.entgra.application.mgt.store.api}/src/test/java/io/entgra/application/mgt/store/api/services/ReviewManagementAPITest.java (99%) rename components/application-mgt/{io.entgra.application.store.api => io.entgra.application.mgt.store.api}/src/test/resources/log4j.properties (100%) rename components/application-mgt/{io.entgra.application.store.api => io.entgra.application.mgt.store.api}/src/test/resources/testng.xml (100%) rename features/application-mgt/{org.wso2.carbon.device.application.mgt.api.feature => io.entgra.application.mgt.api.feature}/pom.xml (93%) rename features/application-mgt/{org.wso2.carbon.device.application.mgt.api.feature => io.entgra.application.mgt.api.feature}/src/main/resources/build.properties (100%) create mode 100644 features/application-mgt/io.entgra.application.mgt.api.feature/src/main/resources/p2.inf rename features/application-mgt/{org.wso2.carbon.device.application.mgt.server.feature => io.entgra.application.mgt.server.feature}/pom.xml (73%) rename features/application-mgt/{org.wso2.carbon.device.application.mgt.server.feature => io.entgra.application.mgt.server.feature}/src/main/resources/build.properties (100%) rename features/application-mgt/{org.wso2.carbon.device.application.mgt.server.feature => io.entgra.application.mgt.server.feature}/src/main/resources/conf/application-mgt.xml (100%) rename features/application-mgt/{org.wso2.carbon.device.application.mgt.server.feature => io.entgra.application.mgt.server.feature}/src/main/resources/conf/datasources/application-mgt-datasources.xml (100%) rename features/application-mgt/{org.wso2.carbon.device.application.mgt.server.feature => io.entgra.application.mgt.server.feature}/src/main/resources/conf_templates/templates/repository/conf/application-mgt.xml.j2 (94%) rename features/application-mgt/{org.wso2.carbon.device.application.mgt.server.feature => io.entgra.application.mgt.server.feature}/src/main/resources/conf_templates/templates/repository/conf/datasources/application-mgt-datasources.xml.j2 (100%) rename features/application-mgt/{org.wso2.carbon.device.application.mgt.server.feature => io.entgra.application.mgt.server.feature}/src/main/resources/dbscripts/cdm/application-mgt/h2.sql (100%) rename features/application-mgt/{org.wso2.carbon.device.application.mgt.server.feature => io.entgra.application.mgt.server.feature}/src/main/resources/dbscripts/cdm/application-mgt/mssql.sql (100%) rename features/application-mgt/{org.wso2.carbon.device.application.mgt.server.feature => io.entgra.application.mgt.server.feature}/src/main/resources/dbscripts/cdm/application-mgt/mysql.sql (100%) rename features/application-mgt/{org.wso2.carbon.device.application.mgt.server.feature => io.entgra.application.mgt.server.feature}/src/main/resources/dbscripts/cdm/application-mgt/oracle.sql (100%) rename features/application-mgt/{org.wso2.carbon.device.application.mgt.server.feature => io.entgra.application.mgt.server.feature}/src/main/resources/dbscripts/cdm/application-mgt/postgresql.sql (100%) create mode 100644 features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/p2.inf delete mode 100644 features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/src/main/resources/p2.inf delete mode 100644 features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/p2.inf diff --git a/components/application-mgt/io.entgra.application.mgt.addons/pom.xml b/components/application-mgt/io.entgra.application.mgt.addons/pom.xml index 06a97f01aa..59c2e6dbba 100644 --- a/components/application-mgt/io.entgra.application.mgt.addons/pom.xml +++ b/components/application-mgt/io.entgra.application.mgt.addons/pom.xml @@ -112,7 +112,7 @@ org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.common + io.entgra.application.mgt.common javax.servlet diff --git a/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/FileStreamingOutput.java b/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/FileStreamingOutput.java index cf477e58c9..3012adf008 100644 --- a/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/FileStreamingOutput.java +++ b/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; diff --git a/components/application-mgt/io.entgra.application.mgt.api/pom.xml b/components/application-mgt/io.entgra.application.mgt.api/pom.xml index a4cda82b78..9ce26dac9f 100644 --- a/components/application-mgt/io.entgra.application.mgt.api/pom.xml +++ b/components/application-mgt/io.entgra.application.mgt.api/pom.xml @@ -154,12 +154,12 @@ org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.core + io.entgra.application.mgt.core provided org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.common + io.entgra.application.mgt.common provided @@ -218,7 +218,7 @@ org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.addons + io.entgra.application.mgt.addons \ No newline at end of file diff --git a/components/application-mgt/io.entgra.application.mgt.api/src/main/java/io/entgra/application/mgt/api/services/ArtifactDownloadAPI.java b/components/application-mgt/io.entgra.application.mgt.api/src/main/java/io/entgra/application/mgt/api/services/ArtifactDownloadAPI.java index ca46ae679e..2698811f7a 100644 --- a/components/application-mgt/io.entgra.application.mgt.api/src/main/java/io/entgra/application/mgt/api/services/ArtifactDownloadAPI.java +++ b/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 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; diff --git a/components/application-mgt/io.entgra.application.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml b/components/application-mgt/io.entgra.application.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml index 69b6816220..8b0e0c94ad 100644 --- a/components/application-mgt/io.entgra.application.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml +++ b/components/application-mgt/io.entgra.application.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml @@ -48,7 +48,7 @@ - + diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ScheduledSubscriptionDTO.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ScheduledSubscriptionDTO.java index ac2277a02d..59ad166e80 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ScheduledSubscriptionDTO.java +++ b/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 __} * {@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} diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/SubscriptionManager.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/SubscriptionManager.java index 8f945844c2..068a6900fc 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/SubscriptionManager.java +++ b/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 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 */ ApplicationInstallResponse performBulkAppOperation(String applicationUUID, List 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}} */ void performEntAppSubscription(String applicationUUID, List params, String subType, String action, boolean requiresUpdatingExternal) throws ApplicationManagementException; diff --git a/components/application-mgt/io.entgra.application.mgt.core/pom.xml b/components/application-mgt/io.entgra.application.mgt.core/pom.xml index 5a1d9f5778..05104b8b57 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/pom.xml +++ b/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 @@ org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.common + io.entgra.application.mgt.common org.wso2.carbon.devicemgt diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/ApplicationDAO.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/ApplicationDAO.java index 6e9566721d..6ffa843e5a 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/ApplicationDAO.java +++ b/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; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/ApplicationReleaseDAO.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/ApplicationReleaseDAO.java index 48bc3bdc8d..0ac4824840 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/ApplicationReleaseDAO.java +++ b/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; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/LifecycleStateDAO.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/LifecycleStateDAO.java index 9f46d533e4..f56849263c 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/LifecycleStateDAO.java +++ b/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; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/ReviewDAO.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/ReviewDAO.java index 6d911fe914..488563987e 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/ReviewDAO.java +++ b/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; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/SubscriptionDAO.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/SubscriptionDAO.java index 6894c08caa..a84446d6a3 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/SubscriptionDAO.java +++ b/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; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/GenericApplicationDAOImpl.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/GenericApplicationDAOImpl.java index a8067fa86e..9fa9743590 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/GenericApplicationDAOImpl.java +++ b/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; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/OracleApplicationDAOImpl.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/OracleApplicationDAOImpl.java index cbd48bd45b..60e49f2a27 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/OracleApplicationDAOImpl.java +++ b/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; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/SQLServerApplicationDAOImpl.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/SQLServerApplicationDAOImpl.java index 9cce71c6e7..7420b9a057 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/SQLServerApplicationDAOImpl.java +++ b/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; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/release/GenericApplicationReleaseDAOImpl.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/release/GenericApplicationReleaseDAOImpl.java index e6e7bf8ead..11dbcf6c20 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/release/GenericApplicationReleaseDAOImpl.java +++ b/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; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/lifecyclestate/GenericLifecycleStateDAOImpl.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/lifecyclestate/GenericLifecycleStateDAOImpl.java index bf2b9288ec..83d1bdf79f 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/lifecyclestate/GenericLifecycleStateDAOImpl.java +++ b/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 org.wso2.carbon.device.application.mgt.common.LifecycleState; +import io.entgra.application.mgt.common.AppLifecycleState; +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; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/review/GenericReviewDAOImpl.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/review/GenericReviewDAOImpl.java index 7238b4d0a4..c5c5a0bfa0 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/review/GenericReviewDAOImpl.java +++ b/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; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/review/OracleReviewDAOImpl.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/review/OracleReviewDAOImpl.java index 3806c312c8..340b7204f4 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/review/OracleReviewDAOImpl.java +++ b/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; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/review/SQLServerReviewDAOImpl.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/review/SQLServerReviewDAOImpl.java index 0e17014319..0b0e45e6f3 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/review/SQLServerReviewDAOImpl.java +++ b/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; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/subscription/GenericSubscriptionDAOImpl.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/subscription/GenericSubscriptionDAOImpl.java index 092beb05c3..521981849d 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/subscription/GenericSubscriptionDAOImpl.java +++ b/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 org.wso2.carbon.device.application.mgt.common.SubAction; -import org.wso2.carbon.device.application.mgt.common.SubscriptionType; +import io.entgra.application.mgt.common.ExecutionStatus; +import io.entgra.application.mgt.common.SubAction; +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; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/impl/ApplicationManagerImpl.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/impl/ApplicationManagerImpl.java index badb4946c5..82405ee2fe 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/impl/ApplicationManagerImpl.java +++ b/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 org.wso2.carbon.device.application.mgt.common.ApplicationInstaller; -import org.wso2.carbon.device.application.mgt.common.DeviceTypes; -import org.wso2.carbon.device.application.mgt.common.LifecycleChanger; -import org.wso2.carbon.device.application.mgt.common.Pagination; +import io.entgra.application.mgt.common.ApplicationArtifact; +import io.entgra.application.mgt.common.ApplicationInstaller; +import io.entgra.application.mgt.common.DeviceTypes; +import io.entgra.application.mgt.common.LifecycleChanger; +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 org.wso2.carbon.device.application.mgt.common.ApplicationType; +import io.entgra.application.mgt.common.ApplicationSubscriptionType; +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; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/impl/ApplicationStorageManagerImpl.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/impl/ApplicationStorageManagerImpl.java index 9e02ad2b9b..91e3f4579b 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/impl/ApplicationStorageManagerImpl.java +++ b/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; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/impl/ReviewManagerImpl.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/impl/ReviewManagerImpl.java index f468e2630a..69b6a2b21b 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/impl/ReviewManagerImpl.java +++ b/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 org.wso2.carbon.device.application.mgt.common.ReviewNode; -import org.wso2.carbon.device.application.mgt.common.PaginationRequest; -import org.wso2.carbon.device.application.mgt.common.PaginationResult; +import io.entgra.application.mgt.common.Rating; +import io.entgra.application.mgt.common.ReviewNode; +import io.entgra.application.mgt.common.PaginationRequest; +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; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/impl/SubscriptionManagerImpl.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/impl/SubscriptionManagerImpl.java index 73cc270e11..95cfbe48e0 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/impl/SubscriptionManagerImpl.java +++ b/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 org.wso2.carbon.device.application.mgt.common.ApplicationSubscriptionInfo; -import org.wso2.carbon.device.application.mgt.common.ApplicationType; -import org.wso2.carbon.device.application.mgt.common.DeviceSubscriptionData; -import org.wso2.carbon.device.application.mgt.common.DeviceTypes; -import org.wso2.carbon.device.application.mgt.common.ExecutionStatus; -import org.wso2.carbon.device.application.mgt.common.SubAction; -import org.wso2.carbon.device.application.mgt.common.SubscriptionType; -import org.wso2.carbon.device.application.mgt.common.SubscribingDeviceIdHolder; +import io.entgra.application.mgt.common.ApplicationInstallResponse; +import io.entgra.application.mgt.common.ApplicationSubscriptionInfo; +import io.entgra.application.mgt.common.ApplicationType; +import io.entgra.application.mgt.common.DeviceSubscriptionData; +import io.entgra.application.mgt.common.DeviceTypes; +import io.entgra.application.mgt.common.ExecutionStatus; +import io.entgra.application.mgt.common.SubAction; +import io.entgra.application.mgt.common.SubscriptionType; +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; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/task/ScheduledAppSubscriptionTask.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/task/ScheduledAppSubscriptionTask.java index 79c36c2e68..fc9b5b35cb 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/task/ScheduledAppSubscriptionTask.java +++ b/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 org.wso2.carbon.device.application.mgt.common.SubscriptionType; +import io.entgra.application.mgt.common.ExecutionStatus; +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; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/task/ScheduledAppSubscriptionTaskManager.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/task/ScheduledAppSubscriptionTaskManager.java index d414d366fe..932bbe626d 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/task/ScheduledAppSubscriptionTaskManager.java +++ b/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 org.wso2.carbon.device.application.mgt.common.SubscriptionType; +import io.entgra.application.mgt.common.SubAction; +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; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/APIUtil.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/APIUtil.java index d433051058..0afcc85ab5 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/APIUtil.java +++ b/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; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/DAOUtil.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/DAOUtil.java index f9fb0da0e8..012a289528 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/DAOUtil.java +++ b/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 org.wso2.carbon.device.application.mgt.common.SubscriptionType; +import io.entgra.application.mgt.common.ExecutionStatus; +import io.entgra.application.mgt.common.SubscriptionType; import io.entgra.application.mgt.common.dto.ApplicationDTO; import io.entgra.application.mgt.common.dto.ApplicationReleaseDTO; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/StorageManagementUtil.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/StorageManagementUtil.java index ee639406b7..f0819dbd80 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/StorageManagementUtil.java +++ b/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; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/BaseTestCase.java b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/BaseTestCase.java index f0a29efd96..fcb9a0dd3b 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/BaseTestCase.java +++ b/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 { diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/dao/ApplicationManagementDAOTest.java b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/dao/ApplicationManagementDAOTest.java index 106e1a08af..be76b9c0b7 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/dao/ApplicationManagementDAOTest.java +++ b/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 org.wso2.carbon.device.application.mgt.core.dto.DeviceTypeCreator; +import io.entgra.application.mgt.core.dto.ApplicationsDTO; +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; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/management/ApplicationManagementTest.java b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/management/ApplicationManagementTest.java index 4ff7e42c66..2652cbf714 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/management/ApplicationManagementTest.java +++ b/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; diff --git a/components/application-mgt/io.entgra.application.mgt.publisher.api/pom.xml b/components/application-mgt/io.entgra.application.mgt.publisher.api/pom.xml index 71fe89cfce..f7d8c05866 100644 --- a/components/application-mgt/io.entgra.application.mgt.publisher.api/pom.xml +++ b/components/application-mgt/io.entgra.application.mgt.publisher.api/pom.xml @@ -154,12 +154,12 @@ org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.core + io.entgra.application.mgt.core provided org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.common + io.entgra.application.mgt.common provided @@ -218,7 +218,7 @@ org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.addons + io.entgra.application.mgt.addons \ No newline at end of file diff --git a/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/ApplicationManagementPublisherAPI.java b/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/ApplicationManagementPublisherAPI.java index c9ab612a84..f82ce53f2d 100644 --- a/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/ApplicationManagementPublisherAPI.java +++ b/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 org.wso2.carbon.device.application.mgt.common.ErrorResponse; -import org.wso2.carbon.device.application.mgt.common.Filter; -import org.wso2.carbon.device.application.mgt.common.LifecycleChanger; +import io.entgra.application.mgt.common.ApplicationList; +import io.entgra.application.mgt.common.ErrorResponse; +import io.entgra.application.mgt.common.Filter; +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; diff --git a/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/admin/ApplicationManagementPublisherAdminAPI.java b/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/admin/ApplicationManagementPublisherAdminAPI.java index 3b9d653b1f..c3db07a21b 100644 --- a/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/admin/ApplicationManagementPublisherAdminAPI.java +++ b/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 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.Consumes; import javax.ws.rs.DELETE; diff --git a/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/admin/ReviewManagementPublisherAdminAPI.java b/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/admin/ReviewManagementPublisherAdminAPI.java index 0cbb416a71..6ae6cdbaeb 100644 --- a/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/admin/ReviewManagementPublisherAdminAPI.java +++ b/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 org.wso2.carbon.device.application.mgt.common.PaginationResult; +import io.entgra.application.mgt.common.ErrorResponse; +import io.entgra.application.mgt.common.PaginationResult; import javax.ws.rs.GET; import javax.ws.rs.Path; diff --git a/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/impl/ApplicationManagementPublisherAPIImpl.java b/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/impl/ApplicationManagementPublisherAPIImpl.java index c0126cf34e..f88c005fb1 100644 --- a/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/impl/ApplicationManagementPublisherAPIImpl.java +++ b/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 org.wso2.carbon.device.application.mgt.common.LifecycleState; +import io.entgra.application.mgt.common.*; +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; diff --git a/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/impl/admin/ReviewManagementPublisherAdminAPIImpl.java b/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/impl/admin/ReviewManagementPublisherAdminAPIImpl.java index 65b7f2e9ec..d6be1a9f89 100644 --- a/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/impl/admin/ReviewManagementPublisherAdminAPIImpl.java +++ b/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 org.wso2.carbon.device.application.mgt.common.PaginationResult; -import org.wso2.carbon.device.application.mgt.common.Rating; +import io.entgra.application.mgt.common.PaginationRequest; +import io.entgra.application.mgt.common.PaginationResult; +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; diff --git a/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/webapp/WEB-INF/cxf-servlet.xml b/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/webapp/WEB-INF/cxf-servlet.xml index 8314c023b3..47dcef91e1 100644 --- a/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/webapp/WEB-INF/cxf-servlet.xml +++ b/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/webapp/WEB-INF/cxf-servlet.xml @@ -50,7 +50,7 @@ - + diff --git a/components/application-mgt/io.entgra.application.store.api/pom.xml b/components/application-mgt/io.entgra.application.mgt.store.api/pom.xml similarity index 97% rename from components/application-mgt/io.entgra.application.store.api/pom.xml rename to components/application-mgt/io.entgra.application.mgt.store.api/pom.xml index ac60b1e26d..7fc3f3da7e 100644 --- a/components/application-mgt/io.entgra.application.store.api/pom.xml +++ b/components/application-mgt/io.entgra.application.mgt.store.api/pom.xml @@ -154,17 +154,17 @@ org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.core + io.entgra.application.mgt.core provided org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.common + io.entgra.application.mgt.common provided org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.addons + io.entgra.application.mgt.addons org.wso2.carbon.devicemgt diff --git a/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/ApplicationManagementAPI.java b/components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/ApplicationManagementAPI.java similarity index 96% rename from components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/ApplicationManagementAPI.java rename to components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/ApplicationManagementAPI.java index b2ccfbd810..eb11be7a40 100644 --- a/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/ApplicationManagementAPI.java +++ b/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 org.wso2.carbon.device.application.mgt.common.Filter; +import io.entgra.application.mgt.common.ErrorResponse; +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; diff --git a/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/ReviewManagementAPI.java b/components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/ReviewManagementAPI.java similarity index 99% rename from components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/ReviewManagementAPI.java rename to components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/ReviewManagementAPI.java index 55f0deed17..3f0cde85f0 100644 --- a/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/ReviewManagementAPI.java +++ b/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 org.wso2.carbon.device.application.mgt.common.ErrorResponse; +import io.entgra.application.mgt.common.PaginationResult; +import io.entgra.application.mgt.common.ErrorResponse; import io.entgra.application.mgt.common.response.Review; import io.entgra.application.mgt.common.wrapper.ReviewWrapper; diff --git a/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/SubscriptionManagementAPI.java b/components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/SubscriptionManagementAPI.java similarity index 99% rename from components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/SubscriptionManagementAPI.java rename to components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/SubscriptionManagementAPI.java index 26742db9f3..00866b508b 100644 --- a/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/SubscriptionManagementAPI.java +++ b/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; diff --git a/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/admin/ReviewManagementStoreAdminAPI.java b/components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/admin/ReviewManagementStoreAdminAPI.java similarity index 98% rename from components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/admin/ReviewManagementStoreAdminAPI.java rename to components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/admin/ReviewManagementStoreAdminAPI.java index 3cbd7ece80..7ab8cc071e 100644 --- a/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/admin/ReviewManagementStoreAdminAPI.java +++ b/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; diff --git a/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/admin/SubscriptionManagementAdminAPI.java b/components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/admin/SubscriptionManagementAdminAPI.java similarity index 98% rename from components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/admin/SubscriptionManagementAdminAPI.java rename to components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/admin/SubscriptionManagementAdminAPI.java index e7bd335817..fc7719bc63 100644 --- a/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/admin/SubscriptionManagementAdminAPI.java +++ b/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; diff --git a/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/ApplicationManagementAPIImpl.java b/components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/ApplicationManagementAPIImpl.java similarity index 97% rename from components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/ApplicationManagementAPIImpl.java rename to components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/ApplicationManagementAPIImpl.java index 05bf95d962..735df25c92 100644 --- a/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/ApplicationManagementAPIImpl.java +++ b/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 org.wso2.carbon.device.application.mgt.common.Filter; +import io.entgra.application.mgt.common.ApplicationList; +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; diff --git a/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/ReviewManagementAPIImpl.java b/components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/ReviewManagementAPIImpl.java similarity index 98% rename from components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/ReviewManagementAPIImpl.java rename to components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/ReviewManagementAPIImpl.java index 420679989c..8aa8b728af 100644 --- a/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/ReviewManagementAPIImpl.java +++ b/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 org.wso2.carbon.device.application.mgt.common.Rating; +import io.entgra.application.mgt.common.PaginationResult; +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; diff --git a/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/SubscriptionManagementAPIImpl.java b/components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/SubscriptionManagementAPIImpl.java similarity index 96% rename from components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/SubscriptionManagementAPIImpl.java rename to components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/SubscriptionManagementAPIImpl.java index b6bcc37f26..b64a9fad9b 100644 --- a/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/SubscriptionManagementAPIImpl.java +++ b/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 org.wso2.carbon.device.application.mgt.common.ErrorResponse; -import org.wso2.carbon.device.application.mgt.common.SubAction; -import org.wso2.carbon.device.application.mgt.common.SubscriptionType; +import io.entgra.application.mgt.common.ApplicationInstallResponse; +import io.entgra.application.mgt.common.ErrorResponse; +import io.entgra.application.mgt.common.SubAction; +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 org.wso2.carbon.device.application.mgt.common.BasicUserInfo; -import org.wso2.carbon.device.application.mgt.common.BasicUserInfoList; -import org.wso2.carbon.device.application.mgt.common.RoleList; -import org.wso2.carbon.device.application.mgt.common.DeviceGroupList; +import io.entgra.application.mgt.common.DeviceList; +import io.entgra.application.mgt.common.BasicUserInfo; +import io.entgra.application.mgt.common.BasicUserInfoList; +import io.entgra.application.mgt.common.RoleList; +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. DEVICE, USER, ROLE, GROUP - * {@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. INSTALL/UNINSTALL - * {@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 */ diff --git a/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/admin/ReviewManagementStoreAdminAPIImpl.java b/components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/admin/ReviewManagementStoreAdminAPIImpl.java similarity index 100% rename from components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/admin/ReviewManagementStoreAdminAPIImpl.java rename to components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/admin/ReviewManagementStoreAdminAPIImpl.java diff --git a/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/admin/SubscriptionManagementAdminAPIImpl.java b/components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/admin/SubscriptionManagementAdminAPIImpl.java similarity index 100% rename from components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/admin/SubscriptionManagementAdminAPIImpl.java rename to components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/admin/SubscriptionManagementAdminAPIImpl.java diff --git a/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/util/RequestValidationUtil.java b/components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/util/RequestValidationUtil.java similarity index 100% rename from components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/util/RequestValidationUtil.java rename to components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/util/RequestValidationUtil.java diff --git a/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/util/Constants.java b/components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/util/Constants.java similarity index 100% rename from components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/util/Constants.java rename to components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/util/Constants.java diff --git a/components/application-mgt/io.entgra.application.store.api/src/main/webapp/META-INF/permissions.xml b/components/application-mgt/io.entgra.application.mgt.store.api/src/main/webapp/META-INF/permissions.xml similarity index 100% rename from components/application-mgt/io.entgra.application.store.api/src/main/webapp/META-INF/permissions.xml rename to components/application-mgt/io.entgra.application.mgt.store.api/src/main/webapp/META-INF/permissions.xml diff --git a/components/application-mgt/io.entgra.application.store.api/src/main/webapp/META-INF/webapp-classloading.xml b/components/application-mgt/io.entgra.application.mgt.store.api/src/main/webapp/META-INF/webapp-classloading.xml similarity index 100% rename from components/application-mgt/io.entgra.application.store.api/src/main/webapp/META-INF/webapp-classloading.xml rename to components/application-mgt/io.entgra.application.mgt.store.api/src/main/webapp/META-INF/webapp-classloading.xml diff --git a/components/application-mgt/io.entgra.application.store.api/src/main/webapp/WEB-INF/cxf-servlet.xml b/components/application-mgt/io.entgra.application.mgt.store.api/src/main/webapp/WEB-INF/cxf-servlet.xml similarity index 96% rename from components/application-mgt/io.entgra.application.store.api/src/main/webapp/WEB-INF/cxf-servlet.xml rename to components/application-mgt/io.entgra.application.mgt.store.api/src/main/webapp/WEB-INF/cxf-servlet.xml index c7003a4fdb..47d03da598 100644 --- a/components/application-mgt/io.entgra.application.store.api/src/main/webapp/WEB-INF/cxf-servlet.xml +++ b/components/application-mgt/io.entgra.application.mgt.store.api/src/main/webapp/WEB-INF/cxf-servlet.xml @@ -51,7 +51,7 @@ - + diff --git a/components/application-mgt/io.entgra.application.store.api/src/main/webapp/WEB-INF/web.xml b/components/application-mgt/io.entgra.application.mgt.store.api/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from components/application-mgt/io.entgra.application.store.api/src/main/webapp/WEB-INF/web.xml rename to components/application-mgt/io.entgra.application.mgt.store.api/src/main/webapp/WEB-INF/web.xml diff --git a/components/application-mgt/io.entgra.application.store.api/src/test/java/io/entgra/application/mgt/store/api/services/CommentMgtTestHelper.java b/components/application-mgt/io.entgra.application.mgt.store.api/src/test/java/io/entgra/application/mgt/store/api/services/CommentMgtTestHelper.java similarity index 100% rename from components/application-mgt/io.entgra.application.store.api/src/test/java/io/entgra/application/mgt/store/api/services/CommentMgtTestHelper.java rename to components/application-mgt/io.entgra.application.mgt.store.api/src/test/java/io/entgra/application/mgt/store/api/services/CommentMgtTestHelper.java diff --git a/components/application-mgt/io.entgra.application.store.api/src/test/java/io/entgra/application/mgt/store/api/services/ReviewManagementAPITest.java b/components/application-mgt/io.entgra.application.mgt.store.api/src/test/java/io/entgra/application/mgt/store/api/services/ReviewManagementAPITest.java similarity index 99% rename from components/application-mgt/io.entgra.application.store.api/src/test/java/io/entgra/application/mgt/store/api/services/ReviewManagementAPITest.java rename to components/application-mgt/io.entgra.application.mgt.store.api/src/test/java/io/entgra/application/mgt/store/api/services/ReviewManagementAPITest.java index 432322ff11..52b6e5e051 100644 --- a/components/application-mgt/io.entgra.application.store.api/src/test/java/io/entgra/application/mgt/store/api/services/ReviewManagementAPITest.java +++ b/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 diff --git a/components/application-mgt/io.entgra.application.store.api/src/test/resources/log4j.properties b/components/application-mgt/io.entgra.application.mgt.store.api/src/test/resources/log4j.properties similarity index 100% rename from components/application-mgt/io.entgra.application.store.api/src/test/resources/log4j.properties rename to components/application-mgt/io.entgra.application.mgt.store.api/src/test/resources/log4j.properties diff --git a/components/application-mgt/io.entgra.application.store.api/src/test/resources/testng.xml b/components/application-mgt/io.entgra.application.mgt.store.api/src/test/resources/testng.xml similarity index 100% rename from components/application-mgt/io.entgra.application.store.api/src/test/resources/testng.xml rename to components/application-mgt/io.entgra.application.mgt.store.api/src/test/resources/testng.xml diff --git a/components/application-mgt/pom.xml b/components/application-mgt/pom.xml index 53a4256688..56489b2310 100644 --- a/components/application-mgt/pom.xml +++ b/components/application-mgt/pom.xml @@ -34,12 +34,12 @@ http://wso2.org - org.wso2.carbon.device.application.mgt.core - org.wso2.carbon.device.application.mgt.common - org.wso2.carbon.device.application.mgt.addons - org.wso2.carbon.device.application.mgt.publisher.api - org.wso2.carbon.device.application.mgt.store.api - org.wso2.carbon.device.application.mgt.api + io.entgra.application.mgt.common + io.entgra.application.mgt.core + io.entgra.application.mgt.addons + io.entgra.application.mgt.publisher.api + io.entgra.application.mgt.store.api + io.entgra.application.mgt.api diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.pull.notification/pom.xml b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.pull.notification/pom.xml index fd84b4cc62..00eeee8d19 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.pull.notification/pom.xml +++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.pull.notification/pom.xml @@ -56,7 +56,7 @@ org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.common + io.entgra.application.mgt.common provided @@ -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.* diff --git a/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 b/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 index 90f8db4004..b7b94c0199 100644 --- a/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 +++ b/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" diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/pom.xml b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/pom.xml index be7d732f59..b87fe21f8e 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/pom.xml +++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/pom.xml @@ -113,7 +113,7 @@ org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.common + io.entgra.application.mgt.common provided @@ -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.* diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml index 01c4ef7d00..d683786250 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml @@ -406,12 +406,12 @@ org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.common + io.entgra.application.mgt.common provided org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.core + io.entgra.application.mgt.core provided diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java index a538a641fd..5d039f27a6 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java +++ b/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 org.wso2.carbon.device.application.mgt.common.SubscriptionType; +import io.entgra.application.mgt.common.ApplicationInstallResponse; +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; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml index 3c17f25ec2..f98e8672e1 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml @@ -83,7 +83,7 @@ org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.common + io.entgra.application.mgt.common test diff --git a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/pom.xml b/components/ui-request-interceptor/io.entgra.ui.request.interceptor/pom.xml index 0fcf6eee7d..45fd0b296b 100644 --- a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/pom.xml +++ b/components/ui-request-interceptor/io.entgra.ui.request.interceptor/pom.xml @@ -144,7 +144,7 @@ org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.core + io.entgra.application.mgt.core provided diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/pom.xml b/features/application-mgt/io.entgra.application.mgt.api.feature/pom.xml similarity index 93% rename from features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/pom.xml rename to features/application-mgt/io.entgra.application.mgt.api.feature/pom.xml index 5bdf583f19..7897e9139b 100644 --- a/features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/pom.xml +++ b/features/application-mgt/io.entgra.application.mgt.api.feature/pom.xml @@ -27,9 +27,9 @@ 4.0.0 - org.wso2.carbon.device.application.mgt.api.feature + io.entgra.application.mgt.api.feature pom - WSO2 Carbon - Application Management API Feature + Entgra - Application Management API Feature https://entgra.io This feature contains the APIs required for Application Management console UI @@ -49,7 +49,7 @@ org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.publisher.api + io.entgra.application.mgt.publisher.api ${project.version} war @@ -72,7 +72,7 @@ org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.store.api + io.entgra.application.mgt.store.api ${project.version} war @@ -95,7 +95,7 @@ org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.api + io.entgra.application.mgt.api ${project.version} war @@ -146,7 +146,7 @@ p2-feature-gen - org.wso2.carbon.device.application.mgt.api + io.entgra.application.mgt.api ../../../features/etc/feature.properties diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/src/main/resources/build.properties b/features/application-mgt/io.entgra.application.mgt.api.feature/src/main/resources/build.properties similarity index 100% rename from features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/src/main/resources/build.properties rename to features/application-mgt/io.entgra.application.mgt.api.feature/src/main/resources/build.properties diff --git a/features/application-mgt/io.entgra.application.mgt.api.feature/src/main/resources/p2.inf b/features/application-mgt/io.entgra.application.mgt.api.feature/src/main/resources/p2.inf new file mode 100644 index 0000000000..cc35cf26a1 --- /dev/null +++ b/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);\ diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/pom.xml b/features/application-mgt/io.entgra.application.mgt.server.feature/pom.xml similarity index 73% rename from features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/pom.xml rename to features/application-mgt/io.entgra.application.mgt.server.feature/pom.xml index 66d0322843..76ce4d2f15 100644 --- a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/pom.xml +++ b/features/application-mgt/io.entgra.application.mgt.server.feature/pom.xml @@ -27,10 +27,10 @@ 4.0.0 - org.wso2.carbon.device.application.mgt.server.feature + io.entgra.application.mgt.server.feature pom - WSO2 Carbon - Application Management Server Feature + Entgra - Application Management Server Feature https://entgra.io This feature contains the core bundles required for Back-end Application Management functionality @@ -38,11 +38,11 @@ org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.common + io.entgra.application.mgt.common org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.core + io.entgra.application.mgt.core com.googlecode.plist @@ -63,25 +63,6 @@ com.h2database.wso2 h2-database-engine - - - - - - - - - - - - - - - - - - - @@ -156,7 +137,7 @@ p2-feature-gen - org.wso2.carbon.device.application.mgt.server + io.entgra.application.mgt.server ../../../features/etc/feature.properties @@ -164,16 +145,12 @@ org.eclipse.equinox.p2.type.group:false - - - - - 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} - 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} com.googlecode.plist:dd-plist:${googlecode.plist.version} @@ -181,17 +158,9 @@ commons-validator:commons-validator:${commons-validator.version} - - - - - - - - diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/build.properties b/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/build.properties similarity index 100% rename from features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/build.properties rename to features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/build.properties diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/conf/application-mgt.xml b/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/conf/application-mgt.xml similarity index 100% rename from features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/conf/application-mgt.xml rename to features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/conf/application-mgt.xml diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/conf/datasources/application-mgt-datasources.xml b/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/conf/datasources/application-mgt-datasources.xml similarity index 100% rename from features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/conf/datasources/application-mgt-datasources.xml rename to features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/conf/datasources/application-mgt-datasources.xml diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/conf_templates/templates/repository/conf/application-mgt.xml.j2 b/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/conf_templates/templates/repository/conf/application-mgt.xml.j2 similarity index 94% rename from features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/conf_templates/templates/repository/conf/application-mgt.xml.j2 rename to features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/conf_templates/templates/repository/conf/application-mgt.xml.j2 index 2550288629..21ce676f3f 100644 --- a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/conf_templates/templates/repository/conf/application-mgt.xml.j2 +++ b/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 %} {{application_mgt_conf.extension.application_manager}} {% else %} - org.wso2.carbon.device.application.mgt.core.impl.ApplicationManagerImpl + io.entgra.application.mgt.core.impl.ApplicationManagerImpl {% endif %} {% if application_mgt_conf.extension.review_manager is defined %} {{application_mgt_conf.extension.review_manager}} {% else %} - org.wso2.carbon.device.application.mgt.core.impl.ReviewManagerImpl + io.entgra.application.mgt.core.impl.ReviewManagerImpl {% endif %} {% if application_mgt_conf.extension.life_cycle_state_manager is defined %} {{application_mgt_conf.extension.life_cycle_state_manager}} {% else %} - org.wso2.carbon.device.application.mgt.core.lifecycle.LifecycleStateManager + io.entgra.application.mgt.core.lifecycle.LifecycleStateManager {% endif %} {% if application_mgt_conf.extension.subscription_manager is defined %} {{application_mgt_conf.extension.subscription_manager}} {% else %} - org.wso2.carbon.device.application.mgt.core.impl.SubscriptionManagerImpl + io.entgra.application.mgt.core.impl.SubscriptionManagerImpl {% endif %} @@ -61,7 +61,7 @@ {% endif %} {% else %} - org.wso2.carbon.device.application.mgt.core.impl.ApplicationStorageManagerImpl + io.entgra.application.mgt.core.impl.ApplicationStorageManagerImpl repository/resources/apps/ 6 diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/conf_templates/templates/repository/conf/datasources/application-mgt-datasources.xml.j2 b/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/conf_templates/templates/repository/conf/datasources/application-mgt-datasources.xml.j2 similarity index 100% rename from features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/conf_templates/templates/repository/conf/datasources/application-mgt-datasources.xml.j2 rename to features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/conf_templates/templates/repository/conf/datasources/application-mgt-datasources.xml.j2 diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/h2.sql b/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/h2.sql similarity index 100% rename from features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/h2.sql rename to features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/h2.sql diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mssql.sql b/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mssql.sql similarity index 100% rename from features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mssql.sql rename to features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mssql.sql diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mysql.sql b/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mysql.sql similarity index 100% rename from features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mysql.sql rename to features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mysql.sql diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/oracle.sql b/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/oracle.sql similarity index 100% rename from features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/oracle.sql rename to features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/oracle.sql diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/postgresql.sql b/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/postgresql.sql similarity index 100% rename from features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/postgresql.sql rename to features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/postgresql.sql diff --git a/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/p2.inf b/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/p2.inf new file mode 100644 index 0000000000..480343ebef --- /dev/null +++ b/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);\ diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/src/main/resources/p2.inf b/features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/src/main/resources/p2.inf deleted file mode 100644 index 5f658e814d..0000000000 --- a/features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/src/main/resources/p2.inf +++ /dev/null @@ -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);\ diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/p2.inf b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/p2.inf deleted file mode 100644 index 360d6ef9f9..0000000000 --- a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/p2.inf +++ /dev/null @@ -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);\ diff --git a/features/application-mgt/pom.xml b/features/application-mgt/pom.xml index 1aa070544a..0efe38c78f 100644 --- a/features/application-mgt/pom.xml +++ b/features/application-mgt/pom.xml @@ -33,7 +33,7 @@ https://entgra.io - org.wso2.carbon.device.application.mgt.api.feature - org.wso2.carbon.device.application.mgt.server.feature + io.entgra.application.mgt.api.feature + io.entgra.application.mgt.server.feature diff --git a/pom.xml b/pom.xml index eacfe8acda..55a55d6e39 100644 --- a/pom.xml +++ b/pom.xml @@ -175,44 +175,44 @@ org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.addons - ${carbon.device.mgt.version} - - - org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.authhandler - ${carbon.device.mgt.version} - - - org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.core - ${carbon.device.mgt.version} - - - org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.common + io.entgra.application.mgt.addons ${carbon.device.mgt.version} + + + + + org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.publisher.api + io.entgra.application.mgt.core ${carbon.device.mgt.version} org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.store.api + io.entgra.application.mgt.common ${carbon.device.mgt.version} org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.publisher.ui + io.entgra.application.mgt.publisher.api ${carbon.device.mgt.version} org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.store.ui + io.entgra.application.mgt.store.api ${carbon.device.mgt.version} + + + + + + + + + + org.wso2.carbon.devicemgt org.wso2.carbon.policy.mgt.common @@ -304,46 +304,46 @@ org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.server.feature - zip - ${carbon.device.mgt.version} - - - org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.extensions.feature - zip - ${carbon.device.mgt.version} - - - org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.api.feature - zip - ${carbon.device.mgt.version} - - - org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.auth.handler.feature - zip - ${carbon.device.mgt.version} - - - org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.publisher.ui.feature - zip - ${carbon.device.mgt.version} - - - org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.store.ui.feature + io.entgra.application.mgt.server.feature zip ${carbon.device.mgt.version} + + + + + + org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.feature + io.entgra.application.mgt.api.feature zip ${carbon.device.mgt.version} + + + + + + + + + + + + + + + + + + + + + + + + org.wso2.carbon.devicemgt io.entgra.server.bootup.heartbeat.beacon