From f7f8ce535aa7f3e11c64438a471a1cf773cca312 Mon Sep 17 00:00:00 2001 From: Amalka Subasinghe Date: Tue, 10 Aug 2021 12:39:58 +0530 Subject: [PATCH 01/10] fixed issue - product-iots #1059 --- .../org.wso2.carbon.webapp.authenticator.framework/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml index 2bf0318675..2a91d7682a 100644 --- a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml +++ b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml @@ -92,6 +92,7 @@ org.apache.axis2.transport.http, org.wso2.carbon.certificate.mgt.core.*, org.wso2.carbon.device.mgt.core.permission.mgt.*, + org.wso2.carbon.device.mgt.core.util.*, org.wso2.carbon.device.mgt.common.*, org.wso2.carbon.device.mgt.common.permission.mgt.*, org.apache.axis2, From d6c04ca92809bb6f76fc7748923ff97de23495ea Mon Sep 17 00:00:00 2001 From: Amalka Subasinghe Date: Tue, 10 Aug 2021 16:02:47 +0530 Subject: [PATCH 02/10] package name change - appmgt store api --- .../pom.xml | 6 +++--- .../store/api/services/ApplicationManagementAPI.java | 2 +- .../mgt/store/api/services/ReviewManagementAPI.java | 2 +- .../api/services/SubscriptionManagementAPI.java | 2 +- .../admin/ReviewManagementStoreAdminAPI.java | 2 +- .../admin/SubscriptionManagementAdminAPI.java | 2 +- .../services/impl/ApplicationManagementAPIImpl.java | 4 ++-- .../api/services/impl/ReviewManagementAPIImpl.java | 4 ++-- .../services/impl/SubscriptionManagementAPIImpl.java | 6 +++--- .../admin/ReviewManagementStoreAdminAPIImpl.java | 4 ++-- .../admin/SubscriptionManagementAdminAPIImpl.java | 6 +++--- .../services/impl/util/RequestValidationUtil.java | 4 ++-- .../application/mgt/store/api/util/Constants.java | 2 +- .../src/main/webapp/META-INF/permissions.xml | 0 .../src/main/webapp/META-INF/webapp-classloading.xml | 0 .../src/main/webapp/WEB-INF/cxf-servlet.xml | 12 ++++++------ .../src/main/webapp/WEB-INF/web.xml | 0 .../store/api/services}/CommentMgtTestHelper.java | 2 +- .../store/api/services/ReviewManagementAPITest.java | 2 +- .../src/test/resources/log4j.properties | 0 .../src/test/resources/testng.xml | 2 +- 21 files changed, 32 insertions(+), 32 deletions(-) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.store.api => io.entgra.application.store.api}/pom.xml (97%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device => io.entgra.application.store.api/src/main/java/io/entgra}/application/mgt/store/api/services/ApplicationManagementAPI.java (98%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device => io.entgra.application.store.api/src/main/java/io/entgra}/application/mgt/store/api/services/ReviewManagementAPI.java (99%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device => io.entgra.application.store.api/src/main/java/io/entgra}/application/mgt/store/api/services/SubscriptionManagementAPI.java (99%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device => io.entgra.application.store.api/src/main/java/io/entgra}/application/mgt/store/api/services/admin/ReviewManagementStoreAdminAPI.java (98%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device => io.entgra.application.store.api/src/main/java/io/entgra}/application/mgt/store/api/services/admin/SubscriptionManagementAdminAPI.java (98%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device => io.entgra.application.store.api/src/main/java/io/entgra}/application/mgt/store/api/services/impl/ApplicationManagementAPIImpl.java (96%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device => io.entgra.application.store.api/src/main/java/io/entgra}/application/mgt/store/api/services/impl/ReviewManagementAPIImpl.java (98%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device => io.entgra.application.store.api/src/main/java/io/entgra}/application/mgt/store/api/services/impl/SubscriptionManagementAPIImpl.java (98%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device => io.entgra.application.store.api/src/main/java/io/entgra}/application/mgt/store/api/services/impl/admin/ReviewManagementStoreAdminAPIImpl.java (94%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device => io.entgra.application.store.api/src/main/java/io/entgra}/application/mgt/store/api/services/impl/admin/SubscriptionManagementAdminAPIImpl.java (94%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device => io.entgra.application.store.api/src/main/java/io/entgra}/application/mgt/store/api/services/impl/util/RequestValidationUtil.java (96%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device => io.entgra.application.store.api/src/main/java/io/entgra}/application/mgt/store/api/util/Constants.java (98%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.store.api => io.entgra.application.store.api}/src/main/webapp/META-INF/permissions.xml (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.store.api => io.entgra.application.store.api}/src/main/webapp/META-INF/webapp-classloading.xml (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.store.api => io.entgra.application.store.api}/src/main/webapp/WEB-INF/cxf-servlet.xml (79%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.store.api => io.entgra.application.store.api}/src/main/webapp/WEB-INF/web.xml (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.store.api/src/test/java/org/wso2/carbon/device/application/mgt/store/api/services/util => io.entgra.application.store.api/src/test/java/io/entgra/application/mgt/store/api/services}/CommentMgtTestHelper.java (95%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.store.api/src/test/java/org/wso2/carbon/device => io.entgra.application.store.api/src/test/java/io/entgra}/application/mgt/store/api/services/ReviewManagementAPITest.java (99%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.store.api => io.entgra.application.store.api}/src/test/resources/log4j.properties (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.store.api => io.entgra.application.store.api}/src/test/resources/testng.xml (89%) diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/pom.xml b/components/application-mgt/io.entgra.application.store.api/pom.xml similarity index 97% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/pom.xml rename to components/application-mgt/io.entgra.application.store.api/pom.xml index 480264b88a..ac60b1e26d 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/pom.xml +++ b/components/application-mgt/io.entgra.application.store.api/pom.xml @@ -27,10 +27,10 @@ 4.0.0 - org.wso2.carbon.device.application.mgt.store.api + io.entgra.application.mgt.store.api war - WSO2 Carbon - Application Management Store API - WSO2 Carbon - Application Management Store API + Entgra - Application Management Store API + Entgra - Application Management Store API https://entgra.io diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/ApplicationManagementAPI.java b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/ApplicationManagementAPI.java similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/ApplicationManagementAPI.java rename to components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/ApplicationManagementAPI.java index eaf5380ddf..0136d7ca5c 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/ApplicationManagementAPI.java +++ b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/ApplicationManagementAPI.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.store.api.services; +package io.entgra.application.mgt.store.api.services; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/ReviewManagementAPI.java b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/ReviewManagementAPI.java similarity index 99% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/ReviewManagementAPI.java rename to components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/ReviewManagementAPI.java index a620045426..2e1613641f 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/ReviewManagementAPI.java +++ b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/ReviewManagementAPI.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.store.api.services; +package io.entgra.application.mgt.store.api.services; import io.swagger.annotations.ApiParam; import io.swagger.annotations.Api; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/SubscriptionManagementAPI.java b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/SubscriptionManagementAPI.java similarity index 99% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/SubscriptionManagementAPI.java rename to components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/SubscriptionManagementAPI.java index 9c2bfcdf79..26742db9f3 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/SubscriptionManagementAPI.java +++ b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/SubscriptionManagementAPI.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.store.api.services; +package io.entgra.application.mgt.store.api.services; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/admin/ReviewManagementStoreAdminAPI.java b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/admin/ReviewManagementStoreAdminAPI.java similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/admin/ReviewManagementStoreAdminAPI.java rename to components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/admin/ReviewManagementStoreAdminAPI.java index cfaf91a5cc..3cbd7ece80 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/admin/ReviewManagementStoreAdminAPI.java +++ b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/admin/ReviewManagementStoreAdminAPI.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.store.api.services.admin; +package io.entgra.application.mgt.store.api.services.admin; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/admin/SubscriptionManagementAdminAPI.java b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/admin/SubscriptionManagementAdminAPI.java similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/admin/SubscriptionManagementAdminAPI.java rename to components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/admin/SubscriptionManagementAdminAPI.java index d46594d6cc..e7bd335817 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/admin/SubscriptionManagementAdminAPI.java +++ b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/admin/SubscriptionManagementAdminAPI.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.store.api.services.admin; +package io.entgra.application.mgt.store.api.services.admin; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/ApplicationManagementAPIImpl.java b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/ApplicationManagementAPIImpl.java similarity index 96% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/ApplicationManagementAPIImpl.java rename to components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/ApplicationManagementAPIImpl.java index ac0b3b283b..808c67b287 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/ApplicationManagementAPIImpl.java +++ b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/ApplicationManagementAPIImpl.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.store.api.services.impl; +package io.entgra.application.mgt.store.api.services.impl; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -27,7 +27,7 @@ import org.wso2.carbon.device.application.mgt.core.exception.BadRequestException import org.wso2.carbon.device.application.mgt.core.exception.NotFoundException; import org.wso2.carbon.device.application.mgt.core.exception.UnexpectedServerErrorException; import org.wso2.carbon.device.application.mgt.core.util.APIUtil; -import org.wso2.carbon.device.application.mgt.store.api.services.ApplicationManagementAPI; +import io.entgra.application.mgt.store.api.services.ApplicationManagementAPI; import javax.validation.Valid; import javax.ws.rs.Consumes; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/ReviewManagementAPIImpl.java b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/ReviewManagementAPIImpl.java similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/ReviewManagementAPIImpl.java rename to components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/ReviewManagementAPIImpl.java index c617671de7..7f5a8b9195 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/ReviewManagementAPIImpl.java +++ b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/ReviewManagementAPIImpl.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.store.api.services.impl; +package io.entgra.application.mgt.store.api.services.impl; import io.swagger.annotations.ApiParam; import org.apache.commons.logging.Log; @@ -28,7 +28,7 @@ import org.wso2.carbon.device.application.mgt.common.wrapper.ReviewWrapper; import org.wso2.carbon.device.application.mgt.core.exception.BadRequestException; import org.wso2.carbon.device.application.mgt.core.exception.ForbiddenException; import org.wso2.carbon.device.application.mgt.core.exception.NotFoundException; -import org.wso2.carbon.device.application.mgt.store.api.services.ReviewManagementAPI; +import io.entgra.application.mgt.store.api.services.ReviewManagementAPI; import org.wso2.carbon.device.application.mgt.common.PaginationRequest; import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; import org.wso2.carbon.device.application.mgt.common.exception.ReviewManagementException; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/SubscriptionManagementAPIImpl.java b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/SubscriptionManagementAPIImpl.java similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/SubscriptionManagementAPIImpl.java rename to components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/SubscriptionManagementAPIImpl.java index 4a51353997..b045b8bda3 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/SubscriptionManagementAPIImpl.java +++ b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/SubscriptionManagementAPIImpl.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.store.api.services.impl; +package io.entgra.application.mgt.store.api.services.impl; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; @@ -33,13 +33,13 @@ 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 org.wso2.carbon.device.application.mgt.store.api.services.impl.util.RequestValidationUtil; +import io.entgra.application.mgt.store.api.services.impl.util.RequestValidationUtil; import org.wso2.carbon.device.application.mgt.core.exception.BadRequestException; import org.wso2.carbon.device.application.mgt.core.exception.ForbiddenException; import org.wso2.carbon.device.application.mgt.core.exception.NotFoundException; import org.wso2.carbon.device.application.mgt.core.task.ScheduledAppSubscriptionTaskManager; import org.wso2.carbon.device.application.mgt.core.util.APIUtil; -import org.wso2.carbon.device.application.mgt.store.api.services.SubscriptionManagementAPI; +import io.entgra.application.mgt.store.api.services.SubscriptionManagementAPI; import org.wso2.carbon.device.mgt.common.Device; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; import org.wso2.carbon.device.mgt.common.MDMAppConstants; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/admin/ReviewManagementStoreAdminAPIImpl.java b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/admin/ReviewManagementStoreAdminAPIImpl.java similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/admin/ReviewManagementStoreAdminAPIImpl.java rename to components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/admin/ReviewManagementStoreAdminAPIImpl.java index 5cca42852f..9dc8aec9fc 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/admin/ReviewManagementStoreAdminAPIImpl.java +++ b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/admin/ReviewManagementStoreAdminAPIImpl.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.store.api.services.impl.admin; +package io.entgra.application.mgt.store.api.services.impl.admin; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -23,7 +23,7 @@ import org.wso2.carbon.device.application.mgt.common.exception.ReviewManagementE import org.wso2.carbon.device.application.mgt.common.services.ReviewManager; import org.wso2.carbon.device.application.mgt.core.exception.NotFoundException; import org.wso2.carbon.device.application.mgt.core.util.APIUtil; -import org.wso2.carbon.device.application.mgt.store.api.services.admin.ReviewManagementStoreAdminAPI; +import io.entgra.application.mgt.store.api.services.admin.ReviewManagementStoreAdminAPI; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/admin/SubscriptionManagementAdminAPIImpl.java b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/admin/SubscriptionManagementAdminAPIImpl.java similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/admin/SubscriptionManagementAdminAPIImpl.java rename to components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/admin/SubscriptionManagementAdminAPIImpl.java index 681b3b5f38..17cf3511f9 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/admin/SubscriptionManagementAdminAPIImpl.java +++ b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/admin/SubscriptionManagementAdminAPIImpl.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.store.api.services.impl.admin; +package io.entgra.application.mgt.store.api.services.impl.admin; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; @@ -26,8 +26,8 @@ import org.wso2.carbon.device.application.mgt.common.services.SubscriptionManage import org.wso2.carbon.device.application.mgt.core.exception.BadRequestException; import org.wso2.carbon.device.application.mgt.core.exception.NotFoundException; import org.wso2.carbon.device.application.mgt.core.util.APIUtil; -import org.wso2.carbon.device.application.mgt.store.api.services.admin.SubscriptionManagementAdminAPI; -import org.wso2.carbon.device.application.mgt.store.api.services.impl.util.RequestValidationUtil; +import io.entgra.application.mgt.store.api.services.admin.SubscriptionManagementAdminAPI; +import io.entgra.application.mgt.store.api.services.impl.util.RequestValidationUtil; import org.wso2.carbon.device.mgt.common.PaginationRequest; import org.wso2.carbon.device.mgt.common.PaginationResult; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/util/RequestValidationUtil.java b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/util/RequestValidationUtil.java similarity index 96% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/util/RequestValidationUtil.java rename to components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/util/RequestValidationUtil.java index 2a59d220a4..4061bcd965 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/util/RequestValidationUtil.java +++ b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/util/RequestValidationUtil.java @@ -16,12 +16,12 @@ * under the License. * */ -package org.wso2.carbon.device.application.mgt.store.api.services.impl.util; +package io.entgra.application.mgt.store.api.services.impl.util; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.device.application.mgt.core.exception.BadRequestException; -import org.wso2.carbon.device.application.mgt.store.api.util.Constants; +import io.entgra.application.mgt.store.api.util.Constants; import java.util.List; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/util/Constants.java b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/util/Constants.java similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/util/Constants.java rename to components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/util/Constants.java index a78c16077f..3c06f365d2 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/util/Constants.java +++ b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/util/Constants.java @@ -33,7 +33,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.store.api.util; +package io.entgra.application.mgt.store.api.util; /** * Holds the constants used by DeviceImpl Management Admin web application. diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/webapp/META-INF/permissions.xml b/components/application-mgt/io.entgra.application.store.api/src/main/webapp/META-INF/permissions.xml similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/webapp/META-INF/permissions.xml rename to components/application-mgt/io.entgra.application.store.api/src/main/webapp/META-INF/permissions.xml diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/webapp/META-INF/webapp-classloading.xml b/components/application-mgt/io.entgra.application.store.api/src/main/webapp/META-INF/webapp-classloading.xml similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/webapp/META-INF/webapp-classloading.xml rename to components/application-mgt/io.entgra.application.store.api/src/main/webapp/META-INF/webapp-classloading.xml diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/webapp/WEB-INF/cxf-servlet.xml b/components/application-mgt/io.entgra.application.store.api/src/main/webapp/WEB-INF/cxf-servlet.xml similarity index 79% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/webapp/WEB-INF/cxf-servlet.xml rename to components/application-mgt/io.entgra.application.store.api/src/main/webapp/WEB-INF/cxf-servlet.xml index 3488f6e8bc..b9f9d11576 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/webapp/WEB-INF/cxf-servlet.xml +++ b/components/application-mgt/io.entgra.application.store.api/src/main/webapp/WEB-INF/cxf-servlet.xml @@ -39,7 +39,7 @@ - + @@ -55,11 +55,11 @@ - - - - - + + + + + diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/webapp/WEB-INF/web.xml b/components/application-mgt/io.entgra.application.store.api/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/webapp/WEB-INF/web.xml rename to components/application-mgt/io.entgra.application.store.api/src/main/webapp/WEB-INF/web.xml diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/test/java/org/wso2/carbon/device/application/mgt/store/api/services/util/CommentMgtTestHelper.java b/components/application-mgt/io.entgra.application.store.api/src/test/java/io/entgra/application/mgt/store/api/services/CommentMgtTestHelper.java similarity index 95% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/test/java/org/wso2/carbon/device/application/mgt/store/api/services/util/CommentMgtTestHelper.java rename to components/application-mgt/io.entgra.application.store.api/src/test/java/io/entgra/application/mgt/store/api/services/CommentMgtTestHelper.java index beae02de6d..b14d9035b4 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/test/java/org/wso2/carbon/device/application/mgt/store/api/services/util/CommentMgtTestHelper.java +++ b/components/application-mgt/io.entgra.application.store.api/src/test/java/io/entgra/application/mgt/store/api/services/CommentMgtTestHelper.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.store.api.services.util; +package io.entgra.application.mgt.store.api.services; import org.wso2.carbon.device.application.mgt.common.response.Review; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/test/java/org/wso2/carbon/device/application/mgt/store/api/services/ReviewManagementAPITest.java b/components/application-mgt/io.entgra.application.store.api/src/test/java/io/entgra/application/mgt/store/api/services/ReviewManagementAPITest.java similarity index 99% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/test/java/org/wso2/carbon/device/application/mgt/store/api/services/ReviewManagementAPITest.java rename to components/application-mgt/io.entgra.application.store.api/src/test/java/io/entgra/application/mgt/store/api/services/ReviewManagementAPITest.java index 86b4730c73..643f3c0ece 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/test/java/org/wso2/carbon/device/application/mgt/store/api/services/ReviewManagementAPITest.java +++ b/components/application-mgt/io.entgra.application.store.api/src/test/java/io/entgra/application/mgt/store/api/services/ReviewManagementAPITest.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.store.api.services; +package io.entgra.application.mgt.store.api.services; import junit.framework.TestCase; import org.apache.commons.logging.Log; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/test/resources/log4j.properties b/components/application-mgt/io.entgra.application.store.api/src/test/resources/log4j.properties similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/test/resources/log4j.properties rename to components/application-mgt/io.entgra.application.store.api/src/test/resources/log4j.properties diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/test/resources/testng.xml b/components/application-mgt/io.entgra.application.store.api/src/test/resources/testng.xml similarity index 89% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/test/resources/testng.xml rename to components/application-mgt/io.entgra.application.store.api/src/test/resources/testng.xml index 3513acff4e..68732a014c 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/test/resources/testng.xml +++ b/components/application-mgt/io.entgra.application.store.api/src/test/resources/testng.xml @@ -23,7 +23,7 @@ - + From a57043b5c1998c3c30fcdfba4a8f7977f5eff962 Mon Sep 17 00:00:00 2001 From: Amalka Subasinghe Date: Tue, 10 Aug 2021 16:07:17 +0530 Subject: [PATCH 03/10] package name change - appmgt publisher api --- .../pom.xml | 6 +++--- .../api/services/ApplicationManagementPublisherAPI.java | 2 +- .../admin/ApplicationManagementPublisherAdminAPI.java | 2 +- .../services/admin/ReviewManagementPublisherAdminAPI.java | 2 +- .../impl/ApplicationManagementPublisherAPIImpl.java | 4 ++-- .../admin/ApplicationManagementPublisherAdminAPIImpl.java | 4 ++-- .../impl/admin/ReviewManagementPublisherAdminAPIImpl.java | 4 ++-- .../src/main/webapp/META-INF/permissions.xml | 0 .../src/main/webapp/META-INF/webapp-classloading.xml | 0 .../src/main/webapp/WEB-INF/cxf-servlet.xml | 8 ++++---- .../src/main/webapp/WEB-INF/web.xml | 0 11 files changed, 16 insertions(+), 16 deletions(-) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.publisher.api => io.entgra.application.mgt.publisher.api}/pom.xml (97%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.publisher.api/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.publisher.api/src/main/java/io/entgra}/application/mgt/publisher/api/services/ApplicationManagementPublisherAPI.java (99%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.publisher.api/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.publisher.api/src/main/java/io/entgra}/application/mgt/publisher/api/services/admin/ApplicationManagementPublisherAdminAPI.java (99%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.publisher.api/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.publisher.api/src/main/java/io/entgra}/application/mgt/publisher/api/services/admin/ReviewManagementPublisherAdminAPI.java (99%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.publisher.api/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.publisher.api/src/main/java/io/entgra}/application/mgt/publisher/api/services/impl/ApplicationManagementPublisherAPIImpl.java (99%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.publisher.api/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.publisher.api/src/main/java/io/entgra}/application/mgt/publisher/api/services/impl/admin/ApplicationManagementPublisherAdminAPIImpl.java (98%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.publisher.api/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.publisher.api/src/main/java/io/entgra}/application/mgt/publisher/api/services/impl/admin/ReviewManagementPublisherAdminAPIImpl.java (96%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.publisher.api => io.entgra.application.mgt.publisher.api}/src/main/webapp/META-INF/permissions.xml (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.publisher.api => io.entgra.application.mgt.publisher.api}/src/main/webapp/META-INF/webapp-classloading.xml (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.publisher.api => io.entgra.application.mgt.publisher.api}/src/main/webapp/WEB-INF/cxf-servlet.xml (84%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.publisher.api => io.entgra.application.mgt.publisher.api}/src/main/webapp/WEB-INF/web.xml (100%) diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/pom.xml b/components/application-mgt/io.entgra.application.mgt.publisher.api/pom.xml similarity index 97% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/pom.xml rename to components/application-mgt/io.entgra.application.mgt.publisher.api/pom.xml index 75586560be..71fe89cfce 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/pom.xml +++ b/components/application-mgt/io.entgra.application.mgt.publisher.api/pom.xml @@ -27,10 +27,10 @@ 4.0.0 - org.wso2.carbon.device.application.mgt.publisher.api + io.entgra.application.mgt.publisher.api war - WSO2 Carbon - Application Management Publisher API - WSO2 Carbon - Application Management Publisher API + Entgra - Application Management Publisher API + Entgra - Application Management Publisher API https://entgra.io diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/src/main/java/org/wso2/carbon/device/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 similarity index 99% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/src/main/java/org/wso2/carbon/device/application/mgt/publisher/api/services/ApplicationManagementPublisherAPI.java rename to components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/ApplicationManagementPublisherAPI.java index 19bf82f0f0..eb2446830e 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/src/main/java/org/wso2/carbon/device/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 @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.publisher.api.services; +package io.entgra.application.mgt.publisher.api.services; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/src/main/java/org/wso2/carbon/device/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 similarity index 99% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/src/main/java/org/wso2/carbon/device/application/mgt/publisher/api/services/admin/ApplicationManagementPublisherAdminAPI.java rename to components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/admin/ApplicationManagementPublisherAdminAPI.java index bbf92d37eb..3b9d653b1f 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/src/main/java/org/wso2/carbon/device/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 @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.publisher.api.services.admin; +package io.entgra.application.mgt.publisher.api.services.admin; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/src/main/java/org/wso2/carbon/device/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 similarity index 99% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/src/main/java/org/wso2/carbon/device/application/mgt/publisher/api/services/admin/ReviewManagementPublisherAdminAPI.java rename to components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/admin/ReviewManagementPublisherAdminAPI.java index 73a1ccb636..0cbb416a71 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/src/main/java/org/wso2/carbon/device/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 @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.publisher.api.services.admin; +package io.entgra.application.mgt.publisher.api.services.admin; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/src/main/java/org/wso2/carbon/device/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 similarity index 99% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/src/main/java/org/wso2/carbon/device/application/mgt/publisher/api/services/impl/ApplicationManagementPublisherAPIImpl.java rename to components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/impl/ApplicationManagementPublisherAPIImpl.java index 74f4b4ee75..0587b0cdd7 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/src/main/java/org/wso2/carbon/device/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 @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.publisher.api.services.impl; +package io.entgra.application.mgt.publisher.api.services.impl; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -43,7 +43,7 @@ import org.wso2.carbon.device.application.mgt.core.exception.ForbiddenException; import org.wso2.carbon.device.application.mgt.core.exception.UnexpectedServerErrorException; import org.wso2.carbon.device.application.mgt.core.util.APIUtil; import org.wso2.carbon.device.application.mgt.core.util.Constants; -import org.wso2.carbon.device.application.mgt.publisher.api.services.ApplicationManagementPublisherAPI; +import io.entgra.application.mgt.publisher.api.services.ApplicationManagementPublisherAPI; import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; import org.wso2.carbon.device.application.mgt.common.services.ApplicationManager; import org.wso2.carbon.device.application.mgt.core.exception.NotFoundException; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/src/main/java/org/wso2/carbon/device/application/mgt/publisher/api/services/impl/admin/ApplicationManagementPublisherAdminAPIImpl.java b/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/impl/admin/ApplicationManagementPublisherAdminAPIImpl.java similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/src/main/java/org/wso2/carbon/device/application/mgt/publisher/api/services/impl/admin/ApplicationManagementPublisherAdminAPIImpl.java rename to components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/impl/admin/ApplicationManagementPublisherAdminAPIImpl.java index 8e739f1602..370f57e57e 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/src/main/java/org/wso2/carbon/device/application/mgt/publisher/api/services/impl/admin/ApplicationManagementPublisherAdminAPIImpl.java +++ b/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/impl/admin/ApplicationManagementPublisherAdminAPIImpl.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.publisher.api.services.impl.admin; +package io.entgra.application.mgt.publisher.api.services.impl.admin; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -25,7 +25,7 @@ import org.wso2.carbon.device.application.mgt.core.exception.BadRequestException import org.wso2.carbon.device.application.mgt.core.exception.ForbiddenException; import org.wso2.carbon.device.application.mgt.core.exception.NotFoundException; import org.wso2.carbon.device.application.mgt.core.util.APIUtil; -import org.wso2.carbon.device.application.mgt.publisher.api.services.admin.ApplicationManagementPublisherAdminAPI; +import io.entgra.application.mgt.publisher.api.services.admin.ApplicationManagementPublisherAdminAPI; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/src/main/java/org/wso2/carbon/device/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 similarity index 96% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/src/main/java/org/wso2/carbon/device/application/mgt/publisher/api/services/impl/admin/ReviewManagementPublisherAdminAPIImpl.java rename to components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/impl/admin/ReviewManagementPublisherAdminAPIImpl.java index c572004e1e..f0af7225b9 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/src/main/java/org/wso2/carbon/device/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 @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.publisher.api.services.impl.admin; +package io.entgra.application.mgt.publisher.api.services.impl.admin; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -26,7 +26,7 @@ import org.wso2.carbon.device.application.mgt.common.exception.ReviewManagementE import org.wso2.carbon.device.application.mgt.common.services.ReviewManager; import org.wso2.carbon.device.application.mgt.core.exception.NotFoundException; import org.wso2.carbon.device.application.mgt.core.util.APIUtil; -import org.wso2.carbon.device.application.mgt.publisher.api.services.admin.ReviewManagementPublisherAdminAPI; +import io.entgra.application.mgt.publisher.api.services.admin.ReviewManagementPublisherAdminAPI; import javax.ws.rs.DefaultValue; import javax.ws.rs.GET; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/src/main/webapp/META-INF/permissions.xml b/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/webapp/META-INF/permissions.xml similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/src/main/webapp/META-INF/permissions.xml rename to components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/webapp/META-INF/permissions.xml diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/src/main/webapp/META-INF/webapp-classloading.xml b/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/webapp/META-INF/webapp-classloading.xml similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/src/main/webapp/META-INF/webapp-classloading.xml rename to components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/webapp/META-INF/webapp-classloading.xml diff --git a/components/application-mgt/org.wso2.carbon.device.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 similarity index 84% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/src/main/webapp/WEB-INF/cxf-servlet.xml rename to components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/webapp/WEB-INF/cxf-servlet.xml index c927571504..91580abb68 100644 --- a/components/application-mgt/org.wso2.carbon.device.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 @@ -38,7 +38,7 @@ - + @@ -54,9 +54,9 @@ - - - + + + diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/src/main/webapp/WEB-INF/web.xml b/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/src/main/webapp/WEB-INF/web.xml rename to components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/webapp/WEB-INF/web.xml From 4de4a153595c00e3c07c98456ebdf9b3bb167855 Mon Sep 17 00:00:00 2001 From: Amalka Subasinghe Date: Tue, 10 Aug 2021 16:13:23 +0530 Subject: [PATCH 04/10] package name change - appmgt api --- .../pom.xml | 6 +++--- .../application/mgt/api/services/ArtifactDownloadAPI.java | 2 +- .../mgt/api/services/impl/ArtifactDownloadAPIImpl.java | 4 ++-- .../src/main/webapp/META-INF/permissions.xml | 0 .../src/main/webapp/META-INF/webapp-classloading.xml | 0 .../src/main/webapp/WEB-INF/cxf-servlet.xml | 4 ++-- .../src/main/webapp/WEB-INF/web.xml | 0 7 files changed, 8 insertions(+), 8 deletions(-) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.api => io.entgra.application.mgt.api}/pom.xml (97%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.api/src/main/java/io/entgra}/application/mgt/api/services/ArtifactDownloadAPI.java (99%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.api/src/main/java/io/entgra}/application/mgt/api/services/impl/ArtifactDownloadAPIImpl.java (98%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.api => io.entgra.application.mgt.api}/src/main/webapp/META-INF/permissions.xml (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.api => io.entgra.application.mgt.api}/src/main/webapp/META-INF/webapp-classloading.xml (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.api => io.entgra.application.mgt.api}/src/main/webapp/WEB-INF/cxf-servlet.xml (92%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.api => io.entgra.application.mgt.api}/src/main/webapp/WEB-INF/web.xml (100%) diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.api/pom.xml b/components/application-mgt/io.entgra.application.mgt.api/pom.xml similarity index 97% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.api/pom.xml rename to components/application-mgt/io.entgra.application.mgt.api/pom.xml index 6a84b225e1..a4cda82b78 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.api/pom.xml +++ b/components/application-mgt/io.entgra.application.mgt.api/pom.xml @@ -27,10 +27,10 @@ 4.0.0 - org.wso2.carbon.device.application.mgt.api + io.entgra.application.mgt.api war - WSO2 Carbon - Application Management API - WSO2 Carbon - Application Management API + Entgra - Application Management API + Entgra - Application Management API https://entgra.io diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device/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 similarity index 99% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device/application/mgt/api/services/ArtifactDownloadAPI.java rename to components/application-mgt/io.entgra.application.mgt.api/src/main/java/io/entgra/application/mgt/api/services/ArtifactDownloadAPI.java index 8a013e1370..ca46ae679e 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device/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 @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.api.services; +package io.entgra.application.mgt.api.services; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device/application/mgt/api/services/impl/ArtifactDownloadAPIImpl.java b/components/application-mgt/io.entgra.application.mgt.api/src/main/java/io/entgra/application/mgt/api/services/impl/ArtifactDownloadAPIImpl.java similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device/application/mgt/api/services/impl/ArtifactDownloadAPIImpl.java rename to components/application-mgt/io.entgra.application.mgt.api/src/main/java/io/entgra/application/mgt/api/services/impl/ArtifactDownloadAPIImpl.java index 005d00e757..526257a2dd 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device/application/mgt/api/services/impl/ArtifactDownloadAPIImpl.java +++ b/components/application-mgt/io.entgra.application.mgt.api/src/main/java/io/entgra/application/mgt/api/services/impl/ArtifactDownloadAPIImpl.java @@ -15,12 +15,12 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.api.services.impl; +package io.entgra.application.mgt.api.services.impl; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.device.application.mgt.api.services.ArtifactDownloadAPI; +import io.entgra.application.mgt.api.services.ArtifactDownloadAPI; import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; import org.wso2.carbon.device.application.mgt.common.services.ApplicationManager; import org.wso2.carbon.device.application.mgt.common.services.AppmDataHandler; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/webapp/META-INF/permissions.xml b/components/application-mgt/io.entgra.application.mgt.api/src/main/webapp/META-INF/permissions.xml similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/webapp/META-INF/permissions.xml rename to components/application-mgt/io.entgra.application.mgt.api/src/main/webapp/META-INF/permissions.xml diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/webapp/META-INF/webapp-classloading.xml b/components/application-mgt/io.entgra.application.mgt.api/src/main/webapp/META-INF/webapp-classloading.xml similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/webapp/META-INF/webapp-classloading.xml rename to components/application-mgt/io.entgra.application.mgt.api/src/main/webapp/META-INF/webapp-classloading.xml diff --git a/components/application-mgt/org.wso2.carbon.device.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 similarity index 92% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml rename to components/application-mgt/io.entgra.application.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml index 23d288898d..cfcce344b9 100644 --- a/components/application-mgt/org.wso2.carbon.device.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 @@ -36,7 +36,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/webapp/WEB-INF/web.xml b/components/application-mgt/io.entgra.application.mgt.api/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/webapp/WEB-INF/web.xml rename to components/application-mgt/io.entgra.application.mgt.api/src/main/webapp/WEB-INF/web.xml From 16af7a44b50161d127552b6483c38de412bf15d2 Mon Sep 17 00:00:00 2001 From: Amalka Subasinghe Date: Tue, 10 Aug 2021 16:15:59 +0530 Subject: [PATCH 05/10] package name change - appmgt addons --- .../pom.xml | 28 +++++++++++++++---- .../mgt/addons/ApiOriginFilter.java | 2 +- .../mgt/addons/FileStreamingOutput.java | 2 +- .../mgt/addons/JSONMessageHandler.java | 4 +-- .../mgt/addons/MultipartCustomProvider.java | 4 +-- .../mgt/addons/ValidationInterceptor.java | 2 +- .../jaxrs/AnnotationExclusionStrategy.java | 2 +- .../application/mgt/addons/jaxrs/Exclude.java | 2 +- .../src/main/webapp/WEB-INF/cxf-servlet.xml | 8 +++--- .../src/main/webapp/WEB-INF/web.xml | 2 +- .../src/main/webapp/WEB-INF/cxf-servlet.xml | 8 +++--- .../src/main/webapp/WEB-INF/web.xml | 2 +- .../src/main/webapp/WEB-INF/cxf-servlet.xml | 8 +++--- .../src/main/webapp/WEB-INF/web.xml | 2 +- 14 files changed, 47 insertions(+), 29 deletions(-) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.addons => io.entgra.application.mgt.addons}/pom.xml (78%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.addons/src/main/java/io/entgra}/application/mgt/addons/ApiOriginFilter.java (96%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.addons/src/main/java/io/entgra}/application/mgt/addons/FileStreamingOutput.java (96%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.addons/src/main/java/io/entgra}/application/mgt/addons/JSONMessageHandler.java (95%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.addons/src/main/java/io/entgra}/application/mgt/addons/MultipartCustomProvider.java (94%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.addons/src/main/java/io/entgra}/application/mgt/addons/ValidationInterceptor.java (98%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.addons/src/main/java/io/entgra}/application/mgt/addons/jaxrs/AnnotationExclusionStrategy.java (95%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.addons/src/main/java/io/entgra}/application/mgt/addons/jaxrs/Exclude.java (94%) diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.addons/pom.xml b/components/application-mgt/io.entgra.application.mgt.addons/pom.xml similarity index 78% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.addons/pom.xml rename to components/application-mgt/io.entgra.application.mgt.addons/pom.xml index 059af5fb7e..06a97f01aa 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.addons/pom.xml +++ b/components/application-mgt/io.entgra.application.mgt.addons/pom.xml @@ -1,5 +1,23 @@ - + + application-mgt org.wso2.carbon.devicemgt @@ -8,9 +26,9 @@ 4.0.0 - org.wso2.carbon.device.application.mgt.addons - WSO2 Carbon - Application Management Add-Ons - WSO2 Carbon - Application Management Add-Ons + io.entgra.application.mgt.addons + Entgra - Application Management Add-Ons + Entgra - Application Management Add-Ons https://entgra.io @@ -35,7 +53,7 @@ io.swagger.annotations.*;resolution:=optional - org.wso2.carbon.device.application.mgt.addons.* + io.entgra.application.mgt.addons.* diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/ApiOriginFilter.java b/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/ApiOriginFilter.java similarity index 96% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/ApiOriginFilter.java rename to components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/ApiOriginFilter.java index 25446e9513..62ba2f3521 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/ApiOriginFilter.java +++ b/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/ApiOriginFilter.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.addons; +package io.entgra.application.mgt.addons; import javax.servlet.Filter; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/FileStreamingOutput.java b/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/FileStreamingOutput.java similarity index 96% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/FileStreamingOutput.java rename to components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/FileStreamingOutput.java index a1ad912d19..cf477e58c9 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/FileStreamingOutput.java +++ b/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/FileStreamingOutput.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.addons; +package io.entgra.application.mgt.addons; import javax.ws.rs.WebApplicationException; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/JSONMessageHandler.java b/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/JSONMessageHandler.java similarity index 95% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/JSONMessageHandler.java rename to components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/JSONMessageHandler.java index 6951e02b2e..9aa828b34c 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/JSONMessageHandler.java +++ b/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/JSONMessageHandler.java @@ -14,11 +14,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.addons; +package io.entgra.application.mgt.addons; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import org.wso2.carbon.device.application.mgt.addons.jaxrs.AnnotationExclusionStrategy; +import io.entgra.application.mgt.addons.jaxrs.AnnotationExclusionStrategy; import javax.ws.rs.Consumes; import javax.ws.rs.Produces; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/MultipartCustomProvider.java b/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/MultipartCustomProvider.java similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/MultipartCustomProvider.java rename to components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/MultipartCustomProvider.java index 647cbcc27d..3a8c2d42ea 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/MultipartCustomProvider.java +++ b/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/MultipartCustomProvider.java @@ -14,14 +14,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.addons; +package io.entgra.application.mgt.addons; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import org.apache.cxf.jaxrs.ext.multipart.Attachment; -import org.wso2.carbon.device.application.mgt.addons.jaxrs.AnnotationExclusionStrategy; +import io.entgra.application.mgt.addons.jaxrs.AnnotationExclusionStrategy; import javax.ws.rs.Consumes; import javax.ws.rs.WebApplicationException; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/ValidationInterceptor.java b/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/ValidationInterceptor.java similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/ValidationInterceptor.java rename to components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/ValidationInterceptor.java index d36e9986b1..43182bafdc 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/ValidationInterceptor.java +++ b/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/ValidationInterceptor.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.addons; +package io.entgra.application.mgt.addons; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/jaxrs/AnnotationExclusionStrategy.java b/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/jaxrs/AnnotationExclusionStrategy.java similarity index 95% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/jaxrs/AnnotationExclusionStrategy.java rename to components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/jaxrs/AnnotationExclusionStrategy.java index d2a92c4c27..5a4932532c 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/jaxrs/AnnotationExclusionStrategy.java +++ b/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/jaxrs/AnnotationExclusionStrategy.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.addons.jaxrs; +package io.entgra.application.mgt.addons.jaxrs; import com.google.gson.ExclusionStrategy; import com.google.gson.FieldAttributes; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/jaxrs/Exclude.java b/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/jaxrs/Exclude.java similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/jaxrs/Exclude.java rename to components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/jaxrs/Exclude.java index e185ececcb..1f42ccb335 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/jaxrs/Exclude.java +++ b/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/jaxrs/Exclude.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.addons.jaxrs; +package io.entgra.application.mgt.addons.jaxrs; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; 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 cfcce344b9..69b6816220 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,17 +48,17 @@ - + - - + + - + diff --git a/components/application-mgt/io.entgra.application.mgt.api/src/main/webapp/WEB-INF/web.xml b/components/application-mgt/io.entgra.application.mgt.api/src/main/webapp/WEB-INF/web.xml index 15677f5277..5917cf8aaa 100644 --- a/components/application-mgt/io.entgra.application.mgt.api/src/main/webapp/WEB-INF/web.xml +++ b/components/application-mgt/io.entgra.application.mgt.api/src/main/webapp/WEB-INF/web.xml @@ -74,7 +74,7 @@ ApiOriginFilter - org.wso2.carbon.device.application.mgt.addons.ApiOriginFilter + io.entgra.application.mgt.addons.ApiOriginFilter 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 91580abb68..8314c023b3 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,19 +50,19 @@ - + - - + + - + diff --git a/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/webapp/WEB-INF/web.xml b/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/webapp/WEB-INF/web.xml index fb8b266948..634df3e71a 100644 --- a/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/webapp/WEB-INF/web.xml +++ b/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/webapp/WEB-INF/web.xml @@ -73,7 +73,7 @@ ApiOriginFilter - org.wso2.carbon.device.application.mgt.addons.ApiOriginFilter + io.entgra.application.mgt.addons.ApiOriginFilter 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.store.api/src/main/webapp/WEB-INF/cxf-servlet.xml index b9f9d11576..c7003a4fdb 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.store.api/src/main/webapp/WEB-INF/cxf-servlet.xml @@ -51,7 +51,7 @@ - + @@ -60,12 +60,12 @@ - - + + - + 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.store.api/src/main/webapp/WEB-INF/web.xml index 93903ed95a..09dc9ca61f 100644 --- a/components/application-mgt/io.entgra.application.store.api/src/main/webapp/WEB-INF/web.xml +++ b/components/application-mgt/io.entgra.application.store.api/src/main/webapp/WEB-INF/web.xml @@ -73,7 +73,7 @@ ApiOriginFilter - org.wso2.carbon.device.application.mgt.addons.ApiOriginFilter + io.entgra.application.mgt.addons.ApiOriginFilter From 37b08ba3895cc317348cc0def8a8a36a3ba602cc Mon Sep 17 00:00:00 2001 From: Amalka Subasinghe Date: Tue, 10 Aug 2021 16:48:15 +0530 Subject: [PATCH 06/10] package name change - appmgt core --- .../impl/ArtifactDownloadAPIImpl.java | 8 +-- .../pom.xml | 12 ++-- .../mgt/core/config/Artifacts.java | 2 +- .../mgt/core/config/Configuration.java | 2 +- .../mgt/core/config/ConfigurationManager.java | 4 +- .../mgt/core/config/Extension.java | 2 +- .../core/config/PaginationConfiguration.java | 2 +- .../mgt/core/config/Parameter.java | 2 +- .../mgt/core/dao/ApplicationDAO.java | 4 +- .../mgt/core/dao/ApplicationReleaseDAO.java | 4 +- .../mgt/core/dao/LifecycleStateDAO.java | 4 +- .../application/mgt/core/dao/ReviewDAO.java | 4 +- .../mgt/core/dao/SubscriptionDAO.java | 5 +- .../mgt/core/dao/VisibilityDAO.java | 4 +- .../ApplicationManagementDAOFactory.java | 66 +++++++++--------- .../mgt/core/dao/impl/AbstractDAOImpl.java | 4 +- .../GenericApplicationDAOImpl.java | 12 ++-- .../application/OracleApplicationDAOImpl.java | 6 +- .../PostgreSQLApplicationDAOImpl.java | 2 +- .../SQLServerApplicationDAOImpl.java | 6 +- .../GenericApplicationReleaseDAOImpl.java | 10 +-- .../OracleApplicationReleaseDAOImpl.java | 4 +- .../PostgreSQLApplicationReleaseDAOImpl.java | 2 +- .../SQLServerApplicationReleaseDAOImpl.java | 4 +- .../GenericLifecycleStateDAOImpl.java | 10 +-- .../OracleLifecycleStateDAOImpl.java | 2 +- .../PostgreSQLLifecycleStateDAOImpl.java | 2 +- .../SQLServerLifecycleStateDAOImpl.java | 2 +- .../dao/impl/review/GenericReviewDAOImpl.java | 14 ++-- .../dao/impl/review/OracleReviewDAOImpl.java | 8 +-- .../impl/review/PostgreSQLReviewDAOImpl.java | 2 +- .../impl/review/SQLServerReviewDAOImpl.java | 8 +-- .../GenericSubscriptionDAOImpl.java | 13 ++-- .../OracleSubscriptionDAOImpl.java | 4 +- .../PostgreSQLSubscriptionDAOImpl.java | 2 +- .../SQLServerSubscriptionDAOImpl.java | 7 +- .../visibility/GenericVisibilityDAOImpl.java | 8 +-- .../visibility/OracleVisibilityDAOImpl.java | 2 +- .../PostgreSQLVisibilityDAOImpl.java | 2 +- .../SQLServerVisibilityDAOImpl.java | 2 +- .../mgt/core/deployer/Property.java | 2 +- .../ApplicationManagementDAOException.java | 2 +- .../ApplicationOperationTaskException.java | 2 +- .../core/exception/BadRequestException.java | 2 +- .../core/exception/ForbiddenException.java | 2 +- .../LifeCycleManagementDAOException.java | 2 +- .../mgt/core/exception/NotFoundException.java | 2 +- .../mgt/core/exception/ParsingException.java | 2 +- .../ReviewManagementDAOException.java | 2 +- .../SubscriptionManagementDAOException.java | 2 +- .../UnexpectedServerErrorException.java | 2 +- .../core/exception/ValidationException.java | 2 +- .../VisibilityManagementDAOException.java | 2 +- .../mgt/core/impl/ApplicationManagerImpl.java | 40 +++++------ .../impl/ApplicationStorageManagerImpl.java | 12 ++-- .../mgt/core/impl/AppmDataHandlerImpl.java | 12 ++-- .../mgt/core/impl/ReviewManagerImpl.java | 24 +++---- .../core/impl/SubscriptionManagerImpl.java | 30 ++++---- ...ApplicationManagementServiceComponent.java | 14 ++-- .../mgt/core/internal/DataHolder.java | 4 +- .../core/lifecycle/LifecycleStateManager.java | 4 +- .../ScheduledAppSubscriptionCleanupTask.java | 4 +- .../task/ScheduledAppSubscriptionTask.java | 6 +- .../ScheduledAppSubscriptionTaskManager.java | 12 ++-- .../application/mgt/core/util/APIUtil.java | 10 +-- .../core/util/ApplicationManagementUtil.java | 8 +-- .../util/ApplicationMgtDatabaseCreator.java | 2 +- .../mgt/core/util/ArtifactsParser.java | 5 +- .../mgt/core/util/ConnectionManagerUtil.java | 2 +- .../application/mgt/core/util/Constants.java | 2 +- .../application/mgt/core/util/DAOUtil.java | 4 +- .../application/mgt/core/util/HelperUtil.java | 2 +- .../application/mgt/core/util/JSONUtil.java | 2 +- .../mgt/core/util/MDMAppConstants.java | 2 +- .../application/mgt/core/util/OAuthUtils.java | 2 +- .../mgt/core/util/StorageManagementUtil.java | 2 +- .../src/main/resources/META-INF/component.xml | 2 +- .../mgt/core}/ArtifactParserTest.java | 6 +- .../application/mgt/core}/BaseTestCase.java | 18 ++--- .../mgt/core}/ConfigurationTest.java | 6 +- .../application/mgt/core}/InitTest.java | 4 +- .../mgt/core}/LifeCycleStateManagerTest.java | 4 +- .../mgt/core}/LifecycleManagementTest.java | 8 +-- .../mgt/core}/StorageManagementUtilTest.java | 4 +- .../application/mgt/core}/TestUtils.java | 2 +- .../mgt/core/common/DataSourceConfig.java | 2 +- .../dao/ApplicationManagementDAOTest.java | 10 +-- .../mgt/core}/dto/ApplicationsDTO.java | 2 +- .../mgt/core}/dto/DeviceTypeCreator.java | 2 +- .../management/ApplicationManagementTest.java | 14 ++-- .../src/test/resources/Platform.xml | 0 .../src/test/resources/application-mgt.xml | 10 +-- .../resources/carbon-home/dbscripts/h2.sql | 0 .../repository/conf/application-mgt.xml | 10 +-- .../repository/conf/axis2/axis2.xml | 0 .../repository/conf/axis2/axis2_client.xml | 0 .../repository/conf/axis2/tenant-axis2.xml | 0 .../carbon-home/repository/conf/carbon.xml | 0 .../repository/conf/cdm-config.xml | 0 .../conf/datasources/master-datasources.xml | 0 .../conf/etc/bundle-config/README.txt | 0 .../carboncontext-osgi-services.properties | 0 .../repository/conf/etc/config-validation.xml | 0 .../carbon-home/repository/conf/etc/jmx.xml | 0 .../repository/conf/etc/launch.ini | 0 .../conf/etc/logging-bridge.properties | 0 .../repository/conf/etc/mime.mappings | 0 .../repository/conf/etc/mime.types | 0 .../repository/conf/etc/osgi-debug.options | 0 .../repository/conf/etc/tasks-config.xml | 0 .../repository/conf/log4j.properties | 0 .../carbon-home/repository/conf/registry.xml | 0 .../conf/security/authenticators.xml | 0 .../conf/tomcat/carbon/META-INF/context.xml | 0 .../conf/tomcat/carbon/WEB-INF/web.xml | 0 .../conf/tomcat/catalina-server.xml | 0 .../repository/conf/tomcat/tomcat-users.xml | 0 .../repository/conf/tomcat/web.xml | 0 .../carbon-home/repository/conf/user-mgt.xml | 0 .../datasource/data-source-config.xml | 0 .../src/test/resources/h2.sql | 0 .../src/test/resources/log4j.properties | 0 .../test/resources/samples/app1/banner1.jpg | Bin .../src/test/resources/samples/app1/icon.png | Bin .../test/resources/samples/app1/sample.apk | Bin .../src/test/resources/samples/app1/shot1.png | Bin .../src/test/resources/samples/app1/shot2.png | Bin .../src/test/resources/samples/app1/shot3.png | Bin .../test/resources/samples/app2/banner1.jpg | Bin .../src/test/resources/samples/app2/icon.png | Bin .../resources/samples/app2/sample_4.0.6.apk | Bin .../src/test/resources/samples/app2/shot1.png | Bin .../src/test/resources/samples/app2/shot2.png | Bin .../src/test/resources/samples/app2/shot3.png | Bin .../src/test/resources/testng.xml | 16 ++--- .../user-test/user-mgt-registry-test.xml | 0 .../src/test/resources/util/app-debug.apk | Bin .../src/test/resources/util/iOSMDMAgent.ipa | Bin ...ApplicationManagementPublisherAPIImpl.java | 12 ++-- ...cationManagementPublisherAdminAPIImpl.java | 8 +-- ...ReviewManagementPublisherAdminAPIImpl.java | 4 +- .../impl/ApplicationManagementAPIImpl.java | 8 +-- .../impl/ReviewManagementAPIImpl.java | 8 +-- .../impl/SubscriptionManagementAPIImpl.java | 12 ++-- .../ReviewManagementStoreAdminAPIImpl.java | 4 +- .../SubscriptionManagementAdminAPIImpl.java | 6 +- .../impl/util/RequestValidationUtil.java | 2 +- .../api/services/ReviewManagementAPITest.java | 2 +- .../impl/DeviceManagementServiceImpl.java | 2 +- .../main/resources/conf/application-mgt.xml | 10 +-- 150 files changed, 342 insertions(+), 350 deletions(-) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/pom.xml (96%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/config/Artifacts.java (96%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/config/Configuration.java (98%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/config/ConfigurationManager.java (96%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/config/Extension.java (97%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/config/PaginationConfiguration.java (95%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/config/Parameter.java (95%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/dao/ApplicationDAO.java (98%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/dao/ApplicationReleaseDAO.java (97%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/dao/LifecycleStateDAO.java (95%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/dao/ReviewDAO.java (97%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/dao/SubscriptionDAO.java (98%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/dao/VisibilityDAO.java (95%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/dao/common/ApplicationManagementDAOFactory.java (72%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/dao/impl/AbstractDAOImpl.java (88%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/dao/impl/application/GenericApplicationDAOImpl.java (99%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/dao/impl/application/OracleApplicationDAOImpl.java (97%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/dao/impl/application/PostgreSQLApplicationDAOImpl.java (93%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/dao/impl/application/SQLServerApplicationDAOImpl.java (97%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/dao/impl/application/release/GenericApplicationReleaseDAOImpl.java (98%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/dao/impl/application/release/OracleApplicationReleaseDAOImpl.java (94%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/dao/impl/application/release/PostgreSQLApplicationReleaseDAOImpl.java (92%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/dao/impl/application/release/SQLServerApplicationReleaseDAOImpl.java (94%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/dao/impl/lifecyclestate/GenericLifecycleStateDAOImpl.java (97%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/dao/impl/lifecyclestate/OracleLifecycleStateDAOImpl.java (91%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/dao/impl/lifecyclestate/PostgreSQLLifecycleStateDAOImpl.java (93%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/dao/impl/lifecyclestate/SQLServerLifecycleStateDAOImpl.java (91%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/dao/impl/review/GenericReviewDAOImpl.java (98%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/dao/impl/review/OracleReviewDAOImpl.java (97%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/dao/impl/review/PostgreSQLReviewDAOImpl.java (93%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/dao/impl/review/SQLServerReviewDAOImpl.java (97%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/dao/impl/subscription/GenericSubscriptionDAOImpl.java (99%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/dao/impl/subscription/OracleSubscriptionDAOImpl.java (97%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/dao/impl/subscription/PostgreSQLSubscriptionDAOImpl.java (93%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/dao/impl/subscription/SQLServerSubscriptionDAOImpl.java (96%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/dao/impl/visibility/GenericVisibilityDAOImpl.java (96%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/dao/impl/visibility/OracleVisibilityDAOImpl.java (92%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/dao/impl/visibility/PostgreSQLVisibilityDAOImpl.java (93%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/dao/impl/visibility/SQLServerVisibilityDAOImpl.java (92%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/deployer/Property.java (96%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/exception/ApplicationManagementDAOException.java (94%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/exception/ApplicationOperationTaskException.java (91%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/exception/BadRequestException.java (94%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/exception/ForbiddenException.java (94%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/exception/LifeCycleManagementDAOException.java (94%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/exception/NotFoundException.java (94%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/exception/ParsingException.java (95%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/exception/ReviewManagementDAOException.java (94%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/exception/SubscriptionManagementDAOException.java (94%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/exception/UnexpectedServerErrorException.java (94%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/exception/ValidationException.java (94%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/exception/VisibilityManagementDAOException.java (95%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/impl/ApplicationManagerImpl.java (99%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/impl/ApplicationStorageManagerImpl.java (97%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/impl/AppmDataHandlerImpl.java (93%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/impl/ReviewManagerImpl.java (97%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/impl/SubscriptionManagerImpl.java (98%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/internal/ApplicationManagementServiceComponent.java (93%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/internal/DataHolder.java (96%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/lifecycle/LifecycleStateManager.java (98%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/task/ScheduledAppSubscriptionCleanupTask.java (93%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/task/ScheduledAppSubscriptionTask.java (97%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/task/ScheduledAppSubscriptionTaskManager.java (96%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/util/APIUtil.java (98%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/util/ApplicationManagementUtil.java (94%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/util/ApplicationMgtDatabaseCreator.java (96%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/util/ArtifactsParser.java (96%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/util/ConnectionManagerUtil.java (99%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/util/Constants.java (99%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/util/DAOUtil.java (98%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/util/HelperUtil.java (97%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/util/JSONUtil.java (96%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/util/MDMAppConstants.java (98%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/util/OAuthUtils.java (98%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/main/java/io/entgra}/application/mgt/core/util/StorageManagementUtil.java (99%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/main/resources/META-INF/component.xml (94%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core}/ArtifactParserTest.java (93%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core}/BaseTestCase.java (92%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core}/ConfigurationTest.java (89%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core}/InitTest.java (90%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core}/LifeCycleStateManagerTest.java (91%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core}/LifecycleManagementTest.java (95%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core}/StorageManagementUtilTest.java (95%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core}/TestUtils.java (96%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/test/java/org/wso2/carbon/device => io.entgra.application.mgt.core/src/test/java/io/entgra}/application/mgt/core/common/DataSourceConfig.java (97%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core}/dao/ApplicationManagementDAOTest.java (88%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core}/dto/ApplicationsDTO.java (95%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core}/dto/DeviceTypeCreator.java (94%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core}/management/ApplicationManagementTest.java (95%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/Platform.xml (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/application-mgt.xml (91%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/carbon-home/dbscripts/h2.sql (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/carbon-home/repository/conf/application-mgt.xml (91%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/carbon-home/repository/conf/carbon.xml (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/carbon-home/repository/conf/cdm-config.xml (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/carbon-home/repository/conf/datasources/master-datasources.xml (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/carbon-home/repository/conf/etc/jmx.xml (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/carbon-home/repository/conf/etc/launch.ini (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/carbon-home/repository/conf/etc/mime.mappings (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/carbon-home/repository/conf/etc/mime.types (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/carbon-home/repository/conf/log4j.properties (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/carbon-home/repository/conf/registry.xml (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/carbon-home/repository/conf/security/authenticators.xml (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/carbon-home/repository/conf/tomcat/web.xml (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/carbon-home/repository/conf/user-mgt.xml (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/datasource/data-source-config.xml (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/h2.sql (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/log4j.properties (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/samples/app1/banner1.jpg (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/samples/app1/icon.png (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/samples/app1/sample.apk (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/samples/app1/shot1.png (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/samples/app1/shot2.png (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/samples/app1/shot3.png (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/samples/app2/banner1.jpg (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/samples/app2/icon.png (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/samples/app2/sample_4.0.6.apk (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/samples/app2/shot1.png (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/samples/app2/shot2.png (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/samples/app2/shot3.png (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/testng.xml (53%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/user-test/user-mgt-registry-test.xml (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/util/app-debug.apk (100%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.core => io.entgra.application.mgt.core}/src/test/resources/util/iOSMDMAgent.ipa (100%) diff --git a/components/application-mgt/io.entgra.application.mgt.api/src/main/java/io/entgra/application/mgt/api/services/impl/ArtifactDownloadAPIImpl.java b/components/application-mgt/io.entgra.application.mgt.api/src/main/java/io/entgra/application/mgt/api/services/impl/ArtifactDownloadAPIImpl.java index 526257a2dd..4d4ea30cd2 100644 --- a/components/application-mgt/io.entgra.application.mgt.api/src/main/java/io/entgra/application/mgt/api/services/impl/ArtifactDownloadAPIImpl.java +++ b/components/application-mgt/io.entgra.application.mgt.api/src/main/java/io/entgra/application/mgt/api/services/impl/ArtifactDownloadAPIImpl.java @@ -24,10 +24,10 @@ import io.entgra.application.mgt.api.services.ArtifactDownloadAPI; import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; import org.wso2.carbon.device.application.mgt.common.services.ApplicationManager; import org.wso2.carbon.device.application.mgt.common.services.AppmDataHandler; -import org.wso2.carbon.device.application.mgt.core.exception.BadRequestException; -import org.wso2.carbon.device.application.mgt.core.exception.NotFoundException; -import org.wso2.carbon.device.application.mgt.core.util.APIUtil; -import org.wso2.carbon.device.application.mgt.core.util.Constants; +import io.entgra.application.mgt.core.exception.BadRequestException; +import io.entgra.application.mgt.core.exception.NotFoundException; +import io.entgra.application.mgt.core.util.APIUtil; +import io.entgra.application.mgt.core.util.Constants; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/pom.xml b/components/application-mgt/io.entgra.application.mgt.core/pom.xml similarity index 96% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/pom.xml rename to components/application-mgt/io.entgra.application.mgt.core/pom.xml index 1bf38faaaa..5a1d9f5778 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/pom.xml +++ b/components/application-mgt/io.entgra.application.mgt.core/pom.xml @@ -26,10 +26,10 @@ 4.0.0 - org.wso2.carbon.device.application.mgt.core + io.entgra.application.mgt.core bundle - WSO2 Carbon - Application Management Core - WSO2 Carbon - Application Management Core + Entgra - Application Management Core + Entgra - Application Management Core https://entgra.io @@ -48,7 +48,7 @@ ${project.artifactId} ${carbon.device.mgt.version} Application Management Core Bundle - org.wso2.carbon.device.application.mgt.core.internal + io.entgra.application.mgt.core.internal org.osgi.framework.*;version="${imp.package.version.osgi.framework}", org.osgi.service.*;version="${imp.package.version.osgi.service}", @@ -87,8 +87,8 @@ apk-parser;scope=compile|runtime;inline=false - !org.wso2.carbon.device.application.mgt.core.internal.*, - org.wso2.carbon.device.application.mgt.core.* + !io.entgra.application.mgt.core.internal.*, + io.entgra.application.mgt.core.* diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/config/Artifacts.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/Artifacts.java similarity index 96% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/config/Artifacts.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/Artifacts.java index 2c2e6cf25e..8e745c77eb 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/config/Artifacts.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/Artifacts.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.config; +package io.entgra.application.mgt.core.config; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/config/Configuration.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/Configuration.java similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/config/Configuration.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/Configuration.java index 3f3626bfb7..3a254accc5 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/config/Configuration.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/Configuration.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.config; +package io.entgra.application.mgt.core.config; import org.wso2.carbon.device.application.mgt.common.config.MDMConfig; import org.wso2.carbon.device.application.mgt.common.config.RatingConfiguration; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/config/ConfigurationManager.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/ConfigurationManager.java similarity index 96% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/config/ConfigurationManager.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/ConfigurationManager.java index da8146cf2e..cd2230aa14 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/config/ConfigurationManager.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/ConfigurationManager.java @@ -15,13 +15,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.config; +package io.entgra.application.mgt.core.config; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; import org.wso2.carbon.device.application.mgt.common.exception.InvalidConfigurationException; -import org.wso2.carbon.device.application.mgt.core.util.Constants; +import io.entgra.application.mgt.core.util.Constants; import java.io.File; import javax.xml.bind.JAXBContext; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/config/Extension.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/Extension.java similarity index 97% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/config/Extension.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/Extension.java index 17c9f3f63d..282f051889 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/config/Extension.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/Extension.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.config; +package io.entgra.application.mgt.core.config; import java.util.List; import javax.xml.bind.annotation.XmlAttribute; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/config/PaginationConfiguration.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/PaginationConfiguration.java similarity index 95% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/config/PaginationConfiguration.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/PaginationConfiguration.java index 0ca3d0e343..6b7974c74f 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/config/PaginationConfiguration.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/PaginationConfiguration.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.config; +package io.entgra.application.mgt.core.config; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/config/Parameter.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/Parameter.java similarity index 95% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/config/Parameter.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/Parameter.java index a8e3d1dbc5..82419b1897 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/config/Parameter.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/Parameter.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.config; +package io.entgra.application.mgt.core.config; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/ApplicationDAO.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/ApplicationDAO.java index 73784e4813..1b680acc79 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 @@ -15,13 +15,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.dao; +package io.entgra.application.mgt.core.dao; import org.wso2.carbon.device.application.mgt.common.*; import org.wso2.carbon.device.application.mgt.common.dto.ApplicationDTO; import org.wso2.carbon.device.application.mgt.common.dto.CategoryDTO; import org.wso2.carbon.device.application.mgt.common.dto.TagDTO; -import org.wso2.carbon.device.application.mgt.core.exception.ApplicationManagementDAOException; +import io.entgra.application.mgt.core.exception.ApplicationManagementDAOException; import java.util.List; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 similarity index 97% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/ApplicationReleaseDAO.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/ApplicationReleaseDAO.java index 28af63f2ed..c877d58478 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 @@ -15,11 +15,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.dao; +package io.entgra.application.mgt.core.dao; import org.wso2.carbon.device.application.mgt.common.dto.ApplicationReleaseDTO; import org.wso2.carbon.device.application.mgt.common.Rating; -import org.wso2.carbon.device.application.mgt.core.exception.ApplicationManagementDAOException; +import io.entgra.application.mgt.core.exception.ApplicationManagementDAOException; import java.util.List; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 similarity index 95% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/LifecycleStateDAO.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/LifecycleStateDAO.java index dd4e2575c9..9f46d533e4 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 @@ -15,10 +15,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.dao; +package io.entgra.application.mgt.core.dao; import org.wso2.carbon.device.application.mgt.common.LifecycleState; -import org.wso2.carbon.device.application.mgt.core.exception.LifeCycleManagementDAOException; +import io.entgra.application.mgt.core.exception.LifeCycleManagementDAOException; import java.util.List; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 similarity index 97% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/ReviewDAO.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/ReviewDAO.java index ff2cf5d164..afcf8ceec3 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 @@ -15,12 +15,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.dao; +package io.entgra.application.mgt.core.dao; import org.wso2.carbon.device.application.mgt.common.response.Review; import org.wso2.carbon.device.application.mgt.common.PaginationRequest; import org.wso2.carbon.device.application.mgt.common.dto.ReviewDTO; -import org.wso2.carbon.device.application.mgt.core.exception.ReviewManagementDAOException; +import io.entgra.application.mgt.core.exception.ReviewManagementDAOException; import java.util.List; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/SubscriptionDAO.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/SubscriptionDAO.java index 3ff0d95945..63151d7454 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 @@ -15,16 +15,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.dao; +package io.entgra.application.mgt.core.dao; import org.wso2.carbon.device.application.mgt.common.ExecutionStatus; import org.wso2.carbon.device.application.mgt.common.dto.ApplicationReleaseDTO; import org.wso2.carbon.device.application.mgt.common.dto.DeviceSubscriptionDTO; import org.wso2.carbon.device.application.mgt.common.dto.ScheduledSubscriptionDTO; import org.wso2.carbon.device.application.mgt.common.exception.SubscriptionManagementException; -import org.wso2.carbon.device.application.mgt.core.exception.ApplicationManagementDAOException; +import io.entgra.application.mgt.core.exception.ApplicationManagementDAOException; -import java.time.LocalDateTime; import java.util.List; import java.util.Map; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/VisibilityDAO.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/VisibilityDAO.java similarity index 95% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/VisibilityDAO.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/VisibilityDAO.java index e1cf1880ec..48597b8495 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/VisibilityDAO.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/VisibilityDAO.java @@ -15,9 +15,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.dao; +package io.entgra.application.mgt.core.dao; -import org.wso2.carbon.device.application.mgt.core.exception.VisibilityManagementDAOException; +import io.entgra.application.mgt.core.exception.VisibilityManagementDAOException; import java.util.List; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/common/ApplicationManagementDAOFactory.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/common/ApplicationManagementDAOFactory.java similarity index 72% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/common/ApplicationManagementDAOFactory.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/common/ApplicationManagementDAOFactory.java index 36aeaf9678..66e54834c2 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/common/ApplicationManagementDAOFactory.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/common/ApplicationManagementDAOFactory.java @@ -15,43 +15,43 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.dao.common; +package io.entgra.application.mgt.core.dao.common; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.device.application.mgt.common.exception.UnsupportedDatabaseEngineException; -import org.wso2.carbon.device.application.mgt.core.dao.ApplicationDAO; -import org.wso2.carbon.device.application.mgt.core.dao.ApplicationReleaseDAO; -import org.wso2.carbon.device.application.mgt.core.dao.LifecycleStateDAO; -import org.wso2.carbon.device.application.mgt.core.dao.ReviewDAO; -import org.wso2.carbon.device.application.mgt.core.dao.SubscriptionDAO; -import org.wso2.carbon.device.application.mgt.core.dao.VisibilityDAO; -import org.wso2.carbon.device.application.mgt.core.dao.impl.application.PostgreSQLApplicationDAOImpl; -import org.wso2.carbon.device.application.mgt.core.dao.impl.application.SQLServerApplicationDAOImpl; -import org.wso2.carbon.device.application.mgt.core.dao.impl.application.release.OracleApplicationReleaseDAOImpl; -import org.wso2.carbon.device.application.mgt.core.dao.impl.application.release.PostgreSQLApplicationReleaseDAOImpl; -import org.wso2.carbon.device.application.mgt.core.dao.impl.application.release.SQLServerApplicationReleaseDAOImpl; -import org.wso2.carbon.device.application.mgt.core.dao.impl.lifecyclestate.OracleLifecycleStateDAOImpl; -import org.wso2.carbon.device.application.mgt.core.dao.impl.lifecyclestate.PostgreSQLLifecycleStateDAOImpl; -import org.wso2.carbon.device.application.mgt.core.dao.impl.lifecyclestate.SQLServerLifecycleStateDAOImpl; -import org.wso2.carbon.device.application.mgt.core.dao.impl.review.GenericReviewDAOImpl; -import org.wso2.carbon.device.application.mgt.core.dao.impl.application.GenericApplicationDAOImpl; -import org.wso2.carbon.device.application.mgt.core.dao.impl.application.release.GenericApplicationReleaseDAOImpl; -import org.wso2.carbon.device.application.mgt.core.dao.impl.application.OracleApplicationDAOImpl; -import org.wso2.carbon.device.application.mgt.core.dao.impl.lifecyclestate.GenericLifecycleStateDAOImpl; -import org.wso2.carbon.device.application.mgt.core.dao.impl.review.OracleReviewDAOImpl; -import org.wso2.carbon.device.application.mgt.core.dao.impl.review.PostgreSQLReviewDAOImpl; -import org.wso2.carbon.device.application.mgt.core.dao.impl.review.SQLServerReviewDAOImpl; -import org.wso2.carbon.device.application.mgt.core.dao.impl.subscription.GenericSubscriptionDAOImpl; -import org.wso2.carbon.device.application.mgt.core.dao.impl.subscription.OracleSubscriptionDAOImpl; -import org.wso2.carbon.device.application.mgt.core.dao.impl.subscription.PostgreSQLSubscriptionDAOImpl; -import org.wso2.carbon.device.application.mgt.core.dao.impl.subscription.SQLServerSubscriptionDAOImpl; -import org.wso2.carbon.device.application.mgt.core.dao.impl.visibility.GenericVisibilityDAOImpl; -import org.wso2.carbon.device.application.mgt.core.dao.impl.visibility.OracleVisibilityDAOImpl; -import org.wso2.carbon.device.application.mgt.core.dao.impl.visibility.PostgreSQLVisibilityDAOImpl; -import org.wso2.carbon.device.application.mgt.core.dao.impl.visibility.SQLServerVisibilityDAOImpl; -import org.wso2.carbon.device.application.mgt.core.util.ConnectionManagerUtil; -import org.wso2.carbon.device.application.mgt.core.util.Constants; +import io.entgra.application.mgt.core.dao.ApplicationDAO; +import io.entgra.application.mgt.core.dao.ApplicationReleaseDAO; +import io.entgra.application.mgt.core.dao.LifecycleStateDAO; +import io.entgra.application.mgt.core.dao.ReviewDAO; +import io.entgra.application.mgt.core.dao.SubscriptionDAO; +import io.entgra.application.mgt.core.dao.VisibilityDAO; +import io.entgra.application.mgt.core.dao.impl.application.PostgreSQLApplicationDAOImpl; +import io.entgra.application.mgt.core.dao.impl.application.SQLServerApplicationDAOImpl; +import io.entgra.application.mgt.core.dao.impl.application.release.OracleApplicationReleaseDAOImpl; +import io.entgra.application.mgt.core.dao.impl.application.release.PostgreSQLApplicationReleaseDAOImpl; +import io.entgra.application.mgt.core.dao.impl.application.release.SQLServerApplicationReleaseDAOImpl; +import io.entgra.application.mgt.core.dao.impl.lifecyclestate.OracleLifecycleStateDAOImpl; +import io.entgra.application.mgt.core.dao.impl.lifecyclestate.PostgreSQLLifecycleStateDAOImpl; +import io.entgra.application.mgt.core.dao.impl.lifecyclestate.SQLServerLifecycleStateDAOImpl; +import io.entgra.application.mgt.core.dao.impl.review.GenericReviewDAOImpl; +import io.entgra.application.mgt.core.dao.impl.application.GenericApplicationDAOImpl; +import io.entgra.application.mgt.core.dao.impl.application.release.GenericApplicationReleaseDAOImpl; +import io.entgra.application.mgt.core.dao.impl.application.OracleApplicationDAOImpl; +import io.entgra.application.mgt.core.dao.impl.lifecyclestate.GenericLifecycleStateDAOImpl; +import io.entgra.application.mgt.core.dao.impl.review.OracleReviewDAOImpl; +import io.entgra.application.mgt.core.dao.impl.review.PostgreSQLReviewDAOImpl; +import io.entgra.application.mgt.core.dao.impl.review.SQLServerReviewDAOImpl; +import io.entgra.application.mgt.core.dao.impl.subscription.GenericSubscriptionDAOImpl; +import io.entgra.application.mgt.core.dao.impl.subscription.OracleSubscriptionDAOImpl; +import io.entgra.application.mgt.core.dao.impl.subscription.PostgreSQLSubscriptionDAOImpl; +import io.entgra.application.mgt.core.dao.impl.subscription.SQLServerSubscriptionDAOImpl; +import io.entgra.application.mgt.core.dao.impl.visibility.GenericVisibilityDAOImpl; +import io.entgra.application.mgt.core.dao.impl.visibility.OracleVisibilityDAOImpl; +import io.entgra.application.mgt.core.dao.impl.visibility.PostgreSQLVisibilityDAOImpl; +import io.entgra.application.mgt.core.dao.impl.visibility.SQLServerVisibilityDAOImpl; +import io.entgra.application.mgt.core.util.ConnectionManagerUtil; +import io.entgra.application.mgt.core.util.Constants; import javax.sql.DataSource; import java.sql.SQLException; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/AbstractDAOImpl.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/AbstractDAOImpl.java similarity index 88% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/AbstractDAOImpl.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/AbstractDAOImpl.java index a9488163fc..b9808ead34 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/AbstractDAOImpl.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/AbstractDAOImpl.java @@ -15,10 +15,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.dao.impl; +package io.entgra.application.mgt.core.dao.impl; import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException; -import org.wso2.carbon.device.application.mgt.core.util.ConnectionManagerUtil; +import io.entgra.application.mgt.core.util.ConnectionManagerUtil; import java.sql.Connection; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 similarity index 99% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/application/GenericApplicationDAOImpl.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/GenericApplicationDAOImpl.java index dd8880c6fc..37b9b72c23 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.dao.impl.application; +package io.entgra.application.mgt.core.dao.impl.application; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; @@ -27,11 +27,11 @@ import org.wso2.carbon.device.application.mgt.common.Filter; import org.wso2.carbon.device.application.mgt.common.dto.ReviewDTO; import org.wso2.carbon.device.application.mgt.common.dto.TagDTO; import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException; -import org.wso2.carbon.device.application.mgt.core.dao.ApplicationDAO; -import org.wso2.carbon.device.application.mgt.core.util.DAOUtil; -import org.wso2.carbon.device.application.mgt.core.dao.impl.AbstractDAOImpl; -import org.wso2.carbon.device.application.mgt.core.exception.ApplicationManagementDAOException; -import org.wso2.carbon.device.application.mgt.core.exception.UnexpectedServerErrorException; +import io.entgra.application.mgt.core.dao.ApplicationDAO; +import io.entgra.application.mgt.core.util.DAOUtil; +import io.entgra.application.mgt.core.dao.impl.AbstractDAOImpl; +import io.entgra.application.mgt.core.exception.ApplicationManagementDAOException; +import io.entgra.application.mgt.core.exception.UnexpectedServerErrorException; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 similarity index 97% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/application/OracleApplicationDAOImpl.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/OracleApplicationDAOImpl.java index bb705d7f82..e96f7769eb 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.dao.impl.application; +package io.entgra.application.mgt.core.dao.impl.application; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; @@ -24,8 +24,8 @@ import org.apache.commons.logging.LogFactory; import org.wso2.carbon.device.application.mgt.common.Filter; import org.wso2.carbon.device.application.mgt.common.dto.ApplicationDTO; import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException; -import org.wso2.carbon.device.application.mgt.core.exception.ApplicationManagementDAOException; -import org.wso2.carbon.device.application.mgt.core.util.DAOUtil; +import io.entgra.application.mgt.core.exception.ApplicationManagementDAOException; +import io.entgra.application.mgt.core.util.DAOUtil; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/application/PostgreSQLApplicationDAOImpl.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/PostgreSQLApplicationDAOImpl.java similarity index 93% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/application/PostgreSQLApplicationDAOImpl.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/PostgreSQLApplicationDAOImpl.java index 54eb76b914..bba8543c2c 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/application/PostgreSQLApplicationDAOImpl.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/PostgreSQLApplicationDAOImpl.java @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.dao.impl.application; +package io.entgra.application.mgt.core.dao.impl.application; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 similarity index 97% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/application/SQLServerApplicationDAOImpl.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/SQLServerApplicationDAOImpl.java index d27e55aa9b..1c755e633e 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.dao.impl.application; +package io.entgra.application.mgt.core.dao.impl.application; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; @@ -23,8 +23,8 @@ import org.apache.commons.logging.LogFactory; import org.wso2.carbon.device.application.mgt.common.Filter; import org.wso2.carbon.device.application.mgt.common.dto.ApplicationDTO; import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException; -import org.wso2.carbon.device.application.mgt.core.exception.ApplicationManagementDAOException; -import org.wso2.carbon.device.application.mgt.core.util.DAOUtil; +import io.entgra.application.mgt.core.exception.ApplicationManagementDAOException; +import io.entgra.application.mgt.core.util.DAOUtil; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/application/release/GenericApplicationReleaseDAOImpl.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/release/GenericApplicationReleaseDAOImpl.java index c03ab8bea2..c6b8309642 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 @@ -16,17 +16,17 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.dao.impl.application.release; +package io.entgra.application.mgt.core.dao.impl.application.release; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.device.application.mgt.common.dto.ApplicationReleaseDTO; import org.wso2.carbon.device.application.mgt.common.Rating; import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException; -import org.wso2.carbon.device.application.mgt.core.dao.ApplicationReleaseDAO; -import org.wso2.carbon.device.application.mgt.core.util.DAOUtil; -import org.wso2.carbon.device.application.mgt.core.dao.impl.AbstractDAOImpl; -import org.wso2.carbon.device.application.mgt.core.exception.ApplicationManagementDAOException; +import io.entgra.application.mgt.core.dao.ApplicationReleaseDAO; +import io.entgra.application.mgt.core.util.DAOUtil; +import io.entgra.application.mgt.core.dao.impl.AbstractDAOImpl; +import io.entgra.application.mgt.core.exception.ApplicationManagementDAOException; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/application/release/OracleApplicationReleaseDAOImpl.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/release/OracleApplicationReleaseDAOImpl.java similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/application/release/OracleApplicationReleaseDAOImpl.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/release/OracleApplicationReleaseDAOImpl.java index d030fa82b7..c9aaae519f 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/application/release/OracleApplicationReleaseDAOImpl.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/release/OracleApplicationReleaseDAOImpl.java @@ -15,12 +15,12 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.dao.impl.application.release; +package io.entgra.application.mgt.core.dao.impl.application.release; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException; -import org.wso2.carbon.device.application.mgt.core.exception.ApplicationManagementDAOException; +import io.entgra.application.mgt.core.exception.ApplicationManagementDAOException; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/application/release/PostgreSQLApplicationReleaseDAOImpl.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/release/PostgreSQLApplicationReleaseDAOImpl.java similarity index 92% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/application/release/PostgreSQLApplicationReleaseDAOImpl.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/release/PostgreSQLApplicationReleaseDAOImpl.java index 3ffa907fcf..3727a992ae 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/application/release/PostgreSQLApplicationReleaseDAOImpl.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/release/PostgreSQLApplicationReleaseDAOImpl.java @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.dao.impl.application.release; +package io.entgra.application.mgt.core.dao.impl.application.release; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/application/release/SQLServerApplicationReleaseDAOImpl.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/release/SQLServerApplicationReleaseDAOImpl.java similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/application/release/SQLServerApplicationReleaseDAOImpl.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/release/SQLServerApplicationReleaseDAOImpl.java index 4afcdf0928..eac1e23271 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/application/release/SQLServerApplicationReleaseDAOImpl.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/release/SQLServerApplicationReleaseDAOImpl.java @@ -15,12 +15,12 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.dao.impl.application.release; +package io.entgra.application.mgt.core.dao.impl.application.release; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException; -import org.wso2.carbon.device.application.mgt.core.exception.ApplicationManagementDAOException; +import io.entgra.application.mgt.core.exception.ApplicationManagementDAOException; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 similarity index 97% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/lifecyclestate/GenericLifecycleStateDAOImpl.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/lifecyclestate/GenericLifecycleStateDAOImpl.java index ee90772205..3c5c2aa559 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 @@ -15,17 +15,17 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.dao.impl.lifecyclestate; +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 org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException; -import org.wso2.carbon.device.application.mgt.core.dao.LifecycleStateDAO; -import org.wso2.carbon.device.application.mgt.core.util.DAOUtil; -import org.wso2.carbon.device.application.mgt.core.dao.impl.AbstractDAOImpl; -import org.wso2.carbon.device.application.mgt.core.exception.LifeCycleManagementDAOException; +import io.entgra.application.mgt.core.dao.LifecycleStateDAO; +import io.entgra.application.mgt.core.util.DAOUtil; +import io.entgra.application.mgt.core.dao.impl.AbstractDAOImpl; +import io.entgra.application.mgt.core.exception.LifeCycleManagementDAOException; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/lifecyclestate/OracleLifecycleStateDAOImpl.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/lifecyclestate/OracleLifecycleStateDAOImpl.java similarity index 91% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/lifecyclestate/OracleLifecycleStateDAOImpl.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/lifecyclestate/OracleLifecycleStateDAOImpl.java index e278574c39..feffaafca9 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/lifecyclestate/OracleLifecycleStateDAOImpl.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/lifecyclestate/OracleLifecycleStateDAOImpl.java @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.dao.impl.lifecyclestate; +package io.entgra.application.mgt.core.dao.impl.lifecyclestate; /** * This handles App Lifecycle operations which are specific to MSSQL. diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/lifecyclestate/PostgreSQLLifecycleStateDAOImpl.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/lifecyclestate/PostgreSQLLifecycleStateDAOImpl.java similarity index 93% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/lifecyclestate/PostgreSQLLifecycleStateDAOImpl.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/lifecyclestate/PostgreSQLLifecycleStateDAOImpl.java index 1637777285..0dff4b0395 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/lifecyclestate/PostgreSQLLifecycleStateDAOImpl.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/lifecyclestate/PostgreSQLLifecycleStateDAOImpl.java @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.dao.impl.lifecyclestate; +package io.entgra.application.mgt.core.dao.impl.lifecyclestate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/lifecyclestate/SQLServerLifecycleStateDAOImpl.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/lifecyclestate/SQLServerLifecycleStateDAOImpl.java similarity index 91% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/lifecyclestate/SQLServerLifecycleStateDAOImpl.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/lifecyclestate/SQLServerLifecycleStateDAOImpl.java index 063e3ccd56..09db338455 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/lifecyclestate/SQLServerLifecycleStateDAOImpl.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/lifecyclestate/SQLServerLifecycleStateDAOImpl.java @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.dao.impl.lifecyclestate; +package io.entgra.application.mgt.core.dao.impl.lifecyclestate; /** * This handles App Lifecycle operations which are specific to MSSQL. diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/review/GenericReviewDAOImpl.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/review/GenericReviewDAOImpl.java index 24052730b3..a43f4710d0 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.dao.impl.review; +package io.entgra.application.mgt.core.dao.impl.review; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -23,12 +23,12 @@ import org.apache.commons.logging.LogFactory; import org.wso2.carbon.device.application.mgt.common.PaginationRequest; import org.wso2.carbon.device.application.mgt.common.dto.ReviewDTO; import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException; -import org.wso2.carbon.device.application.mgt.core.dao.ReviewDAO; -import org.wso2.carbon.device.application.mgt.core.exception.UnexpectedServerErrorException; -import org.wso2.carbon.device.application.mgt.core.util.DAOUtil; -import org.wso2.carbon.device.application.mgt.core.dao.impl.AbstractDAOImpl; -import org.wso2.carbon.device.application.mgt.core.exception.ReviewManagementDAOException; -import org.wso2.carbon.device.application.mgt.core.util.Constants; +import io.entgra.application.mgt.core.dao.ReviewDAO; +import io.entgra.application.mgt.core.exception.UnexpectedServerErrorException; +import io.entgra.application.mgt.core.util.DAOUtil; +import io.entgra.application.mgt.core.dao.impl.AbstractDAOImpl; +import io.entgra.application.mgt.core.exception.ReviewManagementDAOException; +import io.entgra.application.mgt.core.util.Constants; import java.sql.SQLException; import java.sql.ResultSet; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 similarity index 97% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/review/OracleReviewDAOImpl.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/review/OracleReviewDAOImpl.java index ac252e52f7..6f318a1d70 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 @@ -15,16 +15,16 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.dao.impl.review; +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 org.wso2.carbon.device.application.mgt.common.dto.ReviewDTO; import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException; -import org.wso2.carbon.device.application.mgt.core.exception.ReviewManagementDAOException; -import org.wso2.carbon.device.application.mgt.core.util.Constants; -import org.wso2.carbon.device.application.mgt.core.util.DAOUtil; +import io.entgra.application.mgt.core.exception.ReviewManagementDAOException; +import io.entgra.application.mgt.core.util.Constants; +import io.entgra.application.mgt.core.util.DAOUtil; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/review/PostgreSQLReviewDAOImpl.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/review/PostgreSQLReviewDAOImpl.java similarity index 93% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/review/PostgreSQLReviewDAOImpl.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/review/PostgreSQLReviewDAOImpl.java index 38bebccd12..b5eacab5aa 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/review/PostgreSQLReviewDAOImpl.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/review/PostgreSQLReviewDAOImpl.java @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.dao.impl.review; +package io.entgra.application.mgt.core.dao.impl.review; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 similarity index 97% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/review/SQLServerReviewDAOImpl.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/review/SQLServerReviewDAOImpl.java index 213d619b0c..d6a6368076 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 @@ -15,16 +15,16 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.dao.impl.review; +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 org.wso2.carbon.device.application.mgt.common.dto.ReviewDTO; import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException; -import org.wso2.carbon.device.application.mgt.core.exception.ReviewManagementDAOException; -import org.wso2.carbon.device.application.mgt.core.util.Constants; -import org.wso2.carbon.device.application.mgt.core.util.DAOUtil; +import io.entgra.application.mgt.core.exception.ReviewManagementDAOException; +import io.entgra.application.mgt.core.util.Constants; +import io.entgra.application.mgt.core.util.DAOUtil; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 similarity index 99% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/subscription/GenericSubscriptionDAOImpl.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/subscription/GenericSubscriptionDAOImpl.java index 4e6c6623f1..dbf896200c 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.dao.impl.subscription; +package io.entgra.application.mgt.core.dao.impl.subscription; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -25,18 +25,17 @@ import org.wso2.carbon.device.application.mgt.common.SubscriptionType; import org.wso2.carbon.device.application.mgt.common.dto.DeviceSubscriptionDTO; import org.wso2.carbon.device.application.mgt.common.dto.ScheduledSubscriptionDTO; import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException; -import org.wso2.carbon.device.application.mgt.core.dao.SubscriptionDAO; -import org.wso2.carbon.device.application.mgt.core.dao.impl.AbstractDAOImpl; -import org.wso2.carbon.device.application.mgt.core.exception.ApplicationManagementDAOException; -import org.wso2.carbon.device.application.mgt.core.exception.UnexpectedServerErrorException; -import org.wso2.carbon.device.application.mgt.core.util.DAOUtil; +import io.entgra.application.mgt.core.dao.SubscriptionDAO; +import io.entgra.application.mgt.core.dao.impl.AbstractDAOImpl; +import io.entgra.application.mgt.core.exception.ApplicationManagementDAOException; +import io.entgra.application.mgt.core.exception.UnexpectedServerErrorException; +import io.entgra.application.mgt.core.util.DAOUtil; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Timestamp; -import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/subscription/OracleSubscriptionDAOImpl.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/subscription/OracleSubscriptionDAOImpl.java similarity index 97% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/subscription/OracleSubscriptionDAOImpl.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/subscription/OracleSubscriptionDAOImpl.java index b7932d9f9c..e4d25a8219 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/subscription/OracleSubscriptionDAOImpl.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/subscription/OracleSubscriptionDAOImpl.java @@ -15,12 +15,12 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.dao.impl.subscription; +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.exception.DBConnectionException; -import org.wso2.carbon.device.application.mgt.core.exception.ApplicationManagementDAOException; +import io.entgra.application.mgt.core.exception.ApplicationManagementDAOException; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/subscription/PostgreSQLSubscriptionDAOImpl.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/subscription/PostgreSQLSubscriptionDAOImpl.java similarity index 93% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/subscription/PostgreSQLSubscriptionDAOImpl.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/subscription/PostgreSQLSubscriptionDAOImpl.java index de13737299..bae3c14471 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/subscription/PostgreSQLSubscriptionDAOImpl.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/subscription/PostgreSQLSubscriptionDAOImpl.java @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.dao.impl.subscription; +package io.entgra.application.mgt.core.dao.impl.subscription; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/subscription/SQLServerSubscriptionDAOImpl.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/subscription/SQLServerSubscriptionDAOImpl.java similarity index 96% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/subscription/SQLServerSubscriptionDAOImpl.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/subscription/SQLServerSubscriptionDAOImpl.java index 26a498af1b..4d6763b047 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/subscription/SQLServerSubscriptionDAOImpl.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/subscription/SQLServerSubscriptionDAOImpl.java @@ -15,21 +15,18 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.dao.impl.subscription; +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.exception.DBConnectionException; -import org.wso2.carbon.device.application.mgt.core.exception.ApplicationManagementDAOException; +import io.entgra.application.mgt.core.exception.ApplicationManagementDAOException; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.sql.Statement; -import java.sql.Timestamp; import java.util.ArrayList; -import java.util.Calendar; import java.util.List; /** diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/visibility/GenericVisibilityDAOImpl.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/visibility/GenericVisibilityDAOImpl.java similarity index 96% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/visibility/GenericVisibilityDAOImpl.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/visibility/GenericVisibilityDAOImpl.java index 492a65e004..50156e417c 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/visibility/GenericVisibilityDAOImpl.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/visibility/GenericVisibilityDAOImpl.java @@ -15,14 +15,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.dao.impl.visibility; +package io.entgra.application.mgt.core.dao.impl.visibility; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException; -import org.wso2.carbon.device.application.mgt.core.dao.VisibilityDAO; -import org.wso2.carbon.device.application.mgt.core.dao.impl.AbstractDAOImpl; -import org.wso2.carbon.device.application.mgt.core.exception.VisibilityManagementDAOException; +import io.entgra.application.mgt.core.dao.VisibilityDAO; +import io.entgra.application.mgt.core.dao.impl.AbstractDAOImpl; +import io.entgra.application.mgt.core.exception.VisibilityManagementDAOException; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/visibility/OracleVisibilityDAOImpl.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/visibility/OracleVisibilityDAOImpl.java similarity index 92% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/visibility/OracleVisibilityDAOImpl.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/visibility/OracleVisibilityDAOImpl.java index 8234879598..8649d32d06 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/visibility/OracleVisibilityDAOImpl.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/visibility/OracleVisibilityDAOImpl.java @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.dao.impl.visibility; +package io.entgra.application.mgt.core.dao.impl.visibility; /** * This handles Application visibility handling operations which are specific to Oracle.. diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/visibility/PostgreSQLVisibilityDAOImpl.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/visibility/PostgreSQLVisibilityDAOImpl.java similarity index 93% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/visibility/PostgreSQLVisibilityDAOImpl.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/visibility/PostgreSQLVisibilityDAOImpl.java index 3d9169f7b6..fb0cecccd6 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/visibility/PostgreSQLVisibilityDAOImpl.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/visibility/PostgreSQLVisibilityDAOImpl.java @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.dao.impl.visibility; +package io.entgra.application.mgt.core.dao.impl.visibility; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/visibility/SQLServerVisibilityDAOImpl.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/visibility/SQLServerVisibilityDAOImpl.java similarity index 92% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/visibility/SQLServerVisibilityDAOImpl.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/visibility/SQLServerVisibilityDAOImpl.java index 3243f24116..935f0f057e 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/visibility/SQLServerVisibilityDAOImpl.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/visibility/SQLServerVisibilityDAOImpl.java @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.dao.impl.visibility; +package io.entgra.application.mgt.core.dao.impl.visibility; /** * This handles Application visibility handling operations which are specific to MsSQL. diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/deployer/Property.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/deployer/Property.java similarity index 96% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/deployer/Property.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/deployer/Property.java index f9fc46b0a1..0072d10d49 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/deployer/Property.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/deployer/Property.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.deployer; +package io.entgra.application.mgt.core.deployer; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/ApplicationManagementDAOException.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ApplicationManagementDAOException.java similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/ApplicationManagementDAOException.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ApplicationManagementDAOException.java index d946ee3fce..2643d255f7 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/ApplicationManagementDAOException.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ApplicationManagementDAOException.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.exception; +package io.entgra.application.mgt.core.exception; /** * Exception thrown during the ApplicationDTO Management DAO operations. diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/ApplicationOperationTaskException.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ApplicationOperationTaskException.java similarity index 91% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/ApplicationOperationTaskException.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ApplicationOperationTaskException.java index bfec70afc5..1a9b9f55f4 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/ApplicationOperationTaskException.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ApplicationOperationTaskException.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.exception; +package io.entgra.application.mgt.core.exception; public class ApplicationOperationTaskException extends Exception { diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/BadRequestException.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/BadRequestException.java similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/BadRequestException.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/BadRequestException.java index 8930d87310..f4f940fbcd 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/BadRequestException.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/BadRequestException.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.exception; +package io.entgra.application.mgt.core.exception; import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/ForbiddenException.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ForbiddenException.java similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/ForbiddenException.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ForbiddenException.java index 3957b5bff2..f1a5554bfd 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/ForbiddenException.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ForbiddenException.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.exception; +package io.entgra.application.mgt.core.exception; import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/LifeCycleManagementDAOException.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/LifeCycleManagementDAOException.java similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/LifeCycleManagementDAOException.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/LifeCycleManagementDAOException.java index 3b2a36da48..cd90374dc5 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/LifeCycleManagementDAOException.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/LifeCycleManagementDAOException.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.exception; +package io.entgra.application.mgt.core.exception; /** * This exception will be thrown when there is an issue with Lifecycle related DAO operations. diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/NotFoundException.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/NotFoundException.java similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/NotFoundException.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/NotFoundException.java index 2073d5a7c0..36fe34b45a 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/NotFoundException.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/NotFoundException.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.exception; +package io.entgra.application.mgt.core.exception; import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/ParsingException.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ParsingException.java similarity index 95% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/ParsingException.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ParsingException.java index 543de598c4..53ecb39ae0 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/ParsingException.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ParsingException.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.exception; +package io.entgra.application.mgt.core.exception; public class ParsingException extends Exception { diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/ReviewManagementDAOException.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ReviewManagementDAOException.java similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/ReviewManagementDAOException.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ReviewManagementDAOException.java index e9f17065c7..1686453a2d 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/ReviewManagementDAOException.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ReviewManagementDAOException.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.exception; +package io.entgra.application.mgt.core.exception; import org.wso2.carbon.device.application.mgt.common.exception.ReviewManagementException; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/SubscriptionManagementDAOException.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/SubscriptionManagementDAOException.java similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/SubscriptionManagementDAOException.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/SubscriptionManagementDAOException.java index 8419ed643d..56330bd41d 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/SubscriptionManagementDAOException.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/SubscriptionManagementDAOException.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.exception; +package io.entgra.application.mgt.core.exception; import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/UnexpectedServerErrorException.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/UnexpectedServerErrorException.java similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/UnexpectedServerErrorException.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/UnexpectedServerErrorException.java index d17116730f..aec891fda1 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/UnexpectedServerErrorException.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/UnexpectedServerErrorException.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.exception; +package io.entgra.application.mgt.core.exception; import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/ValidationException.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ValidationException.java similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/ValidationException.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ValidationException.java index f17baee7f7..4b06dcb5a2 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/ValidationException.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ValidationException.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.exception; +package io.entgra.application.mgt.core.exception; import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/VisibilityManagementDAOException.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/VisibilityManagementDAOException.java similarity index 95% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/VisibilityManagementDAOException.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/VisibilityManagementDAOException.java index b3cc7a3a63..2a65f5c83d 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/VisibilityManagementDAOException.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/VisibilityManagementDAOException.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.exception; +package io.entgra.application.mgt.core.exception; import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 similarity index 99% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ApplicationManagerImpl.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/impl/ApplicationManagerImpl.java index 05b757ba45..ef08172f10 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.impl; +package io.entgra.application.mgt.core.impl; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.io.IOUtils; @@ -65,25 +65,25 @@ import org.wso2.carbon.device.application.mgt.common.wrapper.PublicAppReleaseWra import org.wso2.carbon.device.application.mgt.common.wrapper.PublicAppWrapper; import org.wso2.carbon.device.application.mgt.common.wrapper.WebAppReleaseWrapper; import org.wso2.carbon.device.application.mgt.common.wrapper.WebAppWrapper; -import org.wso2.carbon.device.application.mgt.core.config.ConfigurationManager; -import org.wso2.carbon.device.application.mgt.core.dao.ApplicationDAO; -import org.wso2.carbon.device.application.mgt.core.dao.ApplicationReleaseDAO; -import org.wso2.carbon.device.application.mgt.core.dao.LifecycleStateDAO; -import org.wso2.carbon.device.application.mgt.core.dao.SubscriptionDAO; -import org.wso2.carbon.device.application.mgt.core.dao.VisibilityDAO; -import org.wso2.carbon.device.application.mgt.core.dao.common.ApplicationManagementDAOFactory; -import org.wso2.carbon.device.application.mgt.core.util.APIUtil; -import org.wso2.carbon.device.application.mgt.core.exception.ApplicationManagementDAOException; -import org.wso2.carbon.device.application.mgt.core.exception.BadRequestException; -import org.wso2.carbon.device.application.mgt.core.exception.ForbiddenException; -import org.wso2.carbon.device.application.mgt.core.exception.LifeCycleManagementDAOException; -import org.wso2.carbon.device.application.mgt.core.exception.NotFoundException; -import org.wso2.carbon.device.application.mgt.core.exception.VisibilityManagementDAOException; -import org.wso2.carbon.device.application.mgt.core.internal.DataHolder; -import org.wso2.carbon.device.application.mgt.core.lifecycle.LifecycleStateManager; -import org.wso2.carbon.device.application.mgt.core.util.ConnectionManagerUtil; -import org.wso2.carbon.device.application.mgt.core.util.Constants; -import org.wso2.carbon.device.application.mgt.core.util.StorageManagementUtil; +import io.entgra.application.mgt.core.config.ConfigurationManager; +import io.entgra.application.mgt.core.dao.ApplicationDAO; +import io.entgra.application.mgt.core.dao.ApplicationReleaseDAO; +import io.entgra.application.mgt.core.dao.LifecycleStateDAO; +import io.entgra.application.mgt.core.dao.SubscriptionDAO; +import io.entgra.application.mgt.core.dao.VisibilityDAO; +import io.entgra.application.mgt.core.dao.common.ApplicationManagementDAOFactory; +import io.entgra.application.mgt.core.util.APIUtil; +import io.entgra.application.mgt.core.exception.ApplicationManagementDAOException; +import io.entgra.application.mgt.core.exception.BadRequestException; +import io.entgra.application.mgt.core.exception.ForbiddenException; +import io.entgra.application.mgt.core.exception.LifeCycleManagementDAOException; +import io.entgra.application.mgt.core.exception.NotFoundException; +import io.entgra.application.mgt.core.exception.VisibilityManagementDAOException; +import io.entgra.application.mgt.core.internal.DataHolder; +import io.entgra.application.mgt.core.lifecycle.LifecycleStateManager; +import io.entgra.application.mgt.core.util.ConnectionManagerUtil; +import io.entgra.application.mgt.core.util.Constants; +import io.entgra.application.mgt.core.util.StorageManagementUtil; import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException; import org.wso2.carbon.device.mgt.core.dto.DeviceType; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 similarity index 97% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ApplicationStorageManagerImpl.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/impl/ApplicationStorageManagerImpl.java index fc58f3c910..5f34e80de4 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.impl; +package io.entgra.application.mgt.core.impl; import com.dd.plist.NSDictionary; import net.dongliu.apk.parser.bean.ApkMeta; @@ -28,15 +28,15 @@ import org.wso2.carbon.device.application.mgt.common.DeviceTypes; import org.wso2.carbon.device.application.mgt.common.exception.ApplicationStorageManagementException; import org.wso2.carbon.device.application.mgt.common.exception.ResourceManagementException; import org.wso2.carbon.device.application.mgt.common.services.ApplicationStorageManager; -import org.wso2.carbon.device.application.mgt.core.exception.ParsingException; -import org.wso2.carbon.device.application.mgt.core.util.ArtifactsParser; -import org.wso2.carbon.device.application.mgt.core.util.Constants; -import org.wso2.carbon.device.application.mgt.core.util.StorageManagementUtil; +import io.entgra.application.mgt.core.exception.ParsingException; +import io.entgra.application.mgt.core.util.ArtifactsParser; +import io.entgra.application.mgt.core.util.Constants; +import io.entgra.application.mgt.core.util.StorageManagementUtil; import java.io.*; import java.util.List; -import static org.wso2.carbon.device.application.mgt.core.util.StorageManagementUtil.saveFile; +import static io.entgra.application.mgt.core.util.StorageManagementUtil.saveFile; /** * This class contains the default concrete implementation of ApplicationStorage Management. diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/AppmDataHandlerImpl.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/impl/AppmDataHandlerImpl.java similarity index 93% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/AppmDataHandlerImpl.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/impl/AppmDataHandlerImpl.java index bd0f6ad79f..9d87520e4b 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/AppmDataHandlerImpl.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/impl/AppmDataHandlerImpl.java @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.impl; +package io.entgra.application.mgt.core.impl; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; @@ -26,11 +26,11 @@ import org.wso2.carbon.device.application.mgt.common.exception.ApplicationStorag import org.wso2.carbon.device.application.mgt.common.exception.LifecycleManagementException; import org.wso2.carbon.device.application.mgt.common.services.ApplicationStorageManager; import org.wso2.carbon.device.application.mgt.common.services.AppmDataHandler; -import org.wso2.carbon.device.application.mgt.core.exception.BadRequestException; -import org.wso2.carbon.device.application.mgt.core.util.APIUtil; -import org.wso2.carbon.device.application.mgt.core.exception.NotFoundException; -import org.wso2.carbon.device.application.mgt.core.internal.DataHolder; -import org.wso2.carbon.device.application.mgt.core.lifecycle.LifecycleStateManager; +import io.entgra.application.mgt.core.exception.BadRequestException; +import io.entgra.application.mgt.core.util.APIUtil; +import io.entgra.application.mgt.core.exception.NotFoundException; +import io.entgra.application.mgt.core.internal.DataHolder; +import io.entgra.application.mgt.core.lifecycle.LifecycleStateManager; import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException; import org.wso2.carbon.device.mgt.core.dto.DeviceType; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 similarity index 97% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ReviewManagerImpl.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/impl/ReviewManagerImpl.java index 92e281fd6b..f9a1ea3709 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.impl; +package io.entgra.application.mgt.core.impl; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -34,17 +34,17 @@ import org.wso2.carbon.device.application.mgt.common.exception.TransactionManage import org.wso2.carbon.device.application.mgt.common.response.Review; import org.wso2.carbon.device.application.mgt.common.services.*; import org.wso2.carbon.device.application.mgt.common.wrapper.ReviewWrapper; -import org.wso2.carbon.device.application.mgt.core.dao.ApplicationDAO; -import org.wso2.carbon.device.application.mgt.core.dao.ApplicationReleaseDAO; -import org.wso2.carbon.device.application.mgt.core.dao.ReviewDAO; -import org.wso2.carbon.device.application.mgt.core.dao.common.ApplicationManagementDAOFactory; -import org.wso2.carbon.device.application.mgt.core.exception.ApplicationManagementDAOException; -import org.wso2.carbon.device.application.mgt.core.exception.BadRequestException; -import org.wso2.carbon.device.application.mgt.core.exception.ForbiddenException; -import org.wso2.carbon.device.application.mgt.core.exception.NotFoundException; -import org.wso2.carbon.device.application.mgt.core.exception.ReviewManagementDAOException; -import org.wso2.carbon.device.application.mgt.core.util.ConnectionManagerUtil; -import org.wso2.carbon.device.application.mgt.core.util.Constants; +import io.entgra.application.mgt.core.dao.ApplicationDAO; +import io.entgra.application.mgt.core.dao.ApplicationReleaseDAO; +import io.entgra.application.mgt.core.dao.ReviewDAO; +import io.entgra.application.mgt.core.dao.common.ApplicationManagementDAOFactory; +import io.entgra.application.mgt.core.exception.ApplicationManagementDAOException; +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.core.exception.ReviewManagementDAOException; +import io.entgra.application.mgt.core.util.ConnectionManagerUtil; +import io.entgra.application.mgt.core.util.Constants; import java.util.ArrayList; import java.util.Comparator; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/SubscriptionManagerImpl.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/impl/SubscriptionManagerImpl.java index 2de1094c1f..0d3a9a2195 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.impl; +package io.entgra.application.mgt.core.impl; import com.google.gson.Gson; import org.apache.commons.httpclient.HttpClient; @@ -51,20 +51,20 @@ import org.wso2.carbon.device.application.mgt.common.exception.SubscriptionManag import org.wso2.carbon.device.application.mgt.common.exception.TransactionManagementException; import org.wso2.carbon.device.application.mgt.common.response.Application; import org.wso2.carbon.device.application.mgt.common.services.SubscriptionManager; -import org.wso2.carbon.device.application.mgt.core.dao.ApplicationDAO; -import org.wso2.carbon.device.application.mgt.core.dao.SubscriptionDAO; -import org.wso2.carbon.device.application.mgt.core.dao.common.ApplicationManagementDAOFactory; -import org.wso2.carbon.device.application.mgt.core.exception.ApplicationManagementDAOException; -import org.wso2.carbon.device.application.mgt.core.exception.BadRequestException; -import org.wso2.carbon.device.application.mgt.core.exception.ForbiddenException; -import org.wso2.carbon.device.application.mgt.core.exception.NotFoundException; -import org.wso2.carbon.device.application.mgt.core.internal.DataHolder; -import org.wso2.carbon.device.application.mgt.core.lifecycle.LifecycleStateManager; -import org.wso2.carbon.device.application.mgt.core.util.APIUtil; -import org.wso2.carbon.device.application.mgt.core.util.ConnectionManagerUtil; -import org.wso2.carbon.device.application.mgt.core.util.Constants; -import org.wso2.carbon.device.application.mgt.core.util.HelperUtil; -import org.wso2.carbon.device.application.mgt.core.util.OAuthUtils; +import io.entgra.application.mgt.core.dao.ApplicationDAO; +import io.entgra.application.mgt.core.dao.SubscriptionDAO; +import io.entgra.application.mgt.core.dao.common.ApplicationManagementDAOFactory; +import io.entgra.application.mgt.core.exception.ApplicationManagementDAOException; +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.core.internal.DataHolder; +import io.entgra.application.mgt.core.lifecycle.LifecycleStateManager; +import io.entgra.application.mgt.core.util.APIUtil; +import io.entgra.application.mgt.core.util.ConnectionManagerUtil; +import io.entgra.application.mgt.core.util.Constants; +import io.entgra.application.mgt.core.util.HelperUtil; +import io.entgra.application.mgt.core.util.OAuthUtils; import org.wso2.carbon.device.mgt.common.*; import org.wso2.carbon.device.mgt.common.app.mgt.App; import org.wso2.carbon.device.mgt.common.app.mgt.MobileAppTypes; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/internal/ApplicationManagementServiceComponent.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/internal/ApplicationManagementServiceComponent.java similarity index 93% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/internal/ApplicationManagementServiceComponent.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/internal/ApplicationManagementServiceComponent.java index 7f07edba77..59f5e7d1b5 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/internal/ApplicationManagementServiceComponent.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/internal/ApplicationManagementServiceComponent.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.internal; +package io.entgra.application.mgt.core.internal; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -27,12 +27,12 @@ import org.wso2.carbon.device.application.mgt.common.services.ApplicationStorage import org.wso2.carbon.device.application.mgt.common.services.AppmDataHandler; import org.wso2.carbon.device.application.mgt.common.services.ReviewManager; import org.wso2.carbon.device.application.mgt.common.services.SubscriptionManager; -import org.wso2.carbon.device.application.mgt.core.config.ConfigurationManager; -import org.wso2.carbon.device.application.mgt.core.dao.common.ApplicationManagementDAOFactory; -import org.wso2.carbon.device.application.mgt.core.impl.AppmDataHandlerImpl; -import org.wso2.carbon.device.application.mgt.core.lifecycle.LifecycleStateManager; -import org.wso2.carbon.device.application.mgt.core.task.ScheduledAppSubscriptionTaskManager; -import org.wso2.carbon.device.application.mgt.core.util.ApplicationManagementUtil; +import io.entgra.application.mgt.core.config.ConfigurationManager; +import io.entgra.application.mgt.core.dao.common.ApplicationManagementDAOFactory; +import io.entgra.application.mgt.core.impl.AppmDataHandlerImpl; +import io.entgra.application.mgt.core.lifecycle.LifecycleStateManager; +import io.entgra.application.mgt.core.task.ScheduledAppSubscriptionTaskManager; +import io.entgra.application.mgt.core.util.ApplicationManagementUtil; import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService; import org.wso2.carbon.ndatasource.core.DataSourceService; import org.wso2.carbon.ntask.core.service.TaskService; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/internal/DataHolder.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/internal/DataHolder.java similarity index 96% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/internal/DataHolder.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/internal/DataHolder.java index 81132a7009..fce0f8f04e 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/internal/DataHolder.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/internal/DataHolder.java @@ -15,14 +15,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.internal; +package io.entgra.application.mgt.core.internal; import org.wso2.carbon.device.application.mgt.common.services.ApplicationManager; import org.wso2.carbon.device.application.mgt.common.services.ApplicationStorageManager; import org.wso2.carbon.device.application.mgt.common.services.AppmDataHandler; import org.wso2.carbon.device.application.mgt.common.services.ReviewManager; import org.wso2.carbon.device.application.mgt.common.services.SubscriptionManager; -import org.wso2.carbon.device.application.mgt.core.lifecycle.LifecycleStateManager; +import io.entgra.application.mgt.core.lifecycle.LifecycleStateManager; import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService; import org.wso2.carbon.ntask.core.service.TaskService; import org.wso2.carbon.user.core.service.RealmService; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/lifecycle/LifecycleStateManager.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/lifecycle/LifecycleStateManager.java similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/lifecycle/LifecycleStateManager.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/lifecycle/LifecycleStateManager.java index e0f9a2f796..33154514a5 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/lifecycle/LifecycleStateManager.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/lifecycle/LifecycleStateManager.java @@ -15,12 +15,12 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.lifecycle; +package io.entgra.application.mgt.core.lifecycle; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.device.application.mgt.common.exception.LifecycleManagementException; -import org.wso2.carbon.device.application.mgt.core.internal.DataHolder; +import io.entgra.application.mgt.core.internal.DataHolder; import org.wso2.carbon.device.application.mgt.common.config.LifecycleState; import org.wso2.carbon.device.mgt.common.permission.mgt.PermissionManagementException; import org.wso2.carbon.device.mgt.core.permission.mgt.PermissionUtils; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/task/ScheduledAppSubscriptionCleanupTask.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/task/ScheduledAppSubscriptionCleanupTask.java similarity index 93% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/task/ScheduledAppSubscriptionCleanupTask.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/task/ScheduledAppSubscriptionCleanupTask.java index 351a4477b2..266084eaa4 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/task/ScheduledAppSubscriptionCleanupTask.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/task/ScheduledAppSubscriptionCleanupTask.java @@ -16,13 +16,13 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.task; +package io.entgra.application.mgt.core.task; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.device.application.mgt.common.exception.SubscriptionManagementException; import org.wso2.carbon.device.application.mgt.common.services.SubscriptionManager; -import org.wso2.carbon.device.application.mgt.core.impl.SubscriptionManagerImpl; +import io.entgra.application.mgt.core.impl.SubscriptionManagerImpl; import org.wso2.carbon.device.mgt.core.task.impl.RandomlyAssignedScheduleTask; import java.util.Map; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 similarity index 97% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/task/ScheduledAppSubscriptionTask.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/task/ScheduledAppSubscriptionTask.java index d8f491e37d..3668b1669e 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.task; +package io.entgra.application.mgt.core.task; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; @@ -30,8 +30,8 @@ import org.wso2.carbon.device.application.mgt.common.dto.ScheduledSubscriptionDT import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; import org.wso2.carbon.device.application.mgt.common.exception.SubscriptionManagementException; import org.wso2.carbon.device.application.mgt.common.services.SubscriptionManager; -import org.wso2.carbon.device.application.mgt.core.impl.SubscriptionManagerImpl; -import org.wso2.carbon.device.application.mgt.core.util.Constants; +import io.entgra.application.mgt.core.impl.SubscriptionManagerImpl; +import io.entgra.application.mgt.core.util.Constants; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; import org.wso2.carbon.device.mgt.core.task.impl.RandomlyAssignedScheduleTask; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 similarity index 96% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/task/ScheduledAppSubscriptionTaskManager.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/task/ScheduledAppSubscriptionTaskManager.java index b274b1850f..66f94d5967 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.task; +package io.entgra.application.mgt.core.task; import com.google.gson.Gson; import org.apache.commons.codec.digest.DigestUtils; @@ -29,17 +29,15 @@ import org.wso2.carbon.device.application.mgt.common.SubscriptionType; import org.wso2.carbon.device.application.mgt.common.dto.ScheduledSubscriptionDTO; import org.wso2.carbon.device.application.mgt.common.exception.SubscriptionManagementException; import org.wso2.carbon.device.application.mgt.common.services.SubscriptionManager; -import org.wso2.carbon.device.application.mgt.core.exception.ApplicationOperationTaskException; -import org.wso2.carbon.device.application.mgt.core.impl.SubscriptionManagerImpl; -import org.wso2.carbon.device.application.mgt.core.internal.DataHolder; -import org.wso2.carbon.device.application.mgt.core.util.Constants; +import io.entgra.application.mgt.core.exception.ApplicationOperationTaskException; +import io.entgra.application.mgt.core.impl.SubscriptionManagerImpl; +import io.entgra.application.mgt.core.internal.DataHolder; +import io.entgra.application.mgt.core.util.Constants; import org.wso2.carbon.ntask.common.TaskException; import org.wso2.carbon.ntask.core.TaskInfo; import org.wso2.carbon.ntask.core.TaskManager; import org.wso2.carbon.ntask.core.service.TaskService; -import java.time.LocalDateTime; -import java.time.format.TextStyle; import java.util.Calendar; import java.util.Date; import java.util.HashMap; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/APIUtil.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/APIUtil.java index 97e83d3128..f3ec5199bd 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.util; +package io.entgra.application.mgt.core.util; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; @@ -40,10 +40,10 @@ import org.wso2.carbon.device.application.mgt.common.wrapper.PublicAppReleaseWra import org.wso2.carbon.device.application.mgt.common.wrapper.PublicAppWrapper; import org.wso2.carbon.device.application.mgt.common.wrapper.WebAppReleaseWrapper; import org.wso2.carbon.device.application.mgt.common.wrapper.WebAppWrapper; -import org.wso2.carbon.device.application.mgt.core.config.ConfigurationManager; -import org.wso2.carbon.device.application.mgt.core.exception.BadRequestException; -import org.wso2.carbon.device.application.mgt.core.exception.UnexpectedServerErrorException; -import org.wso2.carbon.device.application.mgt.core.internal.DataHolder; +import io.entgra.application.mgt.core.config.ConfigurationManager; +import io.entgra.application.mgt.core.exception.BadRequestException; +import io.entgra.application.mgt.core.exception.UnexpectedServerErrorException; +import io.entgra.application.mgt.core.internal.DataHolder; import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException; import org.wso2.carbon.device.mgt.core.dto.DeviceType; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/ApplicationManagementUtil.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/ApplicationManagementUtil.java similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/ApplicationManagementUtil.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/ApplicationManagementUtil.java index db4e749e93..3f14309cd5 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/ApplicationManagementUtil.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/ApplicationManagementUtil.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.util; +package io.entgra.application.mgt.core.util; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -24,9 +24,9 @@ import org.wso2.carbon.device.application.mgt.common.services.ApplicationManager import org.wso2.carbon.device.application.mgt.common.services.ApplicationStorageManager; import org.wso2.carbon.device.application.mgt.common.services.ReviewManager; import org.wso2.carbon.device.application.mgt.common.services.SubscriptionManager; -import org.wso2.carbon.device.application.mgt.core.config.ConfigurationManager; -import org.wso2.carbon.device.application.mgt.core.config.Extension; -import org.wso2.carbon.device.application.mgt.core.lifecycle.LifecycleStateManager; +import io.entgra.application.mgt.core.config.ConfigurationManager; +import io.entgra.application.mgt.core.config.Extension; +import io.entgra.application.mgt.core.lifecycle.LifecycleStateManager; import java.lang.reflect.Constructor; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/ApplicationMgtDatabaseCreator.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/ApplicationMgtDatabaseCreator.java similarity index 96% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/ApplicationMgtDatabaseCreator.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/ApplicationMgtDatabaseCreator.java index 95f2119870..82678ada0a 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/ApplicationMgtDatabaseCreator.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/ApplicationMgtDatabaseCreator.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.util; +package io.entgra.application.mgt.core.util; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/ArtifactsParser.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/ArtifactsParser.java similarity index 96% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/ArtifactsParser.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/ArtifactsParser.java index 32de0f8006..d9f0ad0234 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/ArtifactsParser.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/ArtifactsParser.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.util; +package io.entgra.application.mgt.core.util; import com.dd.plist.BinaryPropertyListParser; import com.dd.plist.NSDictionary; @@ -27,7 +27,7 @@ import net.dongliu.apk.parser.bean.ApkMeta; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.commons.io.IOUtils; -import org.wso2.carbon.device.application.mgt.core.exception.ParsingException; +import io.entgra.application.mgt.core.exception.ParsingException; import java.io.ByteArrayOutputStream; import java.io.File; @@ -38,7 +38,6 @@ import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; import java.util.UUID; -import java.nio.file.Files; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/ConnectionManagerUtil.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/ConnectionManagerUtil.java similarity index 99% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/ConnectionManagerUtil.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/ConnectionManagerUtil.java index d8c0d66f3a..6fda7e1f7c 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/ConnectionManagerUtil.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/ConnectionManagerUtil.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.util; +package io.entgra.application.mgt.core.util; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/Constants.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/Constants.java similarity index 99% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/Constants.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/Constants.java index 27498f77bb..3a5956ea0e 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/Constants.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/Constants.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.util; +package io.entgra.application.mgt.core.util; import org.wso2.carbon.utils.CarbonUtils; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/DAOUtil.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/DAOUtil.java index 4950fe3c6e..6e234fdc72 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.util; +package io.entgra.application.mgt.core.util; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; @@ -30,7 +30,7 @@ import org.wso2.carbon.device.application.mgt.common.dto.ApplicationReleaseDTO; import org.wso2.carbon.device.application.mgt.common.dto.DeviceSubscriptionDTO; import org.wso2.carbon.device.application.mgt.common.dto.ReviewDTO; import org.wso2.carbon.device.application.mgt.common.dto.ScheduledSubscriptionDTO; -import org.wso2.carbon.device.application.mgt.core.exception.UnexpectedServerErrorException; +import io.entgra.application.mgt.core.exception.UnexpectedServerErrorException; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; import java.sql.PreparedStatement; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/HelperUtil.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/HelperUtil.java similarity index 97% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/HelperUtil.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/HelperUtil.java index fcc7698169..25fedae716 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/HelperUtil.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/HelperUtil.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.util; +package io.entgra.application.mgt.core.util; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/JSONUtil.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/JSONUtil.java similarity index 96% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/JSONUtil.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/JSONUtil.java index 34fedf190e..4e57a96c77 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/JSONUtil.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/JSONUtil.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.util; +package io.entgra.application.mgt.core.util; import org.json.JSONArray; import org.json.JSONException; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/MDMAppConstants.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/MDMAppConstants.java similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/MDMAppConstants.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/MDMAppConstants.java index 0892f0909d..46a5f4fd8d 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/MDMAppConstants.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/MDMAppConstants.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.util; +package io.entgra.application.mgt.core.util; public class MDMAppConstants { public static final String USER = "user"; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/OAuthUtils.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/OAuthUtils.java similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/OAuthUtils.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/OAuthUtils.java index 33a9d0706f..9c47a4bc1c 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/OAuthUtils.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/OAuthUtils.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.util; +package io.entgra.application.mgt.core.util; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 similarity index 99% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/StorageManagementUtil.java rename to components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/StorageManagementUtil.java index 97b36aba28..7c9e6560d5 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/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 @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.util; +package io.entgra.application.mgt.core.util; import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.digest.DigestUtils; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/resources/META-INF/component.xml b/components/application-mgt/io.entgra.application.mgt.core/src/main/resources/META-INF/component.xml similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/resources/META-INF/component.xml rename to components/application-mgt/io.entgra.application.mgt.core/src/main/resources/META-INF/component.xml index 2f5770f0bf..857df5b402 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/resources/META-INF/component.xml +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/resources/META-INF/component.xml @@ -20,7 +20,7 @@ platforms xml - org.wso2.carbon.device.application.mgt.core.deployer.PlatformDeployer + io.entgra.application.mgt.core.deployer.PlatformDeployer diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core/ArtifactParserTest.java b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/ArtifactParserTest.java similarity index 93% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core/ArtifactParserTest.java rename to components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/ArtifactParserTest.java index f252a882b1..6fa36dab72 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core/ArtifactParserTest.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/ArtifactParserTest.java @@ -16,14 +16,14 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core; +package io.entgra.application.mgt.core; import com.dd.plist.NSDictionary; import net.dongliu.apk.parser.bean.ApkMeta; import org.testng.Assert; import org.testng.annotations.Test; -import org.wso2.carbon.device.application.mgt.core.exception.ParsingException; -import org.wso2.carbon.device.application.mgt.core.util.ArtifactsParser; +import io.entgra.application.mgt.core.exception.ParsingException; +import io.entgra.application.mgt.core.util.ArtifactsParser; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core/BaseTestCase.java b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/BaseTestCase.java similarity index 92% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core/BaseTestCase.java rename to components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/BaseTestCase.java index c757724712..044cf84951 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core/BaseTestCase.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/BaseTestCase.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core; +package io.entgra.application.mgt.core; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -26,13 +26,13 @@ import org.wso2.carbon.base.MultitenantConstants; import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.device.application.mgt.common.config.LifecycleState; import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; -import org.wso2.carbon.device.application.mgt.core.common.DataSourceConfig; -import org.wso2.carbon.device.application.mgt.core.config.ConfigurationManager; -import org.wso2.carbon.device.application.mgt.core.dao.common.ApplicationManagementDAOFactory; -import org.wso2.carbon.device.application.mgt.core.internal.DataHolder; -import org.wso2.carbon.device.application.mgt.core.lifecycle.LifecycleStateManager; -import org.wso2.carbon.device.application.mgt.core.util.ApplicationManagementUtil; -import org.wso2.carbon.device.application.mgt.core.util.ConnectionManagerUtil; +import io.entgra.application.mgt.core.common.DataSourceConfig; +import io.entgra.application.mgt.core.config.ConfigurationManager; +import io.entgra.application.mgt.core.dao.common.ApplicationManagementDAOFactory; +import io.entgra.application.mgt.core.internal.DataHolder; +import io.entgra.application.mgt.core.lifecycle.LifecycleStateManager; +import io.entgra.application.mgt.core.util.ApplicationManagementUtil; +import io.entgra.application.mgt.core.util.ConnectionManagerUtil; import org.wso2.carbon.device.mgt.core.authorization.DeviceAccessAuthorizationServiceImpl; import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager; import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOFactory; @@ -161,7 +161,7 @@ public abstract class BaseTestCase { if (file.exists()) { System.setProperty("carbon.home", file.getAbsolutePath()); } - file = new File("../resources/carbon-home"); + file = new File("io.entgra.application.mgt.core/src/test/resources/carbon-home"); if (file.exists()) { System.setProperty("carbon.home", file.getAbsolutePath()); } diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core/ConfigurationTest.java b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/ConfigurationTest.java similarity index 89% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core/ConfigurationTest.java rename to components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/ConfigurationTest.java index b14958f105..dfcae3db61 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core/ConfigurationTest.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/ConfigurationTest.java @@ -15,12 +15,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core; +package io.entgra.application.mgt.core; import org.junit.Assert; import org.testng.annotations.Test; -import org.wso2.carbon.device.application.mgt.core.config.Configuration; -import org.wso2.carbon.device.application.mgt.core.config.ConfigurationManager; +import io.entgra.application.mgt.core.config.Configuration; +import io.entgra.application.mgt.core.config.ConfigurationManager; import org.wso2.carbon.device.application.mgt.common.config.LifecycleState; import java.util.List; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core/InitTest.java b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/InitTest.java similarity index 90% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core/InitTest.java rename to components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/InitTest.java index 8d207b555c..796af57966 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core/InitTest.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/InitTest.java @@ -15,11 +15,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core; +package io.entgra.application.mgt.core; import org.testng.annotations.BeforeSuite; import org.wso2.carbon.device.application.mgt.common.exception.InvalidConfigurationException; -import org.wso2.carbon.device.application.mgt.core.config.ConfigurationManager; +import io.entgra.application.mgt.core.config.ConfigurationManager; import java.io.File; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core/LifeCycleStateManagerTest.java b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/LifeCycleStateManagerTest.java similarity index 91% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core/LifeCycleStateManagerTest.java rename to components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/LifeCycleStateManagerTest.java index 75a3d3d04d..3ba7e049e7 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core/LifeCycleStateManagerTest.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/LifeCycleStateManagerTest.java @@ -15,9 +15,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core; +package io.entgra.application.mgt.core; -import org.wso2.carbon.device.application.mgt.core.lifecycle.LifecycleStateManager; +import io.entgra.application.mgt.core.lifecycle.LifecycleStateManager; import org.wso2.carbon.device.application.mgt.common.config.LifecycleState; import java.util.HashMap; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core/LifecycleManagementTest.java b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/LifecycleManagementTest.java similarity index 95% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core/LifecycleManagementTest.java rename to components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/LifecycleManagementTest.java index a0b816489f..cceb7e7e7a 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core/LifecycleManagementTest.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/LifecycleManagementTest.java @@ -15,15 +15,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core; +package io.entgra.application.mgt.core; import org.junit.Assert; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import org.wso2.carbon.device.application.mgt.common.exception.LifecycleManagementException; -import org.wso2.carbon.device.application.mgt.core.config.Configuration; -import org.wso2.carbon.device.application.mgt.core.config.ConfigurationManager; -import org.wso2.carbon.device.application.mgt.core.lifecycle.LifecycleStateManager; +import io.entgra.application.mgt.core.config.Configuration; +import io.entgra.application.mgt.core.config.ConfigurationManager; +import io.entgra.application.mgt.core.lifecycle.LifecycleStateManager; import org.wso2.carbon.device.application.mgt.common.config.LifecycleState; import java.util.List; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core/StorageManagementUtilTest.java b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/StorageManagementUtilTest.java similarity index 95% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core/StorageManagementUtilTest.java rename to components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/StorageManagementUtilTest.java index 88d3fa4ecb..01409e46e7 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core/StorageManagementUtilTest.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/StorageManagementUtilTest.java @@ -16,14 +16,14 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core; +package io.entgra.application.mgt.core; import org.junit.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import org.wso2.carbon.device.application.mgt.common.exception.ResourceManagementException; -import org.wso2.carbon.device.application.mgt.core.util.StorageManagementUtil; +import io.entgra.application.mgt.core.util.StorageManagementUtil; import java.io.File; import java.io.FileInputStream; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core/TestUtils.java b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/TestUtils.java similarity index 96% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core/TestUtils.java rename to components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/TestUtils.java index ceeb41902a..8ae7ba5e61 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core/TestUtils.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/TestUtils.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core; +package io.entgra.application.mgt.core; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org/wso2/carbon/device/application/mgt/core/common/DataSourceConfig.java b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/common/DataSourceConfig.java similarity index 97% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org/wso2/carbon/device/application/mgt/core/common/DataSourceConfig.java rename to components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/common/DataSourceConfig.java index 7b1f2c32bc..14aa81c13a 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org/wso2/carbon/device/application/mgt/core/common/DataSourceConfig.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/common/DataSourceConfig.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.common; +package io.entgra.application.mgt.core.common; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.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 similarity index 88% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core/dao/ApplicationManagementDAOTest.java rename to components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/dao/ApplicationManagementDAOTest.java index bee26a37b8..106e1a08af 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.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 @@ -15,19 +15,19 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.dao; +package io.entgra.application.mgt.core.dao; import junit.framework.Assert; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import org.wso2.carbon.device.application.mgt.core.BaseTestCase; -import org.wso2.carbon.device.application.mgt.core.config.ConfigurationManager; -import org.wso2.carbon.device.application.mgt.core.dao.common.ApplicationManagementDAOFactory; +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 org.wso2.carbon.device.application.mgt.core.util.ConnectionManagerUtil; +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; import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOFactory; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core/dto/ApplicationsDTO.java b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/dto/ApplicationsDTO.java similarity index 95% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core/dto/ApplicationsDTO.java rename to components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/dto/ApplicationsDTO.java index 74f598a831..2d0c0fbd2f 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core/dto/ApplicationsDTO.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/dto/ApplicationsDTO.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.dto; +package io.entgra.application.mgt.core.dto; import org.wso2.carbon.device.application.mgt.common.dto.ApplicationDTO; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core/dto/DeviceTypeCreator.java b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/dto/DeviceTypeCreator.java similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core/dto/DeviceTypeCreator.java rename to components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/dto/DeviceTypeCreator.java index 3ecd1aa675..d1a862afec 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core/dto/DeviceTypeCreator.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/dto/DeviceTypeCreator.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.core.dto; +package io.entgra.application.mgt.core.dto; import org.wso2.carbon.device.mgt.core.dto.DeviceType; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.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 similarity index 95% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core/management/ApplicationManagementTest.java rename to components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/management/ApplicationManagementTest.java index 4ebdf3ce6c..fb8393740a 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.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 @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.core.management; +package io.entgra.application.mgt.core.management; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -33,13 +33,13 @@ import org.wso2.carbon.device.application.mgt.common.services.ApplicationManager import org.wso2.carbon.device.application.mgt.common.wrapper.EntAppReleaseWrapper; import org.wso2.carbon.device.application.mgt.common.wrapper.ApplicationUpdateWrapper; import org.wso2.carbon.device.application.mgt.common.wrapper.ApplicationWrapper; -import org.wso2.carbon.device.application.mgt.core.BaseTestCase; -import org.wso2.carbon.device.application.mgt.core.dao.ApplicationDAO; -import org.wso2.carbon.device.application.mgt.core.dao.common.ApplicationManagementDAOFactory; +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 org.wso2.carbon.device.application.mgt.core.impl.ApplicationManagerImpl; -import org.wso2.carbon.device.application.mgt.core.internal.DataHolder; -import org.wso2.carbon.device.application.mgt.core.util.ConnectionManagerUtil; +import io.entgra.application.mgt.core.impl.ApplicationManagerImpl; +import io.entgra.application.mgt.core.internal.DataHolder; +import io.entgra.application.mgt.core.util.ConnectionManagerUtil; import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException; import org.wso2.carbon.device.mgt.core.dto.DeviceType; import org.wso2.carbon.device.mgt.core.dto.DeviceTypeVersion; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/Platform.xml b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/Platform.xml similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/Platform.xml rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/Platform.xml diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/application-mgt.xml b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/application-mgt.xml similarity index 91% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/application-mgt.xml rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/application-mgt.xml index 60a8b0448b..d80e94c223 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/application-mgt.xml +++ b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/application-mgt.xml @@ -23,19 +23,19 @@ - org.wso2.carbon.device.application.mgt.core.impl.ApplicationManagerImpl + io.entgra.application.mgt.core.impl.ApplicationManagerImpl - org.wso2.carbon.device.application.mgt.core.impl.ReviewManagerImpl + io.entgra.application.mgt.core.impl.ReviewManagerImpl - org.wso2.carbon.device.application.mgt.core.lifecycle.LifecycleStateManager + io.entgra.application.mgt.core.lifecycle.LifecycleStateManager - org.wso2.carbon.device.application.mgt.core.impl.SubscriptionManagerImpl + io.entgra.application.mgt.core.impl.SubscriptionManagerImpl - org.wso2.carbon.device.application.mgt.core.impl.ApplicationStorageManagerImpl + io.entgra.application.mgt.core.impl.ApplicationStorageManagerImpl repository/resources/apps/ 6 diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/dbscripts/h2.sql b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/dbscripts/h2.sql similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/dbscripts/h2.sql rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/dbscripts/h2.sql diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/application-mgt.xml b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/application-mgt.xml similarity index 91% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/application-mgt.xml rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/application-mgt.xml index a94190bda4..aafbdb712e 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/application-mgt.xml +++ b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/application-mgt.xml @@ -23,19 +23,19 @@ - org.wso2.carbon.device.application.mgt.core.impl.ApplicationManagerImpl + io.entgra.application.mgt.core.impl.ApplicationManagerImpl - org.wso2.carbon.device.application.mgt.core.impl.ReviewManagerImpl + io.entgra.application.mgt.core.impl.ReviewManagerImpl - org.wso2.carbon.device.application.mgt.core.lifecycle.LifecycleStateManager + io.entgra.application.mgt.core.lifecycle.LifecycleStateManager - org.wso2.carbon.device.application.mgt.core.impl.SubscriptionManagerImpl + io.entgra.application.mgt.core.impl.SubscriptionManagerImpl - org.wso2.carbon.device.application.mgt.core.impl.ApplicationStorageManagerImpl + io.entgra.application.mgt.core.impl.ApplicationStorageManagerImpl /tmp/apps/ 6 diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/carbon.xml b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/carbon.xml similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/carbon.xml rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/carbon.xml diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/datasources/master-datasources.xml b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/datasources/master-datasources.xml similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/datasources/master-datasources.xml rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/datasources/master-datasources.xml diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/jmx.xml b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/jmx.xml similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/jmx.xml rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/jmx.xml diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/launch.ini b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/launch.ini similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/launch.ini rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/launch.ini diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/mime.mappings b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/mime.mappings similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/mime.mappings rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/mime.mappings diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/mime.types b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/mime.types similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/mime.types rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/mime.types diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/log4j.properties b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/log4j.properties similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/log4j.properties rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/log4j.properties diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/registry.xml b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/registry.xml similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/registry.xml rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/registry.xml diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/security/authenticators.xml b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/security/authenticators.xml similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/security/authenticators.xml rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/security/authenticators.xml diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/web.xml b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/web.xml similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/web.xml rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/web.xml diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/user-mgt.xml b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/user-mgt.xml similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/carbon-home/repository/conf/user-mgt.xml rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/user-mgt.xml diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/datasource/data-source-config.xml b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/datasource/data-source-config.xml similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/datasource/data-source-config.xml rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/datasource/data-source-config.xml diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/h2.sql b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/h2.sql similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/h2.sql rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/h2.sql diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/log4j.properties b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/log4j.properties similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/log4j.properties rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/log4j.properties diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/samples/app1/banner1.jpg b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app1/banner1.jpg similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/samples/app1/banner1.jpg rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app1/banner1.jpg diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/samples/app1/icon.png b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app1/icon.png similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/samples/app1/icon.png rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app1/icon.png diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/samples/app1/sample.apk b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app1/sample.apk similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/samples/app1/sample.apk rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app1/sample.apk diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/samples/app1/shot1.png b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app1/shot1.png similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/samples/app1/shot1.png rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app1/shot1.png diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/samples/app1/shot2.png b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app1/shot2.png similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/samples/app1/shot2.png rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app1/shot2.png diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/samples/app1/shot3.png b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app1/shot3.png similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/samples/app1/shot3.png rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app1/shot3.png diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/samples/app2/banner1.jpg b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app2/banner1.jpg similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/samples/app2/banner1.jpg rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app2/banner1.jpg diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/samples/app2/icon.png b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app2/icon.png similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/samples/app2/icon.png rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app2/icon.png diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/samples/app2/sample_4.0.6.apk b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app2/sample_4.0.6.apk similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/samples/app2/sample_4.0.6.apk rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app2/sample_4.0.6.apk diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/samples/app2/shot1.png b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app2/shot1.png similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/samples/app2/shot1.png rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app2/shot1.png diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/samples/app2/shot2.png b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app2/shot2.png similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/samples/app2/shot2.png rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app2/shot2.png diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/samples/app2/shot3.png b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app2/shot3.png similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/samples/app2/shot3.png rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app2/shot3.png diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/testng.xml b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/testng.xml similarity index 53% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/testng.xml rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/testng.xml index b9fad1fe6a..e8b627e825 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/testng.xml +++ b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/testng.xml @@ -22,14 +22,14 @@ - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/user-test/user-mgt-registry-test.xml b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/user-test/user-mgt-registry-test.xml similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/user-test/user-mgt-registry-test.xml rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/user-test/user-mgt-registry-test.xml diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/util/app-debug.apk b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/util/app-debug.apk similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/util/app-debug.apk rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/util/app-debug.apk diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/util/iOSMDMAgent.ipa b/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/util/iOSMDMAgent.ipa similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/util/iOSMDMAgent.ipa rename to components/application-mgt/io.entgra.application.mgt.core/src/test/resources/util/iOSMDMAgent.ipa 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 0587b0cdd7..6bd5941447 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 @@ -38,15 +38,15 @@ import org.wso2.carbon.device.application.mgt.common.wrapper.PublicAppReleaseWra import org.wso2.carbon.device.application.mgt.common.wrapper.PublicAppWrapper; import org.wso2.carbon.device.application.mgt.common.wrapper.WebAppReleaseWrapper; import org.wso2.carbon.device.application.mgt.common.wrapper.WebAppWrapper; -import org.wso2.carbon.device.application.mgt.core.exception.BadRequestException; -import org.wso2.carbon.device.application.mgt.core.exception.ForbiddenException; -import org.wso2.carbon.device.application.mgt.core.exception.UnexpectedServerErrorException; -import org.wso2.carbon.device.application.mgt.core.util.APIUtil; -import org.wso2.carbon.device.application.mgt.core.util.Constants; +import io.entgra.application.mgt.core.exception.BadRequestException; +import io.entgra.application.mgt.core.exception.ForbiddenException; +import io.entgra.application.mgt.core.exception.UnexpectedServerErrorException; +import io.entgra.application.mgt.core.util.APIUtil; +import io.entgra.application.mgt.core.util.Constants; import io.entgra.application.mgt.publisher.api.services.ApplicationManagementPublisherAPI; import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; import org.wso2.carbon.device.application.mgt.common.services.ApplicationManager; -import org.wso2.carbon.device.application.mgt.core.exception.NotFoundException; +import io.entgra.application.mgt.core.exception.NotFoundException; import java.io.IOException; import java.io.InputStream; diff --git a/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/impl/admin/ApplicationManagementPublisherAdminAPIImpl.java b/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/impl/admin/ApplicationManagementPublisherAdminAPIImpl.java index 370f57e57e..fd37ba0efb 100644 --- a/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/impl/admin/ApplicationManagementPublisherAdminAPIImpl.java +++ b/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/impl/admin/ApplicationManagementPublisherAdminAPIImpl.java @@ -21,10 +21,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; import org.wso2.carbon.device.application.mgt.common.services.ApplicationManager; -import org.wso2.carbon.device.application.mgt.core.exception.BadRequestException; -import org.wso2.carbon.device.application.mgt.core.exception.ForbiddenException; -import org.wso2.carbon.device.application.mgt.core.exception.NotFoundException; -import org.wso2.carbon.device.application.mgt.core.util.APIUtil; +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.core.util.APIUtil; import io.entgra.application.mgt.publisher.api.services.admin.ApplicationManagementPublisherAdminAPI; import javax.ws.rs.Consumes; 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 f0af7225b9..2e5da54e34 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 @@ -24,8 +24,8 @@ import org.wso2.carbon.device.application.mgt.common.Rating; import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; import org.wso2.carbon.device.application.mgt.common.exception.ReviewManagementException; import org.wso2.carbon.device.application.mgt.common.services.ReviewManager; -import org.wso2.carbon.device.application.mgt.core.exception.NotFoundException; -import org.wso2.carbon.device.application.mgt.core.util.APIUtil; +import io.entgra.application.mgt.core.exception.NotFoundException; +import io.entgra.application.mgt.core.util.APIUtil; import io.entgra.application.mgt.publisher.api.services.admin.ReviewManagementPublisherAdminAPI; import javax.ws.rs.DefaultValue; 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.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/ApplicationManagementAPIImpl.java index 808c67b287..c646b32d9e 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.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/ApplicationManagementAPIImpl.java @@ -23,10 +23,10 @@ import org.wso2.carbon.device.application.mgt.common.Filter; import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; import org.wso2.carbon.device.application.mgt.common.response.Application; import org.wso2.carbon.device.application.mgt.common.services.ApplicationManager; -import org.wso2.carbon.device.application.mgt.core.exception.BadRequestException; -import org.wso2.carbon.device.application.mgt.core.exception.NotFoundException; -import org.wso2.carbon.device.application.mgt.core.exception.UnexpectedServerErrorException; -import org.wso2.carbon.device.application.mgt.core.util.APIUtil; +import io.entgra.application.mgt.core.exception.BadRequestException; +import io.entgra.application.mgt.core.exception.NotFoundException; +import io.entgra.application.mgt.core.exception.UnexpectedServerErrorException; +import io.entgra.application.mgt.core.util.APIUtil; import io.entgra.application.mgt.store.api.services.ApplicationManagementAPI; 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/impl/ReviewManagementAPIImpl.java b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/ReviewManagementAPIImpl.java index 7f5a8b9195..762b126664 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.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/ReviewManagementAPIImpl.java @@ -25,14 +25,14 @@ import org.wso2.carbon.device.application.mgt.common.Rating; import org.wso2.carbon.device.application.mgt.common.response.Review; import org.wso2.carbon.device.application.mgt.common.services.ReviewManager; import org.wso2.carbon.device.application.mgt.common.wrapper.ReviewWrapper; -import org.wso2.carbon.device.application.mgt.core.exception.BadRequestException; -import org.wso2.carbon.device.application.mgt.core.exception.ForbiddenException; -import org.wso2.carbon.device.application.mgt.core.exception.NotFoundException; +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 org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; import org.wso2.carbon.device.application.mgt.common.exception.ReviewManagementException; -import org.wso2.carbon.device.application.mgt.core.util.APIUtil; +import io.entgra.application.mgt.core.util.APIUtil; import javax.ws.rs.DefaultValue; import javax.ws.rs.Path; 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.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/SubscriptionManagementAPIImpl.java index b045b8bda3..80ab0ec49e 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.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/SubscriptionManagementAPIImpl.java @@ -27,18 +27,18 @@ 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.exception.ApplicationManagementException; import org.wso2.carbon.device.application.mgt.common.services.SubscriptionManager; -import org.wso2.carbon.device.application.mgt.core.exception.ApplicationOperationTaskException; +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.store.api.services.impl.util.RequestValidationUtil; -import org.wso2.carbon.device.application.mgt.core.exception.BadRequestException; -import org.wso2.carbon.device.application.mgt.core.exception.ForbiddenException; -import org.wso2.carbon.device.application.mgt.core.exception.NotFoundException; -import org.wso2.carbon.device.application.mgt.core.task.ScheduledAppSubscriptionTaskManager; -import org.wso2.carbon.device.application.mgt.core.util.APIUtil; +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.core.task.ScheduledAppSubscriptionTaskManager; +import io.entgra.application.mgt.core.util.APIUtil; import io.entgra.application.mgt.store.api.services.SubscriptionManagementAPI; import org.wso2.carbon.device.mgt.common.Device; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; 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.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/admin/ReviewManagementStoreAdminAPIImpl.java index 9dc8aec9fc..0d62ba9d16 100644 --- 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.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/admin/ReviewManagementStoreAdminAPIImpl.java @@ -21,8 +21,8 @@ import org.apache.commons.logging.LogFactory; import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; import org.wso2.carbon.device.application.mgt.common.exception.ReviewManagementException; import org.wso2.carbon.device.application.mgt.common.services.ReviewManager; -import org.wso2.carbon.device.application.mgt.core.exception.NotFoundException; -import org.wso2.carbon.device.application.mgt.core.util.APIUtil; +import io.entgra.application.mgt.core.exception.NotFoundException; +import io.entgra.application.mgt.core.util.APIUtil; import io.entgra.application.mgt.store.api.services.admin.ReviewManagementStoreAdminAPI; 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/admin/SubscriptionManagementAdminAPIImpl.java b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/admin/SubscriptionManagementAdminAPIImpl.java index 17cf3511f9..c65cd02826 100644 --- 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.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/admin/SubscriptionManagementAdminAPIImpl.java @@ -23,9 +23,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; import org.wso2.carbon.device.application.mgt.common.services.SubscriptionManager; -import org.wso2.carbon.device.application.mgt.core.exception.BadRequestException; -import org.wso2.carbon.device.application.mgt.core.exception.NotFoundException; -import org.wso2.carbon.device.application.mgt.core.util.APIUtil; +import io.entgra.application.mgt.core.exception.BadRequestException; +import io.entgra.application.mgt.core.exception.NotFoundException; +import io.entgra.application.mgt.core.util.APIUtil; import io.entgra.application.mgt.store.api.services.admin.SubscriptionManagementAdminAPI; import io.entgra.application.mgt.store.api.services.impl.util.RequestValidationUtil; import org.wso2.carbon.device.mgt.common.PaginationRequest; 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.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/util/RequestValidationUtil.java index 4061bcd965..aeff5fe9f8 100644 --- 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.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/util/RequestValidationUtil.java @@ -20,7 +20,7 @@ package io.entgra.application.mgt.store.api.services.impl.util; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.device.application.mgt.core.exception.BadRequestException; +import io.entgra.application.mgt.core.exception.BadRequestException; import io.entgra.application.mgt.store.api.util.Constants; import java.util.List; 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.store.api/src/test/java/io/entgra/application/mgt/store/api/services/ReviewManagementAPITest.java index 643f3c0ece..88fe81fcaa 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.store.api/src/test/java/io/entgra/application/mgt/store/api/services/ReviewManagementAPITest.java @@ -25,7 +25,7 @@ import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor; import org.wso2.carbon.device.application.mgt.common.services.ReviewManager; -import org.wso2.carbon.device.application.mgt.core.util.APIUtil; +import io.entgra.application.mgt.core.util.APIUtil; @PowerMockIgnore("javax.ws.rs.*") @SuppressStaticInitializationFor({ 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 c0a5a4a6b4..b28c1a31cc 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 @@ -47,7 +47,7 @@ import org.wso2.carbon.device.application.mgt.common.ApplicationInstallResponse; import org.wso2.carbon.device.application.mgt.common.SubscriptionType; import org.wso2.carbon.device.application.mgt.common.exception.SubscriptionManagementException; import org.wso2.carbon.device.application.mgt.common.services.SubscriptionManager; -import org.wso2.carbon.device.application.mgt.core.util.HelperUtil; +import io.entgra.application.mgt.core.util.HelperUtil; import org.wso2.carbon.device.mgt.common.DeviceFilters; import org.wso2.carbon.device.mgt.common.EnrolmentInfo; import org.wso2.carbon.device.mgt.common.OperationLogFilters; 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/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/conf/application-mgt.xml index d0d02a058a..fa4ce1eb53 100644 --- a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/conf/application-mgt.xml +++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/conf/application-mgt.xml @@ -23,19 +23,19 @@ - org.wso2.carbon.device.application.mgt.core.impl.ApplicationManagerImpl + io.entgra.application.mgt.core.impl.ApplicationManagerImpl - org.wso2.carbon.device.application.mgt.core.impl.ReviewManagerImpl + io.entgra.application.mgt.core.impl.ReviewManagerImpl - org.wso2.carbon.device.application.mgt.core.lifecycle.LifecycleStateManager + io.entgra.application.mgt.core.lifecycle.LifecycleStateManager - org.wso2.carbon.device.application.mgt.core.impl.SubscriptionManagerImpl + io.entgra.application.mgt.core.impl.SubscriptionManagerImpl - org.wso2.carbon.device.application.mgt.core.impl.ApplicationStorageManagerImpl + io.entgra.application.mgt.core.impl.ApplicationStorageManagerImpl repository/resources/apps/ 6 From 8a07dad38c8b351cf8b6be5b6caccf975d839633 Mon Sep 17 00:00:00 2001 From: Amalka Subasinghe Date: Tue, 10 Aug 2021 16:56:19 +0530 Subject: [PATCH 07/10] package name change - appmgt common --- .../impl/ArtifactDownloadAPIImpl.java | 6 +- .../pom.xml | 8 +-- .../mgt/common/AppLifecycleState.java | 2 +- .../application/mgt/common/AppOperation.java | 4 +- .../mgt/common/ApplicationArtifact.java | 2 +- .../common/ApplicationInstallResponse.java | 2 +- .../mgt/common/ApplicationInstaller.java | 2 +- .../mgt/common/ApplicationList.java | 6 +- .../common/ApplicationSubscriptionInfo.java | 2 +- .../common/ApplicationSubscriptionType.java | 2 +- .../mgt/common/ApplicationType.java | 2 +- .../mgt/common/BasePaginatedResult.java | 2 +- .../application/mgt/common/BasicUserInfo.java | 2 +- .../mgt/common/BasicUserInfoList.java | 2 +- .../mgt/common/DeviceGroupList.java | 2 +- .../application/mgt/common/DeviceList.java | 2 +- .../mgt/common/DeviceSubscriptionData.java | 2 +- .../application/mgt/common/DeviceTypes.java | 2 +- .../common/EnterpriseInstallationDetails.java | 2 +- .../application/mgt/common/ErrorListItem.java | 2 +- .../application/mgt/common/ErrorResponse.java | 2 +- .../mgt/common/ExecutionStatus.java | 2 +- .../application/mgt/common/Filter.java | 2 +- .../application/mgt/common/ImageArtifact.java | 2 +- .../mgt/common/InstallationDetails.java | 2 +- .../mgt/common/LifecycleChanger.java | 2 +- .../mgt/common/LifecycleState.java | 2 +- .../application/mgt/common/Pagination.java | 2 +- .../mgt/common/PaginationRequest.java | 2 +- .../mgt/common/PaginationResult.java | 2 +- .../application/mgt/common/Rating.java | 2 +- .../application/mgt/common/ReviewNode.java | 2 +- .../application/mgt/common/RoleList.java | 2 +- .../application/mgt/common/SortingOrder.java | 2 +- .../application/mgt/common/SubAction.java | 2 +- .../mgt/common/SubscribingDeviceIdHolder.java | 2 +- .../mgt/common/SubscriptionType.java | 2 +- .../entgra}/application/mgt/common/User.java | 2 +- .../mgt/common/config/ErrorCallback.java | 2 +- .../mgt/common/config/LifecycleState.java | 2 +- .../mgt/common/config/MDMConfig.java | 2 +- .../common/config/RatingConfiguration.java | 2 +- .../common/dto/ApiRegistrationProfile.java | 2 +- .../mgt/common/dto/ApplicationDTO.java | 2 +- .../mgt/common/dto/ApplicationPolicyDTO.java | 2 +- .../mgt/common/dto/ApplicationReleaseDTO.java | 2 +- .../mgt/common/dto/CategoryDTO.java | 2 +- .../mgt/common/dto/DeviceSubscriptionDTO.java | 2 +- .../mgt/common/dto/GroupSubscriptionDTO.java | 2 +- .../application/mgt/common/dto/ReviewDTO.java | 2 +- .../mgt/common/dto/RoleSubscriptionDTO.java | 2 +- .../common/dto/ScheduledSubscriptionDTO.java | 9 ++- .../application/mgt/common/dto/TagDTO.java | 2 +- .../mgt/common/dto/UserSubscriptionDTO.java | 2 +- ...pplicationCategoryManagementException.java | 2 +- .../ApplicationManagementException.java | 2 +- ...ApplicationStorageManagementException.java | 2 +- .../exception/DBConnectionException.java | 2 +- .../exception/DeviceConnectorException.java | 2 +- .../IllegalTransactionStateException.java | 2 +- .../InvalidConfigurationException.java | 2 +- .../LifecycleManagementException.java | 2 +- .../exception/RequestValidatingException.java | 2 +- .../ResourceManagementException.java | 2 +- .../ReviewDoesNotExistException.java | 2 +- .../exception/ReviewManagementException.java | 2 +- .../SubscriptionManagementException.java | 2 +- .../TransactionManagementException.java | 2 +- .../UnsupportedDatabaseEngineException.java | 2 +- .../VisibilityManagementException.java | 2 +- .../mgt/common/response/Application.java | 2 +- .../common/response/ApplicationRelease.java | 2 +- .../mgt/common/response/Category.java | 2 +- .../mgt/common/response/Review.java | 2 +- .../application/mgt/common/response/Tag.java | 2 +- .../common/services/ApplicationManager.java | 44 +++++++-------- .../services/ApplicationStorageManager.java | 12 ++-- .../mgt/common/services/AppmDataHandler.java | 8 +-- .../mgt/common/services/DeviceConnector.java | 6 +- .../mgt/common/services/ReviewManager.java | 16 +++--- .../common/services/SubscriptionManager.java | 12 ++-- .../wrapper/ApplicationUpdateWrapper.java | 2 +- .../common/wrapper/ApplicationWrapper.java | 2 +- .../wrapper/CustomAppReleaseWrapper.java | 2 +- .../mgt/common/wrapper/CustomAppWrapper.java | 2 +- .../common/wrapper/EntAppReleaseWrapper.java | 2 +- .../wrapper/PublicAppReleaseWrapper.java | 2 +- .../mgt/common/wrapper/PublicAppWrapper.java | 2 +- .../mgt/common/wrapper/ReviewWrapper.java | 2 +- .../common/wrapper/WebAppReleaseWrapper.java | 2 +- .../mgt/common/wrapper/WebAppWrapper.java | 2 +- .../mgt/core/config/Configuration.java | 6 +- .../mgt/core/config/ConfigurationManager.java | 4 +- .../mgt/core/dao/ApplicationDAO.java | 6 +- .../mgt/core/dao/ApplicationReleaseDAO.java | 2 +- .../application/mgt/core/dao/ReviewDAO.java | 4 +- .../mgt/core/dao/SubscriptionDAO.java | 8 +-- .../ApplicationManagementDAOFactory.java | 2 +- .../mgt/core/dao/impl/AbstractDAOImpl.java | 2 +- .../GenericApplicationDAOImpl.java | 10 ++-- .../application/OracleApplicationDAOImpl.java | 4 +- .../SQLServerApplicationDAOImpl.java | 4 +- .../GenericApplicationReleaseDAOImpl.java | 4 +- .../OracleApplicationReleaseDAOImpl.java | 2 +- .../SQLServerApplicationReleaseDAOImpl.java | 2 +- .../GenericLifecycleStateDAOImpl.java | 2 +- .../dao/impl/review/GenericReviewDAOImpl.java | 4 +- .../dao/impl/review/OracleReviewDAOImpl.java | 4 +- .../impl/review/SQLServerReviewDAOImpl.java | 4 +- .../GenericSubscriptionDAOImpl.java | 6 +- .../OracleSubscriptionDAOImpl.java | 2 +- .../SQLServerSubscriptionDAOImpl.java | 2 +- .../visibility/GenericVisibilityDAOImpl.java | 2 +- .../core/exception/BadRequestException.java | 2 +- .../core/exception/ForbiddenException.java | 2 +- .../mgt/core/exception/NotFoundException.java | 2 +- .../ReviewManagementDAOException.java | 2 +- .../SubscriptionManagementDAOException.java | 2 +- .../UnexpectedServerErrorException.java | 2 +- .../core/exception/ValidationException.java | 2 +- .../VisibilityManagementDAOException.java | 2 +- .../mgt/core/impl/ApplicationManagerImpl.java | 56 +++++++++---------- .../impl/ApplicationStorageManagerImpl.java | 8 +-- .../mgt/core/impl/AppmDataHandlerImpl.java | 12 ++-- .../mgt/core/impl/ReviewManagerImpl.java | 20 +++---- .../core/impl/SubscriptionManagerImpl.java | 24 ++++---- ...ApplicationManagementServiceComponent.java | 12 ++-- .../mgt/core/internal/DataHolder.java | 10 ++-- .../core/lifecycle/LifecycleStateManager.java | 4 +- .../ScheduledAppSubscriptionCleanupTask.java | 4 +- .../task/ScheduledAppSubscriptionTask.java | 8 +-- .../ScheduledAppSubscriptionTaskManager.java | 6 +- .../application/mgt/core/util/APIUtil.java | 30 +++++----- .../core/util/ApplicationManagementUtil.java | 10 ++-- .../mgt/core/util/ConnectionManagerUtil.java | 6 +- .../application/mgt/core/util/DAOUtil.java | 10 ++-- .../application/mgt/core/util/OAuthUtils.java | 2 +- .../mgt/core/util/StorageManagementUtil.java | 4 +- .../application/mgt/core/BaseTestCase.java | 4 +- .../mgt/core/ConfigurationTest.java | 2 +- .../entgra/application/mgt/core/InitTest.java | 2 +- .../mgt/core/LifeCycleStateManagerTest.java | 2 +- .../mgt/core/LifecycleManagementTest.java | 4 +- .../mgt/core/StorageManagementUtilTest.java | 2 +- .../mgt/core/dto/ApplicationsDTO.java | 2 +- .../management/ApplicationManagementTest.java | 22 ++++---- .../ApplicationManagementPublisherAPI.java | 24 ++++---- ...ApplicationManagementPublisherAPIImpl.java | 36 ++++++------ ...cationManagementPublisherAdminAPIImpl.java | 4 +- ...ReviewManagementPublisherAdminAPIImpl.java | 6 +- .../services/ApplicationManagementAPI.java | 2 +- .../api/services/ReviewManagementAPI.java | 4 +- .../impl/ApplicationManagementAPIImpl.java | 6 +- .../impl/ReviewManagementAPIImpl.java | 10 ++-- .../impl/SubscriptionManagementAPIImpl.java | 4 +- .../ReviewManagementStoreAdminAPIImpl.java | 6 +- .../SubscriptionManagementAdminAPIImpl.java | 4 +- .../api/services/CommentMgtTestHelper.java | 2 +- .../api/services/ReviewManagementAPITest.java | 2 +- .../pom.xml | 10 ++-- .../PullNotificationSubscriberImpl.java | 6 +- .../internal/PullNotificationDataHolder.java | 2 +- .../PullNotificationServiceComponent.java | 2 +- .../pom.xml | 2 +- .../impl/DeviceManagementServiceImpl.java | 6 +- .../mgt/jaxrs/util/DeviceMgtAPIUtils.java | 2 +- 166 files changed, 398 insertions(+), 401 deletions(-) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common => io.entgra.application.mgt.common}/pom.xml (94%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/AppLifecycleState.java (93%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/AppOperation.java (95%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/ApplicationArtifact.java (97%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/ApplicationInstallResponse.java (97%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/ApplicationInstaller.java (95%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/ApplicationList.java (86%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/ApplicationSubscriptionInfo.java (97%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/ApplicationSubscriptionType.java (93%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/ApplicationType.java (93%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/BasePaginatedResult.java (95%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/BasicUserInfo.java (97%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/BasicUserInfoList.java (96%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/DeviceGroupList.java (96%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/DeviceList.java (96%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/DeviceSubscriptionData.java (97%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/DeviceTypes.java (93%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/EnterpriseInstallationDetails.java (97%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/ErrorListItem.java (97%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/ErrorResponse.java (98%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/ExecutionStatus.java (90%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/Filter.java (98%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/ImageArtifact.java (96%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/InstallationDetails.java (96%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/LifecycleChanger.java (94%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/LifecycleState.java (98%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/Pagination.java (96%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/PaginationRequest.java (96%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/PaginationResult.java (97%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/Rating.java (96%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/ReviewNode.java (96%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/RoleList.java (96%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/SortingOrder.java (93%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/SubAction.java (93%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/SubscribingDeviceIdHolder.java (97%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/SubscriptionType.java (93%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/User.java (96%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/config/ErrorCallback.java (98%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/config/LifecycleState.java (98%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/config/MDMConfig.java (95%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/config/RatingConfiguration.java (95%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/dto/ApiRegistrationProfile.java (96%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/dto/ApplicationDTO.java (98%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/dto/ApplicationPolicyDTO.java (96%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/dto/ApplicationReleaseDTO.java (99%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/dto/CategoryDTO.java (94%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/dto/DeviceSubscriptionDTO.java (97%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/dto/GroupSubscriptionDTO.java (97%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/dto/ReviewDTO.java (97%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/dto/RoleSubscriptionDTO.java (97%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/dto/ScheduledSubscriptionDTO.java (93%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/dto/TagDTO.java (94%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/dto/UserSubscriptionDTO.java (94%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/exception/ApplicationCategoryManagementException.java (93%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/exception/ApplicationManagementException.java (95%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/exception/ApplicationStorageManagementException.java (94%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/exception/DBConnectionException.java (94%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/exception/DeviceConnectorException.java (95%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/exception/IllegalTransactionStateException.java (94%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/exception/InvalidConfigurationException.java (94%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/exception/LifecycleManagementException.java (94%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/exception/RequestValidatingException.java (93%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/exception/ResourceManagementException.java (94%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/exception/ReviewDoesNotExistException.java (95%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/exception/ReviewManagementException.java (95%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/exception/SubscriptionManagementException.java (95%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/exception/TransactionManagementException.java (95%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/exception/UnsupportedDatabaseEngineException.java (95%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/exception/VisibilityManagementException.java (94%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/response/Application.java (98%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/response/ApplicationRelease.java (98%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/response/Category.java (94%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/response/Review.java (98%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/response/Tag.java (94%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/services/ApplicationManager.java (88%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/services/ApplicationStorageManager.java (91%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/services/AppmDataHandler.java (84%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/services/DeviceConnector.java (87%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/services/ReviewManager.java (85%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/services/SubscriptionManager.java (94%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/wrapper/ApplicationUpdateWrapper.java (98%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/wrapper/ApplicationWrapper.java (98%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/wrapper/CustomAppReleaseWrapper.java (98%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/wrapper/CustomAppWrapper.java (98%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/wrapper/EntAppReleaseWrapper.java (98%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/wrapper/PublicAppReleaseWrapper.java (98%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/wrapper/PublicAppWrapper.java (98%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/wrapper/ReviewWrapper.java (94%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/wrapper/WebAppReleaseWrapper.java (98%) rename components/application-mgt/{org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.common/src/main/java/io/entgra}/application/mgt/common/wrapper/WebAppWrapper.java (98%) diff --git a/components/application-mgt/io.entgra.application.mgt.api/src/main/java/io/entgra/application/mgt/api/services/impl/ArtifactDownloadAPIImpl.java b/components/application-mgt/io.entgra.application.mgt.api/src/main/java/io/entgra/application/mgt/api/services/impl/ArtifactDownloadAPIImpl.java index 4d4ea30cd2..51a5074e13 100644 --- a/components/application-mgt/io.entgra.application.mgt.api/src/main/java/io/entgra/application/mgt/api/services/impl/ArtifactDownloadAPIImpl.java +++ b/components/application-mgt/io.entgra.application.mgt.api/src/main/java/io/entgra/application/mgt/api/services/impl/ArtifactDownloadAPIImpl.java @@ -21,9 +21,9 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import io.entgra.application.mgt.api.services.ArtifactDownloadAPI; -import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; -import org.wso2.carbon.device.application.mgt.common.services.ApplicationManager; -import org.wso2.carbon.device.application.mgt.common.services.AppmDataHandler; +import io.entgra.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.application.mgt.common.services.ApplicationManager; +import io.entgra.application.mgt.common.services.AppmDataHandler; import io.entgra.application.mgt.core.exception.BadRequestException; import io.entgra.application.mgt.core.exception.NotFoundException; import io.entgra.application.mgt.core.util.APIUtil; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/pom.xml b/components/application-mgt/io.entgra.application.mgt.common/pom.xml similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/pom.xml rename to components/application-mgt/io.entgra.application.mgt.common/pom.xml index 9bc4a1dcf4..877c259b6f 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/pom.xml +++ b/components/application-mgt/io.entgra.application.mgt.common/pom.xml @@ -26,10 +26,10 @@ 4.0.0 - org.wso2.carbon.device.application.mgt.common + io.entgra.application.mgt.common bundle - WSO2 Carbon - Application Management Common - WSO2 Carbon - Application Management Common + Entgra - Application Management Common + Entgra - Application Management Common https://entgra.io @@ -58,7 +58,7 @@ javax.xml.bind.annotation; version="${javax.xml.bind.imp.pkg.version}", - org.wso2.carbon.device.application.mgt.common.* + io.entgra.application.mgt.common.* diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/AppLifecycleState.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/AppLifecycleState.java similarity index 93% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/AppLifecycleState.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/AppLifecycleState.java index d41de093e2..7c068158d2 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/AppLifecycleState.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/AppLifecycleState.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common; +package io.entgra.application.mgt.common; /** diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/AppOperation.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/AppOperation.java similarity index 95% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/AppOperation.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/AppOperation.java index a7fe3c9ced..100042f892 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/AppOperation.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/AppOperation.java @@ -14,9 +14,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common; +package io.entgra.application.mgt.common; -import org.wso2.carbon.device.application.mgt.common.dto.ApplicationDTO; +import io.entgra.application.mgt.common.dto.ApplicationDTO; public class AppOperation { diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ApplicationArtifact.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationArtifact.java similarity index 97% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ApplicationArtifact.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationArtifact.java index c71a468957..1485ef0e11 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ApplicationArtifact.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationArtifact.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common; +package io.entgra.application.mgt.common; import java.io.InputStream; import java.util.Map; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ApplicationInstallResponse.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationInstallResponse.java similarity index 97% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ApplicationInstallResponse.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationInstallResponse.java index 06b0817ac1..bd77ad4079 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ApplicationInstallResponse.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationInstallResponse.java @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.common; +package io.entgra.application.mgt.common; import io.swagger.annotations.ApiModelProperty; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ApplicationInstaller.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationInstaller.java similarity index 95% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ApplicationInstaller.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationInstaller.java index dde6722d85..78876f0d43 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ApplicationInstaller.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationInstaller.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common; +package io.entgra.application.mgt.common; public class ApplicationInstaller { diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ApplicationList.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationList.java similarity index 86% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ApplicationList.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationList.java index e34c55c464..9d725dd6b5 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ApplicationList.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationList.java @@ -14,10 +14,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common; +package io.entgra.application.mgt.common; -import org.wso2.carbon.device.application.mgt.common.dto.ApplicationDTO; -import org.wso2.carbon.device.application.mgt.common.response.Application; +import io.entgra.application.mgt.common.dto.ApplicationDTO; +import io.entgra.application.mgt.common.response.Application; import java.util.List; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ApplicationSubscriptionInfo.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationSubscriptionInfo.java similarity index 97% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ApplicationSubscriptionInfo.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationSubscriptionInfo.java index 648e8585f9..d8c0736f65 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ApplicationSubscriptionInfo.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationSubscriptionInfo.java @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.common; +package io.entgra.application.mgt.common; import org.wso2.carbon.device.mgt.common.Device; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ApplicationSubscriptionType.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationSubscriptionType.java similarity index 93% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ApplicationSubscriptionType.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationSubscriptionType.java index 5628c9d96d..9dadc7ebd7 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ApplicationSubscriptionType.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationSubscriptionType.java @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.common; +package io.entgra.application.mgt.common; /** * Possible Subscription Type of the application. diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ApplicationType.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationType.java similarity index 93% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ApplicationType.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationType.java index 8964ec60e7..54d091aeb1 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ApplicationType.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationType.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common; +package io.entgra.application.mgt.common; /** diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/BasePaginatedResult.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/BasePaginatedResult.java similarity index 95% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/BasePaginatedResult.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/BasePaginatedResult.java index b2445fcf7f..b32f6c553e 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/BasePaginatedResult.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/BasePaginatedResult.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common; +package io.entgra.application.mgt.common; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/BasicUserInfo.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/BasicUserInfo.java similarity index 97% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/BasicUserInfo.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/BasicUserInfo.java index 26e73d2dc1..ece8ad6867 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/BasicUserInfo.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/BasicUserInfo.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common; +package io.entgra.application.mgt.common; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/BasicUserInfoList.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/BasicUserInfoList.java similarity index 96% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/BasicUserInfoList.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/BasicUserInfoList.java index 3f4762e3cb..e7f0747298 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/BasicUserInfoList.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/BasicUserInfoList.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common; +package io.entgra.application.mgt.common; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModel; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/DeviceGroupList.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/DeviceGroupList.java similarity index 96% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/DeviceGroupList.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/DeviceGroupList.java index 698d29ee44..bb7daca91a 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/DeviceGroupList.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/DeviceGroupList.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common; +package io.entgra.application.mgt.common; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/DeviceList.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/DeviceList.java similarity index 96% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/DeviceList.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/DeviceList.java index 94f81e153c..692a3a8aed 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/DeviceList.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/DeviceList.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common; +package io.entgra.application.mgt.common; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/DeviceSubscriptionData.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/DeviceSubscriptionData.java similarity index 97% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/DeviceSubscriptionData.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/DeviceSubscriptionData.java index 550c1c98fc..d769a8b139 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/DeviceSubscriptionData.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/DeviceSubscriptionData.java @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.common; +package io.entgra.application.mgt.common; import org.wso2.carbon.device.mgt.common.Device; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/DeviceTypes.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/DeviceTypes.java similarity index 93% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/DeviceTypes.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/DeviceTypes.java index 7fa8a02062..fed66c582c 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/DeviceTypes.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/DeviceTypes.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common; +package io.entgra.application.mgt.common; public enum DeviceTypes { ANDROID, IOS, WINDOWS diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/EnterpriseInstallationDetails.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/EnterpriseInstallationDetails.java similarity index 97% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/EnterpriseInstallationDetails.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/EnterpriseInstallationDetails.java index e045fecd78..49986c11bd 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/EnterpriseInstallationDetails.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/EnterpriseInstallationDetails.java @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.common; +package io.entgra.application.mgt.common; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ErrorListItem.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ErrorListItem.java similarity index 97% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ErrorListItem.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ErrorListItem.java index 8a5e2e2f60..143c1374ff 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ErrorListItem.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ErrorListItem.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common; +package io.entgra.application.mgt.common; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModel; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ErrorResponse.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ErrorResponse.java similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ErrorResponse.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ErrorResponse.java index 58c67bfc3a..6a7673bba8 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ErrorResponse.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ErrorResponse.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common; +package io.entgra.application.mgt.common; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModel; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ExecutionStatus.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ExecutionStatus.java similarity index 90% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ExecutionStatus.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ExecutionStatus.java index c24a65593f..dc4a8f2197 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ExecutionStatus.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ExecutionStatus.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.common; +package io.entgra.application.mgt.common; public enum ExecutionStatus { PENDING, EXECUTED, FAILED diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/Filter.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/Filter.java similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/Filter.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/Filter.java index 6e45015c41..6ce0f2b2d3 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/Filter.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/Filter.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common; +package io.entgra.application.mgt.common; import java.util.List; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ImageArtifact.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ImageArtifact.java similarity index 96% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ImageArtifact.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ImageArtifact.java index 30eed0d513..e885ffbcf8 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ImageArtifact.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ImageArtifact.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.common; +package io.entgra.application.mgt.common; /** * This represents a image artifact of a application. Icon, Screen-shot or Banner. diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/InstallationDetails.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/InstallationDetails.java similarity index 96% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/InstallationDetails.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/InstallationDetails.java index d15dd4a7c5..22ade53450 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/InstallationDetails.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/InstallationDetails.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common; +package io.entgra.application.mgt.common; import io.swagger.annotations.ApiModelProperty; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/LifecycleChanger.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/LifecycleChanger.java similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/LifecycleChanger.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/LifecycleChanger.java index abb39642f9..2709823ddd 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/LifecycleChanger.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/LifecycleChanger.java @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.common; +package io.entgra.application.mgt.common; public class LifecycleChanger { diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/LifecycleState.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/LifecycleState.java similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/LifecycleState.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/LifecycleState.java index 3021b6fd9b..78ad768912 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/LifecycleState.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/LifecycleState.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common; +package io.entgra.application.mgt.common; import java.sql.Timestamp; import io.swagger.annotations.ApiModel; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/Pagination.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/Pagination.java similarity index 96% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/Pagination.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/Pagination.java index 01a2205bf7..c2179dcd70 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/Pagination.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/Pagination.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common; +package io.entgra.application.mgt.common; /** * This class represents the pagination details that will be used when fetching application details from database. diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/PaginationRequest.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/PaginationRequest.java similarity index 96% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/PaginationRequest.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/PaginationRequest.java index 80e0f1c603..794ec1a2a1 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/PaginationRequest.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/PaginationRequest.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.common; +package io.entgra.application.mgt.common; /** * This class holds required parameters for a querying a paginated device response. diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/PaginationResult.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/PaginationResult.java similarity index 97% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/PaginationResult.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/PaginationResult.java index 3f90066264..57cbafb884 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/PaginationResult.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/PaginationResult.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.common; +package io.entgra.application.mgt.common; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/Rating.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/Rating.java similarity index 96% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/Rating.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/Rating.java index 8ac2414668..5fbb1a1e39 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/Rating.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/Rating.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common; +package io.entgra.application.mgt.common; import java.util.TreeMap; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ReviewNode.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ReviewNode.java similarity index 96% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ReviewNode.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ReviewNode.java index c3c5c75026..f8f45ef6ef 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ReviewNode.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ReviewNode.java @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.common; +package io.entgra.application.mgt.common; import java.util.ArrayList; import java.util.List; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/RoleList.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/RoleList.java similarity index 96% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/RoleList.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/RoleList.java index 183f196c8c..fadca3462c 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/RoleList.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/RoleList.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common; +package io.entgra.application.mgt.common; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModel; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/SortingOrder.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/SortingOrder.java similarity index 93% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/SortingOrder.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/SortingOrder.java index f0c19bdffc..2479c97046 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/SortingOrder.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/SortingOrder.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common; +package io.entgra.application.mgt.common; /** diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/SubAction.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/SubAction.java similarity index 93% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/SubAction.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/SubAction.java index fde06081ef..1c3bd64ff9 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/SubAction.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/SubAction.java @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.common; +package io.entgra.application.mgt.common; public enum SubAction { INSTALL, UNINSTALL diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/SubscribingDeviceIdHolder.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/SubscribingDeviceIdHolder.java similarity index 97% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/SubscribingDeviceIdHolder.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/SubscribingDeviceIdHolder.java index 0dd283b3fe..be3051a314 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/SubscribingDeviceIdHolder.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/SubscribingDeviceIdHolder.java @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.common; +package io.entgra.application.mgt.common; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/SubscriptionType.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/SubscriptionType.java similarity index 93% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/SubscriptionType.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/SubscriptionType.java index 08af098d8f..048c83b721 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/SubscriptionType.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/SubscriptionType.java @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.common; +package io.entgra.application.mgt.common; public enum SubscriptionType { USER, ROLE, GROUP, DEVICE diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/User.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/User.java similarity index 96% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/User.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/User.java index 780a066b17..3e0b201126 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/User.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/User.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common; +package io.entgra.application.mgt.common; /** * Represents an user. diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/config/ErrorCallback.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/config/ErrorCallback.java similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/config/ErrorCallback.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/config/ErrorCallback.java index 660c6c4b09..83a5810dd9 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/config/ErrorCallback.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/config/ErrorCallback.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common.config; +package io.entgra.application.mgt.common.config; import javax.xml.bind.annotation.XmlElement; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/config/LifecycleState.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/config/LifecycleState.java similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/config/LifecycleState.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/config/LifecycleState.java index f94f3b3690..8f8122b437 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/config/LifecycleState.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/config/LifecycleState.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common.config; +package io.entgra.application.mgt.common.config; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/config/MDMConfig.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/config/MDMConfig.java similarity index 95% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/config/MDMConfig.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/config/MDMConfig.java index 1f478f8481..1c6c47330d 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/config/MDMConfig.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/config/MDMConfig.java @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.common.config; +package io.entgra.application.mgt.common.config; import javax.xml.bind.annotation.XmlElement; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/config/RatingConfiguration.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/config/RatingConfiguration.java similarity index 95% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/config/RatingConfiguration.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/config/RatingConfiguration.java index 44892c462f..f821d7c996 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/config/RatingConfiguration.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/config/RatingConfiguration.java @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.common.config; +package io.entgra.application.mgt.common.config; import javax.xml.bind.annotation.XmlElement; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/ApiRegistrationProfile.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ApiRegistrationProfile.java similarity index 96% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/ApiRegistrationProfile.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ApiRegistrationProfile.java index a117584bd8..6d44f35478 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/ApiRegistrationProfile.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ApiRegistrationProfile.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.common.dto; +package io.entgra.application.mgt.common.dto; public class ApiRegistrationProfile { diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/ApplicationDTO.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ApplicationDTO.java similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/ApplicationDTO.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ApplicationDTO.java index 57ec6991f9..48bd1c6822 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/ApplicationDTO.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ApplicationDTO.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common.dto; +package io.entgra.application.mgt.common.dto; import io.swagger.annotations.ApiModel; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/ApplicationPolicyDTO.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ApplicationPolicyDTO.java similarity index 96% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/ApplicationPolicyDTO.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ApplicationPolicyDTO.java index 5611eb51b7..f4357d59be 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/ApplicationPolicyDTO.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ApplicationPolicyDTO.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common.dto; +package io.entgra.application.mgt.common.dto; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/ApplicationReleaseDTO.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ApplicationReleaseDTO.java similarity index 99% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/ApplicationReleaseDTO.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ApplicationReleaseDTO.java index d5df40f969..7b5fddac63 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/ApplicationReleaseDTO.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ApplicationReleaseDTO.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common.dto; +package io.entgra.application.mgt.common.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/CategoryDTO.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/CategoryDTO.java similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/CategoryDTO.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/CategoryDTO.java index 5ab45a3079..a29c2b9670 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/CategoryDTO.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/CategoryDTO.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common.dto; +package io.entgra.application.mgt.common.dto; public class CategoryDTO { int id; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/DeviceSubscriptionDTO.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/DeviceSubscriptionDTO.java similarity index 97% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/DeviceSubscriptionDTO.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/DeviceSubscriptionDTO.java index 58809c1b2e..b2cd3d1572 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/DeviceSubscriptionDTO.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/DeviceSubscriptionDTO.java @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.common.dto; +package io.entgra.application.mgt.common.dto; import java.sql.Timestamp; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/GroupSubscriptionDTO.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/GroupSubscriptionDTO.java similarity index 97% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/GroupSubscriptionDTO.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/GroupSubscriptionDTO.java index 1d1640a247..a01b2b08bc 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/GroupSubscriptionDTO.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/GroupSubscriptionDTO.java @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.common.dto; +package io.entgra.application.mgt.common.dto; import java.sql.Timestamp; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/ReviewDTO.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ReviewDTO.java similarity index 97% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/ReviewDTO.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ReviewDTO.java index 42f410a26f..24dbb6125c 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/ReviewDTO.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ReviewDTO.java @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.common.dto; +package io.entgra.application.mgt.common.dto; import java.sql.Timestamp; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/RoleSubscriptionDTO.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/RoleSubscriptionDTO.java similarity index 97% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/RoleSubscriptionDTO.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/RoleSubscriptionDTO.java index 9d06179024..075e96d083 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/RoleSubscriptionDTO.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/RoleSubscriptionDTO.java @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.common.dto; +package io.entgra.application.mgt.common.dto; import java.sql.Timestamp; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/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 similarity index 93% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/ScheduledSubscriptionDTO.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ScheduledSubscriptionDTO.java index da3e1e01e0..ac2277a02d 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/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 @@ -16,13 +16,12 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.common.dto; +package io.entgra.application.mgt.common.dto; import com.google.gson.Gson; -import org.wso2.carbon.device.application.mgt.common.ExecutionStatus; -import org.wso2.carbon.device.application.mgt.common.SubscriptionType; +import io.entgra.application.mgt.common.ExecutionStatus; +import io.entgra.application.mgt.common.SubscriptionType; -import java.time.LocalDateTime; import java.util.List; import java.util.stream.Collectors; @@ -50,7 +49,7 @@ public class ScheduledSubscriptionDTO { /** * UUID of the application release which is subscribed to. - * {@see {@link org.wso2.carbon.device.application.mgt.common.response.ApplicationRelease}} + * {@see {@link io.entgra.application.mgt.common.response.ApplicationRelease}} */ private String applicationUUID; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/TagDTO.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/TagDTO.java similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/TagDTO.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/TagDTO.java index 6a7f5f5af0..cb06a8a1ce 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/TagDTO.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/TagDTO.java @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.common.dto; +package io.entgra.application.mgt.common.dto; public class TagDTO { diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/UserSubscriptionDTO.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/UserSubscriptionDTO.java similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/UserSubscriptionDTO.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/UserSubscriptionDTO.java index 277b04e97d..4b318df937 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/UserSubscriptionDTO.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/UserSubscriptionDTO.java @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.common.dto; +package io.entgra.application.mgt.common.dto; import java.sql.Timestamp; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/ApplicationCategoryManagementException.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ApplicationCategoryManagementException.java similarity index 93% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/ApplicationCategoryManagementException.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ApplicationCategoryManagementException.java index 027aa52d43..206b4d1970 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/ApplicationCategoryManagementException.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ApplicationCategoryManagementException.java @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.common.exception; +package io.entgra.application.mgt.common.exception; /** * Exception that will be thrown during Application Category Management. diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/ApplicationManagementException.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ApplicationManagementException.java similarity index 95% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/ApplicationManagementException.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ApplicationManagementException.java index 48596fe969..c698aa01ec 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/ApplicationManagementException.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ApplicationManagementException.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common.exception; +package io.entgra.application.mgt.common.exception; /** * Represents the exception thrown during application management. diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/ApplicationStorageManagementException.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ApplicationStorageManagementException.java similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/ApplicationStorageManagementException.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ApplicationStorageManagementException.java index 56cfb19710..0549d2e3fc 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/ApplicationStorageManagementException.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ApplicationStorageManagementException.java @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.common.exception; +package io.entgra.application.mgt.common.exception; /** * Represents the exception thrown during storing and retrieving the artifacts. diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/DBConnectionException.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/DBConnectionException.java similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/DBConnectionException.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/DBConnectionException.java index cedf06bf7c..e09cbae4b0 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/DBConnectionException.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/DBConnectionException.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common.exception; +package io.entgra.application.mgt.common.exception; /** * Exception thrown due to Database Connection issues. diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/DeviceConnectorException.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/DeviceConnectorException.java similarity index 95% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/DeviceConnectorException.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/DeviceConnectorException.java index 3e9fb9ddee..d6e43825fb 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/DeviceConnectorException.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/DeviceConnectorException.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common.exception; +package io.entgra.application.mgt.common.exception; /** * Represents the exception thrown during device connections. diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/IllegalTransactionStateException.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/IllegalTransactionStateException.java similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/IllegalTransactionStateException.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/IllegalTransactionStateException.java index 40d0c4916a..10400af2e0 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/IllegalTransactionStateException.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/IllegalTransactionStateException.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common.exception; +package io.entgra.application.mgt.common.exception; /** * Exception thrown due to an issue in database transactions. diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/InvalidConfigurationException.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/InvalidConfigurationException.java similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/InvalidConfigurationException.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/InvalidConfigurationException.java index 9ad11d10b5..2acfdd57eb 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/InvalidConfigurationException.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/InvalidConfigurationException.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common.exception; +package io.entgra.application.mgt.common.exception; /** * Exception thrown due to invalid configurations provided for Application Management. diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/LifecycleManagementException.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/LifecycleManagementException.java similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/LifecycleManagementException.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/LifecycleManagementException.java index 6df1b09246..022e2bfcac 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/LifecycleManagementException.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/LifecycleManagementException.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common.exception; +package io.entgra.application.mgt.common.exception; /** * Exception caused during the lifecycle management. diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/RequestValidatingException.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/RequestValidatingException.java similarity index 93% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/RequestValidatingException.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/RequestValidatingException.java index 3fbb27fc35..62d5d06eb2 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/RequestValidatingException.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/RequestValidatingException.java @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.common.exception; +package io.entgra.application.mgt.common.exception; /** * Represents the exception thrown during validating the request. diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/ResourceManagementException.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ResourceManagementException.java similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/ResourceManagementException.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ResourceManagementException.java index 3b5125d365..21634a38aa 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/ResourceManagementException.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ResourceManagementException.java @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.common.exception; +package io.entgra.application.mgt.common.exception; /** * Represents the exception that will be thrown when there is an issue while managing the resources. diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/ReviewDoesNotExistException.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ReviewDoesNotExistException.java similarity index 95% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/ReviewDoesNotExistException.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ReviewDoesNotExistException.java index c31c8b6263..81ed5ad18c 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/ReviewDoesNotExistException.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ReviewDoesNotExistException.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common.exception; +package io.entgra.application.mgt.common.exception; public class ReviewDoesNotExistException extends Exception { private String message; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/ReviewManagementException.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ReviewManagementException.java similarity index 95% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/ReviewManagementException.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ReviewManagementException.java index 1e6d0c0a63..c8ef1af781 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/ReviewManagementException.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ReviewManagementException.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common.exception; +package io.entgra.application.mgt.common.exception; public class ReviewManagementException extends Exception { private String message; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/SubscriptionManagementException.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/SubscriptionManagementException.java similarity index 95% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/SubscriptionManagementException.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/SubscriptionManagementException.java index e3c48164d0..1abb93a98d 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/SubscriptionManagementException.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/SubscriptionManagementException.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.common.exception; +package io.entgra.application.mgt.common.exception; public class SubscriptionManagementException extends Exception { private String message; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/TransactionManagementException.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/TransactionManagementException.java similarity index 95% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/TransactionManagementException.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/TransactionManagementException.java index 4fcb6261fd..bb24e02638 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/TransactionManagementException.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/TransactionManagementException.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common.exception; +package io.entgra.application.mgt.common.exception; /** * Exception thrown due to an issue in TransactionManagement of Database. diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/UnsupportedDatabaseEngineException.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/UnsupportedDatabaseEngineException.java similarity index 95% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/UnsupportedDatabaseEngineException.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/UnsupportedDatabaseEngineException.java index 0be1bc7466..99613e6736 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/UnsupportedDatabaseEngineException.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/UnsupportedDatabaseEngineException.java @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.common.exception; +package io.entgra.application.mgt.common.exception; /** * This runtime exception will be thrown if the server has configured with unsupported DB engine. diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/VisibilityManagementException.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/VisibilityManagementException.java similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/VisibilityManagementException.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/VisibilityManagementException.java index aecf2c76c5..4133158ebb 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/exception/VisibilityManagementException.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/VisibilityManagementException.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common.exception; +package io.entgra.application.mgt.common.exception; /** * This specialized exception is thrown by the Visibility Manager during unexpected behaviour diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/response/Application.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/response/Application.java similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/response/Application.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/response/Application.java index 0cd8a72783..fc5251d3a8 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/response/Application.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/response/Application.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common.response; +package io.entgra.application.mgt.common.response; import io.swagger.annotations.ApiModelProperty; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/response/ApplicationRelease.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/response/ApplicationRelease.java similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/response/ApplicationRelease.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/response/ApplicationRelease.java index 25009bae1f..aff7688f18 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/response/ApplicationRelease.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/response/ApplicationRelease.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common.response; +package io.entgra.application.mgt.common.response; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/response/Category.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/response/Category.java similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/response/Category.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/response/Category.java index f90a688a5f..f65614d197 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/response/Category.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/response/Category.java @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.common.response; +package io.entgra.application.mgt.common.response; public class Category { diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/response/Review.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/response/Review.java similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/response/Review.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/response/Review.java index 1c0285fbb4..5e72e376de 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/response/Review.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/response/Review.java @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.common.response; +package io.entgra.application.mgt.common.response; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/response/Tag.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/response/Tag.java similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/response/Tag.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/response/Tag.java index a10e3eccc9..bc58ded996 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/response/Tag.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/response/Tag.java @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.common.response; +package io.entgra.application.mgt.common.response; public class Tag { diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/ApplicationManager.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/ApplicationManager.java similarity index 88% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/ApplicationManager.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/ApplicationManager.java index 73f78478e7..5e77584b9a 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/ApplicationManager.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/ApplicationManager.java @@ -14,30 +14,30 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common.services; +package io.entgra.application.mgt.common.services; import org.apache.cxf.jaxrs.ext.multipart.Attachment; -import org.wso2.carbon.device.application.mgt.common.ApplicationArtifact; -import org.wso2.carbon.device.application.mgt.common.LifecycleChanger; -import org.wso2.carbon.device.application.mgt.common.ApplicationList; -import org.wso2.carbon.device.application.mgt.common.dto.ApplicationReleaseDTO; -import org.wso2.carbon.device.application.mgt.common.Filter; -import org.wso2.carbon.device.application.mgt.common.LifecycleState; -import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; -import org.wso2.carbon.device.application.mgt.common.exception.RequestValidatingException; -import org.wso2.carbon.device.application.mgt.common.response.Application; -import org.wso2.carbon.device.application.mgt.common.response.ApplicationRelease; -import org.wso2.carbon.device.application.mgt.common.response.Category; -import org.wso2.carbon.device.application.mgt.common.response.Tag; -import org.wso2.carbon.device.application.mgt.common.wrapper.CustomAppReleaseWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.CustomAppWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.EntAppReleaseWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.ApplicationUpdateWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.ApplicationWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.PublicAppReleaseWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.PublicAppWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.WebAppReleaseWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.WebAppWrapper; +import io.entgra.application.mgt.common.ApplicationArtifact; +import io.entgra.application.mgt.common.LifecycleChanger; +import io.entgra.application.mgt.common.ApplicationList; +import io.entgra.application.mgt.common.dto.ApplicationReleaseDTO; +import io.entgra.application.mgt.common.Filter; +import io.entgra.application.mgt.common.LifecycleState; +import io.entgra.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.application.mgt.common.exception.RequestValidatingException; +import io.entgra.application.mgt.common.response.Application; +import io.entgra.application.mgt.common.response.ApplicationRelease; +import io.entgra.application.mgt.common.response.Category; +import io.entgra.application.mgt.common.response.Tag; +import io.entgra.application.mgt.common.wrapper.CustomAppReleaseWrapper; +import io.entgra.application.mgt.common.wrapper.CustomAppWrapper; +import io.entgra.application.mgt.common.wrapper.EntAppReleaseWrapper; +import io.entgra.application.mgt.common.wrapper.ApplicationUpdateWrapper; +import io.entgra.application.mgt.common.wrapper.ApplicationWrapper; +import io.entgra.application.mgt.common.wrapper.PublicAppReleaseWrapper; +import io.entgra.application.mgt.common.wrapper.PublicAppWrapper; +import io.entgra.application.mgt.common.wrapper.WebAppReleaseWrapper; +import io.entgra.application.mgt.common.wrapper.WebAppWrapper; import java.util.List; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/ApplicationStorageManager.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/ApplicationStorageManager.java similarity index 91% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/ApplicationStorageManager.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/ApplicationStorageManager.java index 3d8b0f6821..39be94cc3d 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/ApplicationStorageManager.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/ApplicationStorageManager.java @@ -15,13 +15,13 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.common.services; +package io.entgra.application.mgt.common.services; -import org.wso2.carbon.device.application.mgt.common.ApplicationInstaller; -import org.wso2.carbon.device.application.mgt.common.dto.ApplicationReleaseDTO; -import org.wso2.carbon.device.application.mgt.common.exception.ApplicationStorageManagementException; -import org.wso2.carbon.device.application.mgt.common.exception.RequestValidatingException; -import org.wso2.carbon.device.application.mgt.common.exception.ResourceManagementException; +import io.entgra.application.mgt.common.ApplicationInstaller; +import io.entgra.application.mgt.common.dto.ApplicationReleaseDTO; +import io.entgra.application.mgt.common.exception.ApplicationStorageManagementException; +import io.entgra.application.mgt.common.exception.RequestValidatingException; +import io.entgra.application.mgt.common.exception.ResourceManagementException; import java.io.InputStream; import java.util.List; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/AppmDataHandler.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/AppmDataHandler.java similarity index 84% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/AppmDataHandler.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/AppmDataHandler.java index e789fe5421..5b99870c5f 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/AppmDataHandler.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/AppmDataHandler.java @@ -15,11 +15,11 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.common.services; +package io.entgra.application.mgt.common.services; -import org.wso2.carbon.device.application.mgt.common.config.LifecycleState; -import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; -import org.wso2.carbon.device.application.mgt.common.exception.LifecycleManagementException; +import io.entgra.application.mgt.common.config.LifecycleState; +import io.entgra.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.application.mgt.common.exception.LifecycleManagementException; import java.io.InputStream; import java.util.Map; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/DeviceConnector.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/DeviceConnector.java similarity index 87% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/DeviceConnector.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/DeviceConnector.java index b227dd43b5..10a8c31258 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/DeviceConnector.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/DeviceConnector.java @@ -14,10 +14,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common.services; +package io.entgra.application.mgt.common.services; -import org.wso2.carbon.device.application.mgt.common.AppOperation; -import org.wso2.carbon.device.application.mgt.common.exception.DeviceConnectorException; +import io.entgra.application.mgt.common.AppOperation; +import io.entgra.application.mgt.common.exception.DeviceConnectorException; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; import java.util.List; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/ReviewManager.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/ReviewManager.java similarity index 85% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/ReviewManager.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/ReviewManager.java index c87b50a3eb..97da7397c4 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/ReviewManager.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/ReviewManager.java @@ -14,15 +14,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common.services; +package io.entgra.application.mgt.common.services; -import org.wso2.carbon.device.application.mgt.common.Rating; -import org.wso2.carbon.device.application.mgt.common.response.Review; -import org.wso2.carbon.device.application.mgt.common.PaginationRequest; -import org.wso2.carbon.device.application.mgt.common.PaginationResult; -import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; -import org.wso2.carbon.device.application.mgt.common.exception.ReviewManagementException; -import org.wso2.carbon.device.application.mgt.common.wrapper.ReviewWrapper; +import io.entgra.application.mgt.common.Rating; +import io.entgra.application.mgt.common.response.Review; +import io.entgra.application.mgt.common.PaginationRequest; +import io.entgra.application.mgt.common.PaginationResult; +import io.entgra.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.application.mgt.common.exception.ReviewManagementException; +import io.entgra.application.mgt.common.wrapper.ReviewWrapper; /** * ReviewManager is responsible for handling all the add/update/delete/get operations related with diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/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 similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/SubscriptionManager.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/SubscriptionManager.java index bc2eaabc47..8f945844c2 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/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 @@ -14,13 +14,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common.services; +package io.entgra.application.mgt.common.services; -import org.wso2.carbon.device.application.mgt.common.ApplicationInstallResponse; -import org.wso2.carbon.device.application.mgt.common.ExecutionStatus; -import org.wso2.carbon.device.application.mgt.common.dto.ScheduledSubscriptionDTO; -import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; -import org.wso2.carbon.device.application.mgt.common.exception.SubscriptionManagementException; +import io.entgra.application.mgt.common.ApplicationInstallResponse; +import io.entgra.application.mgt.common.ExecutionStatus; +import io.entgra.application.mgt.common.dto.ScheduledSubscriptionDTO; +import io.entgra.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.application.mgt.common.exception.SubscriptionManagementException; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; import org.wso2.carbon.device.mgt.common.PaginationRequest; import org.wso2.carbon.device.mgt.common.PaginationResult; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/wrapper/ApplicationUpdateWrapper.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/ApplicationUpdateWrapper.java similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/wrapper/ApplicationUpdateWrapper.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/ApplicationUpdateWrapper.java index 4c7614e612..84da8cecb5 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/wrapper/ApplicationUpdateWrapper.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/ApplicationUpdateWrapper.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common.wrapper; +package io.entgra.application.mgt.common.wrapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/wrapper/ApplicationWrapper.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/ApplicationWrapper.java similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/wrapper/ApplicationWrapper.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/ApplicationWrapper.java index 11ae27b7f2..f109b7b78d 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/wrapper/ApplicationWrapper.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/ApplicationWrapper.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common.wrapper; +package io.entgra.application.mgt.common.wrapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/wrapper/CustomAppReleaseWrapper.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/CustomAppReleaseWrapper.java similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/wrapper/CustomAppReleaseWrapper.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/CustomAppReleaseWrapper.java index ca9a77e2cd..eb30c7e912 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/wrapper/CustomAppReleaseWrapper.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/CustomAppReleaseWrapper.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common.wrapper; +package io.entgra.application.mgt.common.wrapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/wrapper/CustomAppWrapper.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/CustomAppWrapper.java similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/wrapper/CustomAppWrapper.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/CustomAppWrapper.java index ce0108bbd7..4c0a392d89 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/wrapper/CustomAppWrapper.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/CustomAppWrapper.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common.wrapper; +package io.entgra.application.mgt.common.wrapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/wrapper/EntAppReleaseWrapper.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/EntAppReleaseWrapper.java similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/wrapper/EntAppReleaseWrapper.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/EntAppReleaseWrapper.java index c3c7ddb84d..4d39506e9b 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/wrapper/EntAppReleaseWrapper.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/EntAppReleaseWrapper.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common.wrapper; +package io.entgra.application.mgt.common.wrapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/wrapper/PublicAppReleaseWrapper.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/PublicAppReleaseWrapper.java similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/wrapper/PublicAppReleaseWrapper.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/PublicAppReleaseWrapper.java index badbdf30d5..4b60e52941 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/wrapper/PublicAppReleaseWrapper.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/PublicAppReleaseWrapper.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common.wrapper; +package io.entgra.application.mgt.common.wrapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/wrapper/PublicAppWrapper.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/PublicAppWrapper.java similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/wrapper/PublicAppWrapper.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/PublicAppWrapper.java index beb66706fd..5f653257cb 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/wrapper/PublicAppWrapper.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/PublicAppWrapper.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common.wrapper; +package io.entgra.application.mgt.common.wrapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/wrapper/ReviewWrapper.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/ReviewWrapper.java similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/wrapper/ReviewWrapper.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/ReviewWrapper.java index 120df8cc1b..90a525f3db 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/wrapper/ReviewWrapper.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/ReviewWrapper.java @@ -15,7 +15,7 @@ * under the License. */ -package org.wso2.carbon.device.application.mgt.common.wrapper; +package io.entgra.application.mgt.common.wrapper; public class ReviewWrapper { private String content; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/wrapper/WebAppReleaseWrapper.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/WebAppReleaseWrapper.java similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/wrapper/WebAppReleaseWrapper.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/WebAppReleaseWrapper.java index 02435bcc8e..090307a32d 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/wrapper/WebAppReleaseWrapper.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/WebAppReleaseWrapper.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common.wrapper; +package io.entgra.application.mgt.common.wrapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/wrapper/WebAppWrapper.java b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/WebAppWrapper.java similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/wrapper/WebAppWrapper.java rename to components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/WebAppWrapper.java index 1c5bba1d20..8455f0ce67 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/wrapper/WebAppWrapper.java +++ b/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/WebAppWrapper.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.application.mgt.common.wrapper; +package io.entgra.application.mgt.common.wrapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/Configuration.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/Configuration.java index 3a254accc5..b152ed28b8 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/Configuration.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/Configuration.java @@ -17,9 +17,9 @@ */ package io.entgra.application.mgt.core.config; -import org.wso2.carbon.device.application.mgt.common.config.MDMConfig; -import org.wso2.carbon.device.application.mgt.common.config.RatingConfiguration; -import org.wso2.carbon.device.application.mgt.common.config.LifecycleState; +import io.entgra.application.mgt.common.config.MDMConfig; +import io.entgra.application.mgt.common.config.RatingConfiguration; +import io.entgra.application.mgt.common.config.LifecycleState; import java.util.List; import javax.xml.bind.annotation.XmlElement; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/ConfigurationManager.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/ConfigurationManager.java index cd2230aa14..ab85f87bb3 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/ConfigurationManager.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/ConfigurationManager.java @@ -19,8 +19,8 @@ package io.entgra.application.mgt.core.config; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; -import org.wso2.carbon.device.application.mgt.common.exception.InvalidConfigurationException; +import io.entgra.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.application.mgt.common.exception.InvalidConfigurationException; import io.entgra.application.mgt.core.util.Constants; import java.io.File; 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 1b680acc79..6e9566721d 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 @@ -18,9 +18,9 @@ package io.entgra.application.mgt.core.dao; import org.wso2.carbon.device.application.mgt.common.*; -import org.wso2.carbon.device.application.mgt.common.dto.ApplicationDTO; -import org.wso2.carbon.device.application.mgt.common.dto.CategoryDTO; -import org.wso2.carbon.device.application.mgt.common.dto.TagDTO; +import io.entgra.application.mgt.common.dto.ApplicationDTO; +import io.entgra.application.mgt.common.dto.CategoryDTO; +import io.entgra.application.mgt.common.dto.TagDTO; 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/ApplicationReleaseDAO.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/ApplicationReleaseDAO.java index c877d58478..48bc3bdc8d 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 @@ -17,7 +17,7 @@ */ package io.entgra.application.mgt.core.dao; -import org.wso2.carbon.device.application.mgt.common.dto.ApplicationReleaseDTO; +import io.entgra.application.mgt.common.dto.ApplicationReleaseDTO; import org.wso2.carbon.device.application.mgt.common.Rating; 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/ReviewDAO.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/ReviewDAO.java index afcf8ceec3..6d911fe914 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 @@ -17,9 +17,9 @@ */ package io.entgra.application.mgt.core.dao; -import org.wso2.carbon.device.application.mgt.common.response.Review; +import io.entgra.application.mgt.common.response.Review; import org.wso2.carbon.device.application.mgt.common.PaginationRequest; -import org.wso2.carbon.device.application.mgt.common.dto.ReviewDTO; +import io.entgra.application.mgt.common.dto.ReviewDTO; import io.entgra.application.mgt.core.exception.ReviewManagementDAOException; import java.util.List; 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 63151d7454..6894c08caa 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 @@ -18,10 +18,10 @@ package io.entgra.application.mgt.core.dao; import org.wso2.carbon.device.application.mgt.common.ExecutionStatus; -import org.wso2.carbon.device.application.mgt.common.dto.ApplicationReleaseDTO; -import org.wso2.carbon.device.application.mgt.common.dto.DeviceSubscriptionDTO; -import org.wso2.carbon.device.application.mgt.common.dto.ScheduledSubscriptionDTO; -import org.wso2.carbon.device.application.mgt.common.exception.SubscriptionManagementException; +import io.entgra.application.mgt.common.dto.ApplicationReleaseDTO; +import io.entgra.application.mgt.common.dto.DeviceSubscriptionDTO; +import io.entgra.application.mgt.common.dto.ScheduledSubscriptionDTO; +import io.entgra.application.mgt.common.exception.SubscriptionManagementException; 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/common/ApplicationManagementDAOFactory.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/common/ApplicationManagementDAOFactory.java index 66e54834c2..414ca0d015 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/common/ApplicationManagementDAOFactory.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/common/ApplicationManagementDAOFactory.java @@ -19,7 +19,7 @@ package io.entgra.application.mgt.core.dao.common; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.device.application.mgt.common.exception.UnsupportedDatabaseEngineException; +import io.entgra.application.mgt.common.exception.UnsupportedDatabaseEngineException; import io.entgra.application.mgt.core.dao.ApplicationDAO; import io.entgra.application.mgt.core.dao.ApplicationReleaseDAO; import io.entgra.application.mgt.core.dao.LifecycleStateDAO; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/AbstractDAOImpl.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/AbstractDAOImpl.java index b9808ead34..f8b50341fc 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/AbstractDAOImpl.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/AbstractDAOImpl.java @@ -17,7 +17,7 @@ */ package io.entgra.application.mgt.core.dao.impl; -import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException; +import io.entgra.application.mgt.common.exception.DBConnectionException; import io.entgra.application.mgt.core.util.ConnectionManagerUtil; import java.sql.Connection; 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 37b9b72c23..a8067fa86e 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 @@ -21,12 +21,12 @@ 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 org.wso2.carbon.device.application.mgt.common.dto.ApplicationDTO; -import org.wso2.carbon.device.application.mgt.common.dto.CategoryDTO; +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 org.wso2.carbon.device.application.mgt.common.dto.ReviewDTO; -import org.wso2.carbon.device.application.mgt.common.dto.TagDTO; -import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException; +import io.entgra.application.mgt.common.dto.ReviewDTO; +import io.entgra.application.mgt.common.dto.TagDTO; +import io.entgra.application.mgt.common.exception.DBConnectionException; import io.entgra.application.mgt.core.dao.ApplicationDAO; import io.entgra.application.mgt.core.util.DAOUtil; import io.entgra.application.mgt.core.dao.impl.AbstractDAOImpl; 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 e96f7769eb..cbd48bd45b 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 @@ -22,8 +22,8 @@ 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 org.wso2.carbon.device.application.mgt.common.dto.ApplicationDTO; -import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException; +import io.entgra.application.mgt.common.dto.ApplicationDTO; +import io.entgra.application.mgt.common.exception.DBConnectionException; import io.entgra.application.mgt.core.exception.ApplicationManagementDAOException; 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/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 1c755e633e..9cce71c6e7 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 @@ -21,8 +21,8 @@ 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 org.wso2.carbon.device.application.mgt.common.dto.ApplicationDTO; -import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException; +import io.entgra.application.mgt.common.dto.ApplicationDTO; +import io.entgra.application.mgt.common.exception.DBConnectionException; import io.entgra.application.mgt.core.exception.ApplicationManagementDAOException; 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/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 c6b8309642..e6e7bf8ead 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 @@ -20,9 +20,9 @@ package io.entgra.application.mgt.core.dao.impl.application.release; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.device.application.mgt.common.dto.ApplicationReleaseDTO; +import io.entgra.application.mgt.common.dto.ApplicationReleaseDTO; import org.wso2.carbon.device.application.mgt.common.Rating; -import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException; +import io.entgra.application.mgt.common.exception.DBConnectionException; import io.entgra.application.mgt.core.dao.ApplicationReleaseDAO; import io.entgra.application.mgt.core.util.DAOUtil; import io.entgra.application.mgt.core.dao.impl.AbstractDAOImpl; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/release/OracleApplicationReleaseDAOImpl.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/release/OracleApplicationReleaseDAOImpl.java index c9aaae519f..33105e9bdc 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/release/OracleApplicationReleaseDAOImpl.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/release/OracleApplicationReleaseDAOImpl.java @@ -19,7 +19,7 @@ package io.entgra.application.mgt.core.dao.impl.application.release; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException; +import io.entgra.application.mgt.common.exception.DBConnectionException; import io.entgra.application.mgt.core.exception.ApplicationManagementDAOException; import java.sql.Connection; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/release/SQLServerApplicationReleaseDAOImpl.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/release/SQLServerApplicationReleaseDAOImpl.java index eac1e23271..b40790a7b8 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/release/SQLServerApplicationReleaseDAOImpl.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/release/SQLServerApplicationReleaseDAOImpl.java @@ -19,7 +19,7 @@ package io.entgra.application.mgt.core.dao.impl.application.release; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException; +import io.entgra.application.mgt.common.exception.DBConnectionException; import io.entgra.application.mgt.core.exception.ApplicationManagementDAOException; import java.sql.Connection; 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 3c5c2aa559..bf2b9288ec 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 @@ -21,7 +21,7 @@ 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 org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException; +import io.entgra.application.mgt.common.exception.DBConnectionException; import io.entgra.application.mgt.core.dao.LifecycleStateDAO; import io.entgra.application.mgt.core.util.DAOUtil; import io.entgra.application.mgt.core.dao.impl.AbstractDAOImpl; 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 a43f4710d0..7238b4d0a4 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 @@ -21,8 +21,8 @@ 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.dto.ReviewDTO; -import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException; +import io.entgra.application.mgt.common.dto.ReviewDTO; +import io.entgra.application.mgt.common.exception.DBConnectionException; import io.entgra.application.mgt.core.dao.ReviewDAO; import io.entgra.application.mgt.core.exception.UnexpectedServerErrorException; 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/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 6f318a1d70..3806c312c8 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 @@ -20,8 +20,8 @@ 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 org.wso2.carbon.device.application.mgt.common.dto.ReviewDTO; -import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException; +import io.entgra.application.mgt.common.dto.ReviewDTO; +import io.entgra.application.mgt.common.exception.DBConnectionException; import io.entgra.application.mgt.core.exception.ReviewManagementDAOException; import io.entgra.application.mgt.core.util.Constants; 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/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 d6a6368076..0e17014319 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 @@ -20,8 +20,8 @@ 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 org.wso2.carbon.device.application.mgt.common.dto.ReviewDTO; -import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException; +import io.entgra.application.mgt.common.dto.ReviewDTO; +import io.entgra.application.mgt.common.exception.DBConnectionException; import io.entgra.application.mgt.core.exception.ReviewManagementDAOException; import io.entgra.application.mgt.core.util.Constants; 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/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 dbf896200c..092beb05c3 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 @@ -22,9 +22,9 @@ 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 org.wso2.carbon.device.application.mgt.common.dto.DeviceSubscriptionDTO; -import org.wso2.carbon.device.application.mgt.common.dto.ScheduledSubscriptionDTO; -import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException; +import io.entgra.application.mgt.common.dto.DeviceSubscriptionDTO; +import io.entgra.application.mgt.common.dto.ScheduledSubscriptionDTO; +import io.entgra.application.mgt.common.exception.DBConnectionException; import io.entgra.application.mgt.core.dao.SubscriptionDAO; import io.entgra.application.mgt.core.dao.impl.AbstractDAOImpl; 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/subscription/OracleSubscriptionDAOImpl.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/subscription/OracleSubscriptionDAOImpl.java index e4d25a8219..d52cc49fef 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/subscription/OracleSubscriptionDAOImpl.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/subscription/OracleSubscriptionDAOImpl.java @@ -19,7 +19,7 @@ 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.exception.DBConnectionException; +import io.entgra.application.mgt.common.exception.DBConnectionException; import io.entgra.application.mgt.core.exception.ApplicationManagementDAOException; import java.sql.Connection; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/subscription/SQLServerSubscriptionDAOImpl.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/subscription/SQLServerSubscriptionDAOImpl.java index 4d6763b047..7872b64ff5 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/subscription/SQLServerSubscriptionDAOImpl.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/subscription/SQLServerSubscriptionDAOImpl.java @@ -19,7 +19,7 @@ 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.exception.DBConnectionException; +import io.entgra.application.mgt.common.exception.DBConnectionException; import io.entgra.application.mgt.core.exception.ApplicationManagementDAOException; import java.sql.Connection; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/visibility/GenericVisibilityDAOImpl.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/visibility/GenericVisibilityDAOImpl.java index 50156e417c..eb4b712cd5 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/visibility/GenericVisibilityDAOImpl.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/visibility/GenericVisibilityDAOImpl.java @@ -19,7 +19,7 @@ package io.entgra.application.mgt.core.dao.impl.visibility; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException; +import io.entgra.application.mgt.common.exception.DBConnectionException; import io.entgra.application.mgt.core.dao.VisibilityDAO; import io.entgra.application.mgt.core.dao.impl.AbstractDAOImpl; import io.entgra.application.mgt.core.exception.VisibilityManagementDAOException; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/BadRequestException.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/BadRequestException.java index f4f940fbcd..c898bb3318 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/BadRequestException.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/BadRequestException.java @@ -18,7 +18,7 @@ package io.entgra.application.mgt.core.exception; -import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.application.mgt.common.exception.ApplicationManagementException; /** * Custom exception class for wrapping BadRequest related exceptions. diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ForbiddenException.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ForbiddenException.java index f1a5554bfd..f0286f3e69 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ForbiddenException.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ForbiddenException.java @@ -19,7 +19,7 @@ package io.entgra.application.mgt.core.exception; -import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.application.mgt.common.exception.ApplicationManagementException; /** * Exception class that is corresponding to 401 Forbidden response diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/NotFoundException.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/NotFoundException.java index 36fe34b45a..aca4f221fe 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/NotFoundException.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/NotFoundException.java @@ -17,7 +17,7 @@ */ package io.entgra.application.mgt.core.exception; -import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.application.mgt.common.exception.ApplicationManagementException; /** * This exception will be thrown when the requested application or platform not found. diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ReviewManagementDAOException.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ReviewManagementDAOException.java index 1686453a2d..4dec217d0c 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ReviewManagementDAOException.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ReviewManagementDAOException.java @@ -17,7 +17,7 @@ */ package io.entgra.application.mgt.core.exception; -import org.wso2.carbon.device.application.mgt.common.exception.ReviewManagementException; +import io.entgra.application.mgt.common.exception.ReviewManagementException; /** * Exception thrown during the Review Management DAO operations. diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/SubscriptionManagementDAOException.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/SubscriptionManagementDAOException.java index 56330bd41d..f45337cd3b 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/SubscriptionManagementDAOException.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/SubscriptionManagementDAOException.java @@ -16,7 +16,7 @@ */ package io.entgra.application.mgt.core.exception; -import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.application.mgt.common.exception.ApplicationManagementException; /** * Exception thrown during the ApplicationDTO Management DAO operations. diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/UnexpectedServerErrorException.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/UnexpectedServerErrorException.java index aec891fda1..58a24f1e44 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/UnexpectedServerErrorException.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/UnexpectedServerErrorException.java @@ -18,7 +18,7 @@ package io.entgra.application.mgt.core.exception; -import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.application.mgt.common.exception.ApplicationManagementException; public class UnexpectedServerErrorException extends ApplicationManagementException { diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ValidationException.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ValidationException.java index 4b06dcb5a2..bad1b6b69d 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ValidationException.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ValidationException.java @@ -17,7 +17,7 @@ */ package io.entgra.application.mgt.core.exception; -import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.application.mgt.common.exception.ApplicationManagementException; /** * This exception will be thrown when the initial validation fails to perform an operation. diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/VisibilityManagementDAOException.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/VisibilityManagementDAOException.java index 2a65f5c83d..5988904f55 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/VisibilityManagementDAOException.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/VisibilityManagementDAOException.java @@ -17,7 +17,7 @@ */ package io.entgra.application.mgt.core.exception; -import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.application.mgt.common.exception.ApplicationManagementException; /** * This is the specialized exception which is thrown when there are database level problems encountered 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 ef08172f10..badb4946c5 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 @@ -32,39 +32,39 @@ 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 org.wso2.carbon.device.application.mgt.common.config.RatingConfiguration; -import org.wso2.carbon.device.application.mgt.common.dto.ApplicationDTO; +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 org.wso2.carbon.device.application.mgt.common.dto.ApplicationReleaseDTO; +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 org.wso2.carbon.device.application.mgt.common.dto.CategoryDTO; +import io.entgra.application.mgt.common.dto.CategoryDTO; import org.wso2.carbon.device.application.mgt.common.Filter; -import org.wso2.carbon.device.application.mgt.common.dto.DeviceSubscriptionDTO; +import io.entgra.application.mgt.common.dto.DeviceSubscriptionDTO; import org.wso2.carbon.device.application.mgt.common.LifecycleState; -import org.wso2.carbon.device.application.mgt.common.dto.TagDTO; -import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; -import org.wso2.carbon.device.application.mgt.common.exception.ApplicationStorageManagementException; -import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException; -import org.wso2.carbon.device.application.mgt.common.exception.LifecycleManagementException; -import org.wso2.carbon.device.application.mgt.common.exception.RequestValidatingException; -import org.wso2.carbon.device.application.mgt.common.exception.ResourceManagementException; -import org.wso2.carbon.device.application.mgt.common.exception.TransactionManagementException; -import org.wso2.carbon.device.application.mgt.common.response.Application; -import org.wso2.carbon.device.application.mgt.common.response.ApplicationRelease; -import org.wso2.carbon.device.application.mgt.common.response.Category; -import org.wso2.carbon.device.application.mgt.common.response.Tag; -import org.wso2.carbon.device.application.mgt.common.services.ApplicationManager; -import org.wso2.carbon.device.application.mgt.common.services.ApplicationStorageManager; -import org.wso2.carbon.device.application.mgt.common.wrapper.CustomAppReleaseWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.CustomAppWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.EntAppReleaseWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.ApplicationUpdateWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.ApplicationWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.PublicAppReleaseWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.PublicAppWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.WebAppReleaseWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.WebAppWrapper; +import io.entgra.application.mgt.common.dto.TagDTO; +import io.entgra.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.application.mgt.common.exception.ApplicationStorageManagementException; +import io.entgra.application.mgt.common.exception.DBConnectionException; +import io.entgra.application.mgt.common.exception.LifecycleManagementException; +import io.entgra.application.mgt.common.exception.RequestValidatingException; +import io.entgra.application.mgt.common.exception.ResourceManagementException; +import io.entgra.application.mgt.common.exception.TransactionManagementException; +import io.entgra.application.mgt.common.response.Application; +import io.entgra.application.mgt.common.response.ApplicationRelease; +import io.entgra.application.mgt.common.response.Category; +import io.entgra.application.mgt.common.response.Tag; +import io.entgra.application.mgt.common.services.ApplicationManager; +import io.entgra.application.mgt.common.services.ApplicationStorageManager; +import io.entgra.application.mgt.common.wrapper.CustomAppReleaseWrapper; +import io.entgra.application.mgt.common.wrapper.CustomAppWrapper; +import io.entgra.application.mgt.common.wrapper.EntAppReleaseWrapper; +import io.entgra.application.mgt.common.wrapper.ApplicationUpdateWrapper; +import io.entgra.application.mgt.common.wrapper.ApplicationWrapper; +import io.entgra.application.mgt.common.wrapper.PublicAppReleaseWrapper; +import io.entgra.application.mgt.common.wrapper.PublicAppWrapper; +import io.entgra.application.mgt.common.wrapper.WebAppReleaseWrapper; +import io.entgra.application.mgt.common.wrapper.WebAppWrapper; import io.entgra.application.mgt.core.config.ConfigurationManager; import io.entgra.application.mgt.core.dao.ApplicationDAO; import io.entgra.application.mgt.core.dao.ApplicationReleaseDAO; 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 5f34e80de4..9e02ad2b9b 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 @@ -23,11 +23,11 @@ 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 org.wso2.carbon.device.application.mgt.common.dto.ApplicationReleaseDTO; +import io.entgra.application.mgt.common.dto.ApplicationReleaseDTO; import org.wso2.carbon.device.application.mgt.common.DeviceTypes; -import org.wso2.carbon.device.application.mgt.common.exception.ApplicationStorageManagementException; -import org.wso2.carbon.device.application.mgt.common.exception.ResourceManagementException; -import org.wso2.carbon.device.application.mgt.common.services.ApplicationStorageManager; +import io.entgra.application.mgt.common.exception.ApplicationStorageManagementException; +import io.entgra.application.mgt.common.exception.ResourceManagementException; +import io.entgra.application.mgt.common.services.ApplicationStorageManager; import io.entgra.application.mgt.core.exception.ParsingException; import io.entgra.application.mgt.core.util.ArtifactsParser; import io.entgra.application.mgt.core.util.Constants; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/impl/AppmDataHandlerImpl.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/impl/AppmDataHandlerImpl.java index 9d87520e4b..0700689081 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/impl/AppmDataHandlerImpl.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/impl/AppmDataHandlerImpl.java @@ -20,12 +20,12 @@ package io.entgra.application.mgt.core.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.config.LifecycleState; -import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; -import org.wso2.carbon.device.application.mgt.common.exception.ApplicationStorageManagementException; -import org.wso2.carbon.device.application.mgt.common.exception.LifecycleManagementException; -import org.wso2.carbon.device.application.mgt.common.services.ApplicationStorageManager; -import org.wso2.carbon.device.application.mgt.common.services.AppmDataHandler; +import io.entgra.application.mgt.common.config.LifecycleState; +import io.entgra.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.application.mgt.common.exception.ApplicationStorageManagementException; +import io.entgra.application.mgt.common.exception.LifecycleManagementException; +import io.entgra.application.mgt.common.services.ApplicationStorageManager; +import io.entgra.application.mgt.common.services.AppmDataHandler; import io.entgra.application.mgt.core.exception.BadRequestException; import io.entgra.application.mgt.core.util.APIUtil; import io.entgra.application.mgt.core.exception.NotFoundException; 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 f9a1ea3709..f468e2630a 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 @@ -24,16 +24,16 @@ 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 org.wso2.carbon.device.application.mgt.common.dto.ApplicationDTO; -import org.wso2.carbon.device.application.mgt.common.dto.ApplicationReleaseDTO; -import org.wso2.carbon.device.application.mgt.common.dto.ReviewDTO; -import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; -import org.wso2.carbon.device.application.mgt.common.exception.ReviewManagementException; -import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException; -import org.wso2.carbon.device.application.mgt.common.exception.TransactionManagementException; -import org.wso2.carbon.device.application.mgt.common.response.Review; -import org.wso2.carbon.device.application.mgt.common.services.*; -import org.wso2.carbon.device.application.mgt.common.wrapper.ReviewWrapper; +import io.entgra.application.mgt.common.dto.ApplicationDTO; +import io.entgra.application.mgt.common.dto.ApplicationReleaseDTO; +import io.entgra.application.mgt.common.dto.ReviewDTO; +import io.entgra.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.application.mgt.common.exception.ReviewManagementException; +import io.entgra.application.mgt.common.exception.DBConnectionException; +import io.entgra.application.mgt.common.exception.TransactionManagementException; +import io.entgra.application.mgt.common.response.Review; +import io.entgra.application.mgt.common.services.*; +import io.entgra.application.mgt.common.wrapper.ReviewWrapper; import io.entgra.application.mgt.core.dao.ApplicationDAO; import io.entgra.application.mgt.core.dao.ApplicationReleaseDAO; 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/impl/SubscriptionManagerImpl.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/impl/SubscriptionManagerImpl.java index 0d3a9a2195..73cc270e11 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 @@ -39,18 +39,18 @@ 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 org.wso2.carbon.device.application.mgt.common.dto.ApplicationDTO; -import org.wso2.carbon.device.application.mgt.common.dto.ApplicationPolicyDTO; -import org.wso2.carbon.device.application.mgt.common.dto.ApplicationReleaseDTO; -import org.wso2.carbon.device.application.mgt.common.dto.DeviceSubscriptionDTO; -import org.wso2.carbon.device.application.mgt.common.dto.ScheduledSubscriptionDTO; -import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; -import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException; -import org.wso2.carbon.device.application.mgt.common.exception.LifecycleManagementException; -import org.wso2.carbon.device.application.mgt.common.exception.SubscriptionManagementException; -import org.wso2.carbon.device.application.mgt.common.exception.TransactionManagementException; -import org.wso2.carbon.device.application.mgt.common.response.Application; -import org.wso2.carbon.device.application.mgt.common.services.SubscriptionManager; +import io.entgra.application.mgt.common.dto.ApplicationDTO; +import io.entgra.application.mgt.common.dto.ApplicationPolicyDTO; +import io.entgra.application.mgt.common.dto.ApplicationReleaseDTO; +import io.entgra.application.mgt.common.dto.DeviceSubscriptionDTO; +import io.entgra.application.mgt.common.dto.ScheduledSubscriptionDTO; +import io.entgra.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.application.mgt.common.exception.DBConnectionException; +import io.entgra.application.mgt.common.exception.LifecycleManagementException; +import io.entgra.application.mgt.common.exception.SubscriptionManagementException; +import io.entgra.application.mgt.common.exception.TransactionManagementException; +import io.entgra.application.mgt.common.response.Application; +import io.entgra.application.mgt.common.services.SubscriptionManager; import io.entgra.application.mgt.core.dao.ApplicationDAO; import io.entgra.application.mgt.core.dao.SubscriptionDAO; import io.entgra.application.mgt.core.dao.common.ApplicationManagementDAOFactory; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/internal/ApplicationManagementServiceComponent.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/internal/ApplicationManagementServiceComponent.java index 59f5e7d1b5..e56f73e1cb 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/internal/ApplicationManagementServiceComponent.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/internal/ApplicationManagementServiceComponent.java @@ -21,12 +21,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.osgi.framework.BundleContext; import org.osgi.service.component.ComponentContext; -import org.wso2.carbon.device.application.mgt.common.config.LifecycleState; -import org.wso2.carbon.device.application.mgt.common.services.ApplicationManager; -import org.wso2.carbon.device.application.mgt.common.services.ApplicationStorageManager; -import org.wso2.carbon.device.application.mgt.common.services.AppmDataHandler; -import org.wso2.carbon.device.application.mgt.common.services.ReviewManager; -import org.wso2.carbon.device.application.mgt.common.services.SubscriptionManager; +import io.entgra.application.mgt.common.config.LifecycleState; +import io.entgra.application.mgt.common.services.ApplicationManager; +import io.entgra.application.mgt.common.services.ApplicationStorageManager; +import io.entgra.application.mgt.common.services.AppmDataHandler; +import io.entgra.application.mgt.common.services.ReviewManager; +import io.entgra.application.mgt.common.services.SubscriptionManager; import io.entgra.application.mgt.core.config.ConfigurationManager; import io.entgra.application.mgt.core.dao.common.ApplicationManagementDAOFactory; import io.entgra.application.mgt.core.impl.AppmDataHandlerImpl; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/internal/DataHolder.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/internal/DataHolder.java index fce0f8f04e..3c675db85a 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/internal/DataHolder.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/internal/DataHolder.java @@ -17,11 +17,11 @@ */ package io.entgra.application.mgt.core.internal; -import org.wso2.carbon.device.application.mgt.common.services.ApplicationManager; -import org.wso2.carbon.device.application.mgt.common.services.ApplicationStorageManager; -import org.wso2.carbon.device.application.mgt.common.services.AppmDataHandler; -import org.wso2.carbon.device.application.mgt.common.services.ReviewManager; -import org.wso2.carbon.device.application.mgt.common.services.SubscriptionManager; +import io.entgra.application.mgt.common.services.ApplicationManager; +import io.entgra.application.mgt.common.services.ApplicationStorageManager; +import io.entgra.application.mgt.common.services.AppmDataHandler; +import io.entgra.application.mgt.common.services.ReviewManager; +import io.entgra.application.mgt.common.services.SubscriptionManager; import io.entgra.application.mgt.core.lifecycle.LifecycleStateManager; import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService; import org.wso2.carbon.ntask.core.service.TaskService; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/lifecycle/LifecycleStateManager.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/lifecycle/LifecycleStateManager.java index 33154514a5..a44c708fc3 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/lifecycle/LifecycleStateManager.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/lifecycle/LifecycleStateManager.java @@ -19,9 +19,9 @@ package io.entgra.application.mgt.core.lifecycle; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.device.application.mgt.common.exception.LifecycleManagementException; +import io.entgra.application.mgt.common.exception.LifecycleManagementException; import io.entgra.application.mgt.core.internal.DataHolder; -import org.wso2.carbon.device.application.mgt.common.config.LifecycleState; +import io.entgra.application.mgt.common.config.LifecycleState; import org.wso2.carbon.device.mgt.common.permission.mgt.PermissionManagementException; import org.wso2.carbon.device.mgt.core.permission.mgt.PermissionUtils; import org.wso2.carbon.device.mgt.core.search.mgt.Constants; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/task/ScheduledAppSubscriptionCleanupTask.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/task/ScheduledAppSubscriptionCleanupTask.java index 266084eaa4..1860d2f7ff 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/task/ScheduledAppSubscriptionCleanupTask.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/task/ScheduledAppSubscriptionCleanupTask.java @@ -20,8 +20,8 @@ package io.entgra.application.mgt.core.task; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.device.application.mgt.common.exception.SubscriptionManagementException; -import org.wso2.carbon.device.application.mgt.common.services.SubscriptionManager; +import io.entgra.application.mgt.common.exception.SubscriptionManagementException; +import io.entgra.application.mgt.common.services.SubscriptionManager; import io.entgra.application.mgt.core.impl.SubscriptionManagerImpl; import org.wso2.carbon.device.mgt.core.task.impl.RandomlyAssignedScheduleTask; 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 3668b1669e..79c36c2e68 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 @@ -26,10 +26,10 @@ 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 org.wso2.carbon.device.application.mgt.common.dto.ScheduledSubscriptionDTO; -import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; -import org.wso2.carbon.device.application.mgt.common.exception.SubscriptionManagementException; -import org.wso2.carbon.device.application.mgt.common.services.SubscriptionManager; +import io.entgra.application.mgt.common.dto.ScheduledSubscriptionDTO; +import io.entgra.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.application.mgt.common.exception.SubscriptionManagementException; +import io.entgra.application.mgt.common.services.SubscriptionManager; import io.entgra.application.mgt.core.impl.SubscriptionManagerImpl; import io.entgra.application.mgt.core.util.Constants; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; 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 66f94d5967..d414d366fe 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 @@ -26,9 +26,9 @@ 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 org.wso2.carbon.device.application.mgt.common.dto.ScheduledSubscriptionDTO; -import org.wso2.carbon.device.application.mgt.common.exception.SubscriptionManagementException; -import org.wso2.carbon.device.application.mgt.common.services.SubscriptionManager; +import io.entgra.application.mgt.common.dto.ScheduledSubscriptionDTO; +import io.entgra.application.mgt.common.exception.SubscriptionManagementException; +import io.entgra.application.mgt.common.services.SubscriptionManager; import io.entgra.application.mgt.core.exception.ApplicationOperationTaskException; import io.entgra.application.mgt.core.impl.SubscriptionManagerImpl; import io.entgra.application.mgt.core.internal.DataHolder; 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 f3ec5199bd..d433051058 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 @@ -24,22 +24,22 @@ 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 org.wso2.carbon.device.application.mgt.common.config.MDMConfig; -import org.wso2.carbon.device.application.mgt.common.dto.ApplicationDTO; -import org.wso2.carbon.device.application.mgt.common.dto.ApplicationReleaseDTO; -import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; -import org.wso2.carbon.device.application.mgt.common.response.Application; -import org.wso2.carbon.device.application.mgt.common.response.ApplicationRelease; -import org.wso2.carbon.device.application.mgt.common.services.*; +import io.entgra.application.mgt.common.config.MDMConfig; +import io.entgra.application.mgt.common.dto.ApplicationDTO; +import io.entgra.application.mgt.common.dto.ApplicationReleaseDTO; +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 org.wso2.carbon.device.application.mgt.common.wrapper.CustomAppReleaseWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.CustomAppWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.EntAppReleaseWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.ApplicationWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.PublicAppReleaseWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.PublicAppWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.WebAppReleaseWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.WebAppWrapper; +import io.entgra.application.mgt.common.wrapper.CustomAppReleaseWrapper; +import io.entgra.application.mgt.common.wrapper.CustomAppWrapper; +import io.entgra.application.mgt.common.wrapper.EntAppReleaseWrapper; +import io.entgra.application.mgt.common.wrapper.ApplicationWrapper; +import io.entgra.application.mgt.common.wrapper.PublicAppReleaseWrapper; +import io.entgra.application.mgt.common.wrapper.PublicAppWrapper; +import io.entgra.application.mgt.common.wrapper.WebAppReleaseWrapper; +import io.entgra.application.mgt.common.wrapper.WebAppWrapper; import io.entgra.application.mgt.core.config.ConfigurationManager; import io.entgra.application.mgt.core.exception.BadRequestException; import io.entgra.application.mgt.core.exception.UnexpectedServerErrorException; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/ApplicationManagementUtil.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/ApplicationManagementUtil.java index 3f14309cd5..11d8adb2ce 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/ApplicationManagementUtil.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/ApplicationManagementUtil.java @@ -19,11 +19,11 @@ package io.entgra.application.mgt.core.util; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.device.application.mgt.common.exception.InvalidConfigurationException; -import org.wso2.carbon.device.application.mgt.common.services.ApplicationManager; -import org.wso2.carbon.device.application.mgt.common.services.ApplicationStorageManager; -import org.wso2.carbon.device.application.mgt.common.services.ReviewManager; -import org.wso2.carbon.device.application.mgt.common.services.SubscriptionManager; +import io.entgra.application.mgt.common.exception.InvalidConfigurationException; +import io.entgra.application.mgt.common.services.ApplicationManager; +import io.entgra.application.mgt.common.services.ApplicationStorageManager; +import io.entgra.application.mgt.common.services.ReviewManager; +import io.entgra.application.mgt.common.services.SubscriptionManager; import io.entgra.application.mgt.core.config.ConfigurationManager; import io.entgra.application.mgt.core.config.Extension; import io.entgra.application.mgt.core.lifecycle.LifecycleStateManager; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/ConnectionManagerUtil.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/ConnectionManagerUtil.java index 6fda7e1f7c..cbfa27f63e 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/ConnectionManagerUtil.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/ConnectionManagerUtil.java @@ -19,9 +19,9 @@ package io.entgra.application.mgt.core.util; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException; -import org.wso2.carbon.device.application.mgt.common.exception.IllegalTransactionStateException; -import org.wso2.carbon.device.application.mgt.common.exception.TransactionManagementException; +import io.entgra.application.mgt.common.exception.DBConnectionException; +import io.entgra.application.mgt.common.exception.IllegalTransactionStateException; +import io.entgra.application.mgt.common.exception.TransactionManagementException; import java.sql.Connection; import java.sql.SQLException; 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 6e234fdc72..f9fb0da0e8 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 @@ -24,12 +24,12 @@ 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 org.wso2.carbon.device.application.mgt.common.dto.ApplicationDTO; +import io.entgra.application.mgt.common.dto.ApplicationDTO; -import org.wso2.carbon.device.application.mgt.common.dto.ApplicationReleaseDTO; -import org.wso2.carbon.device.application.mgt.common.dto.DeviceSubscriptionDTO; -import org.wso2.carbon.device.application.mgt.common.dto.ReviewDTO; -import org.wso2.carbon.device.application.mgt.common.dto.ScheduledSubscriptionDTO; +import io.entgra.application.mgt.common.dto.ApplicationReleaseDTO; +import io.entgra.application.mgt.common.dto.DeviceSubscriptionDTO; +import io.entgra.application.mgt.common.dto.ReviewDTO; +import io.entgra.application.mgt.common.dto.ScheduledSubscriptionDTO; import io.entgra.application.mgt.core.exception.UnexpectedServerErrorException; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/OAuthUtils.java b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/OAuthUtils.java index 9c47a4bc1c..71eb214ecc 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/OAuthUtils.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/OAuthUtils.java @@ -24,7 +24,7 @@ import org.wso2.carbon.apimgt.application.extension.APIManagementProviderService import org.wso2.carbon.apimgt.application.extension.dto.ApiApplicationKey; import org.wso2.carbon.apimgt.application.extension.exception.APIManagerException; import org.wso2.carbon.context.PrivilegedCarbonContext; -import org.wso2.carbon.device.application.mgt.common.dto.ApiRegistrationProfile; +import io.entgra.application.mgt.common.dto.ApiRegistrationProfile; import org.wso2.carbon.identity.jwt.client.extension.JWTClient; import org.wso2.carbon.identity.jwt.client.extension.dto.AccessTokenInfo; import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException; 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 7c9e6560d5..ee639406b7 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 @@ -24,8 +24,8 @@ 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 org.wso2.carbon.device.application.mgt.common.exception.ApplicationStorageManagementException; -import org.wso2.carbon.device.application.mgt.common.exception.ResourceManagementException; +import io.entgra.application.mgt.common.exception.ApplicationStorageManagementException; +import io.entgra.application.mgt.common.exception.ResourceManagementException; import java.io.File; import java.io.FileInputStream; 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 044cf84951..f0a29efd96 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 @@ -24,8 +24,8 @@ import org.testng.annotations.BeforeSuite; import org.w3c.dom.Document; import org.wso2.carbon.base.MultitenantConstants; import org.wso2.carbon.context.PrivilegedCarbonContext; -import org.wso2.carbon.device.application.mgt.common.config.LifecycleState; -import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.application.mgt.common.config.LifecycleState; +import io.entgra.application.mgt.common.exception.ApplicationManagementException; import io.entgra.application.mgt.core.common.DataSourceConfig; import io.entgra.application.mgt.core.config.ConfigurationManager; import io.entgra.application.mgt.core.dao.common.ApplicationManagementDAOFactory; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/ConfigurationTest.java b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/ConfigurationTest.java index dfcae3db61..9a8609f1ae 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/ConfigurationTest.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/ConfigurationTest.java @@ -21,7 +21,7 @@ import org.junit.Assert; import org.testng.annotations.Test; import io.entgra.application.mgt.core.config.Configuration; import io.entgra.application.mgt.core.config.ConfigurationManager; -import org.wso2.carbon.device.application.mgt.common.config.LifecycleState; +import io.entgra.application.mgt.common.config.LifecycleState; import java.util.List; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/InitTest.java b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/InitTest.java index 796af57966..2db5d9fa98 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/InitTest.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/InitTest.java @@ -18,7 +18,7 @@ package io.entgra.application.mgt.core; import org.testng.annotations.BeforeSuite; -import org.wso2.carbon.device.application.mgt.common.exception.InvalidConfigurationException; +import io.entgra.application.mgt.common.exception.InvalidConfigurationException; import io.entgra.application.mgt.core.config.ConfigurationManager; import java.io.File; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/LifeCycleStateManagerTest.java b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/LifeCycleStateManagerTest.java index 3ba7e049e7..248cd1929f 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/LifeCycleStateManagerTest.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/LifeCycleStateManagerTest.java @@ -18,7 +18,7 @@ package io.entgra.application.mgt.core; import io.entgra.application.mgt.core.lifecycle.LifecycleStateManager; -import org.wso2.carbon.device.application.mgt.common.config.LifecycleState; +import io.entgra.application.mgt.common.config.LifecycleState; import java.util.HashMap; import java.util.List; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/LifecycleManagementTest.java b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/LifecycleManagementTest.java index cceb7e7e7a..6080982a5d 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/LifecycleManagementTest.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/LifecycleManagementTest.java @@ -20,11 +20,11 @@ package io.entgra.application.mgt.core; import org.junit.Assert; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import org.wso2.carbon.device.application.mgt.common.exception.LifecycleManagementException; +import io.entgra.application.mgt.common.exception.LifecycleManagementException; import io.entgra.application.mgt.core.config.Configuration; import io.entgra.application.mgt.core.config.ConfigurationManager; import io.entgra.application.mgt.core.lifecycle.LifecycleStateManager; -import org.wso2.carbon.device.application.mgt.common.config.LifecycleState; +import io.entgra.application.mgt.common.config.LifecycleState; import java.util.List; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/StorageManagementUtilTest.java b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/StorageManagementUtilTest.java index 01409e46e7..08644a5fab 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/StorageManagementUtilTest.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/StorageManagementUtilTest.java @@ -22,7 +22,7 @@ import org.junit.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.wso2.carbon.device.application.mgt.common.exception.ResourceManagementException; +import io.entgra.application.mgt.common.exception.ResourceManagementException; import io.entgra.application.mgt.core.util.StorageManagementUtil; import java.io.File; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/dto/ApplicationsDTO.java b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/dto/ApplicationsDTO.java index 2d0c0fbd2f..d13d288b62 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/dto/ApplicationsDTO.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/dto/ApplicationsDTO.java @@ -17,7 +17,7 @@ */ package io.entgra.application.mgt.core.dto; -import org.wso2.carbon.device.application.mgt.common.dto.ApplicationDTO; +import io.entgra.application.mgt.common.dto.ApplicationDTO; import java.util.ArrayList; import java.util.List; 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 fb8393740a..4ff7e42c66 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 @@ -22,17 +22,17 @@ 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 org.wso2.carbon.device.application.mgt.common.dto.ApplicationDTO; -import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; -import org.wso2.carbon.device.application.mgt.common.exception.RequestValidatingException; -import org.wso2.carbon.device.application.mgt.common.response.Application; -import org.wso2.carbon.device.application.mgt.common.response.ApplicationRelease; -import org.wso2.carbon.device.application.mgt.common.response.Category; -import org.wso2.carbon.device.application.mgt.common.response.Tag; -import org.wso2.carbon.device.application.mgt.common.services.ApplicationManager; -import org.wso2.carbon.device.application.mgt.common.wrapper.EntAppReleaseWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.ApplicationUpdateWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.ApplicationWrapper; +import io.entgra.application.mgt.common.dto.ApplicationDTO; +import io.entgra.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.application.mgt.common.exception.RequestValidatingException; +import io.entgra.application.mgt.common.response.Application; +import io.entgra.application.mgt.common.response.ApplicationRelease; +import io.entgra.application.mgt.common.response.Category; +import io.entgra.application.mgt.common.response.Tag; +import io.entgra.application.mgt.common.services.ApplicationManager; +import io.entgra.application.mgt.common.wrapper.EntAppReleaseWrapper; +import io.entgra.application.mgt.common.wrapper.ApplicationUpdateWrapper; +import io.entgra.application.mgt.common.wrapper.ApplicationWrapper; import io.entgra.application.mgt.core.BaseTestCase; import io.entgra.application.mgt.core.dao.ApplicationDAO; import io.entgra.application.mgt.core.dao.common.ApplicationManagementDAOFactory; 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 eb2446830e..c9ab612a84 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 @@ -35,18 +35,18 @@ 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 org.wso2.carbon.device.application.mgt.common.dto.ApplicationDTO; -import org.wso2.carbon.device.application.mgt.common.dto.ApplicationReleaseDTO; -import org.wso2.carbon.device.application.mgt.common.response.ApplicationRelease; -import org.wso2.carbon.device.application.mgt.common.wrapper.CustomAppReleaseWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.CustomAppWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.EntAppReleaseWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.ApplicationUpdateWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.ApplicationWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.PublicAppReleaseWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.PublicAppWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.WebAppReleaseWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.WebAppWrapper; +import io.entgra.application.mgt.common.dto.ApplicationDTO; +import io.entgra.application.mgt.common.dto.ApplicationReleaseDTO; +import io.entgra.application.mgt.common.response.ApplicationRelease; +import io.entgra.application.mgt.common.wrapper.CustomAppReleaseWrapper; +import io.entgra.application.mgt.common.wrapper.CustomAppWrapper; +import io.entgra.application.mgt.common.wrapper.EntAppReleaseWrapper; +import io.entgra.application.mgt.common.wrapper.ApplicationUpdateWrapper; +import io.entgra.application.mgt.common.wrapper.ApplicationWrapper; +import io.entgra.application.mgt.common.wrapper.PublicAppReleaseWrapper; +import io.entgra.application.mgt.common.wrapper.PublicAppWrapper; +import io.entgra.application.mgt.common.wrapper.WebAppReleaseWrapper; +import io.entgra.application.mgt.common.wrapper.WebAppWrapper; import java.util.List; import javax.validation.Valid; 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 6bd5941447..c0126cf34e 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 @@ -22,30 +22,30 @@ 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 org.wso2.carbon.device.application.mgt.common.exception.LifecycleManagementException; -import org.wso2.carbon.device.application.mgt.common.exception.RequestValidatingException; -import org.wso2.carbon.device.application.mgt.common.response.Application; -import org.wso2.carbon.device.application.mgt.common.response.ApplicationRelease; -import org.wso2.carbon.device.application.mgt.common.response.Category; -import org.wso2.carbon.device.application.mgt.common.response.Tag; -import org.wso2.carbon.device.application.mgt.common.services.AppmDataHandler; -import org.wso2.carbon.device.application.mgt.common.wrapper.CustomAppReleaseWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.CustomAppWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.EntAppReleaseWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.ApplicationUpdateWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.ApplicationWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.PublicAppReleaseWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.PublicAppWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.WebAppReleaseWrapper; -import org.wso2.carbon.device.application.mgt.common.wrapper.WebAppWrapper; +import io.entgra.application.mgt.common.exception.LifecycleManagementException; +import io.entgra.application.mgt.common.exception.RequestValidatingException; +import io.entgra.application.mgt.common.response.Application; +import io.entgra.application.mgt.common.response.ApplicationRelease; +import io.entgra.application.mgt.common.response.Category; +import io.entgra.application.mgt.common.response.Tag; +import io.entgra.application.mgt.common.services.AppmDataHandler; +import io.entgra.application.mgt.common.wrapper.CustomAppReleaseWrapper; +import io.entgra.application.mgt.common.wrapper.CustomAppWrapper; +import io.entgra.application.mgt.common.wrapper.EntAppReleaseWrapper; +import io.entgra.application.mgt.common.wrapper.ApplicationUpdateWrapper; +import io.entgra.application.mgt.common.wrapper.ApplicationWrapper; +import io.entgra.application.mgt.common.wrapper.PublicAppReleaseWrapper; +import io.entgra.application.mgt.common.wrapper.PublicAppWrapper; +import io.entgra.application.mgt.common.wrapper.WebAppReleaseWrapper; +import io.entgra.application.mgt.common.wrapper.WebAppWrapper; import io.entgra.application.mgt.core.exception.BadRequestException; import io.entgra.application.mgt.core.exception.ForbiddenException; import io.entgra.application.mgt.core.exception.UnexpectedServerErrorException; import io.entgra.application.mgt.core.util.APIUtil; import io.entgra.application.mgt.core.util.Constants; import io.entgra.application.mgt.publisher.api.services.ApplicationManagementPublisherAPI; -import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; -import org.wso2.carbon.device.application.mgt.common.services.ApplicationManager; +import io.entgra.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.application.mgt.common.services.ApplicationManager; import io.entgra.application.mgt.core.exception.NotFoundException; import java.io.IOException; diff --git a/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/impl/admin/ApplicationManagementPublisherAdminAPIImpl.java b/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/impl/admin/ApplicationManagementPublisherAdminAPIImpl.java index fd37ba0efb..9799ab9a7f 100644 --- a/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/impl/admin/ApplicationManagementPublisherAdminAPIImpl.java +++ b/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/impl/admin/ApplicationManagementPublisherAdminAPIImpl.java @@ -19,8 +19,8 @@ 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.exception.ApplicationManagementException; -import org.wso2.carbon.device.application.mgt.common.services.ApplicationManager; +import io.entgra.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.application.mgt.common.services.ApplicationManager; import io.entgra.application.mgt.core.exception.BadRequestException; import io.entgra.application.mgt.core.exception.ForbiddenException; import io.entgra.application.mgt.core.exception.NotFoundException; 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 2e5da54e34..65b7f2e9ec 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 @@ -21,9 +21,9 @@ 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 org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; -import org.wso2.carbon.device.application.mgt.common.exception.ReviewManagementException; -import org.wso2.carbon.device.application.mgt.common.services.ReviewManager; +import io.entgra.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.application.mgt.common.exception.ReviewManagementException; +import io.entgra.application.mgt.common.services.ReviewManager; import io.entgra.application.mgt.core.exception.NotFoundException; import io.entgra.application.mgt.core.util.APIUtil; import io.entgra.application.mgt.publisher.api.services.admin.ReviewManagementPublisherAdminAPI; 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.store.api/src/main/java/io/entgra/application/mgt/store/api/services/ApplicationManagementAPI.java index 0136d7ca5c..b2ccfbd810 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.store.api/src/main/java/io/entgra/application/mgt/store/api/services/ApplicationManagementAPI.java @@ -30,7 +30,7 @@ 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 org.wso2.carbon.device.application.mgt.common.dto.ApplicationDTO; +import io.entgra.application.mgt.common.dto.ApplicationDTO; import org.wso2.carbon.device.application.mgt.common.ApplicationList; 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/ReviewManagementAPI.java b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/ReviewManagementAPI.java index 2e1613641f..55f0deed17 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.store.api/src/main/java/io/entgra/application/mgt/store/api/services/ReviewManagementAPI.java @@ -31,8 +31,8 @@ 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 org.wso2.carbon.device.application.mgt.common.response.Review; -import org.wso2.carbon.device.application.mgt.common.wrapper.ReviewWrapper; +import io.entgra.application.mgt.common.response.Review; +import io.entgra.application.mgt.common.wrapper.ReviewWrapper; import javax.validation.Valid; import javax.ws.rs.Path; 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.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/ApplicationManagementAPIImpl.java index c646b32d9e..05bf95d962 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.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/ApplicationManagementAPIImpl.java @@ -20,9 +20,9 @@ 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 org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; -import org.wso2.carbon.device.application.mgt.common.response.Application; -import org.wso2.carbon.device.application.mgt.common.services.ApplicationManager; +import io.entgra.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.application.mgt.common.response.Application; +import io.entgra.application.mgt.common.services.ApplicationManager; import io.entgra.application.mgt.core.exception.BadRequestException; import io.entgra.application.mgt.core.exception.NotFoundException; import io.entgra.application.mgt.core.exception.UnexpectedServerErrorException; 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.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/ReviewManagementAPIImpl.java index 762b126664..420679989c 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.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/ReviewManagementAPIImpl.java @@ -22,16 +22,16 @@ 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 org.wso2.carbon.device.application.mgt.common.response.Review; -import org.wso2.carbon.device.application.mgt.common.services.ReviewManager; -import org.wso2.carbon.device.application.mgt.common.wrapper.ReviewWrapper; +import io.entgra.application.mgt.common.response.Review; +import io.entgra.application.mgt.common.services.ReviewManager; +import io.entgra.application.mgt.common.wrapper.ReviewWrapper; 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 org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; -import org.wso2.carbon.device.application.mgt.common.exception.ReviewManagementException; +import io.entgra.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.application.mgt.common.exception.ReviewManagementException; import io.entgra.application.mgt.core.util.APIUtil; import javax.ws.rs.DefaultValue; 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.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/SubscriptionManagementAPIImpl.java index 80ab0ec49e..b6bcc37f26 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.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/SubscriptionManagementAPIImpl.java @@ -25,8 +25,8 @@ 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 org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; -import org.wso2.carbon.device.application.mgt.common.services.SubscriptionManager; +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; 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.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/admin/ReviewManagementStoreAdminAPIImpl.java index 0d62ba9d16..2585edaf1a 100644 --- 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.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/admin/ReviewManagementStoreAdminAPIImpl.java @@ -18,9 +18,9 @@ package io.entgra.application.mgt.store.api.services.impl.admin; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; -import org.wso2.carbon.device.application.mgt.common.exception.ReviewManagementException; -import org.wso2.carbon.device.application.mgt.common.services.ReviewManager; +import io.entgra.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.application.mgt.common.exception.ReviewManagementException; +import io.entgra.application.mgt.common.services.ReviewManager; import io.entgra.application.mgt.core.exception.NotFoundException; import io.entgra.application.mgt.core.util.APIUtil; import io.entgra.application.mgt.store.api.services.admin.ReviewManagementStoreAdminAPI; 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.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/admin/SubscriptionManagementAdminAPIImpl.java index c65cd02826..b767c39ccd 100644 --- 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.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/admin/SubscriptionManagementAdminAPIImpl.java @@ -21,8 +21,8 @@ package io.entgra.application.mgt.store.api.services.impl.admin; 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.exception.ApplicationManagementException; -import org.wso2.carbon.device.application.mgt.common.services.SubscriptionManager; +import io.entgra.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.application.mgt.common.services.SubscriptionManager; import io.entgra.application.mgt.core.exception.BadRequestException; import io.entgra.application.mgt.core.exception.NotFoundException; import io.entgra.application.mgt.core.util.APIUtil; 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.store.api/src/test/java/io/entgra/application/mgt/store/api/services/CommentMgtTestHelper.java index b14d9035b4..d586b5f5cb 100644 --- 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.store.api/src/test/java/io/entgra/application/mgt/store/api/services/CommentMgtTestHelper.java @@ -17,7 +17,7 @@ */ package io.entgra.application.mgt.store.api.services; -import org.wso2.carbon.device.application.mgt.common.response.Review; +import io.entgra.application.mgt.common.response.Review; /** * Helper class for Review Management API test cases. 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.store.api/src/test/java/io/entgra/application/mgt/store/api/services/ReviewManagementAPITest.java index 88fe81fcaa..432322ff11 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.store.api/src/test/java/io/entgra/application/mgt/store/api/services/ReviewManagementAPITest.java @@ -24,7 +24,7 @@ import org.junit.Ignore; import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor; -import org.wso2.carbon.device.application.mgt.common.services.ReviewManager; +import io.entgra.application.mgt.common.services.ReviewManager; import io.entgra.application.mgt.core.util.APIUtil; @PowerMockIgnore("javax.ws.rs.*") 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 ae6ddc3665..fd84b4cc62 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 @@ -87,12 +87,12 @@ org.apache.commons.logging, org.wso2.carbon.device.mgt.common.*, org.wso2.carbon.device.mgt.core.service - org.wso2.carbon.policy.mgt.core.*, - org.wso2.carbon.policy.mgt.core, - com.google.gson, - org.wso2.carbon.device.mgt.core.service.*, + org.wso2.carbon.policy.mgt.core.*, + org.wso2.carbon.policy.mgt.core, + com.google.gson, + org.wso2.carbon.device.mgt.core.service.*, org.wso2.carbon.device.application.mgt.common.*, - org.wso2.carbon.device.application.mgt.common.services.* + 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/PullNotificationSubscriberImpl.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/PullNotificationSubscriberImpl.java index 620757ace1..4ad59f212d 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/PullNotificationSubscriberImpl.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/PullNotificationSubscriberImpl.java @@ -24,11 +24,9 @@ import com.google.gson.JsonElement; import com.google.gson.JsonParser; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.application.mgt.common.exception.ApplicationManagementException; import org.wso2.carbon.device.mgt.common.Device; -import org.wso2.carbon.device.mgt.common.DeviceIdentifier; -import org.wso2.carbon.device.application.mgt.common.services.ApplicationManager; -import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException; +import io.entgra.application.mgt.common.services.ApplicationManager; import org.wso2.carbon.device.mgt.common.operation.mgt.Operation; import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException; import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.ComplianceFeature; 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/PullNotificationDataHolder.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/PullNotificationDataHolder.java index fd257ea28c..453325d5cd 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/PullNotificationDataHolder.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/PullNotificationDataHolder.java @@ -18,7 +18,7 @@ */ package org.wso2.carbon.device.mgt.extensions.pull.notification.internal; -import org.wso2.carbon.device.application.mgt.common.services.ApplicationManager; +import io.entgra.application.mgt.common.services.ApplicationManager; import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService; import org.wso2.carbon.policy.mgt.core.PolicyManagerService; 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 4c3971bf7d..90f8db4004 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 @@ -21,7 +21,7 @@ package org.wso2.carbon.device.mgt.extensions.pull.notification.internal; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.osgi.service.component.ComponentContext; -import org.wso2.carbon.device.application.mgt.common.services.ApplicationManager; +import io.entgra.application.mgt.common.services.ApplicationManager; import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService; import org.wso2.carbon.policy.mgt.core.PolicyManagerService; 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 61f896e377..be7d732f59 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 @@ -161,7 +161,7 @@ org.wso2.carbon.device.mgt.core.operation.mgt, org.wso2.carbon.core, org.wso2.carbon.device.application.mgt.common.*, - org.wso2.carbon.device.application.mgt.common.services.* + io.entgra.application.mgt.common.services.* 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 b28c1a31cc..a538a641fd 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 @@ -45,8 +45,8 @@ 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 org.wso2.carbon.device.application.mgt.common.exception.SubscriptionManagementException; -import org.wso2.carbon.device.application.mgt.common.services.SubscriptionManager; +import io.entgra.application.mgt.common.exception.SubscriptionManagementException; +import io.entgra.application.mgt.common.services.SubscriptionManager; import io.entgra.application.mgt.core.util.HelperUtil; import org.wso2.carbon.device.mgt.common.DeviceFilters; import org.wso2.carbon.device.mgt.common.EnrolmentInfo; @@ -944,7 +944,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService { return Response.serverError().entity( new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build()).build(); } catch (SubscriptionManagementException | - org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException + io.entgra.application.mgt.common.exception.ApplicationManagementException e) { String msg = "Error occurred while getting the " + type + "application is of device " + id + "subscribed " + "at entgra store"; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/util/DeviceMgtAPIUtils.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/util/DeviceMgtAPIUtils.java index 4f45ea3980..8275ea0163 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/util/DeviceMgtAPIUtils.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/util/DeviceMgtAPIUtils.java @@ -51,7 +51,7 @@ import org.wso2.carbon.base.ServerConfiguration; import org.wso2.carbon.context.CarbonContext; import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.core.util.Utils; -import org.wso2.carbon.device.application.mgt.common.services.SubscriptionManager; +import io.entgra.application.mgt.common.services.SubscriptionManager; import org.wso2.carbon.device.mgt.common.Device; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; import org.wso2.carbon.device.mgt.common.EnrolmentInfo; From 4503ab77c7c7e1be85783e151b0c82a0137b36f0 Mon Sep 17 00:00:00 2001 From: Amalka Subasinghe Date: Tue, 10 Aug 2021 17:30:48 +0530 Subject: [PATCH 08/10] 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 From 39b26d58dc62cc86933aa97225625211fa83eec8 Mon Sep 17 00:00:00 2001 From: Amalka Subasinghe Date: Tue, 10 Aug 2021 17:48:41 +0530 Subject: [PATCH 09/10] removed unused dependecies --- pom.xml | 45 --------------------------------------------- 1 file changed, 45 deletions(-) diff --git a/pom.xml b/pom.xml index 55a55d6e39..b8aacf28c3 100644 --- a/pom.xml +++ b/pom.xml @@ -178,11 +178,6 @@ io.entgra.application.mgt.addons ${carbon.device.mgt.version} - - - - - org.wso2.carbon.devicemgt io.entgra.application.mgt.core @@ -203,16 +198,6 @@ io.entgra.application.mgt.store.api ${carbon.device.mgt.version} - - - - - - - - - - org.wso2.carbon.devicemgt org.wso2.carbon.policy.mgt.common @@ -308,42 +293,12 @@ zip ${carbon.device.mgt.version} - - - - - - org.wso2.carbon.devicemgt io.entgra.application.mgt.api.feature zip ${carbon.device.mgt.version} - - - - - - - - - - - - - - - - - - - - - - - - org.wso2.carbon.devicemgt io.entgra.server.bootup.heartbeat.beacon From 29b561e9c3beb448ca8a44d2802b73b1afe82b55 Mon Sep 17 00:00:00 2001 From: Amalka Subasinghe Date: Tue, 10 Aug 2021 22:00:15 +0530 Subject: [PATCH 10/10] added config to j2 file --- .../templates/repository/conf/mdm-ui-config.xml.j2 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/mdm-ui-config.xml.j2 b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/mdm-ui-config.xml.j2 index d15f23de86..68742071a6 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/mdm-ui-config.xml.j2 +++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/mdm-ui-config.xml.j2 @@ -28,6 +28,13 @@ {% else %} true {% endif %} + + {% if mdm_ui_conf.login_cache_capacity is defined %} + {{mdm_ui_conf.login_cache_capacity}} + {% else %} + 10000 + {% endif %} + application_management