From d98abb1ddfdbc4a7ebbf421661048085b47a2c13 Mon Sep 17 00:00:00 2001 From: Amalka Subasinghe Date: Thu, 11 May 2023 11:03:21 +0530 Subject: [PATCH] refactored application mgt component --- .../api/impl/GrafanaAPIProxyServiceImpl.java | 2 +- .../pom.xml | 4 +- .../core/service/GrafanaQueryService.java | 2 +- .../service/impl/GrafanaQueryServiceImpl.java | 4 +- .../GrafanaDatasourceConnectionFactory.java | 8 +- .../sql/query/encoder/MySQLQueryEncoder.java | 2 +- .../core/sql/query/encoder/QueryEncoder.java | 2 +- .../pom.xml | 6 +- .../mgt/addons/ApiOriginFilter.java | 2 +- .../mgt/addons/FileStreamingOutput.java | 4 +- .../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 +- .../pom.xml | 8 +- .../mgt/api}/ArtifactDownloadAPI.java | 6 +- .../api}/impl/ArtifactDownloadAPIImpl.java | 18 +-- .../src/main/webapp/META-INF/permissions.xml | 0 .../webapp/META-INF/webapp-classloading.xml | 0 .../src/main/webapp/WEB-INF/cxf-servlet.xml | 12 +- .../src/main/webapp/WEB-INF/web.xml | 2 +- .../pom.xml | 4 +- .../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 +- .../mgt/common/FileDataHolder.java | 2 +- .../core}/application/mgt/common/Filter.java | 2 +- .../mgt/common/IdentityServerResponse.java | 2 +- .../application/mgt/common/ImageArtifact.java | 2 +- .../mgt/common/InstallationDetails.java | 2 +- .../mgt/common/LifecycleChanger.java | 2 +- .../mgt/common/LifecycleState.java | 2 +- .../mgt/common/OperationStatusBean.java | 2 +- .../application/mgt/common/Pagination.java | 2 +- .../mgt/common/PaginationRequest.java | 2 +- .../mgt/common/PaginationResult.java | 2 +- .../core}/application/mgt/common/Rating.java | 2 +- .../application/mgt/common/ReviewNode.java | 2 +- .../application/mgt/common/RoleList.java | 2 +- .../application/mgt/common/SPApplication.java | 4 +- .../mgt/common/SPApplicationListResponse.java | 2 +- .../application/mgt/common/SortingOrder.java | 2 +- .../application/mgt/common/SubAction.java | 2 +- .../mgt/common/SubscribingDeviceIdHolder.java | 2 +- .../mgt/common/SubscriptionType.java | 2 +- .../core}/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 +- .../mgt/common/dto/IdentityServerDTO.java | 2 +- .../dto/IdentityServiceProviderDTO.java | 2 +- .../application/mgt/common/dto/ReviewDTO.java | 2 +- .../mgt/common/dto/RoleSubscriptionDTO.java | 2 +- .../common/dto/ScheduledSubscriptionDTO.java | 12 +- .../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 +- .../IdentityServerManagementException.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 | 11 +- .../mgt/common/services/AppmDataHandler.java | 8 +- .../mgt/common/services/DeviceConnector.java | 6 +- .../mgt/common/services/ReviewManager.java | 16 +-- .../common/services/SPApplicationManager.java | 19 +-- .../common/services/SubscriptionManager.java | 17 +-- .../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 +- .../pom.xml | 12 +- .../mgt/core/config/Artifacts.java | 2 +- .../mgt/core/config/Configuration.java | 8 +- .../mgt/core/config/ConfigurationManager.java | 8 +- .../mgt/core/config/Extension.java | 2 +- .../core/config/IdentityServiceProvider.java | 2 +- .../IdentityServiceProviderConfiguration.java | 2 +- .../core/config/PaginationConfiguration.java | 2 +- .../mgt/core/config/Parameter.java | 2 +- .../mgt/core/dao/ApplicationDAO.java | 12 +- .../mgt/core/dao/ApplicationReleaseDAO.java | 8 +- .../mgt/core/dao/LifecycleStateDAO.java | 6 +- .../application/mgt/core/dao/ReviewDAO.java | 10 +- .../mgt/core/dao/SPApplicationDAO.java | 8 +- .../mgt/core/dao/SubscriptionDAO.java | 16 +-- .../mgt/core/dao/VisibilityDAO.java | 4 +- .../ApplicationManagementDAOFactory.java | 78 ++++++------ .../mgt/core/dao/impl/AbstractDAOImpl.java | 6 +- .../GenericApplicationDAOImpl.java | 26 ++-- .../application/OracleApplicationDAOImpl.java | 14 +-- .../PostgreSQLApplicationDAOImpl.java | 2 +- .../SQLServerApplicationDAOImpl.java | 14 +-- .../GenericApplicationReleaseDAOImpl.java | 16 +-- .../OracleApplicationReleaseDAOImpl.java | 6 +- .../PostgreSQLApplicationReleaseDAOImpl.java | 2 +- .../SQLServerApplicationReleaseDAOImpl.java | 6 +- .../GenericSPApplicationDAOImpl.java | 20 +-- .../OracleSPApplicationDAOImpl.java | 18 +-- .../PostgreSQLSPApplicationDAOImpl.java | 18 +-- .../SQLServerSPApplicationDAOImpl.java | 18 +-- .../GenericLifecycleStateDAOImpl.java | 17 ++- .../OracleLifecycleStateDAOImpl.java | 2 +- .../PostgreSQLLifecycleStateDAOImpl.java | 2 +- .../SQLServerLifecycleStateDAOImpl.java | 2 +- .../dao/impl/review/GenericReviewDAOImpl.java | 21 ++-- .../dao/impl/review/OracleReviewDAOImpl.java | 14 +-- .../impl/review/PostgreSQLReviewDAOImpl.java | 2 +- .../impl/review/SQLServerReviewDAOImpl.java | 14 +-- .../GenericSubscriptionDAOImpl.java | 24 ++-- .../OracleSubscriptionDAOImpl.java | 6 +- .../PostgreSQLSubscriptionDAOImpl.java | 2 +- .../SQLServerSubscriptionDAOImpl.java | 6 +- .../visibility/GenericVisibilityDAOImpl.java | 10 +- .../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 | 4 +- .../core/exception/ForbiddenException.java | 4 +- .../LifeCycleManagementDAOException.java | 2 +- .../mgt/core/exception/NotFoundException.java | 4 +- .../mgt/core/exception/ParsingException.java | 2 +- .../ReviewManagementDAOException.java | 4 +- .../SubscriptionManagementDAOException.java | 4 +- .../UnexpectedServerErrorException.java | 4 +- .../core/exception/ValidationException.java | 4 +- .../VisibilityManagementDAOException.java | 4 +- .../mgt/core/impl/ApplicationManagerImpl.java | 118 +++++++++--------- .../impl/ApplicationStorageManagerImpl.java | 20 +-- .../mgt/core/impl/AppmDataHandlerImpl.java | 24 ++-- .../mgt/core/impl/ReviewManagerImpl.java | 55 ++++---- .../core/impl/SPApplicationManagerImpl.java | 58 ++++----- .../core/impl/SubscriptionManagerImpl.java | 72 +++++------ ...ApplicationManagementServiceComponent.java | 28 ++--- .../mgt/core/internal/DataHolder.java | 18 +-- .../core/lifecycle/LifecycleStateManager.java | 8 +- .../ISServiceProviderApplicationService.java | 14 +-- .../impl/WSO2IAMSPApplicationService.java | 16 +-- .../ScheduledAppSubscriptionCleanupTask.java | 8 +- .../task/ScheduledAppSubscriptionTask.java | 18 +-- .../ScheduledAppSubscriptionTaskManager.java | 20 +-- .../application/mgt/core/util/APIUtil.java | 58 ++++----- .../core/util/ApplicationManagementUtil.java | 48 +++---- .../util/ApplicationMgtDatabaseCreator.java | 2 +- .../mgt/core/util/ArtifactsParser.java | 4 +- .../mgt/core/util/ConnectionManagerUtil.java | 8 +- .../application/mgt/core/util/Constants.java | 2 +- .../application/mgt/core/util/DAOUtil.java | 20 +-- .../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 | 4 +- .../src/main/resources/META-INF/component.xml | 2 +- .../mgt/core/ArtifactParserTest.java | 6 +- .../application/mgt/core/BaseTestCase.java | 26 ++-- .../mgt/core/ConfigurationTest.java | 8 +- .../core}/application/mgt/core/InitTest.java | 6 +- .../mgt/core/LifeCycleStateManagerTest.java | 6 +- .../mgt/core/LifecycleManagementTest.java | 12 +- .../mgt/core/StorageManagementUtilTest.java | 4 +- .../core}/application/mgt/core/TestUtils.java | 2 +- .../mgt/core/common/DataSourceConfig.java | 2 +- .../dao/ApplicationManagementDAOTest.java | 14 +-- .../mgt/core/dto/ApplicationsDTO.java | 4 +- .../mgt/core/dto/DeviceTypeCreator.java | 2 +- .../management/ApplicationManagementTest.java | 43 ++++--- .../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 .../pom.xml | 8 +- .../ApplicationManagementPublisherAPI.java | 34 ++--- .../publisher/api}/SPApplicationService.java | 12 +- ...pplicationManagementPublisherAdminAPI.java | 6 +- .../ReviewManagementPublisherAdminAPI.java | 6 +- ...ApplicationManagementPublisherAPIImpl.java | 64 +++++----- .../api}/impl/SPApplicationServiceImpl.java | 34 ++--- ...cationManagementPublisherAdminAPIImpl.java | 16 +-- ...ReviewManagementPublisherAdminAPIImpl.java | 20 +-- .../src/main/webapp/META-INF/permissions.xml | 0 .../webapp/META-INF/webapp-classloading.xml | 0 .../src/main/webapp/WEB-INF/cxf-servlet.xml | 18 +-- .../src/main/webapp/WEB-INF/web.xml | 2 +- .../pom.xml | 8 +- .../api/beans/SubscriptionStatusBean.java | 2 +- .../services/ApplicationManagementAPI.java | 10 +- .../api/services/ReviewManagementAPI.java | 10 +- .../services/SubscriptionManagementAPI.java | 4 +- .../admin/ReviewManagementStoreAdminAPI.java | 4 +- .../admin/SubscriptionManagementAdminAPI.java | 6 +- .../impl/ApplicationManagementAPIImpl.java | 22 ++-- .../impl/ReviewManagementAPIImpl.java | 28 ++--- .../impl/SubscriptionManagementAPIImpl.java | 48 +++---- .../ReviewManagementStoreAdminAPIImpl.java | 14 +-- .../SubscriptionManagementAdminAPIImpl.java | 20 +-- .../impl/util/RequestValidationUtil.java | 7 +- .../mgt/store/api/util/Constants.java | 2 +- .../src/main/webapp/META-INF/permissions.xml | 0 .../webapp/META-INF/webapp-classloading.xml | 0 .../src/main/webapp/WEB-INF/cxf-servlet.xml | 20 +-- .../src/main/webapp/WEB-INF/web.xml | 2 +- .../api/services/CommentMgtTestHelper.java | 4 +- .../api/services/ReviewManagementAPITest.java | 8 +- .../src/test/resources/log4j.properties | 0 .../src/test/resources/testng.xml | 2 +- components/application-mgt/pom.xml | 12 +- .../pom.xml | 6 +- .../PullNotificationSubscriberImpl.java | 4 +- .../internal/PullNotificationDataHolder.java | 2 +- .../PullNotificationServiceComponent.java | 4 +- .../pom.xml | 6 +- .../org.wso2.carbon.device.mgt.api/pom.xml | 4 +- .../impl/DeviceManagementServiceImpl.java | 16 +-- .../mgt/jaxrs/util/DeviceMgtAPIUtils.java | 4 +- .../pom.xml | 2 +- .../pom.xml | 8 +- .../mgt/core/impl/TenantManagerImpl.java | 6 +- .../core/internal/TenantMgtDataHolder.java | 2 +- .../internal/TenantMgtServiceComponent.java | 4 +- .../pom.xml | 2 +- .../pom.xml | 6 +- .../pom.xml | 8 +- .../main/resources/conf/application-mgt.xml | 12 +- .../conf/identity-service-provider-config.xml | 2 +- .../repository/conf/application-mgt.xml.j2 | 12 +- .../identity-service-provider-config.xml.j2 | 2 +- pom.xml | 18 ++- 324 files changed, 1159 insertions(+), 1165 deletions(-) rename components/application-mgt/{io.entgra.application.mgt.addons => io.entgra.device.mgt.core.application.mgt.addons}/pom.xml (95%) rename components/application-mgt/{io.entgra.application.mgt.addons/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core}/application/mgt/addons/ApiOriginFilter.java (96%) rename components/application-mgt/{io.entgra.application.mgt.addons/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core}/application/mgt/addons/FileStreamingOutput.java (89%) rename components/application-mgt/{io.entgra.application.mgt.addons/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core}/application/mgt/addons/JSONMessageHandler.java (95%) rename components/application-mgt/{io.entgra.application.mgt.addons/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core}/application/mgt/addons/MultipartCustomProvider.java (94%) rename components/application-mgt/{io.entgra.application.mgt.addons/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core}/application/mgt/addons/ValidationInterceptor.java (98%) rename components/application-mgt/{io.entgra.application.mgt.addons/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core}/application/mgt/addons/jaxrs/AnnotationExclusionStrategy.java (94%) rename components/application-mgt/{io.entgra.application.mgt.addons/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core}/application/mgt/addons/jaxrs/Exclude.java (94%) rename components/application-mgt/{io.entgra.application.mgt.api => io.entgra.device.mgt.core.application.mgt.api}/pom.xml (96%) rename components/application-mgt/{io.entgra.application.mgt.api/src/main/java/io/entgra/application/mgt/api/services => io.entgra.device.mgt.core.application.mgt.api/src/main/java/io/entgra/device/mgt/core/application/mgt/api}/ArtifactDownloadAPI.java (97%) rename components/application-mgt/{io.entgra.application.mgt.api/src/main/java/io/entgra/application/mgt/api/services => io.entgra.device.mgt.core.application.mgt.api/src/main/java/io/entgra/device/mgt/core/application/mgt/api}/impl/ArtifactDownloadAPIImpl.java (91%) rename components/application-mgt/{io.entgra.application.mgt.api => io.entgra.device.mgt.core.application.mgt.api}/src/main/webapp/META-INF/permissions.xml (100%) rename components/application-mgt/{io.entgra.application.mgt.api => io.entgra.device.mgt.core.application.mgt.api}/src/main/webapp/META-INF/webapp-classloading.xml (100%) rename components/application-mgt/{io.entgra.application.mgt.api => io.entgra.device.mgt.core.application.mgt.api}/src/main/webapp/WEB-INF/cxf-servlet.xml (78%) rename components/application-mgt/{io.entgra.application.mgt.api => io.entgra.device.mgt.core.application.mgt.api}/src/main/webapp/WEB-INF/web.xml (97%) rename components/application-mgt/{io.entgra.application.mgt.common => io.entgra.device.mgt.core.application.mgt.common}/pom.xml (96%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/AppLifecycleState.java (93%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/AppOperation.java (95%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/ApplicationArtifact.java (97%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/ApplicationInstallResponse.java (97%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/ApplicationInstaller.java (95%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/ApplicationList.java (85%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/ApplicationSubscriptionInfo.java (96%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/ApplicationSubscriptionType.java (93%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/ApplicationType.java (93%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/BasePaginatedResult.java (95%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/BasicUserInfo.java (97%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/BasicUserInfoList.java (96%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/DeviceGroupList.java (96%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/DeviceList.java (96%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/DeviceSubscriptionData.java (97%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/DeviceTypes.java (92%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/EnterpriseInstallationDetails.java (97%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/ErrorListItem.java (97%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/ErrorResponse.java (98%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/ExecutionStatus.java (90%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/FileDataHolder.java (95%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/Filter.java (98%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/IdentityServerResponse.java (97%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/ImageArtifact.java (96%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/InstallationDetails.java (96%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/LifecycleChanger.java (94%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/LifecycleState.java (98%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/OperationStatusBean.java (91%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/Pagination.java (96%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/PaginationRequest.java (96%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/PaginationResult.java (97%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/Rating.java (96%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/ReviewNode.java (96%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/RoleList.java (96%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/SPApplication.java (94%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/SPApplicationListResponse.java (96%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/SortingOrder.java (93%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/SubAction.java (92%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/SubscribingDeviceIdHolder.java (97%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/SubscriptionType.java (92%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/User.java (95%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/config/ErrorCallback.java (98%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/config/LifecycleState.java (97%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/config/MDMConfig.java (95%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/config/RatingConfiguration.java (95%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/dto/ApiRegistrationProfile.java (96%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/dto/ApplicationDTO.java (98%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/dto/ApplicationPolicyDTO.java (96%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/dto/ApplicationReleaseDTO.java (99%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/dto/CategoryDTO.java (94%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/dto/DeviceSubscriptionDTO.java (97%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/dto/GroupSubscriptionDTO.java (97%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/dto/IdentityServerDTO.java (97%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/dto/IdentityServiceProviderDTO.java (94%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/dto/ReviewDTO.java (97%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/dto/RoleSubscriptionDTO.java (97%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/dto/ScheduledSubscriptionDTO.java (90%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/dto/TagDTO.java (94%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/dto/UserSubscriptionDTO.java (94%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/exception/ApplicationCategoryManagementException.java (93%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/exception/ApplicationManagementException.java (95%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/exception/ApplicationStorageManagementException.java (94%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/exception/DBConnectionException.java (94%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/exception/DeviceConnectorException.java (95%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/exception/IdentityServerManagementException.java (94%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/exception/IllegalTransactionStateException.java (94%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/exception/InvalidConfigurationException.java (94%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/exception/LifecycleManagementException.java (93%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/exception/RequestValidatingException.java (93%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/exception/ResourceManagementException.java (93%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/exception/ReviewDoesNotExistException.java (94%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/exception/ReviewManagementException.java (94%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/exception/SubscriptionManagementException.java (94%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/exception/TransactionManagementException.java (94%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/exception/UnsupportedDatabaseEngineException.java (94%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/exception/VisibilityManagementException.java (94%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/response/Application.java (98%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/response/ApplicationRelease.java (98%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/response/Category.java (94%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/response/Review.java (98%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/response/Tag.java (94%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/services/ApplicationManager.java (93%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/services/ApplicationStorageManager.java (92%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/services/AppmDataHandler.java (83%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/services/DeviceConnector.java (86%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/services/ReviewManager.java (85%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/services/SPApplicationManager.java (91%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/services/SubscriptionManager.java (94%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/wrapper/ApplicationUpdateWrapper.java (98%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/wrapper/ApplicationWrapper.java (98%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/wrapper/CustomAppReleaseWrapper.java (98%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/wrapper/CustomAppWrapper.java (98%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/wrapper/EntAppReleaseWrapper.java (98%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/wrapper/PublicAppReleaseWrapper.java (98%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/wrapper/PublicAppWrapper.java (98%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/wrapper/ReviewWrapper.java (94%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/wrapper/WebAppReleaseWrapper.java (98%) rename components/application-mgt/{io.entgra.application.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core}/application/mgt/common/wrapper/WebAppWrapper.java (98%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/pom.xml (96%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/config/Artifacts.java (95%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/config/Configuration.java (90%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/config/ConfigurationManager.java (93%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/config/Extension.java (97%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/config/IdentityServiceProvider.java (96%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/config/IdentityServiceProviderConfiguration.java (96%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/config/PaginationConfiguration.java (95%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/config/Parameter.java (95%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/dao/ApplicationDAO.java (95%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/dao/ApplicationReleaseDAO.java (94%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/dao/LifecycleStateDAO.java (92%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/dao/ReviewDAO.java (92%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/dao/SPApplicationDAO.java (94%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/dao/SubscriptionDAO.java (95%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/dao/VisibilityDAO.java (94%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/dao/common/ApplicationManagementDAOFactory.java (70%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/dao/impl/AbstractDAOImpl.java (80%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/dao/impl/application/GenericApplicationDAOImpl.java (98%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/dao/impl/application/OracleApplicationDAOImpl.java (94%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/dao/impl/application/PostgreSQLApplicationDAOImpl.java (92%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/dao/impl/application/SQLServerApplicationDAOImpl.java (94%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/dao/impl/application/release/GenericApplicationReleaseDAOImpl.java (97%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/dao/impl/application/release/OracleApplicationReleaseDAOImpl.java (91%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/dao/impl/application/release/PostgreSQLApplicationReleaseDAOImpl.java (92%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/dao/impl/application/release/SQLServerApplicationReleaseDAOImpl.java (91%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/dao/impl/application/spapplication/GenericSPApplicationDAOImpl.java (96%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/dao/impl/application/spapplication/OracleSPApplicationDAOImpl.java (96%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/dao/impl/application/spapplication/PostgreSQLSPApplicationDAOImpl.java (96%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/dao/impl/application/spapplication/SQLServerSPApplicationDAOImpl.java (96%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/dao/impl/lifecyclestate/GenericLifecycleStateDAOImpl.java (95%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/dao/impl/lifecyclestate/OracleLifecycleStateDAOImpl.java (91%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/dao/impl/lifecyclestate/PostgreSQLLifecycleStateDAOImpl.java (92%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/dao/impl/lifecyclestate/SQLServerLifecycleStateDAOImpl.java (91%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/dao/impl/review/GenericReviewDAOImpl.java (97%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/dao/impl/review/OracleReviewDAOImpl.java (95%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/dao/impl/review/PostgreSQLReviewDAOImpl.java (93%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/dao/impl/review/SQLServerReviewDAOImpl.java (95%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/dao/impl/subscription/GenericSubscriptionDAOImpl.java (98%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/dao/impl/subscription/OracleSubscriptionDAOImpl.java (96%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/dao/impl/subscription/PostgreSQLSubscriptionDAOImpl.java (92%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/dao/impl/subscription/SQLServerSubscriptionDAOImpl.java (96%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/dao/impl/visibility/GenericVisibilityDAOImpl.java (94%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/dao/impl/visibility/OracleVisibilityDAOImpl.java (91%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/dao/impl/visibility/PostgreSQLVisibilityDAOImpl.java (93%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/dao/impl/visibility/SQLServerVisibilityDAOImpl.java (91%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/deployer/Property.java (96%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/exception/ApplicationManagementDAOException.java (94%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/exception/ApplicationOperationTaskException.java (91%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/exception/BadRequestException.java (86%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/exception/ForbiddenException.java (86%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/exception/LifeCycleManagementDAOException.java (94%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/exception/NotFoundException.java (86%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/exception/ParsingException.java (95%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/exception/ReviewManagementDAOException.java (87%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/exception/SubscriptionManagementDAOException.java (87%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/exception/UnexpectedServerErrorException.java (85%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/exception/ValidationException.java (86%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/exception/VisibilityManagementDAOException.java (87%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/impl/ApplicationManagerImpl.java (97%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/impl/ApplicationStorageManagerImpl.java (94%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/impl/AppmDataHandlerImpl.java (85%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/impl/ReviewManagerImpl.java (94%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/impl/SPApplicationManagerImpl.java (93%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/impl/SubscriptionManagerImpl.java (96%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/internal/ApplicationManagementServiceComponent.java (86%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/internal/DataHolder.java (85%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/lifecycle/LifecycleStateManager.java (97%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/identityserver => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core}/serviceprovider/ISServiceProviderApplicationService.java (84%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/identityserver => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core}/serviceprovider/impl/WSO2IAMSPApplicationService.java (91%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/task/ScheduledAppSubscriptionCleanupTask.java (85%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/task/ScheduledAppSubscriptionTask.java (90%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/task/ScheduledAppSubscriptionTaskManager.java (93%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/util/APIUtil.java (92%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/util/ApplicationManagementUtil.java (85%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/util/ApplicationMgtDatabaseCreator.java (96%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/util/ArtifactsParser.java (97%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/util/ConnectionManagerUtil.java (97%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/util/Constants.java (99%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/util/DAOUtil.java (95%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/util/HelperUtil.java (97%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/util/JSONUtil.java (96%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/util/MDMAppConstants.java (98%) rename components/application-mgt/{io.entgra.application.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core}/application/mgt/core/util/OAuthUtils.java (97%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/main/resources/META-INF/component.xml (93%) rename components/application-mgt/{io.entgra.application.mgt.core/src/test/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core}/application/mgt/core/ArtifactParserTest.java (93%) rename components/application-mgt/{io.entgra.application.mgt.core/src/test/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core}/application/mgt/core/BaseTestCase.java (88%) rename components/application-mgt/{io.entgra.application.mgt.core/src/test/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core}/application/mgt/core/ConfigurationTest.java (85%) rename components/application-mgt/{io.entgra.application.mgt.core/src/test/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core}/application/mgt/core/InitTest.java (82%) rename components/application-mgt/{io.entgra.application.mgt.core/src/test/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core}/application/mgt/core/LifeCycleStateManagerTest.java (85%) rename components/application-mgt/{io.entgra.application.mgt.core/src/test/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core}/application/mgt/core/LifecycleManagementTest.java (92%) rename components/application-mgt/{io.entgra.application.mgt.core/src/test/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core}/application/mgt/core/StorageManagementUtilTest.java (94%) rename components/application-mgt/{io.entgra.application.mgt.core/src/test/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core}/application/mgt/core/TestUtils.java (96%) rename components/application-mgt/{io.entgra.application.mgt.core/src/test/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core}/application/mgt/core/common/DataSourceConfig.java (97%) rename components/application-mgt/{io.entgra.application.mgt.core/src/test/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core}/application/mgt/core/dao/ApplicationManagementDAOTest.java (83%) rename components/application-mgt/{io.entgra.application.mgt.core/src/test/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core}/application/mgt/core/dto/ApplicationsDTO.java (90%) rename components/application-mgt/{io.entgra.application.mgt.core/src/test/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core}/application/mgt/core/dto/DeviceTypeCreator.java (94%) rename components/application-mgt/{io.entgra.application.mgt.core/src/test/java/io/entgra => io.entgra.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core}/application/mgt/core/management/ApplicationManagementTest.java (85%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/Platform.xml (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/application-mgt.xml (91%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/carbon-home/dbscripts/h2.sql (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/carbon-home/repository/conf/application-mgt.xml (91%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/carbon-home/repository/conf/carbon.xml (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/carbon-home/repository/conf/cdm-config.xml (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/carbon-home/repository/conf/datasources/master-datasources.xml (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/carbon-home/repository/conf/etc/jmx.xml (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/carbon-home/repository/conf/etc/launch.ini (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/carbon-home/repository/conf/etc/mime.mappings (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/carbon-home/repository/conf/etc/mime.types (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/carbon-home/repository/conf/log4j.properties (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/carbon-home/repository/conf/registry.xml (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/carbon-home/repository/conf/security/authenticators.xml (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/carbon-home/repository/conf/tomcat/web.xml (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/carbon-home/repository/conf/user-mgt.xml (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/datasource/data-source-config.xml (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/h2.sql (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/log4j.properties (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/samples/app1/banner1.jpg (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/samples/app1/icon.png (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/samples/app1/sample.apk (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/samples/app1/shot1.png (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/samples/app1/shot2.png (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/samples/app1/shot3.png (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/samples/app2/banner1.jpg (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/samples/app2/icon.png (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/samples/app2/sample_4.0.6.apk (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/samples/app2/shot1.png (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/samples/app2/shot2.png (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/samples/app2/shot3.png (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/testng.xml (52%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/user-test/user-mgt-registry-test.xml (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/util/app-debug.apk (100%) rename components/application-mgt/{io.entgra.application.mgt.core => io.entgra.device.mgt.core.application.mgt.core}/src/test/resources/util/iOSMDMAgent.ipa (100%) rename components/application-mgt/{io.entgra.application.mgt.publisher.api => io.entgra.device.mgt.core.application.mgt.publisher.api}/pom.xml (96%) rename components/application-mgt/{io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services => io.entgra.device.mgt.core.application.mgt.publisher.api/src/main/java/io/entgra/device/mgt/core/application/mgt/publisher/api}/ApplicationManagementPublisherAPI.java (97%) rename components/application-mgt/{io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services => io.entgra.device.mgt.core.application.mgt.publisher.api/src/main/java/io/entgra/device/mgt/core/application/mgt/publisher/api}/SPApplicationService.java (97%) rename components/application-mgt/{io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services => io.entgra.device.mgt.core.application.mgt.publisher.api/src/main/java/io/entgra/device/mgt/core/application/mgt/publisher/api}/admin/ApplicationManagementPublisherAdminAPI.java (98%) rename components/application-mgt/{io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services => io.entgra.device.mgt.core.application.mgt.publisher.api/src/main/java/io/entgra/device/mgt/core/application/mgt/publisher/api}/admin/ReviewManagementPublisherAdminAPI.java (97%) rename components/application-mgt/{io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services => io.entgra.device.mgt.core.application.mgt.publisher.api/src/main/java/io/entgra/device/mgt/core/application/mgt/publisher/api}/impl/ApplicationManagementPublisherAPIImpl.java (94%) rename components/application-mgt/{io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services => io.entgra.device.mgt.core.application.mgt.publisher.api/src/main/java/io/entgra/device/mgt/core/application/mgt/publisher/api}/impl/SPApplicationServiceImpl.java (92%) rename components/application-mgt/{io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services => io.entgra.device.mgt.core.application.mgt.publisher.api/src/main/java/io/entgra/device/mgt/core/application/mgt/publisher/api}/impl/admin/ApplicationManagementPublisherAdminAPIImpl.java (93%) rename components/application-mgt/{io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services => io.entgra.device.mgt.core.application.mgt.publisher.api/src/main/java/io/entgra/device/mgt/core/application/mgt/publisher/api}/impl/admin/ReviewManagementPublisherAdminAPIImpl.java (84%) rename components/application-mgt/{io.entgra.application.mgt.publisher.api => io.entgra.device.mgt.core.application.mgt.publisher.api}/src/main/webapp/META-INF/permissions.xml (100%) rename components/application-mgt/{io.entgra.application.mgt.publisher.api => io.entgra.device.mgt.core.application.mgt.publisher.api}/src/main/webapp/META-INF/webapp-classloading.xml (100%) rename components/application-mgt/{io.entgra.application.mgt.publisher.api => io.entgra.device.mgt.core.application.mgt.publisher.api}/src/main/webapp/WEB-INF/cxf-servlet.xml (70%) rename components/application-mgt/{io.entgra.application.mgt.publisher.api => io.entgra.device.mgt.core.application.mgt.publisher.api}/src/main/webapp/WEB-INF/web.xml (97%) rename components/application-mgt/{io.entgra.application.mgt.store.api => io.entgra.device.mgt.core.application.mgt.store.api}/pom.xml (96%) rename components/application-mgt/{io.entgra.application.mgt.store.api/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core}/application/mgt/store/api/beans/SubscriptionStatusBean.java (93%) rename components/application-mgt/{io.entgra.application.mgt.store.api/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core}/application/mgt/store/api/services/ApplicationManagementAPI.java (96%) rename components/application-mgt/{io.entgra.application.mgt.store.api/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core}/application/mgt/store/api/services/ReviewManagementAPI.java (97%) rename components/application-mgt/{io.entgra.application.mgt.store.api/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core}/application/mgt/store/api/services/SubscriptionManagementAPI.java (99%) rename components/application-mgt/{io.entgra.application.mgt.store.api/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core}/application/mgt/store/api/services/admin/ReviewManagementStoreAdminAPI.java (96%) rename components/application-mgt/{io.entgra.application.mgt.store.api/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core}/application/mgt/store/api/services/admin/SubscriptionManagementAdminAPI.java (97%) rename components/application-mgt/{io.entgra.application.mgt.store.api/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core}/application/mgt/store/api/services/impl/ApplicationManagementAPIImpl.java (88%) rename components/application-mgt/{io.entgra.application.mgt.store.api/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core}/application/mgt/store/api/services/impl/ReviewManagementAPIImpl.java (92%) rename components/application-mgt/{io.entgra.application.mgt.store.api/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core}/application/mgt/store/api/services/impl/SubscriptionManagementAPIImpl.java (92%) rename components/application-mgt/{io.entgra.application.mgt.store.api/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core}/application/mgt/store/api/services/impl/admin/ReviewManagementStoreAdminAPIImpl.java (80%) rename components/application-mgt/{io.entgra.application.mgt.store.api/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core}/application/mgt/store/api/services/impl/admin/SubscriptionManagementAdminAPIImpl.java (86%) rename components/application-mgt/{io.entgra.application.mgt.store.api/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core}/application/mgt/store/api/services/impl/util/RequestValidationUtil.java (96%) rename components/application-mgt/{io.entgra.application.mgt.store.api/src/main/java/io/entgra => io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core}/application/mgt/store/api/util/Constants.java (98%) rename components/application-mgt/{io.entgra.application.mgt.store.api => io.entgra.device.mgt.core.application.mgt.store.api}/src/main/webapp/META-INF/permissions.xml (100%) rename components/application-mgt/{io.entgra.application.mgt.store.api => io.entgra.device.mgt.core.application.mgt.store.api}/src/main/webapp/META-INF/webapp-classloading.xml (100%) rename components/application-mgt/{io.entgra.application.mgt.store.api => io.entgra.device.mgt.core.application.mgt.store.api}/src/main/webapp/WEB-INF/cxf-servlet.xml (68%) rename components/application-mgt/{io.entgra.application.mgt.store.api => io.entgra.device.mgt.core.application.mgt.store.api}/src/main/webapp/WEB-INF/web.xml (97%) rename components/application-mgt/{io.entgra.application.mgt.store.api/src/test/java/io/entgra => io.entgra.device.mgt.core.application.mgt.store.api/src/test/java/io/entgra/device/mgt/core}/application/mgt/store/api/services/CommentMgtTestHelper.java (91%) rename components/application-mgt/{io.entgra.application.mgt.store.api/src/test/java/io/entgra => io.entgra.device.mgt.core.application.mgt.store.api/src/test/java/io/entgra/device/mgt/core}/application/mgt/store/api/services/ReviewManagementAPITest.java (97%) rename components/application-mgt/{io.entgra.application.mgt.store.api => io.entgra.device.mgt.core.application.mgt.store.api}/src/test/resources/log4j.properties (100%) rename components/application-mgt/{io.entgra.application.mgt.store.api => io.entgra.device.mgt.core.application.mgt.store.api}/src/test/resources/testng.xml (89%) diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api/impl/GrafanaAPIProxyServiceImpl.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api/impl/GrafanaAPIProxyServiceImpl.java index 17199e73cb..8d8a2f7cc9 100644 --- a/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api/impl/GrafanaAPIProxyServiceImpl.java +++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api/impl/GrafanaAPIProxyServiceImpl.java @@ -50,7 +50,7 @@ public class GrafanaAPIProxyServiceImpl implements GrafanaAPIProxyService { } catch (RefererNotValid e) { return GrafanaRequestHandlerUtil.constructInvalidReferer(); } catch (SQLException | IOException | DBConnectionException | - io.entgra.application.mgt.common.exception.DBConnectionException e) { + io.entgra.device.mgt.core.application.mgt.common.exception.DBConnectionException e) { log.error(e); return GrafanaRequestHandlerUtil.constructInternalServerError(e, e.getMessage()); } diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/pom.xml b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/pom.xml index b1c01c5394..53af42ee07 100644 --- a/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/pom.xml +++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/pom.xml @@ -85,7 +85,7 @@ org.wso2.carbon, org.wso2.carbon.device.mgt.common.*, org.wso2.carbon.device.mgt.core.* - io.entgra.application.mgt.core.* + io.entgra.device.mgt.core.application.mgt.core.* !io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.internal, @@ -142,7 +142,7 @@ io.entgra.device.mgt.core - io.entgra.application.mgt.core + io.entgra.device.mgt.core.application.mgt.core org.apache.httpcomponents.wso2 diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/service/GrafanaQueryService.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/service/GrafanaQueryService.java index 38845b21d4..47528a88bc 100644 --- a/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/service/GrafanaQueryService.java +++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/service/GrafanaQueryService.java @@ -29,6 +29,6 @@ public interface GrafanaQueryService { void buildSafeQuery(JsonObject queryRequestBody, String dashboardUID, String panelId, URI requestUri) throws IOException, SQLException, GrafanaManagementException, - DBConnectionException, io.entgra.application.mgt.common.exception.DBConnectionException; + DBConnectionException, io.entgra.device.mgt.core.application.mgt.common.exception.DBConnectionException; } diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/service/impl/GrafanaQueryServiceImpl.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/service/impl/GrafanaQueryServiceImpl.java index 44ea539ec4..c55c17b359 100644 --- a/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/service/impl/GrafanaQueryServiceImpl.java +++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/service/impl/GrafanaQueryServiceImpl.java @@ -51,7 +51,7 @@ public class GrafanaQueryServiceImpl implements GrafanaQueryService { } public void buildSafeQuery(JsonObject queryRequestBody, String dashboardUID, String panelId, URI requestUri) - throws IOException, SQLException, GrafanaManagementException, DBConnectionException, io.entgra.application.mgt.common.exception.DBConnectionException { + throws IOException, SQLException, GrafanaManagementException, DBConnectionException, io.entgra.device.mgt.core.application.mgt.common.exception.DBConnectionException { JsonArray queries = queryRequestBody.getAsJsonArray(GrafanaConstants.QUERY_BODY_QUERIES_KEY); for (int i = 0; i < queries.size(); i++) { JsonObject queryObj = queries.get(i).getAsJsonObject(); @@ -118,7 +118,7 @@ public class GrafanaQueryServiceImpl implements GrafanaQueryService { private void encodeQuery(JsonObject queryObj, Datasource datasource, String queryTemplate, String rawSql) throws SQLException, GrafanaManagementException, DBConnectionException, - io.entgra.application.mgt.common.exception.DBConnectionException { + io.entgra.device.mgt.core.application.mgt.common.exception.DBConnectionException { PreparedQuery pq = GrafanaPreparedQueryBuilder.build(queryTemplate, rawSql); String encodedQuery = QueryEncoderFactory.createEncoder(datasource.getType(), datasource.getName()).encode(pq); CacheManager.getInstance().getEncodedQueryCache().put(rawSql, encodedQuery); diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/sql/connection/GrafanaDatasourceConnectionFactory.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/sql/connection/GrafanaDatasourceConnectionFactory.java index 234af41d0d..d485702564 100644 --- a/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/sql/connection/GrafanaDatasourceConnectionFactory.java +++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/sql/connection/GrafanaDatasourceConnectionFactory.java @@ -1,8 +1,8 @@ package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.sql.connection; -import io.entgra.application.mgt.core.config.Configuration; -import io.entgra.application.mgt.core.config.ConfigurationManager; -import io.entgra.application.mgt.core.util.ConnectionManagerUtil; +import io.entgra.device.mgt.core.application.mgt.core.config.Configuration; +import io.entgra.device.mgt.core.application.mgt.core.config.ConfigurationManager; +import io.entgra.device.mgt.core.application.mgt.core.util.ConnectionManagerUtil; import org.wso2.carbon.device.mgt.common.exceptions.DBConnectionException; import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager; import org.wso2.carbon.device.mgt.core.config.DeviceManagementConfig; @@ -24,7 +24,7 @@ public class GrafanaDatasourceConnectionFactory { private static final Configuration applicationMgtConfig = ConfigurationManager.getInstance().getConfiguration(); public static Connection getConnection(String databaseName) throws SQLException, DBConnectionException, - io.entgra.application.mgt.common.exception.DBConnectionException { + io.entgra.device.mgt.core.application.mgt.common.exception.DBConnectionException { if(databaseName.equals(getReportManagementDatasourceName())) { ReportMgtConnectionManager.openDBConnection(); return ReportMgtConnectionManager.getDBConnection(); diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/sql/query/encoder/MySQLQueryEncoder.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/sql/query/encoder/MySQLQueryEncoder.java index a805755a94..dbe84c29d7 100644 --- a/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/sql/query/encoder/MySQLQueryEncoder.java +++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/sql/query/encoder/MySQLQueryEncoder.java @@ -41,7 +41,7 @@ public class MySQLQueryEncoder implements QueryEncoder { @Override public String encode(PreparedQuery preparedQuery) throws SQLException, DBConnectionException, - io.entgra.application.mgt.common.exception.DBConnectionException { + io.entgra.device.mgt.core.application.mgt.common.exception.DBConnectionException { try { Connection con = GrafanaDatasourceConnectionFactory.getConnection(databaseName); PreparedStatement stmt = con.prepareStatement(preparedQuery.getPreparedSQL()); diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/sql/query/encoder/QueryEncoder.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/sql/query/encoder/QueryEncoder.java index 0b2fbe02ae..c471df205d 100644 --- a/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/sql/query/encoder/QueryEncoder.java +++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/sql/query/encoder/QueryEncoder.java @@ -24,6 +24,6 @@ import java.sql.SQLException; public interface QueryEncoder { - String encode(PreparedQuery preparedQuery) throws SQLException, DBConnectionException, io.entgra.application.mgt.common.exception.DBConnectionException; + String encode(PreparedQuery preparedQuery) throws SQLException, DBConnectionException, io.entgra.device.mgt.core.application.mgt.common.exception.DBConnectionException; } diff --git a/components/application-mgt/io.entgra.application.mgt.addons/pom.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/pom.xml similarity index 95% rename from components/application-mgt/io.entgra.application.mgt.addons/pom.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/pom.xml index bf54787911..39b74a2045 100644 --- a/components/application-mgt/io.entgra.application.mgt.addons/pom.xml +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/pom.xml @@ -25,7 +25,7 @@ 4.0.0 - io.entgra.application.mgt.addons + io.entgra.device.mgt.core.application.mgt.addons Entgra - Application Management Add-Ons Entgra - Application Management Add-Ons https://entgra.io @@ -52,7 +52,7 @@ io.swagger.annotations.*;resolution:=optional - io.entgra.application.mgt.addons.* + io.entgra.device.mgt.core.application.mgt.addons.* @@ -111,7 +111,7 @@ io.entgra.device.mgt.core - io.entgra.application.mgt.common + io.entgra.device.mgt.core.application.mgt.common javax.servlet diff --git a/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/ApiOriginFilter.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core/application/mgt/addons/ApiOriginFilter.java similarity index 96% rename from components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/ApiOriginFilter.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core/application/mgt/addons/ApiOriginFilter.java index 62ba2f3521..2b2c65dfe4 100644 --- a/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/ApiOriginFilter.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core/application/mgt/addons/ApiOriginFilter.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.addons; +package io.entgra.device.mgt.core.application.mgt.addons; import javax.servlet.Filter; 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.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core/application/mgt/addons/FileStreamingOutput.java similarity index 89% rename from components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/FileStreamingOutput.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core/application/mgt/addons/FileStreamingOutput.java index 3012adf008..dd6f56cd52 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.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core/application/mgt/addons/FileStreamingOutput.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.addons; +package io.entgra.device.mgt.core.application.mgt.addons; import javax.ws.rs.WebApplicationException; @@ -24,7 +24,7 @@ import java.io.InputStream; import java.io.OutputStream; /** - * io.entgra.application.mgt.addons.FileStreamingOutput to allow the user to send the files as Stream. + * io.entgra.device.mgt.core.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.addons/src/main/java/io/entgra/application/mgt/addons/JSONMessageHandler.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core/application/mgt/addons/JSONMessageHandler.java similarity index 95% rename from components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/JSONMessageHandler.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core/application/mgt/addons/JSONMessageHandler.java index 9aa828b34c..3834cedd01 100644 --- a/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/JSONMessageHandler.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core/application/mgt/addons/JSONMessageHandler.java @@ -14,11 +14,11 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.addons; +package io.entgra.device.mgt.core.application.mgt.addons; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import io.entgra.application.mgt.addons.jaxrs.AnnotationExclusionStrategy; +import io.entgra.device.mgt.core.application.mgt.addons.jaxrs.AnnotationExclusionStrategy; import javax.ws.rs.Consumes; import javax.ws.rs.Produces; diff --git a/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/MultipartCustomProvider.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core/application/mgt/addons/MultipartCustomProvider.java similarity index 94% rename from components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/MultipartCustomProvider.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core/application/mgt/addons/MultipartCustomProvider.java index 3a8c2d42ea..1ef766a957 100644 --- a/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/MultipartCustomProvider.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core/application/mgt/addons/MultipartCustomProvider.java @@ -14,14 +14,14 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.addons; +package io.entgra.device.mgt.core.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 io.entgra.application.mgt.addons.jaxrs.AnnotationExclusionStrategy; +import io.entgra.device.mgt.core.application.mgt.addons.jaxrs.AnnotationExclusionStrategy; import javax.ws.rs.Consumes; import javax.ws.rs.WebApplicationException; diff --git a/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/ValidationInterceptor.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core/application/mgt/addons/ValidationInterceptor.java similarity index 98% rename from components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/ValidationInterceptor.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core/application/mgt/addons/ValidationInterceptor.java index 43182bafdc..c445b4f55a 100644 --- a/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/ValidationInterceptor.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core/application/mgt/addons/ValidationInterceptor.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.addons; +package io.entgra.device.mgt.core.application.mgt.addons; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/jaxrs/AnnotationExclusionStrategy.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core/application/mgt/addons/jaxrs/AnnotationExclusionStrategy.java similarity index 94% rename from components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/jaxrs/AnnotationExclusionStrategy.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core/application/mgt/addons/jaxrs/AnnotationExclusionStrategy.java index 5a4932532c..10ef809f55 100644 --- a/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/jaxrs/AnnotationExclusionStrategy.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core/application/mgt/addons/jaxrs/AnnotationExclusionStrategy.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.addons.jaxrs; +package io.entgra.device.mgt.core.application.mgt.addons.jaxrs; import com.google.gson.ExclusionStrategy; import com.google.gson.FieldAttributes; diff --git a/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/jaxrs/Exclude.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core/application/mgt/addons/jaxrs/Exclude.java similarity index 94% rename from components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/jaxrs/Exclude.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core/application/mgt/addons/jaxrs/Exclude.java index 1f42ccb335..c63b950ef6 100644 --- a/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/jaxrs/Exclude.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core/application/mgt/addons/jaxrs/Exclude.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.addons.jaxrs; +package io.entgra.device.mgt.core.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/pom.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.api/pom.xml similarity index 96% rename from components/application-mgt/io.entgra.application.mgt.api/pom.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.api/pom.xml index 87fec0225f..0bba1e6e71 100644 --- a/components/application-mgt/io.entgra.application.mgt.api/pom.xml +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.api/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - io.entgra.application.mgt.api + io.entgra.device.mgt.core.application.mgt.api war Entgra - Application Management API Entgra - Application Management API @@ -154,12 +154,12 @@ io.entgra.device.mgt.core - io.entgra.application.mgt.core + io.entgra.device.mgt.core.application.mgt.core provided io.entgra.device.mgt.core - io.entgra.application.mgt.common + io.entgra.device.mgt.core.application.mgt.common provided @@ -218,7 +218,7 @@ io.entgra.device.mgt.core - io.entgra.application.mgt.addons + io.entgra.device.mgt.core.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.device.mgt.core.application.mgt.api/src/main/java/io/entgra/device/mgt/core/application/mgt/api/ArtifactDownloadAPI.java similarity index 97% rename from components/application-mgt/io.entgra.application.mgt.api/src/main/java/io/entgra/application/mgt/api/services/ArtifactDownloadAPI.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.api/src/main/java/io/entgra/device/mgt/core/application/mgt/api/ArtifactDownloadAPI.java index 0c0f3ae551..6956f57b9c 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.device.mgt.core.application.mgt.api/src/main/java/io/entgra/device/mgt/core/application/mgt/api/ArtifactDownloadAPI.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.api.services; +package io.entgra.device.mgt.core.application.mgt.api; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -26,8 +26,8 @@ import io.swagger.annotations.Extension; import io.swagger.annotations.ExtensionProperty; import io.swagger.annotations.Info; import io.swagger.annotations.SwaggerDefinition; -import io.entgra.application.mgt.common.ApplicationList; -import io.entgra.application.mgt.common.ErrorResponse; +import io.entgra.device.mgt.core.application.mgt.common.ApplicationList; +import io.entgra.device.mgt.core.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/java/io/entgra/application/mgt/api/services/impl/ArtifactDownloadAPIImpl.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.api/src/main/java/io/entgra/device/mgt/core/application/mgt/api/impl/ArtifactDownloadAPIImpl.java similarity index 91% rename from components/application-mgt/io.entgra.application.mgt.api/src/main/java/io/entgra/application/mgt/api/services/impl/ArtifactDownloadAPIImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.api/src/main/java/io/entgra/device/mgt/core/application/mgt/api/impl/ArtifactDownloadAPIImpl.java index 51a5074e13..b6b7938132 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.device.mgt.core.application.mgt.api/src/main/java/io/entgra/device/mgt/core/application/mgt/api/impl/ArtifactDownloadAPIImpl.java @@ -15,19 +15,19 @@ * under the License. */ -package io.entgra.application.mgt.api.services.impl; +package io.entgra.device.mgt.core.application.mgt.api.impl; 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 io.entgra.application.mgt.common.exception.ApplicationManagementException; -import io.entgra.application.mgt.common.services.ApplicationManager; -import io.entgra.application.mgt.common.services.AppmDataHandler; -import io.entgra.application.mgt.core.exception.BadRequestException; -import io.entgra.application.mgt.core.exception.NotFoundException; -import io.entgra.application.mgt.core.util.APIUtil; -import io.entgra.application.mgt.core.util.Constants; +import io.entgra.device.mgt.core.application.mgt.api.ArtifactDownloadAPI; +import io.entgra.device.mgt.core.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.device.mgt.core.application.mgt.common.services.ApplicationManager; +import io.entgra.device.mgt.core.application.mgt.common.services.AppmDataHandler; +import io.entgra.device.mgt.core.application.mgt.core.exception.BadRequestException; +import io.entgra.device.mgt.core.application.mgt.core.exception.NotFoundException; +import io.entgra.device.mgt.core.application.mgt.core.util.APIUtil; +import io.entgra.device.mgt.core.application.mgt.core.util.Constants; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/components/application-mgt/io.entgra.application.mgt.api/src/main/webapp/META-INF/permissions.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.api/src/main/webapp/META-INF/permissions.xml similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.api/src/main/webapp/META-INF/permissions.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.api/src/main/webapp/META-INF/permissions.xml diff --git a/components/application-mgt/io.entgra.application.mgt.api/src/main/webapp/META-INF/webapp-classloading.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.api/src/main/webapp/META-INF/webapp-classloading.xml similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.api/src/main/webapp/META-INF/webapp-classloading.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.api/src/main/webapp/META-INF/webapp-classloading.xml 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.device.mgt.core.application.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml similarity index 78% rename from components/application-mgt/io.entgra.application.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml index e9c391e1de..f1fbbd15c6 100644 --- a/components/application-mgt/io.entgra.application.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml @@ -36,7 +36,7 @@ - + @@ -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.device.mgt.core.application.mgt.api/src/main/webapp/WEB-INF/web.xml similarity index 97% rename from components/application-mgt/io.entgra.application.mgt.api/src/main/webapp/WEB-INF/web.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.api/src/main/webapp/WEB-INF/web.xml index 5917cf8aaa..48d35b6dcd 100644 --- a/components/application-mgt/io.entgra.application.mgt.api/src/main/webapp/WEB-INF/web.xml +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.api/src/main/webapp/WEB-INF/web.xml @@ -74,7 +74,7 @@ ApiOriginFilter - io.entgra.application.mgt.addons.ApiOriginFilter + io.entgra.device.mgt.core.application.mgt.addons.ApiOriginFilter diff --git a/components/application-mgt/io.entgra.application.mgt.common/pom.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/pom.xml similarity index 96% rename from components/application-mgt/io.entgra.application.mgt.common/pom.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/pom.xml index 14cd91cce7..b8461521a6 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/pom.xml +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/pom.xml @@ -26,7 +26,7 @@ 4.0.0 - io.entgra.application.mgt.common + io.entgra.device.mgt.core.application.mgt.common bundle Entgra - Application Management Common Entgra - Application Management Common @@ -58,7 +58,7 @@ javax.xml.bind.annotation; version="${javax.xml.bind.imp.pkg.version}", - io.entgra.application.mgt.common.* + io.entgra.device.mgt.core.application.mgt.common.* diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/AppLifecycleState.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/AppLifecycleState.java similarity index 93% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/AppLifecycleState.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/AppLifecycleState.java index 7c068158d2..fbc1d49537 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/AppLifecycleState.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/AppLifecycleState.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; /** diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/AppOperation.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/AppOperation.java similarity index 95% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/AppOperation.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/AppOperation.java index 100042f892..e725c18c54 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/AppOperation.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/AppOperation.java @@ -14,9 +14,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; -import io.entgra.application.mgt.common.dto.ApplicationDTO; +import io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationDTO; public class AppOperation { diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationArtifact.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ApplicationArtifact.java similarity index 97% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationArtifact.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ApplicationArtifact.java index 1485ef0e11..c3b6269440 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationArtifact.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ApplicationArtifact.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; import java.io.InputStream; import java.util.Map; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationInstallResponse.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ApplicationInstallResponse.java similarity index 97% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationInstallResponse.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ApplicationInstallResponse.java index bd77ad4079..a4dd62eb0a 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationInstallResponse.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ApplicationInstallResponse.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; import io.swagger.annotations.ApiModelProperty; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationInstaller.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ApplicationInstaller.java similarity index 95% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationInstaller.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ApplicationInstaller.java index 78876f0d43..099a380ac5 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationInstaller.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ApplicationInstaller.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; public class ApplicationInstaller { diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationList.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ApplicationList.java similarity index 85% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationList.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ApplicationList.java index 9d725dd6b5..fea02f351a 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationList.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ApplicationList.java @@ -14,10 +14,10 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; -import io.entgra.application.mgt.common.dto.ApplicationDTO; -import io.entgra.application.mgt.common.response.Application; +import io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationDTO; +import io.entgra.device.mgt.core.application.mgt.common.response.Application; import java.util.List; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationSubscriptionInfo.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ApplicationSubscriptionInfo.java similarity index 96% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationSubscriptionInfo.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ApplicationSubscriptionInfo.java index d8c0736f65..0abcff66c7 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationSubscriptionInfo.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ApplicationSubscriptionInfo.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.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/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationSubscriptionType.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ApplicationSubscriptionType.java similarity index 93% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationSubscriptionType.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ApplicationSubscriptionType.java index 9dadc7ebd7..f237808d0e 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationSubscriptionType.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ApplicationSubscriptionType.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; /** * Possible Subscription Type of the application. diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationType.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ApplicationType.java similarity index 93% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationType.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ApplicationType.java index 54d091aeb1..cb9f448c2d 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ApplicationType.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ApplicationType.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; /** diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/BasePaginatedResult.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/BasePaginatedResult.java similarity index 95% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/BasePaginatedResult.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/BasePaginatedResult.java index b32f6c553e..2ebe14a5da 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/BasePaginatedResult.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/BasePaginatedResult.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/BasicUserInfo.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/BasicUserInfo.java similarity index 97% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/BasicUserInfo.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/BasicUserInfo.java index ece8ad6867..2e33f3bf8c 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/BasicUserInfo.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/BasicUserInfo.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/BasicUserInfoList.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/BasicUserInfoList.java similarity index 96% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/BasicUserInfoList.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/BasicUserInfoList.java index e7f0747298..b49c46b3ab 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/BasicUserInfoList.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/BasicUserInfoList.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModel; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/DeviceGroupList.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/DeviceGroupList.java similarity index 96% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/DeviceGroupList.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/DeviceGroupList.java index bb7daca91a..8616601de9 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/DeviceGroupList.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/DeviceGroupList.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/DeviceList.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/DeviceList.java similarity index 96% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/DeviceList.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/DeviceList.java index 692a3a8aed..164ba1e6ff 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/DeviceList.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/DeviceList.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/DeviceSubscriptionData.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/DeviceSubscriptionData.java similarity index 97% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/DeviceSubscriptionData.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/DeviceSubscriptionData.java index ea1f09e6c5..842336495e 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/DeviceSubscriptionData.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/DeviceSubscriptionData.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; import org.wso2.carbon.device.mgt.common.Device; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/DeviceTypes.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/DeviceTypes.java similarity index 92% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/DeviceTypes.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/DeviceTypes.java index fed66c582c..5bb12111d4 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/DeviceTypes.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/DeviceTypes.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; public enum DeviceTypes { ANDROID, IOS, WINDOWS diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/EnterpriseInstallationDetails.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/EnterpriseInstallationDetails.java similarity index 97% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/EnterpriseInstallationDetails.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/EnterpriseInstallationDetails.java index 49986c11bd..51ccbd000b 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/EnterpriseInstallationDetails.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/EnterpriseInstallationDetails.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ErrorListItem.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ErrorListItem.java similarity index 97% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ErrorListItem.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ErrorListItem.java index 143c1374ff..7cb8ab628b 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ErrorListItem.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ErrorListItem.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModel; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ErrorResponse.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ErrorResponse.java similarity index 98% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ErrorResponse.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ErrorResponse.java index 6a7673bba8..ffa3c777e4 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ErrorResponse.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ErrorResponse.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModel; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ExecutionStatus.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ExecutionStatus.java similarity index 90% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ExecutionStatus.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ExecutionStatus.java index dc4a8f2197..4f4c55ffd8 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ExecutionStatus.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ExecutionStatus.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; public enum ExecutionStatus { PENDING, EXECUTED, FAILED diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/FileDataHolder.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/FileDataHolder.java similarity index 95% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/FileDataHolder.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/FileDataHolder.java index 1a3d4cfd8c..f5c83acc64 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/FileDataHolder.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/FileDataHolder.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; import java.io.InputStream; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/Filter.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/Filter.java similarity index 98% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/Filter.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/Filter.java index 16858d7f90..cc6efb41db 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/Filter.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/Filter.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; import java.util.List; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/IdentityServerResponse.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/IdentityServerResponse.java similarity index 97% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/IdentityServerResponse.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/IdentityServerResponse.java index 69f33f7c66..05fe5d4636 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/IdentityServerResponse.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/IdentityServerResponse.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; import java.util.HashMap; import java.util.List; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ImageArtifact.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ImageArtifact.java similarity index 96% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ImageArtifact.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ImageArtifact.java index e885ffbcf8..f6e3d95ab1 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ImageArtifact.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ImageArtifact.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; /** * This represents a image artifact of a application. Icon, Screen-shot or Banner. diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/InstallationDetails.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/InstallationDetails.java similarity index 96% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/InstallationDetails.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/InstallationDetails.java index 22ade53450..7dd06d6bb8 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/InstallationDetails.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/InstallationDetails.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; import io.swagger.annotations.ApiModelProperty; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/LifecycleChanger.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/LifecycleChanger.java similarity index 94% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/LifecycleChanger.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/LifecycleChanger.java index 2709823ddd..386d3eb7eb 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/LifecycleChanger.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/LifecycleChanger.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; public class LifecycleChanger { diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/LifecycleState.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/LifecycleState.java similarity index 98% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/LifecycleState.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/LifecycleState.java index 78ad768912..cc6c7c3193 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/LifecycleState.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/LifecycleState.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; import java.sql.Timestamp; import io.swagger.annotations.ApiModel; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/OperationStatusBean.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/OperationStatusBean.java similarity index 91% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/OperationStatusBean.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/OperationStatusBean.java index 3446d55576..66dcc97cf1 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/OperationStatusBean.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/OperationStatusBean.java @@ -1,4 +1,4 @@ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; public class OperationStatusBean { diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/Pagination.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/Pagination.java similarity index 96% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/Pagination.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/Pagination.java index c2179dcd70..511c608aaa 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/Pagination.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/Pagination.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.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/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/PaginationRequest.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/PaginationRequest.java similarity index 96% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/PaginationRequest.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/PaginationRequest.java index 794ec1a2a1..a5e6caba7b 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/PaginationRequest.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/PaginationRequest.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; /** * This class holds required parameters for a querying a paginated device response. diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/PaginationResult.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/PaginationResult.java similarity index 97% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/PaginationResult.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/PaginationResult.java index 57cbafb884..d0cc340567 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/PaginationResult.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/PaginationResult.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/Rating.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/Rating.java similarity index 96% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/Rating.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/Rating.java index 5fbb1a1e39..1cf32a3a05 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/Rating.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/Rating.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; import java.util.TreeMap; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ReviewNode.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ReviewNode.java similarity index 96% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ReviewNode.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ReviewNode.java index f8f45ef6ef..c2ae87e2aa 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/ReviewNode.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ReviewNode.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; import java.util.ArrayList; import java.util.List; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/RoleList.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/RoleList.java similarity index 96% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/RoleList.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/RoleList.java index fadca3462c..0f9ee7a86a 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/RoleList.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/RoleList.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModel; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/SPApplication.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/SPApplication.java similarity index 94% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/SPApplication.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/SPApplication.java index da4b094bfc..f65b32a9d6 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/SPApplication.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/SPApplication.java @@ -15,10 +15,10 @@ * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; -import io.entgra.application.mgt.common.response.Application; +import io.entgra.device.mgt.core.application.mgt.common.response.Application; import java.util.List; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/SPApplicationListResponse.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/SPApplicationListResponse.java similarity index 96% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/SPApplicationListResponse.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/SPApplicationListResponse.java index bbe1f5da7f..3234dbf6da 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/SPApplicationListResponse.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/SPApplicationListResponse.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; import java.util.List; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/SortingOrder.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/SortingOrder.java similarity index 93% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/SortingOrder.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/SortingOrder.java index 2479c97046..1b5030b0ef 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/SortingOrder.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/SortingOrder.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; /** diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/SubAction.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/SubAction.java similarity index 92% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/SubAction.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/SubAction.java index 1c3bd64ff9..04137f18df 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/SubAction.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/SubAction.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; public enum SubAction { INSTALL, UNINSTALL diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/SubscribingDeviceIdHolder.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/SubscribingDeviceIdHolder.java similarity index 97% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/SubscribingDeviceIdHolder.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/SubscribingDeviceIdHolder.java index be3051a314..5438d9b0c0 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/SubscribingDeviceIdHolder.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/SubscribingDeviceIdHolder.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/SubscriptionType.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/SubscriptionType.java similarity index 92% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/SubscriptionType.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/SubscriptionType.java index 048c83b721..218da4936b 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/SubscriptionType.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/SubscriptionType.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; public enum SubscriptionType { USER, ROLE, GROUP, DEVICE diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/User.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/User.java similarity index 95% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/User.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/User.java index 3e0b201126..8df4dbdcde 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/User.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/User.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common; +package io.entgra.device.mgt.core.application.mgt.common; /** * Represents an user. diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/config/ErrorCallback.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/config/ErrorCallback.java similarity index 98% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/config/ErrorCallback.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/config/ErrorCallback.java index 83a5810dd9..62819558fd 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/config/ErrorCallback.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/config/ErrorCallback.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common.config; +package io.entgra.device.mgt.core.application.mgt.common.config; import javax.xml.bind.annotation.XmlElement; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/config/LifecycleState.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/config/LifecycleState.java similarity index 97% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/config/LifecycleState.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/config/LifecycleState.java index 8f8122b437..88ee5d8fc7 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/config/LifecycleState.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/config/LifecycleState.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common.config; +package io.entgra.device.mgt.core.application.mgt.common.config; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/config/MDMConfig.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/config/MDMConfig.java similarity index 95% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/config/MDMConfig.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/config/MDMConfig.java index 1c6c47330d..df006bef67 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/config/MDMConfig.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/config/MDMConfig.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.common.config; +package io.entgra.device.mgt.core.application.mgt.common.config; import javax.xml.bind.annotation.XmlElement; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/config/RatingConfiguration.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/config/RatingConfiguration.java similarity index 95% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/config/RatingConfiguration.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/config/RatingConfiguration.java index f821d7c996..581d61b82d 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/config/RatingConfiguration.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/config/RatingConfiguration.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.common.config; +package io.entgra.device.mgt.core.application.mgt.common.config; import javax.xml.bind.annotation.XmlElement; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ApiRegistrationProfile.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/ApiRegistrationProfile.java similarity index 96% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ApiRegistrationProfile.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/ApiRegistrationProfile.java index 6d44f35478..a7ba4c4a7c 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ApiRegistrationProfile.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/ApiRegistrationProfile.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.application.mgt.common.dto; +package io.entgra.device.mgt.core.application.mgt.common.dto; public class ApiRegistrationProfile { diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ApplicationDTO.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/ApplicationDTO.java similarity index 98% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ApplicationDTO.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/ApplicationDTO.java index 2877c02f94..1c8f2a9f5f 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ApplicationDTO.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/ApplicationDTO.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common.dto; +package io.entgra.device.mgt.core.application.mgt.common.dto; import io.swagger.annotations.ApiModel; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ApplicationPolicyDTO.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/ApplicationPolicyDTO.java similarity index 96% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ApplicationPolicyDTO.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/ApplicationPolicyDTO.java index f4357d59be..8b3a419767 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ApplicationPolicyDTO.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/ApplicationPolicyDTO.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common.dto; +package io.entgra.device.mgt.core.application.mgt.common.dto; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ApplicationReleaseDTO.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/ApplicationReleaseDTO.java similarity index 99% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ApplicationReleaseDTO.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/ApplicationReleaseDTO.java index 7b5fddac63..f4de20c3c9 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ApplicationReleaseDTO.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/ApplicationReleaseDTO.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common.dto; +package io.entgra.device.mgt.core.application.mgt.common.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/CategoryDTO.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/CategoryDTO.java similarity index 94% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/CategoryDTO.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/CategoryDTO.java index a29c2b9670..56710d6321 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/CategoryDTO.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/CategoryDTO.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common.dto; +package io.entgra.device.mgt.core.application.mgt.common.dto; public class CategoryDTO { int id; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/DeviceSubscriptionDTO.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/DeviceSubscriptionDTO.java similarity index 97% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/DeviceSubscriptionDTO.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/DeviceSubscriptionDTO.java index b2cd3d1572..4100eb30c7 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/DeviceSubscriptionDTO.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/DeviceSubscriptionDTO.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.common.dto; +package io.entgra.device.mgt.core.application.mgt.common.dto; import java.sql.Timestamp; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/GroupSubscriptionDTO.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/GroupSubscriptionDTO.java similarity index 97% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/GroupSubscriptionDTO.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/GroupSubscriptionDTO.java index a01b2b08bc..65870d3a1d 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/GroupSubscriptionDTO.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/GroupSubscriptionDTO.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.common.dto; +package io.entgra.device.mgt.core.application.mgt.common.dto; import java.sql.Timestamp; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/IdentityServerDTO.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/IdentityServerDTO.java similarity index 97% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/IdentityServerDTO.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/IdentityServerDTO.java index bf1ed88fef..7f8494dc2d 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/IdentityServerDTO.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/IdentityServerDTO.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.common.dto; +package io.entgra.device.mgt.core.application.mgt.common.dto; import com.google.gson.Gson; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/IdentityServiceProviderDTO.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/IdentityServiceProviderDTO.java similarity index 94% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/IdentityServiceProviderDTO.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/IdentityServiceProviderDTO.java index d9e8e2ac60..03329f60dc 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/IdentityServiceProviderDTO.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/IdentityServiceProviderDTO.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.common.dto; +package io.entgra.device.mgt.core.application.mgt.common.dto; import java.util.List; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ReviewDTO.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/ReviewDTO.java similarity index 97% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ReviewDTO.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/ReviewDTO.java index 24dbb6125c..1e2b450fac 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ReviewDTO.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/ReviewDTO.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.common.dto; +package io.entgra.device.mgt.core.application.mgt.common.dto; import java.sql.Timestamp; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/RoleSubscriptionDTO.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/RoleSubscriptionDTO.java similarity index 97% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/RoleSubscriptionDTO.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/RoleSubscriptionDTO.java index 075e96d083..6d975cf29d 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/RoleSubscriptionDTO.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/RoleSubscriptionDTO.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.common.dto; +package io.entgra.device.mgt.core.application.mgt.common.dto; import java.sql.Timestamp; 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.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/ScheduledSubscriptionDTO.java similarity index 90% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/ScheduledSubscriptionDTO.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/ScheduledSubscriptionDTO.java index 59ad166e80..4fc5ef52f5 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.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/ScheduledSubscriptionDTO.java @@ -16,11 +16,13 @@ * under the License. */ -package io.entgra.application.mgt.common.dto; +package io.entgra.device.mgt.core.application.mgt.common.dto; import com.google.gson.Gson; -import io.entgra.application.mgt.common.ExecutionStatus; -import io.entgra.application.mgt.common.SubscriptionType; +import io.entgra.device.mgt.core.application.mgt.common.ExecutionStatus; +import io.entgra.device.mgt.core.application.mgt.common.SubscriptionType; +import io.entgra.device.mgt.core.application.mgt.common.SubAction; +import io.entgra.device.mgt.core.application.mgt.common.response.ApplicationRelease; import java.util.List; import java.util.stream.Collectors; @@ -40,7 +42,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 io.entgra.application.mgt.common.SubAction} + * {@code ACTION} - {@see {@linkplain SubAction } * {@code HASH-VALUE} - this is a hash value of the combination of application uuid and the subscriber list. * * Example: {@code DEVICE_INSTALL_e593e00e8ef55efc764295b6aa9ad56b} @@ -49,7 +51,7 @@ public class ScheduledSubscriptionDTO { /** * UUID of the application release which is subscribed to. - * {@see {@link io.entgra.application.mgt.common.response.ApplicationRelease}} + * {@see {@link ApplicationRelease }} */ private String applicationUUID; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/TagDTO.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/TagDTO.java similarity index 94% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/TagDTO.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/TagDTO.java index cb06a8a1ce..a50d27c610 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/TagDTO.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/TagDTO.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.common.dto; +package io.entgra.device.mgt.core.application.mgt.common.dto; public class TagDTO { diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/UserSubscriptionDTO.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/UserSubscriptionDTO.java similarity index 94% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/UserSubscriptionDTO.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/UserSubscriptionDTO.java index 4b318df937..90b58d9aa6 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/dto/UserSubscriptionDTO.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/UserSubscriptionDTO.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.common.dto; +package io.entgra.device.mgt.core.application.mgt.common.dto; import java.sql.Timestamp; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ApplicationCategoryManagementException.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/ApplicationCategoryManagementException.java similarity index 93% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ApplicationCategoryManagementException.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/ApplicationCategoryManagementException.java index 206b4d1970..3c0e8b67b5 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ApplicationCategoryManagementException.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/ApplicationCategoryManagementException.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.common.exception; +package io.entgra.device.mgt.core.application.mgt.common.exception; /** * Exception that will be thrown during Application Category Management. diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ApplicationManagementException.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/ApplicationManagementException.java similarity index 95% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ApplicationManagementException.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/ApplicationManagementException.java index c698aa01ec..e4320d3ed0 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ApplicationManagementException.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/ApplicationManagementException.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common.exception; +package io.entgra.device.mgt.core.application.mgt.common.exception; /** * Represents the exception thrown during application management. diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ApplicationStorageManagementException.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/ApplicationStorageManagementException.java similarity index 94% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ApplicationStorageManagementException.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/ApplicationStorageManagementException.java index 0549d2e3fc..902d3e61de 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ApplicationStorageManagementException.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/ApplicationStorageManagementException.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.common.exception; +package io.entgra.device.mgt.core.application.mgt.common.exception; /** * Represents the exception thrown during storing and retrieving the artifacts. diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/DBConnectionException.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/DBConnectionException.java similarity index 94% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/DBConnectionException.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/DBConnectionException.java index e09cbae4b0..28016ddbea 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/DBConnectionException.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/DBConnectionException.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common.exception; +package io.entgra.device.mgt.core.application.mgt.common.exception; /** * Exception thrown due to Database Connection issues. diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/DeviceConnectorException.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/DeviceConnectorException.java similarity index 95% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/DeviceConnectorException.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/DeviceConnectorException.java index d6e43825fb..c9f6f59911 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/DeviceConnectorException.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/DeviceConnectorException.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common.exception; +package io.entgra.device.mgt.core.application.mgt.common.exception; /** * Represents the exception thrown during device connections. diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/IdentityServerManagementException.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/IdentityServerManagementException.java similarity index 94% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/IdentityServerManagementException.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/IdentityServerManagementException.java index f2168ec32b..97cb2e65e4 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/IdentityServerManagementException.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/IdentityServerManagementException.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.common.exception; +package io.entgra.device.mgt.core.application.mgt.common.exception; /** * Exception that will be thrown if any error occurs while calling identity server services . diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/IllegalTransactionStateException.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/IllegalTransactionStateException.java similarity index 94% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/IllegalTransactionStateException.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/IllegalTransactionStateException.java index 10400af2e0..9871188a74 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/IllegalTransactionStateException.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/IllegalTransactionStateException.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common.exception; +package io.entgra.device.mgt.core.application.mgt.common.exception; /** * Exception thrown due to an issue in database transactions. diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/InvalidConfigurationException.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/InvalidConfigurationException.java similarity index 94% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/InvalidConfigurationException.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/InvalidConfigurationException.java index 2acfdd57eb..a941fc6a6d 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/InvalidConfigurationException.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/InvalidConfigurationException.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common.exception; +package io.entgra.device.mgt.core.application.mgt.common.exception; /** * Exception thrown due to invalid configurations provided for Application Management. diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/LifecycleManagementException.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/LifecycleManagementException.java similarity index 93% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/LifecycleManagementException.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/LifecycleManagementException.java index 022e2bfcac..f2764160b1 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/LifecycleManagementException.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/LifecycleManagementException.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common.exception; +package io.entgra.device.mgt.core.application.mgt.common.exception; /** * Exception caused during the lifecycle management. diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/RequestValidatingException.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/RequestValidatingException.java similarity index 93% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/RequestValidatingException.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/RequestValidatingException.java index 62d5d06eb2..02f97d0a94 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/RequestValidatingException.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/RequestValidatingException.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.common.exception; +package io.entgra.device.mgt.core.application.mgt.common.exception; /** * Represents the exception thrown during validating the request. diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ResourceManagementException.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/ResourceManagementException.java similarity index 93% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ResourceManagementException.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/ResourceManagementException.java index 21634a38aa..ef617b843f 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ResourceManagementException.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/ResourceManagementException.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.common.exception; +package io.entgra.device.mgt.core.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/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ReviewDoesNotExistException.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/ReviewDoesNotExistException.java similarity index 94% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ReviewDoesNotExistException.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/ReviewDoesNotExistException.java index 81ed5ad18c..69d7c7f566 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ReviewDoesNotExistException.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/ReviewDoesNotExistException.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common.exception; +package io.entgra.device.mgt.core.application.mgt.common.exception; public class ReviewDoesNotExistException extends Exception { private String message; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ReviewManagementException.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/ReviewManagementException.java similarity index 94% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ReviewManagementException.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/ReviewManagementException.java index c8ef1af781..ddf61303dd 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/ReviewManagementException.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/ReviewManagementException.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common.exception; +package io.entgra.device.mgt.core.application.mgt.common.exception; public class ReviewManagementException extends Exception { private String message; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/SubscriptionManagementException.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/SubscriptionManagementException.java similarity index 94% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/SubscriptionManagementException.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/SubscriptionManagementException.java index 1abb93a98d..98571655e0 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/SubscriptionManagementException.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/SubscriptionManagementException.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.application.mgt.common.exception; +package io.entgra.device.mgt.core.application.mgt.common.exception; public class SubscriptionManagementException extends Exception { private String message; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/TransactionManagementException.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/TransactionManagementException.java similarity index 94% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/TransactionManagementException.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/TransactionManagementException.java index bb24e02638..b2a01540b0 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/TransactionManagementException.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/TransactionManagementException.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common.exception; +package io.entgra.device.mgt.core.application.mgt.common.exception; /** * Exception thrown due to an issue in TransactionManagement of Database. diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/UnsupportedDatabaseEngineException.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/UnsupportedDatabaseEngineException.java similarity index 94% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/UnsupportedDatabaseEngineException.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/UnsupportedDatabaseEngineException.java index 99613e6736..5d99ec776d 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/UnsupportedDatabaseEngineException.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/UnsupportedDatabaseEngineException.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.common.exception; +package io.entgra.device.mgt.core.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/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/VisibilityManagementException.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/VisibilityManagementException.java similarity index 94% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/VisibilityManagementException.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/VisibilityManagementException.java index 4133158ebb..a0c925d599 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/exception/VisibilityManagementException.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/VisibilityManagementException.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common.exception; +package io.entgra.device.mgt.core.application.mgt.common.exception; /** * This specialized exception is thrown by the Visibility Manager during unexpected behaviour diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/response/Application.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/response/Application.java similarity index 98% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/response/Application.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/response/Application.java index 0d11e7bfaa..a356a8b18e 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/response/Application.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/response/Application.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common.response; +package io.entgra.device.mgt.core.application.mgt.common.response; import io.swagger.annotations.ApiModelProperty; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/response/ApplicationRelease.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/response/ApplicationRelease.java similarity index 98% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/response/ApplicationRelease.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/response/ApplicationRelease.java index aff7688f18..7300622166 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/response/ApplicationRelease.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/response/ApplicationRelease.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common.response; +package io.entgra.device.mgt.core.application.mgt.common.response; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/response/Category.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/response/Category.java similarity index 94% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/response/Category.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/response/Category.java index f65614d197..8eeadb48f7 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/response/Category.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/response/Category.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.common.response; +package io.entgra.device.mgt.core.application.mgt.common.response; public class Category { diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/response/Review.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/response/Review.java similarity index 98% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/response/Review.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/response/Review.java index 5e72e376de..c42f239c79 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/response/Review.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/response/Review.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.common.response; +package io.entgra.device.mgt.core.application.mgt.common.response; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/response/Tag.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/response/Tag.java similarity index 94% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/response/Tag.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/response/Tag.java index bc58ded996..9c4481b76f 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/response/Tag.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/response/Tag.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.common.response; +package io.entgra.device.mgt.core.application.mgt.common.response; public class Tag { diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/ApplicationManager.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/services/ApplicationManager.java similarity index 93% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/ApplicationManager.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/services/ApplicationManager.java index dcc63be3b3..c564e828df 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/ApplicationManager.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/services/ApplicationManager.java @@ -14,30 +14,30 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common.services; - -import io.entgra.application.mgt.common.ApplicationType; +package io.entgra.device.mgt.core.application.mgt.common.services; + +import io.entgra.device.mgt.core.application.mgt.common.ApplicationType; +import io.entgra.device.mgt.core.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.device.mgt.core.application.mgt.common.exception.RequestValidatingException; +import io.entgra.device.mgt.core.application.mgt.common.exception.ResourceManagementException; +import io.entgra.device.mgt.core.application.mgt.common.response.Application; +import io.entgra.device.mgt.core.application.mgt.common.response.ApplicationRelease; +import io.entgra.device.mgt.core.application.mgt.common.response.Category; +import io.entgra.device.mgt.core.application.mgt.common.response.Tag; import org.wso2.carbon.device.mgt.common.Base64File; -import io.entgra.application.mgt.common.dto.ApplicationDTO; -import io.entgra.application.mgt.common.exception.ResourceManagementException; +import io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationDTO; import org.apache.cxf.jaxrs.ext.multipart.Attachment; -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.EntAppReleaseWrapper; -import io.entgra.application.mgt.common.wrapper.ApplicationUpdateWrapper; -import io.entgra.application.mgt.common.wrapper.PublicAppReleaseWrapper; -import io.entgra.application.mgt.common.wrapper.WebAppReleaseWrapper; +import io.entgra.device.mgt.core.application.mgt.common.ApplicationArtifact; +import io.entgra.device.mgt.core.application.mgt.common.LifecycleChanger; +import io.entgra.device.mgt.core.application.mgt.common.ApplicationList; +import io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationReleaseDTO; +import io.entgra.device.mgt.core.application.mgt.common.Filter; +import io.entgra.device.mgt.core.application.mgt.common.LifecycleState; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.CustomAppReleaseWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.EntAppReleaseWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.ApplicationUpdateWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.PublicAppReleaseWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.WebAppReleaseWrapper; import java.util.List; /** diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/ApplicationStorageManager.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/services/ApplicationStorageManager.java similarity index 92% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/ApplicationStorageManager.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/services/ApplicationStorageManager.java index 9c8ffb0654..66e0b277af 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/ApplicationStorageManager.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/services/ApplicationStorageManager.java @@ -15,13 +15,12 @@ * under the License. */ -package io.entgra.application.mgt.common.services; +package io.entgra.device.mgt.core.application.mgt.common.services; -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 io.entgra.device.mgt.core.application.mgt.common.ApplicationInstaller; +import io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationReleaseDTO; +import io.entgra.device.mgt.core.application.mgt.common.exception.ApplicationStorageManagementException; +import io.entgra.device.mgt.core.application.mgt.common.exception.ResourceManagementException; import org.wso2.carbon.device.mgt.core.common.exception.StorageManagementException; import java.io.InputStream; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/AppmDataHandler.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/services/AppmDataHandler.java similarity index 83% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/AppmDataHandler.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/services/AppmDataHandler.java index 5b99870c5f..ebe4e2274b 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/AppmDataHandler.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/services/AppmDataHandler.java @@ -15,11 +15,11 @@ * under the License. */ -package io.entgra.application.mgt.common.services; +package io.entgra.device.mgt.core.application.mgt.common.services; -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 io.entgra.device.mgt.core.application.mgt.common.config.LifecycleState; +import io.entgra.device.mgt.core.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.device.mgt.core.application.mgt.common.exception.LifecycleManagementException; import java.io.InputStream; import java.util.Map; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/DeviceConnector.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/services/DeviceConnector.java similarity index 86% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/DeviceConnector.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/services/DeviceConnector.java index 10a8c31258..1b54ecbbcd 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/DeviceConnector.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/services/DeviceConnector.java @@ -14,10 +14,10 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common.services; +package io.entgra.device.mgt.core.application.mgt.common.services; -import io.entgra.application.mgt.common.AppOperation; -import io.entgra.application.mgt.common.exception.DeviceConnectorException; +import io.entgra.device.mgt.core.application.mgt.common.AppOperation; +import io.entgra.device.mgt.core.application.mgt.common.exception.DeviceConnectorException; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; import java.util.List; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/ReviewManager.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/services/ReviewManager.java similarity index 85% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/ReviewManager.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/services/ReviewManager.java index 97da7397c4..2a2f6d29db 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/ReviewManager.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/services/ReviewManager.java @@ -14,15 +14,15 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common.services; +package io.entgra.device.mgt.core.application.mgt.common.services; -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; +import io.entgra.device.mgt.core.application.mgt.common.Rating; +import io.entgra.device.mgt.core.application.mgt.common.response.Review; +import io.entgra.device.mgt.core.application.mgt.common.PaginationRequest; +import io.entgra.device.mgt.core.application.mgt.common.PaginationResult; +import io.entgra.device.mgt.core.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.device.mgt.core.application.mgt.common.exception.ReviewManagementException; +import io.entgra.device.mgt.core.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/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/SPApplicationManager.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/services/SPApplicationManager.java similarity index 91% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/SPApplicationManager.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/services/SPApplicationManager.java index bd4b1dd015..563725087f 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/SPApplicationManager.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/services/SPApplicationManager.java @@ -15,15 +15,16 @@ * under the License. */ -package io.entgra.application.mgt.common.services; - -import io.entgra.application.mgt.common.IdentityServerResponse; -import io.entgra.application.mgt.common.SPApplicationListResponse; -import io.entgra.application.mgt.common.dto.IdentityServerDTO; -import io.entgra.application.mgt.common.dto.IdentityServiceProviderDTO; -import io.entgra.application.mgt.common.exception.ApplicationManagementException; -import io.entgra.application.mgt.common.exception.RequestValidatingException; -import io.entgra.application.mgt.common.response.Application; +package io.entgra.device.mgt.core.application.mgt.common.services; + +import io.entgra.device.mgt.core.application.mgt.common.IdentityServerResponse; +import io.entgra.device.mgt.core.application.mgt.common.SPApplicationListResponse; +import io.entgra.device.mgt.core.application.mgt.common.dto.IdentityServerDTO; +import io.entgra.device.mgt.core.application.mgt.common.dto.IdentityServiceProviderDTO; +import io.entgra.device.mgt.core.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.device.mgt.core.application.mgt.common.exception.RequestValidatingException; +import io.entgra.device.mgt.core.application.mgt.common.response.Application; + import java.util.List; public interface SPApplicationManager { 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.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/services/SubscriptionManager.java similarity index 94% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/services/SubscriptionManager.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/services/SubscriptionManager.java index 7b4f99e355..def655ff12 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.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/services/SubscriptionManager.java @@ -14,13 +14,14 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common.services; - -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; +package io.entgra.device.mgt.core.application.mgt.common.services; + +import io.entgra.device.mgt.core.application.mgt.common.ApplicationInstallResponse; +import io.entgra.device.mgt.core.application.mgt.common.ExecutionStatus; +import io.entgra.device.mgt.core.application.mgt.common.dto.ScheduledSubscriptionDTO; +import io.entgra.device.mgt.core.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.device.mgt.core.application.mgt.common.exception.SubscriptionManagementException; +import io.entgra.device.mgt.core.application.mgt.common.SubscriptionType; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; import org.wso2.carbon.device.mgt.common.PaginationRequest; import org.wso2.carbon.device.mgt.common.PaginationResult; @@ -138,7 +139,7 @@ public interface SubscriptionManager { * @return {@link ApplicationInstallResponse} * @throws ApplicationManagementException ApplicationManagementException if error occurs when subscribing to the * given application - * @link io.entgra.application.mgt.common.SubscriptionType}} + * @link 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.common/src/main/java/io/entgra/application/mgt/common/wrapper/ApplicationUpdateWrapper.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/wrapper/ApplicationUpdateWrapper.java similarity index 98% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/ApplicationUpdateWrapper.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/wrapper/ApplicationUpdateWrapper.java index 84da8cecb5..d32f5bd150 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/ApplicationUpdateWrapper.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/wrapper/ApplicationUpdateWrapper.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common.wrapper; +package io.entgra.device.mgt.core.application.mgt.common.wrapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/ApplicationWrapper.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/wrapper/ApplicationWrapper.java similarity index 98% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/ApplicationWrapper.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/wrapper/ApplicationWrapper.java index 82e52cdebe..339e546c96 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/ApplicationWrapper.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/wrapper/ApplicationWrapper.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common.wrapper; +package io.entgra.device.mgt.core.application.mgt.common.wrapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/CustomAppReleaseWrapper.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/wrapper/CustomAppReleaseWrapper.java similarity index 98% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/CustomAppReleaseWrapper.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/wrapper/CustomAppReleaseWrapper.java index e2d49c5dcb..63930379be 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/CustomAppReleaseWrapper.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/wrapper/CustomAppReleaseWrapper.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common.wrapper; +package io.entgra.device.mgt.core.application.mgt.common.wrapper; import org.wso2.carbon.device.mgt.common.Base64File; import io.swagger.annotations.ApiModel; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/CustomAppWrapper.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/wrapper/CustomAppWrapper.java similarity index 98% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/CustomAppWrapper.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/wrapper/CustomAppWrapper.java index b874a83661..e427215466 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/CustomAppWrapper.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/wrapper/CustomAppWrapper.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common.wrapper; +package io.entgra.device.mgt.core.application.mgt.common.wrapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/EntAppReleaseWrapper.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/wrapper/EntAppReleaseWrapper.java similarity index 98% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/EntAppReleaseWrapper.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/wrapper/EntAppReleaseWrapper.java index e73f948a1e..5e5db1f93b 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/EntAppReleaseWrapper.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/wrapper/EntAppReleaseWrapper.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common.wrapper; +package io.entgra.device.mgt.core.application.mgt.common.wrapper; import org.wso2.carbon.device.mgt.common.Base64File; import io.swagger.annotations.ApiModel; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/PublicAppReleaseWrapper.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/wrapper/PublicAppReleaseWrapper.java similarity index 98% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/PublicAppReleaseWrapper.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/wrapper/PublicAppReleaseWrapper.java index 011f083753..129e95f7f9 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/PublicAppReleaseWrapper.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/wrapper/PublicAppReleaseWrapper.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common.wrapper; +package io.entgra.device.mgt.core.application.mgt.common.wrapper; import org.wso2.carbon.device.mgt.common.Base64File; import io.swagger.annotations.ApiModel; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/PublicAppWrapper.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/wrapper/PublicAppWrapper.java similarity index 98% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/PublicAppWrapper.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/wrapper/PublicAppWrapper.java index 1025aa47f9..56b8fbe980 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/PublicAppWrapper.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/wrapper/PublicAppWrapper.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common.wrapper; +package io.entgra.device.mgt.core.application.mgt.common.wrapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/ReviewWrapper.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/wrapper/ReviewWrapper.java similarity index 94% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/ReviewWrapper.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/wrapper/ReviewWrapper.java index 90a525f3db..061ffcb15b 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/ReviewWrapper.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/wrapper/ReviewWrapper.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.common.wrapper; +package io.entgra.device.mgt.core.application.mgt.common.wrapper; public class ReviewWrapper { private String content; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/WebAppReleaseWrapper.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/wrapper/WebAppReleaseWrapper.java similarity index 98% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/WebAppReleaseWrapper.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/wrapper/WebAppReleaseWrapper.java index 41fed3a76b..d083e5c912 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/WebAppReleaseWrapper.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/wrapper/WebAppReleaseWrapper.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common.wrapper; +package io.entgra.device.mgt.core.application.mgt.common.wrapper; import org.wso2.carbon.device.mgt.common.Base64File; import io.swagger.annotations.ApiModel; diff --git a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/WebAppWrapper.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/wrapper/WebAppWrapper.java similarity index 98% rename from components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/WebAppWrapper.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/wrapper/WebAppWrapper.java index e6f02593ad..2028c9f1da 100644 --- a/components/application-mgt/io.entgra.application.mgt.common/src/main/java/io/entgra/application/mgt/common/wrapper/WebAppWrapper.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/wrapper/WebAppWrapper.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.common.wrapper; +package io.entgra.device.mgt.core.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/pom.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/pom.xml similarity index 96% rename from components/application-mgt/io.entgra.application.mgt.core/pom.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/pom.xml index b9f3fa46b8..0bd584338a 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/pom.xml +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/pom.xml @@ -26,7 +26,7 @@ 4.0.0 - io.entgra.application.mgt.core + io.entgra.device.mgt.core.application.mgt.core bundle Entgra - Application Management Core Entgra - Application Management Core @@ -48,7 +48,7 @@ ${project.artifactId} ${carbon.device.mgt.version} Application Management Core Bundle - io.entgra.application.mgt.core.internal + io.entgra.device.mgt.core.application.mgt.core.internal org.osgi.framework.*;version="${imp.package.version.osgi.framework}", org.osgi.service.*;version="${imp.package.version.osgi.service}", @@ -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}", - io.entgra.application.mgt.common.*, + io.entgra.device.mgt.core.application.mgt.common.*, org.wso2.carbon.device.mgt.core.*, org.wso2.carbon.device.mgt.common.*, org.wso2.carbon.user.core.*, @@ -87,8 +87,8 @@ apk-parser;scope=compile|runtime;inline=false - !io.entgra.application.mgt.core.internal.*, - io.entgra.application.mgt.core.* + !io.entgra.device.mgt.core.application.mgt.core.internal.*, + io.entgra.device.mgt.core.application.mgt.core.* * @@ -164,7 +164,7 @@ io.entgra.device.mgt.core - io.entgra.application.mgt.common + io.entgra.device.mgt.core.application.mgt.common io.entgra.device.mgt.core diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/Artifacts.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/config/Artifacts.java similarity index 95% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/Artifacts.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/config/Artifacts.java index 43721fbe37..49d8ab5ee5 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/Artifacts.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/config/Artifacts.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.config; +package io.entgra.device.mgt.core.application.mgt.core.config; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/config/Configuration.java similarity index 90% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/Configuration.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/config/Configuration.java index b152ed28b8..c5d2c871dd 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/config/Configuration.java @@ -15,11 +15,11 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.config; +package io.entgra.device.mgt.core.application.mgt.core.config; -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 io.entgra.device.mgt.core.application.mgt.common.config.MDMConfig; +import io.entgra.device.mgt.core.application.mgt.common.config.RatingConfiguration; +import io.entgra.device.mgt.core.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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/config/ConfigurationManager.java similarity index 93% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/ConfigurationManager.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/config/ConfigurationManager.java index f0753a0942..de441ec9e8 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/config/ConfigurationManager.java @@ -15,13 +15,13 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.config; +package io.entgra.device.mgt.core.application.mgt.core.config; +import io.entgra.device.mgt.core.application.mgt.core.util.Constants; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -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 io.entgra.device.mgt.core.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.device.mgt.core.application.mgt.common.exception.InvalidConfigurationException; import java.io.File; import javax.xml.bind.JAXBContext; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/Extension.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/config/Extension.java similarity index 97% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/Extension.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/config/Extension.java index 98741a5efd..36ba438863 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/Extension.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/config/Extension.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.config; +package io.entgra.device.mgt.core.application.mgt.core.config; import java.util.List; import javax.xml.bind.annotation.XmlAttribute; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/IdentityServiceProvider.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/config/IdentityServiceProvider.java similarity index 96% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/IdentityServiceProvider.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/config/IdentityServiceProvider.java index 63098fdd1b..037fde5039 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/IdentityServiceProvider.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/config/IdentityServiceProvider.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.core.config; +package io.entgra.device.mgt.core.application.mgt.core.config; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/IdentityServiceProviderConfiguration.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/config/IdentityServiceProviderConfiguration.java similarity index 96% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/IdentityServiceProviderConfiguration.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/config/IdentityServiceProviderConfiguration.java index b8b7350413..91e13678ff 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/IdentityServiceProviderConfiguration.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/config/IdentityServiceProviderConfiguration.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.application.mgt.core.config; +package io.entgra.device.mgt.core.application.mgt.core.config; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementWrapper; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/PaginationConfiguration.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/config/PaginationConfiguration.java similarity index 95% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/PaginationConfiguration.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/config/PaginationConfiguration.java index 6b7974c74f..26f2c99312 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/PaginationConfiguration.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/config/PaginationConfiguration.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.application.mgt.core.config; +package io.entgra.device.mgt.core.application.mgt.core.config; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/Parameter.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/config/Parameter.java similarity index 95% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/Parameter.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/config/Parameter.java index 82419b1897..6846bb7f5b 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/config/Parameter.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/config/Parameter.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.config; +package io.entgra.device.mgt.core.application.mgt.core.config; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/ApplicationDAO.java similarity index 95% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/ApplicationDAO.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/ApplicationDAO.java index c64eba8814..6378fe0546 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/ApplicationDAO.java @@ -15,13 +15,13 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.dao; +package io.entgra.device.mgt.core.application.mgt.core.dao; -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; -import io.entgra.application.mgt.core.exception.ApplicationManagementDAOException; +import io.entgra.device.mgt.core.application.mgt.common.*; +import io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationDTO; +import io.entgra.device.mgt.core.application.mgt.common.dto.CategoryDTO; +import io.entgra.device.mgt.core.application.mgt.common.dto.TagDTO; +import io.entgra.device.mgt.core.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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/ApplicationReleaseDAO.java similarity index 94% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/ApplicationReleaseDAO.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/ApplicationReleaseDAO.java index 0ac4824840..19054f0ae4 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/ApplicationReleaseDAO.java @@ -15,11 +15,11 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.dao; +package io.entgra.device.mgt.core.application.mgt.core.dao; -import io.entgra.application.mgt.common.dto.ApplicationReleaseDTO; -import io.entgra.application.mgt.common.Rating; -import io.entgra.application.mgt.core.exception.ApplicationManagementDAOException; +import io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationReleaseDTO; +import io.entgra.device.mgt.core.application.mgt.common.Rating; +import io.entgra.device.mgt.core.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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/LifecycleStateDAO.java similarity index 92% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/LifecycleStateDAO.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/LifecycleStateDAO.java index f56849263c..95643e4d3a 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/LifecycleStateDAO.java @@ -15,10 +15,10 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.dao; +package io.entgra.device.mgt.core.application.mgt.core.dao; -import io.entgra.application.mgt.common.LifecycleState; -import io.entgra.application.mgt.core.exception.LifeCycleManagementDAOException; +import io.entgra.device.mgt.core.application.mgt.common.LifecycleState; +import io.entgra.device.mgt.core.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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/ReviewDAO.java similarity index 92% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/ReviewDAO.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/ReviewDAO.java index 488563987e..6d010a0dd7 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/ReviewDAO.java @@ -15,12 +15,12 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.dao; +package io.entgra.device.mgt.core.application.mgt.core.dao; -import io.entgra.application.mgt.common.response.Review; -import io.entgra.application.mgt.common.PaginationRequest; -import io.entgra.application.mgt.common.dto.ReviewDTO; -import io.entgra.application.mgt.core.exception.ReviewManagementDAOException; +import io.entgra.device.mgt.core.application.mgt.common.response.Review; +import io.entgra.device.mgt.core.application.mgt.common.PaginationRequest; +import io.entgra.device.mgt.core.application.mgt.common.dto.ReviewDTO; +import io.entgra.device.mgt.core.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/SPApplicationDAO.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/SPApplicationDAO.java similarity index 94% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/SPApplicationDAO.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/SPApplicationDAO.java index 3d5d171585..65dc94d98f 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/SPApplicationDAO.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/SPApplicationDAO.java @@ -15,11 +15,11 @@ * under the License. */ -package io.entgra.application.mgt.core.dao; +package io.entgra.device.mgt.core.application.mgt.core.dao; -import io.entgra.application.mgt.common.dto.IdentityServerDTO; -import io.entgra.application.mgt.common.dto.ApplicationDTO; -import io.entgra.application.mgt.core.exception.ApplicationManagementDAOException; +import io.entgra.device.mgt.core.application.mgt.common.dto.IdentityServerDTO; +import io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationDTO; +import io.entgra.device.mgt.core.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/SubscriptionDAO.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/SubscriptionDAO.java similarity index 95% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/SubscriptionDAO.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/SubscriptionDAO.java index c8747547d2..8be9fcca85 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/SubscriptionDAO.java @@ -15,14 +15,14 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.dao; - -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; -import io.entgra.application.mgt.common.exception.SubscriptionManagementException; -import io.entgra.application.mgt.core.exception.ApplicationManagementDAOException; +package io.entgra.device.mgt.core.application.mgt.core.dao; + +import io.entgra.device.mgt.core.application.mgt.common.ExecutionStatus; +import io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationReleaseDTO; +import io.entgra.device.mgt.core.application.mgt.common.dto.DeviceSubscriptionDTO; +import io.entgra.device.mgt.core.application.mgt.common.dto.ScheduledSubscriptionDTO; +import io.entgra.device.mgt.core.application.mgt.common.exception.SubscriptionManagementException; +import io.entgra.device.mgt.core.application.mgt.core.exception.ApplicationManagementDAOException; import java.util.List; import java.util.Map; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/VisibilityDAO.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/VisibilityDAO.java similarity index 94% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/VisibilityDAO.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/VisibilityDAO.java index 48597b8495..09acd9e426 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/VisibilityDAO.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/VisibilityDAO.java @@ -15,9 +15,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.dao; +package io.entgra.device.mgt.core.application.mgt.core.dao; -import io.entgra.application.mgt.core.exception.VisibilityManagementDAOException; +import io.entgra.device.mgt.core.application.mgt.core.exception.VisibilityManagementDAOException; 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/common/ApplicationManagementDAOFactory.java similarity index 70% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/common/ApplicationManagementDAOFactory.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/common/ApplicationManagementDAOFactory.java index 9352a12aeb..babf2bd07c 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/common/ApplicationManagementDAOFactory.java @@ -15,48 +15,48 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.dao.common; +package io.entgra.device.mgt.core.application.mgt.core.dao.common; -import io.entgra.application.mgt.core.dao.SPApplicationDAO; -import io.entgra.application.mgt.core.dao.impl.application.spapplication.GenericSPApplicationDAOImpl; -import io.entgra.application.mgt.core.dao.impl.application.spapplication.OracleSPApplicationDAOImpl; -import io.entgra.application.mgt.core.dao.impl.application.spapplication.PostgreSQLSPApplicationDAOImpl; -import io.entgra.application.mgt.core.dao.impl.application.spapplication.SQLServerSPApplicationDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.dao.SPApplicationDAO; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.application.spapplication.GenericSPApplicationDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.application.spapplication.OracleSPApplicationDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.application.spapplication.PostgreSQLSPApplicationDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.application.spapplication.SQLServerSPApplicationDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.visibility.GenericVisibilityDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.visibility.OracleVisibilityDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.visibility.PostgreSQLVisibilityDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.visibility.SQLServerVisibilityDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.util.Constants; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -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; -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 io.entgra.device.mgt.core.application.mgt.common.exception.UnsupportedDatabaseEngineException; +import io.entgra.device.mgt.core.application.mgt.core.dao.ApplicationDAO; +import io.entgra.device.mgt.core.application.mgt.core.dao.ApplicationReleaseDAO; +import io.entgra.device.mgt.core.application.mgt.core.dao.LifecycleStateDAO; +import io.entgra.device.mgt.core.application.mgt.core.dao.ReviewDAO; +import io.entgra.device.mgt.core.application.mgt.core.dao.SubscriptionDAO; +import io.entgra.device.mgt.core.application.mgt.core.dao.VisibilityDAO; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.application.PostgreSQLApplicationDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.application.SQLServerApplicationDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.application.release.OracleApplicationReleaseDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.application.release.PostgreSQLApplicationReleaseDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.application.release.SQLServerApplicationReleaseDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.lifecyclestate.OracleLifecycleStateDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.lifecyclestate.PostgreSQLLifecycleStateDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.lifecyclestate.SQLServerLifecycleStateDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.review.GenericReviewDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.application.GenericApplicationDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.application.release.GenericApplicationReleaseDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.application.OracleApplicationDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.lifecyclestate.GenericLifecycleStateDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.review.OracleReviewDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.review.PostgreSQLReviewDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.review.SQLServerReviewDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.subscription.GenericSubscriptionDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.subscription.OracleSubscriptionDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.subscription.PostgreSQLSubscriptionDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.subscription.SQLServerSubscriptionDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.util.ConnectionManagerUtil; import javax.sql.DataSource; import java.sql.SQLException; 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/AbstractDAOImpl.java similarity index 80% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/AbstractDAOImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/AbstractDAOImpl.java index f8b50341fc..31c869876f 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/AbstractDAOImpl.java @@ -15,10 +15,10 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.dao.impl; +package io.entgra.device.mgt.core.application.mgt.core.dao.impl; -import io.entgra.application.mgt.common.exception.DBConnectionException; -import io.entgra.application.mgt.core.util.ConnectionManagerUtil; +import io.entgra.device.mgt.core.application.mgt.common.exception.DBConnectionException; +import io.entgra.device.mgt.core.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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/GenericApplicationDAOImpl.java similarity index 98% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/GenericApplicationDAOImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/GenericApplicationDAOImpl.java index 362c9086d7..5480401643 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/GenericApplicationDAOImpl.java @@ -15,23 +15,23 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.dao.impl.application; +package io.entgra.device.mgt.core.application.mgt.core.dao.impl.application; +import io.entgra.device.mgt.core.application.mgt.core.dao.ApplicationDAO; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.AbstractDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.exception.UnexpectedServerErrorException; +import io.entgra.device.mgt.core.application.mgt.core.util.Constants; +import io.entgra.device.mgt.core.application.mgt.core.util.DAOUtil; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import io.entgra.application.mgt.common.AppLifecycleState; -import io.entgra.application.mgt.common.dto.ApplicationDTO; -import io.entgra.application.mgt.common.dto.CategoryDTO; -import io.entgra.application.mgt.common.Filter; -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; -import io.entgra.application.mgt.core.exception.ApplicationManagementDAOException; -import io.entgra.application.mgt.core.exception.UnexpectedServerErrorException; -import io.entgra.application.mgt.core.util.Constants; +import io.entgra.device.mgt.core.application.mgt.common.AppLifecycleState; +import io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationDTO; +import io.entgra.device.mgt.core.application.mgt.common.dto.CategoryDTO; +import io.entgra.device.mgt.core.application.mgt.common.Filter; +import io.entgra.device.mgt.core.application.mgt.common.dto.TagDTO; +import io.entgra.device.mgt.core.application.mgt.common.exception.DBConnectionException; +import io.entgra.device.mgt.core.application.mgt.core.exception.ApplicationManagementDAOException; import java.sql.Connection; import java.sql.PreparedStatement; 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/OracleApplicationDAOImpl.java similarity index 94% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/OracleApplicationDAOImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/OracleApplicationDAOImpl.java index 58e85560a7..f342dd1c4a 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/OracleApplicationDAOImpl.java @@ -16,17 +16,17 @@ * under the License. */ -package io.entgra.application.mgt.core.dao.impl.application; +package io.entgra.device.mgt.core.application.mgt.core.dao.impl.application; +import io.entgra.device.mgt.core.application.mgt.core.util.Constants; +import io.entgra.device.mgt.core.application.mgt.core.util.DAOUtil; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -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; -import io.entgra.application.mgt.core.util.DAOUtil; -import io.entgra.application.mgt.core.util.Constants; +import io.entgra.device.mgt.core.application.mgt.common.Filter; +import io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationDTO; +import io.entgra.device.mgt.core.application.mgt.common.exception.DBConnectionException; +import io.entgra.device.mgt.core.application.mgt.core.exception.ApplicationManagementDAOException; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/PostgreSQLApplicationDAOImpl.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/PostgreSQLApplicationDAOImpl.java similarity index 92% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/PostgreSQLApplicationDAOImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/PostgreSQLApplicationDAOImpl.java index bba8543c2c..9e662ecad2 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/PostgreSQLApplicationDAOImpl.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/PostgreSQLApplicationDAOImpl.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.core.dao.impl.application; +package io.entgra.device.mgt.core.application.mgt.core.dao.impl.application; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/SQLServerApplicationDAOImpl.java similarity index 94% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/SQLServerApplicationDAOImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/SQLServerApplicationDAOImpl.java index bfce4e31fa..f347080d80 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/SQLServerApplicationDAOImpl.java @@ -15,17 +15,17 @@ * under the License. */ -package io.entgra.application.mgt.core.dao.impl.application; +package io.entgra.device.mgt.core.application.mgt.core.dao.impl.application; +import io.entgra.device.mgt.core.application.mgt.core.util.Constants; +import io.entgra.device.mgt.core.application.mgt.core.util.DAOUtil; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -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; -import io.entgra.application.mgt.core.util.DAOUtil; -import io.entgra.application.mgt.core.util.Constants; +import io.entgra.device.mgt.core.application.mgt.common.Filter; +import io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationDTO; +import io.entgra.device.mgt.core.application.mgt.common.exception.DBConnectionException; +import io.entgra.device.mgt.core.application.mgt.core.exception.ApplicationManagementDAOException; import java.sql.Connection; import java.sql.PreparedStatement; 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/release/GenericApplicationReleaseDAOImpl.java similarity index 97% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/release/GenericApplicationReleaseDAOImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/release/GenericApplicationReleaseDAOImpl.java index 11dbcf6c20..0506c1d396 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/release/GenericApplicationReleaseDAOImpl.java @@ -16,17 +16,17 @@ * under the License. */ -package io.entgra.application.mgt.core.dao.impl.application.release; +package io.entgra.device.mgt.core.application.mgt.core.dao.impl.application.release; +import io.entgra.device.mgt.core.application.mgt.core.util.DAOUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import io.entgra.application.mgt.common.dto.ApplicationReleaseDTO; -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; -import io.entgra.application.mgt.core.dao.impl.AbstractDAOImpl; -import io.entgra.application.mgt.core.exception.ApplicationManagementDAOException; +import io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationReleaseDTO; +import io.entgra.device.mgt.core.application.mgt.common.Rating; +import io.entgra.device.mgt.core.application.mgt.common.exception.DBConnectionException; +import io.entgra.device.mgt.core.application.mgt.core.dao.ApplicationReleaseDAO; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.AbstractDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.exception.ApplicationManagementDAOException; import java.sql.Connection; import java.sql.PreparedStatement; 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/release/OracleApplicationReleaseDAOImpl.java similarity index 91% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/release/OracleApplicationReleaseDAOImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/release/OracleApplicationReleaseDAOImpl.java index 33105e9bdc..f3a525b3b3 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/release/OracleApplicationReleaseDAOImpl.java @@ -15,12 +15,12 @@ * under the License. */ -package io.entgra.application.mgt.core.dao.impl.application.release; +package io.entgra.device.mgt.core.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.exception.DBConnectionException; -import io.entgra.application.mgt.core.exception.ApplicationManagementDAOException; +import io.entgra.device.mgt.core.application.mgt.common.exception.DBConnectionException; +import io.entgra.device.mgt.core.application.mgt.core.exception.ApplicationManagementDAOException; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/release/PostgreSQLApplicationReleaseDAOImpl.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/release/PostgreSQLApplicationReleaseDAOImpl.java similarity index 92% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/release/PostgreSQLApplicationReleaseDAOImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/release/PostgreSQLApplicationReleaseDAOImpl.java index 3727a992ae..e400827bb7 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/release/PostgreSQLApplicationReleaseDAOImpl.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/release/PostgreSQLApplicationReleaseDAOImpl.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.core.dao.impl.application.release; +package io.entgra.device.mgt.core.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/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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/release/SQLServerApplicationReleaseDAOImpl.java similarity index 91% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/release/SQLServerApplicationReleaseDAOImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/release/SQLServerApplicationReleaseDAOImpl.java index b40790a7b8..905b193bf1 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/release/SQLServerApplicationReleaseDAOImpl.java @@ -15,12 +15,12 @@ * under the License. */ -package io.entgra.application.mgt.core.dao.impl.application.release; +package io.entgra.device.mgt.core.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.exception.DBConnectionException; -import io.entgra.application.mgt.core.exception.ApplicationManagementDAOException; +import io.entgra.device.mgt.core.application.mgt.common.exception.DBConnectionException; +import io.entgra.device.mgt.core.application.mgt.core.exception.ApplicationManagementDAOException; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/spapplication/GenericSPApplicationDAOImpl.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/spapplication/GenericSPApplicationDAOImpl.java similarity index 96% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/spapplication/GenericSPApplicationDAOImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/spapplication/GenericSPApplicationDAOImpl.java index 501c965b79..df88bc4619 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/spapplication/GenericSPApplicationDAOImpl.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/spapplication/GenericSPApplicationDAOImpl.java @@ -15,17 +15,17 @@ * under the License. */ -package io.entgra.application.mgt.core.dao.impl.application.spapplication; +package io.entgra.device.mgt.core.application.mgt.core.dao.impl.application.spapplication; -import io.entgra.application.mgt.common.dto.IdentityServerDTO; -import io.entgra.application.mgt.common.dto.ApplicationDTO; -import io.entgra.application.mgt.common.exception.DBConnectionException; -import io.entgra.application.mgt.core.dao.SPApplicationDAO; -import io.entgra.application.mgt.core.dao.impl.AbstractDAOImpl; -import io.entgra.application.mgt.core.dao.impl.application.GenericApplicationDAOImpl; -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 io.entgra.device.mgt.core.application.mgt.common.dto.IdentityServerDTO; +import io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationDTO; +import io.entgra.device.mgt.core.application.mgt.common.exception.DBConnectionException; +import io.entgra.device.mgt.core.application.mgt.core.dao.SPApplicationDAO; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.AbstractDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.application.GenericApplicationDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.exception.ApplicationManagementDAOException; +import io.entgra.device.mgt.core.application.mgt.core.exception.UnexpectedServerErrorException; +import io.entgra.device.mgt.core.application.mgt.core.util.DAOUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/spapplication/OracleSPApplicationDAOImpl.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/spapplication/OracleSPApplicationDAOImpl.java similarity index 96% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/spapplication/OracleSPApplicationDAOImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/spapplication/OracleSPApplicationDAOImpl.java index 77dc285375..f68a68c790 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/spapplication/OracleSPApplicationDAOImpl.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/spapplication/OracleSPApplicationDAOImpl.java @@ -15,16 +15,16 @@ * under the License. */ -package io.entgra.application.mgt.core.dao.impl.application.spapplication; +package io.entgra.device.mgt.core.application.mgt.core.dao.impl.application.spapplication; -import io.entgra.application.mgt.common.dto.IdentityServerDTO; -import io.entgra.application.mgt.common.dto.ApplicationDTO; -import io.entgra.application.mgt.common.exception.DBConnectionException; -import io.entgra.application.mgt.core.dao.SPApplicationDAO; -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 io.entgra.device.mgt.core.application.mgt.common.dto.IdentityServerDTO; +import io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationDTO; +import io.entgra.device.mgt.core.application.mgt.common.exception.DBConnectionException; +import io.entgra.device.mgt.core.application.mgt.core.dao.SPApplicationDAO; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.AbstractDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.exception.ApplicationManagementDAOException; +import io.entgra.device.mgt.core.application.mgt.core.exception.UnexpectedServerErrorException; +import io.entgra.device.mgt.core.application.mgt.core.util.DAOUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; 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/spapplication/PostgreSQLSPApplicationDAOImpl.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/spapplication/PostgreSQLSPApplicationDAOImpl.java similarity index 96% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/spapplication/PostgreSQLSPApplicationDAOImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/spapplication/PostgreSQLSPApplicationDAOImpl.java index 5e33a4c278..4aeedb4f3e 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/spapplication/PostgreSQLSPApplicationDAOImpl.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/spapplication/PostgreSQLSPApplicationDAOImpl.java @@ -15,16 +15,16 @@ * under the License. */ -package io.entgra.application.mgt.core.dao.impl.application.spapplication; +package io.entgra.device.mgt.core.application.mgt.core.dao.impl.application.spapplication; -import io.entgra.application.mgt.common.dto.IdentityServerDTO; -import io.entgra.application.mgt.common.dto.ApplicationDTO; -import io.entgra.application.mgt.common.exception.DBConnectionException; -import io.entgra.application.mgt.core.dao.SPApplicationDAO; -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 io.entgra.device.mgt.core.application.mgt.common.dto.IdentityServerDTO; +import io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationDTO; +import io.entgra.device.mgt.core.application.mgt.common.exception.DBConnectionException; +import io.entgra.device.mgt.core.application.mgt.core.dao.SPApplicationDAO; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.AbstractDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.exception.ApplicationManagementDAOException; +import io.entgra.device.mgt.core.application.mgt.core.exception.UnexpectedServerErrorException; +import io.entgra.device.mgt.core.application.mgt.core.util.DAOUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; 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/spapplication/SQLServerSPApplicationDAOImpl.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/spapplication/SQLServerSPApplicationDAOImpl.java similarity index 96% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/spapplication/SQLServerSPApplicationDAOImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/spapplication/SQLServerSPApplicationDAOImpl.java index 619b3214de..33cfa97e0a 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/spapplication/SQLServerSPApplicationDAOImpl.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/spapplication/SQLServerSPApplicationDAOImpl.java @@ -15,16 +15,16 @@ * under the License. */ -package io.entgra.application.mgt.core.dao.impl.application.spapplication; +package io.entgra.device.mgt.core.application.mgt.core.dao.impl.application.spapplication; -import io.entgra.application.mgt.common.dto.IdentityServerDTO; -import io.entgra.application.mgt.common.dto.ApplicationDTO; -import io.entgra.application.mgt.common.exception.DBConnectionException; -import io.entgra.application.mgt.core.dao.SPApplicationDAO; -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 io.entgra.device.mgt.core.application.mgt.common.dto.IdentityServerDTO; +import io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationDTO; +import io.entgra.device.mgt.core.application.mgt.common.exception.DBConnectionException; +import io.entgra.device.mgt.core.application.mgt.core.dao.SPApplicationDAO; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.AbstractDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.exception.ApplicationManagementDAOException; +import io.entgra.device.mgt.core.application.mgt.core.exception.UnexpectedServerErrorException; +import io.entgra.device.mgt.core.application.mgt.core.util.DAOUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/lifecyclestate/GenericLifecycleStateDAOImpl.java similarity index 95% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/lifecyclestate/GenericLifecycleStateDAOImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/lifecyclestate/GenericLifecycleStateDAOImpl.java index 6af77f48ea..699f23cf58 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/lifecyclestate/GenericLifecycleStateDAOImpl.java @@ -15,17 +15,17 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.dao.impl.lifecyclestate; +package io.entgra.device.mgt.core.application.mgt.core.dao.impl.lifecyclestate; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.AbstractDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.util.DAOUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -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; -import io.entgra.application.mgt.core.dao.impl.AbstractDAOImpl; -import io.entgra.application.mgt.core.exception.LifeCycleManagementDAOException; +import io.entgra.device.mgt.core.application.mgt.common.AppLifecycleState; +import io.entgra.device.mgt.core.application.mgt.common.LifecycleState; +import io.entgra.device.mgt.core.application.mgt.common.exception.DBConnectionException; +import io.entgra.device.mgt.core.application.mgt.core.dao.LifecycleStateDAO; +import io.entgra.device.mgt.core.application.mgt.core.exception.LifeCycleManagementDAOException; import java.sql.Connection; import java.sql.PreparedStatement; @@ -33,7 +33,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Timestamp; import java.util.ArrayList; -import java.util.Calendar; import java.util.List; /** diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/lifecyclestate/OracleLifecycleStateDAOImpl.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/lifecyclestate/OracleLifecycleStateDAOImpl.java similarity index 91% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/lifecyclestate/OracleLifecycleStateDAOImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/lifecyclestate/OracleLifecycleStateDAOImpl.java index feffaafca9..d46d4bb238 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/lifecyclestate/OracleLifecycleStateDAOImpl.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/lifecyclestate/OracleLifecycleStateDAOImpl.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.core.dao.impl.lifecyclestate; +package io.entgra.device.mgt.core.application.mgt.core.dao.impl.lifecyclestate; /** * This handles App Lifecycle operations which are specific to MSSQL. diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/lifecyclestate/PostgreSQLLifecycleStateDAOImpl.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/lifecyclestate/PostgreSQLLifecycleStateDAOImpl.java similarity index 92% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/lifecyclestate/PostgreSQLLifecycleStateDAOImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/lifecyclestate/PostgreSQLLifecycleStateDAOImpl.java index 0dff4b0395..1f14f73c4e 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/lifecyclestate/PostgreSQLLifecycleStateDAOImpl.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/lifecyclestate/PostgreSQLLifecycleStateDAOImpl.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.core.dao.impl.lifecyclestate; +package io.entgra.device.mgt.core.application.mgt.core.dao.impl.lifecyclestate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/lifecyclestate/SQLServerLifecycleStateDAOImpl.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/lifecyclestate/SQLServerLifecycleStateDAOImpl.java similarity index 91% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/lifecyclestate/SQLServerLifecycleStateDAOImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/lifecyclestate/SQLServerLifecycleStateDAOImpl.java index 09db338455..ab49679984 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/lifecyclestate/SQLServerLifecycleStateDAOImpl.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/lifecyclestate/SQLServerLifecycleStateDAOImpl.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.core.dao.impl.lifecyclestate; +package io.entgra.device.mgt.core.application.mgt.core.dao.impl.lifecyclestate; /** * This handles App Lifecycle operations which are specific to MSSQL. 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/review/GenericReviewDAOImpl.java similarity index 97% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/review/GenericReviewDAOImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/review/GenericReviewDAOImpl.java index 6a4041b0e1..22bc5a62d2 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/review/GenericReviewDAOImpl.java @@ -15,20 +15,20 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.dao.impl.review; +package io.entgra.device.mgt.core.application.mgt.core.dao.impl.review; +import io.entgra.device.mgt.core.application.mgt.core.exception.UnexpectedServerErrorException; +import io.entgra.device.mgt.core.application.mgt.core.util.Constants; +import io.entgra.device.mgt.core.application.mgt.core.util.DAOUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -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; -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 io.entgra.device.mgt.core.application.mgt.common.PaginationRequest; +import io.entgra.device.mgt.core.application.mgt.common.dto.ReviewDTO; +import io.entgra.device.mgt.core.application.mgt.common.exception.DBConnectionException; +import io.entgra.device.mgt.core.application.mgt.core.dao.ReviewDAO; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.AbstractDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.exception.ReviewManagementDAOException; import java.sql.SQLException; import java.sql.ResultSet; @@ -36,7 +36,6 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.Timestamp; import java.util.ArrayList; -import java.util.Calendar; import java.util.List; import java.util.StringJoiner; 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/review/OracleReviewDAOImpl.java similarity index 95% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/review/OracleReviewDAOImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/review/OracleReviewDAOImpl.java index 340b7204f4..ad4da703fc 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/review/OracleReviewDAOImpl.java @@ -15,16 +15,16 @@ * under the License. */ -package io.entgra.application.mgt.core.dao.impl.review; +package io.entgra.device.mgt.core.application.mgt.core.dao.impl.review; +import io.entgra.device.mgt.core.application.mgt.core.util.Constants; +import io.entgra.device.mgt.core.application.mgt.core.util.DAOUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -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; -import io.entgra.application.mgt.core.util.Constants; -import io.entgra.application.mgt.core.util.DAOUtil; +import io.entgra.device.mgt.core.application.mgt.common.PaginationRequest; +import io.entgra.device.mgt.core.application.mgt.common.dto.ReviewDTO; +import io.entgra.device.mgt.core.application.mgt.common.exception.DBConnectionException; +import io.entgra.device.mgt.core.application.mgt.core.exception.ReviewManagementDAOException; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/review/PostgreSQLReviewDAOImpl.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/review/PostgreSQLReviewDAOImpl.java similarity index 93% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/review/PostgreSQLReviewDAOImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/review/PostgreSQLReviewDAOImpl.java index b5eacab5aa..235078de6d 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/review/PostgreSQLReviewDAOImpl.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/review/PostgreSQLReviewDAOImpl.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.core.dao.impl.review; +package io.entgra.device.mgt.core.application.mgt.core.dao.impl.review; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/review/SQLServerReviewDAOImpl.java similarity index 95% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/review/SQLServerReviewDAOImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/review/SQLServerReviewDAOImpl.java index 0b0e45e6f3..eac947383f 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/review/SQLServerReviewDAOImpl.java @@ -15,16 +15,16 @@ * under the License. */ -package io.entgra.application.mgt.core.dao.impl.review; +package io.entgra.device.mgt.core.application.mgt.core.dao.impl.review; +import io.entgra.device.mgt.core.application.mgt.core.util.Constants; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -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; -import io.entgra.application.mgt.core.util.Constants; -import io.entgra.application.mgt.core.util.DAOUtil; +import io.entgra.device.mgt.core.application.mgt.common.PaginationRequest; +import io.entgra.device.mgt.core.application.mgt.common.dto.ReviewDTO; +import io.entgra.device.mgt.core.application.mgt.common.exception.DBConnectionException; +import io.entgra.device.mgt.core.application.mgt.core.exception.ReviewManagementDAOException; +import io.entgra.device.mgt.core.application.mgt.core.util.DAOUtil; import java.sql.Connection; import java.sql.PreparedStatement; 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/subscription/GenericSubscriptionDAOImpl.java similarity index 98% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/subscription/GenericSubscriptionDAOImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/subscription/GenericSubscriptionDAOImpl.java index c814392ae0..a712b397a5 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/subscription/GenericSubscriptionDAOImpl.java @@ -15,21 +15,21 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.dao.impl.subscription; +package io.entgra.device.mgt.core.application.mgt.core.dao.impl.subscription; +import io.entgra.device.mgt.core.application.mgt.core.dao.SubscriptionDAO; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.AbstractDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.exception.UnexpectedServerErrorException; +import io.entgra.device.mgt.core.application.mgt.core.util.DAOUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -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; -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 io.entgra.device.mgt.core.application.mgt.common.ExecutionStatus; +import io.entgra.device.mgt.core.application.mgt.common.SubAction; +import io.entgra.device.mgt.core.application.mgt.common.SubscriptionType; +import io.entgra.device.mgt.core.application.mgt.common.dto.DeviceSubscriptionDTO; +import io.entgra.device.mgt.core.application.mgt.common.dto.ScheduledSubscriptionDTO; +import io.entgra.device.mgt.core.application.mgt.common.exception.DBConnectionException; +import io.entgra.device.mgt.core.application.mgt.core.exception.ApplicationManagementDAOException; import java.sql.Connection; import java.sql.PreparedStatement; 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/subscription/OracleSubscriptionDAOImpl.java similarity index 96% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/subscription/OracleSubscriptionDAOImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/subscription/OracleSubscriptionDAOImpl.java index d52cc49fef..9f304f9af4 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/subscription/OracleSubscriptionDAOImpl.java @@ -15,12 +15,12 @@ * under the License. */ -package io.entgra.application.mgt.core.dao.impl.subscription; +package io.entgra.device.mgt.core.application.mgt.core.dao.impl.subscription; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import io.entgra.application.mgt.common.exception.DBConnectionException; -import io.entgra.application.mgt.core.exception.ApplicationManagementDAOException; +import io.entgra.device.mgt.core.application.mgt.common.exception.DBConnectionException; +import io.entgra.device.mgt.core.application.mgt.core.exception.ApplicationManagementDAOException; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/subscription/PostgreSQLSubscriptionDAOImpl.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/subscription/PostgreSQLSubscriptionDAOImpl.java similarity index 92% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/subscription/PostgreSQLSubscriptionDAOImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/subscription/PostgreSQLSubscriptionDAOImpl.java index bae3c14471..26f690b283 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/subscription/PostgreSQLSubscriptionDAOImpl.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/subscription/PostgreSQLSubscriptionDAOImpl.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.core.dao.impl.subscription; +package io.entgra.device.mgt.core.application.mgt.core.dao.impl.subscription; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/subscription/SQLServerSubscriptionDAOImpl.java similarity index 96% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/subscription/SQLServerSubscriptionDAOImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/subscription/SQLServerSubscriptionDAOImpl.java index 7872b64ff5..e92b2c8cb4 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/subscription/SQLServerSubscriptionDAOImpl.java @@ -15,12 +15,12 @@ * under the License. */ -package io.entgra.application.mgt.core.dao.impl.subscription; +package io.entgra.device.mgt.core.application.mgt.core.dao.impl.subscription; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import io.entgra.application.mgt.common.exception.DBConnectionException; -import io.entgra.application.mgt.core.exception.ApplicationManagementDAOException; +import io.entgra.device.mgt.core.application.mgt.common.exception.DBConnectionException; +import io.entgra.device.mgt.core.application.mgt.core.exception.ApplicationManagementDAOException; import java.sql.Connection; import java.sql.PreparedStatement; 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/visibility/GenericVisibilityDAOImpl.java similarity index 94% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/visibility/GenericVisibilityDAOImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/visibility/GenericVisibilityDAOImpl.java index eb4b712cd5..582b76f4a3 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/visibility/GenericVisibilityDAOImpl.java @@ -15,14 +15,14 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.dao.impl.visibility; +package io.entgra.device.mgt.core.application.mgt.core.dao.impl.visibility; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -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; +import io.entgra.device.mgt.core.application.mgt.common.exception.DBConnectionException; +import io.entgra.device.mgt.core.application.mgt.core.dao.VisibilityDAO; +import io.entgra.device.mgt.core.application.mgt.core.dao.impl.AbstractDAOImpl; +import io.entgra.device.mgt.core.application.mgt.core.exception.VisibilityManagementDAOException; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/visibility/OracleVisibilityDAOImpl.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/visibility/OracleVisibilityDAOImpl.java similarity index 91% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/visibility/OracleVisibilityDAOImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/visibility/OracleVisibilityDAOImpl.java index 8649d32d06..89b18c5ddc 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/visibility/OracleVisibilityDAOImpl.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/visibility/OracleVisibilityDAOImpl.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.core.dao.impl.visibility; +package io.entgra.device.mgt.core.application.mgt.core.dao.impl.visibility; /** * This handles Application visibility handling operations which are specific to Oracle.. diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/visibility/PostgreSQLVisibilityDAOImpl.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/visibility/PostgreSQLVisibilityDAOImpl.java similarity index 93% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/visibility/PostgreSQLVisibilityDAOImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/visibility/PostgreSQLVisibilityDAOImpl.java index fb0cecccd6..84a0d441ce 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/visibility/PostgreSQLVisibilityDAOImpl.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/visibility/PostgreSQLVisibilityDAOImpl.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.core.dao.impl.visibility; +package io.entgra.device.mgt.core.application.mgt.core.dao.impl.visibility; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/visibility/SQLServerVisibilityDAOImpl.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/visibility/SQLServerVisibilityDAOImpl.java similarity index 91% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/visibility/SQLServerVisibilityDAOImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/visibility/SQLServerVisibilityDAOImpl.java index 935f0f057e..a931509e06 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/visibility/SQLServerVisibilityDAOImpl.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/visibility/SQLServerVisibilityDAOImpl.java @@ -15,7 +15,7 @@ * under the License. */ -package io.entgra.application.mgt.core.dao.impl.visibility; +package io.entgra.device.mgt.core.application.mgt.core.dao.impl.visibility; /** * This handles Application visibility handling operations which are specific to MsSQL. diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/deployer/Property.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/deployer/Property.java similarity index 96% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/deployer/Property.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/deployer/Property.java index 0072d10d49..79de0aabb0 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/deployer/Property.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/deployer/Property.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.deployer; +package io.entgra.device.mgt.core.application.mgt.core.deployer; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ApplicationManagementDAOException.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/exception/ApplicationManagementDAOException.java similarity index 94% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ApplicationManagementDAOException.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/exception/ApplicationManagementDAOException.java index 2643d255f7..aa0e54b6a1 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ApplicationManagementDAOException.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/exception/ApplicationManagementDAOException.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.exception; +package io.entgra.device.mgt.core.application.mgt.core.exception; /** * 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/ApplicationOperationTaskException.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/exception/ApplicationOperationTaskException.java similarity index 91% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ApplicationOperationTaskException.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/exception/ApplicationOperationTaskException.java index 1a9b9f55f4..6ced2c1625 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ApplicationOperationTaskException.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/exception/ApplicationOperationTaskException.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.application.mgt.core.exception; +package io.entgra.device.mgt.core.application.mgt.core.exception; public class ApplicationOperationTaskException extends Exception { 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/exception/BadRequestException.java similarity index 86% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/BadRequestException.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/exception/BadRequestException.java index c898bb3318..f347a20701 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/exception/BadRequestException.java @@ -16,9 +16,9 @@ * under the License. */ -package io.entgra.application.mgt.core.exception; +package io.entgra.device.mgt.core.application.mgt.core.exception; -import io.entgra.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.device.mgt.core.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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/exception/ForbiddenException.java similarity index 86% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ForbiddenException.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/exception/ForbiddenException.java index f0286f3e69..c46ae4fe91 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/exception/ForbiddenException.java @@ -16,10 +16,10 @@ * under the License. */ -package io.entgra.application.mgt.core.exception; +package io.entgra.device.mgt.core.application.mgt.core.exception; -import io.entgra.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.device.mgt.core.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/LifeCycleManagementDAOException.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/exception/LifeCycleManagementDAOException.java similarity index 94% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/LifeCycleManagementDAOException.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/exception/LifeCycleManagementDAOException.java index cd90374dc5..3ee34731c2 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/LifeCycleManagementDAOException.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/exception/LifeCycleManagementDAOException.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.exception; +package io.entgra.device.mgt.core.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/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/NotFoundException.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/exception/NotFoundException.java similarity index 86% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/NotFoundException.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/exception/NotFoundException.java index aca4f221fe..d5a831432e 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/exception/NotFoundException.java @@ -15,9 +15,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.exception; +package io.entgra.device.mgt.core.application.mgt.core.exception; -import io.entgra.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.device.mgt.core.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/ParsingException.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/exception/ParsingException.java similarity index 95% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ParsingException.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/exception/ParsingException.java index 53ecb39ae0..0f99c72c7d 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ParsingException.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/exception/ParsingException.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.application.mgt.core.exception; +package io.entgra.device.mgt.core.application.mgt.core.exception; public class ParsingException extends Exception { 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/exception/ReviewManagementDAOException.java similarity index 87% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ReviewManagementDAOException.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/exception/ReviewManagementDAOException.java index 4dec217d0c..429128e3ac 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/exception/ReviewManagementDAOException.java @@ -15,9 +15,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.exception; +package io.entgra.device.mgt.core.application.mgt.core.exception; -import io.entgra.application.mgt.common.exception.ReviewManagementException; +import io.entgra.device.mgt.core.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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/exception/SubscriptionManagementDAOException.java similarity index 87% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/SubscriptionManagementDAOException.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/exception/SubscriptionManagementDAOException.java index f45337cd3b..19569cccd5 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/exception/SubscriptionManagementDAOException.java @@ -14,9 +14,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.exception; +package io.entgra.device.mgt.core.application.mgt.core.exception; -import io.entgra.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.device.mgt.core.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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/exception/UnexpectedServerErrorException.java similarity index 85% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/UnexpectedServerErrorException.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/exception/UnexpectedServerErrorException.java index 58a24f1e44..bc7efafa21 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/exception/UnexpectedServerErrorException.java @@ -15,10 +15,10 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.exception; +package io.entgra.device.mgt.core.application.mgt.core.exception; -import io.entgra.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.device.mgt.core.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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/exception/ValidationException.java similarity index 86% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/ValidationException.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/exception/ValidationException.java index bad1b6b69d..6155527f33 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/exception/ValidationException.java @@ -15,9 +15,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.exception; +package io.entgra.device.mgt.core.application.mgt.core.exception; -import io.entgra.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.device.mgt.core.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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/exception/VisibilityManagementDAOException.java similarity index 87% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/exception/VisibilityManagementDAOException.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/exception/VisibilityManagementDAOException.java index 5988904f55..1fb37113a0 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/exception/VisibilityManagementDAOException.java @@ -15,9 +15,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.exception; +package io.entgra.device.mgt.core.application.mgt.core.exception; -import io.entgra.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.device.mgt.core.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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/impl/ApplicationManagerImpl.java similarity index 97% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/impl/ApplicationManagerImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/impl/ApplicationManagerImpl.java index fd23dd64ea..b9f3844687 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/impl/ApplicationManagerImpl.java @@ -15,11 +15,12 @@ * under the License. */ -package io.entgra.application.mgt.core.impl; +package io.entgra.device.mgt.core.application.mgt.core.impl; +import io.entgra.device.mgt.core.application.mgt.core.exception.BadRequestException; import org.wso2.carbon.device.mgt.common.Base64File; -import io.entgra.application.mgt.core.dao.SPApplicationDAO; -import io.entgra.application.mgt.core.util.ApplicationManagementUtil; +import io.entgra.device.mgt.core.application.mgt.core.dao.SPApplicationDAO; +import io.entgra.device.mgt.core.application.mgt.core.util.ApplicationManagementUtil; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringEscapeUtils; @@ -30,62 +31,61 @@ 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 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 io.entgra.application.mgt.common.ApplicationList; -import io.entgra.application.mgt.common.dto.ApplicationReleaseDTO; -import io.entgra.application.mgt.common.ApplicationSubscriptionType; -import io.entgra.application.mgt.common.ApplicationType; -import io.entgra.application.mgt.common.dto.CategoryDTO; -import io.entgra.application.mgt.common.Filter; -import io.entgra.application.mgt.common.dto.DeviceSubscriptionDTO; -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; -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; -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.device.mgt.core.application.mgt.common.ApplicationArtifact; +import io.entgra.device.mgt.core.application.mgt.common.ApplicationInstaller; +import io.entgra.device.mgt.core.application.mgt.common.DeviceTypes; +import io.entgra.device.mgt.core.application.mgt.common.LifecycleChanger; +import io.entgra.device.mgt.core.application.mgt.common.Pagination; +import io.entgra.device.mgt.core.application.mgt.common.config.RatingConfiguration; +import io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationDTO; +import io.entgra.device.mgt.core.application.mgt.common.ApplicationList; +import io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationReleaseDTO; +import io.entgra.device.mgt.core.application.mgt.common.ApplicationSubscriptionType; +import io.entgra.device.mgt.core.application.mgt.common.ApplicationType; +import io.entgra.device.mgt.core.application.mgt.common.dto.CategoryDTO; +import io.entgra.device.mgt.core.application.mgt.common.Filter; +import io.entgra.device.mgt.core.application.mgt.common.dto.DeviceSubscriptionDTO; +import io.entgra.device.mgt.core.application.mgt.common.LifecycleState; +import io.entgra.device.mgt.core.application.mgt.common.dto.TagDTO; +import io.entgra.device.mgt.core.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.device.mgt.core.application.mgt.common.exception.ApplicationStorageManagementException; +import io.entgra.device.mgt.core.application.mgt.common.exception.DBConnectionException; +import io.entgra.device.mgt.core.application.mgt.common.exception.LifecycleManagementException; +import io.entgra.device.mgt.core.application.mgt.common.exception.RequestValidatingException; +import io.entgra.device.mgt.core.application.mgt.common.exception.ResourceManagementException; +import io.entgra.device.mgt.core.application.mgt.common.exception.TransactionManagementException; +import io.entgra.device.mgt.core.application.mgt.common.response.Application; +import io.entgra.device.mgt.core.application.mgt.common.response.ApplicationRelease; +import io.entgra.device.mgt.core.application.mgt.common.response.Category; +import io.entgra.device.mgt.core.application.mgt.common.response.Tag; +import io.entgra.device.mgt.core.application.mgt.common.services.ApplicationManager; +import io.entgra.device.mgt.core.application.mgt.common.services.ApplicationStorageManager; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.CustomAppReleaseWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.CustomAppWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.EntAppReleaseWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.ApplicationUpdateWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.ApplicationWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.PublicAppReleaseWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.PublicAppWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.WebAppReleaseWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.WebAppWrapper; +import io.entgra.device.mgt.core.application.mgt.core.config.ConfigurationManager; +import io.entgra.device.mgt.core.application.mgt.core.dao.ApplicationDAO; +import io.entgra.device.mgt.core.application.mgt.core.dao.ApplicationReleaseDAO; +import io.entgra.device.mgt.core.application.mgt.core.dao.LifecycleStateDAO; +import io.entgra.device.mgt.core.application.mgt.core.dao.SubscriptionDAO; +import io.entgra.device.mgt.core.application.mgt.core.dao.VisibilityDAO; +import io.entgra.device.mgt.core.application.mgt.core.dao.common.ApplicationManagementDAOFactory; +import io.entgra.device.mgt.core.application.mgt.core.util.APIUtil; +import io.entgra.device.mgt.core.application.mgt.core.exception.ApplicationManagementDAOException; +import io.entgra.device.mgt.core.application.mgt.core.exception.ForbiddenException; +import io.entgra.device.mgt.core.application.mgt.core.exception.LifeCycleManagementDAOException; +import io.entgra.device.mgt.core.application.mgt.core.exception.NotFoundException; +import io.entgra.device.mgt.core.application.mgt.core.exception.VisibilityManagementDAOException; +import io.entgra.device.mgt.core.application.mgt.core.internal.DataHolder; +import io.entgra.device.mgt.core.application.mgt.core.lifecycle.LifecycleStateManager; +import io.entgra.device.mgt.core.application.mgt.core.util.ConnectionManagerUtil; +import io.entgra.device.mgt.core.application.mgt.core.util.Constants; import org.wso2.carbon.device.mgt.core.common.exception.StorageManagementException; import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException; 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/impl/ApplicationStorageManagerImpl.java similarity index 94% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/impl/ApplicationStorageManagerImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/impl/ApplicationStorageManagerImpl.java index 09b7b20848..ec8ff26239 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/impl/ApplicationStorageManagerImpl.java @@ -15,23 +15,23 @@ * under the License. */ -package io.entgra.application.mgt.core.impl; +package io.entgra.device.mgt.core.application.mgt.core.impl; import com.dd.plist.NSDictionary; +import io.entgra.device.mgt.core.application.mgt.core.exception.ParsingException; +import io.entgra.device.mgt.core.application.mgt.core.util.ArtifactsParser; +import io.entgra.device.mgt.core.application.mgt.core.util.Constants; import net.dongliu.apk.parser.bean.ApkMeta; 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 io.entgra.application.mgt.common.ApplicationInstaller; -import io.entgra.application.mgt.common.dto.ApplicationReleaseDTO; -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; -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.device.mgt.core.application.mgt.common.ApplicationInstaller; +import io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationReleaseDTO; +import io.entgra.device.mgt.core.application.mgt.common.DeviceTypes; +import io.entgra.device.mgt.core.application.mgt.common.exception.ApplicationStorageManagementException; +import io.entgra.device.mgt.core.application.mgt.common.exception.ResourceManagementException; +import io.entgra.device.mgt.core.application.mgt.common.services.ApplicationStorageManager; import org.wso2.carbon.device.mgt.core.common.exception.StorageManagementException; import org.wso2.carbon.device.mgt.core.common.util.StorageManagementUtil; 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/impl/AppmDataHandlerImpl.java similarity index 85% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/impl/AppmDataHandlerImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/impl/AppmDataHandlerImpl.java index 0700689081..18419b43e0 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/impl/AppmDataHandlerImpl.java @@ -15,22 +15,22 @@ * under the License. */ -package io.entgra.application.mgt.core.impl; +package io.entgra.device.mgt.core.application.mgt.core.impl; +import io.entgra.device.mgt.core.application.mgt.core.exception.BadRequestException; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -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; -import io.entgra.application.mgt.core.internal.DataHolder; -import io.entgra.application.mgt.core.lifecycle.LifecycleStateManager; +import io.entgra.device.mgt.core.application.mgt.common.config.LifecycleState; +import io.entgra.device.mgt.core.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.device.mgt.core.application.mgt.common.exception.ApplicationStorageManagementException; +import io.entgra.device.mgt.core.application.mgt.common.exception.LifecycleManagementException; +import io.entgra.device.mgt.core.application.mgt.common.services.ApplicationStorageManager; +import io.entgra.device.mgt.core.application.mgt.common.services.AppmDataHandler; +import io.entgra.device.mgt.core.application.mgt.core.util.APIUtil; +import io.entgra.device.mgt.core.application.mgt.core.exception.NotFoundException; +import io.entgra.device.mgt.core.application.mgt.core.internal.DataHolder; +import io.entgra.device.mgt.core.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/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/impl/ReviewManagerImpl.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/impl/ReviewManagerImpl.java similarity index 94% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/impl/ReviewManagerImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/impl/ReviewManagerImpl.java index facbfa4163..acd483fb6a 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/impl/ReviewManagerImpl.java @@ -15,38 +15,37 @@ * under the License. */ -package io.entgra.application.mgt.core.impl; +package io.entgra.device.mgt.core.application.mgt.core.impl; +import io.entgra.device.mgt.core.application.mgt.core.exception.BadRequestException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.context.PrivilegedCarbonContext; -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; -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; -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.sql.Timestamp; +import io.entgra.device.mgt.core.application.mgt.common.Rating; +import io.entgra.device.mgt.core.application.mgt.common.ReviewNode; +import io.entgra.device.mgt.core.application.mgt.common.PaginationRequest; +import io.entgra.device.mgt.core.application.mgt.common.PaginationResult; +import io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationDTO; +import io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationReleaseDTO; +import io.entgra.device.mgt.core.application.mgt.common.dto.ReviewDTO; +import io.entgra.device.mgt.core.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.device.mgt.core.application.mgt.common.exception.ReviewManagementException; +import io.entgra.device.mgt.core.application.mgt.common.exception.DBConnectionException; +import io.entgra.device.mgt.core.application.mgt.common.exception.TransactionManagementException; +import io.entgra.device.mgt.core.application.mgt.common.response.Review; +import io.entgra.device.mgt.core.application.mgt.common.services.*; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.ReviewWrapper; +import io.entgra.device.mgt.core.application.mgt.core.dao.ApplicationDAO; +import io.entgra.device.mgt.core.application.mgt.core.dao.ApplicationReleaseDAO; +import io.entgra.device.mgt.core.application.mgt.core.dao.ReviewDAO; +import io.entgra.device.mgt.core.application.mgt.core.dao.common.ApplicationManagementDAOFactory; +import io.entgra.device.mgt.core.application.mgt.core.exception.ApplicationManagementDAOException; +import io.entgra.device.mgt.core.application.mgt.core.exception.ForbiddenException; +import io.entgra.device.mgt.core.application.mgt.core.exception.NotFoundException; +import io.entgra.device.mgt.core.application.mgt.core.exception.ReviewManagementDAOException; +import io.entgra.device.mgt.core.application.mgt.core.util.ConnectionManagerUtil; +import io.entgra.device.mgt.core.application.mgt.core.util.Constants; + import java.util.ArrayList; import java.util.Comparator; import java.util.List; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/impl/SPApplicationManagerImpl.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/impl/SPApplicationManagerImpl.java similarity index 93% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/impl/SPApplicationManagerImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/impl/SPApplicationManagerImpl.java index bd0afe85a6..cc4fa8dbf9 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/impl/SPApplicationManagerImpl.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/impl/SPApplicationManagerImpl.java @@ -15,35 +15,35 @@ * under the License. */ -package io.entgra.application.mgt.core.impl; - -import io.entgra.application.mgt.common.IdentityServerResponse; -import io.entgra.application.mgt.common.SPApplicationListResponse; -import io.entgra.application.mgt.common.dto.IdentityServerDTO; -import io.entgra.application.mgt.common.SPApplication; -import io.entgra.application.mgt.common.dto.ApplicationDTO; -import io.entgra.application.mgt.common.dto.IdentityServiceProviderDTO; -import io.entgra.application.mgt.common.exception.ApplicationManagementException; -import io.entgra.application.mgt.common.exception.DBConnectionException; -import io.entgra.application.mgt.common.exception.TransactionManagementException; -import io.entgra.application.mgt.common.response.Application; -import io.entgra.application.mgt.common.services.ApplicationManager; -import io.entgra.application.mgt.common.services.SPApplicationManager; -import io.entgra.application.mgt.core.config.ConfigurationManager; -import io.entgra.application.mgt.core.config.IdentityServiceProvider; -import io.entgra.application.mgt.core.dao.ApplicationDAO; -import io.entgra.application.mgt.core.dao.SPApplicationDAO; -import io.entgra.application.mgt.core.dao.VisibilityDAO; -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.NotFoundException; -import io.entgra.application.mgt.core.identityserver.serviceprovider.ISServiceProviderApplicationService; -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.ApplicationManagementUtil; -import io.entgra.application.mgt.core.util.ConnectionManagerUtil; +package io.entgra.device.mgt.core.application.mgt.core.impl; + +import io.entgra.device.mgt.core.application.mgt.common.IdentityServerResponse; +import io.entgra.device.mgt.core.application.mgt.common.SPApplicationListResponse; +import io.entgra.device.mgt.core.application.mgt.common.dto.IdentityServerDTO; +import io.entgra.device.mgt.core.application.mgt.common.SPApplication; +import io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationDTO; +import io.entgra.device.mgt.core.application.mgt.common.dto.IdentityServiceProviderDTO; +import io.entgra.device.mgt.core.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.device.mgt.core.application.mgt.common.exception.DBConnectionException; +import io.entgra.device.mgt.core.application.mgt.common.exception.TransactionManagementException; +import io.entgra.device.mgt.core.application.mgt.common.response.Application; +import io.entgra.device.mgt.core.application.mgt.common.services.ApplicationManager; +import io.entgra.device.mgt.core.application.mgt.common.services.SPApplicationManager; +import io.entgra.device.mgt.core.application.mgt.core.config.ConfigurationManager; +import io.entgra.device.mgt.core.application.mgt.core.config.IdentityServiceProvider; +import io.entgra.device.mgt.core.application.mgt.core.dao.ApplicationDAO; +import io.entgra.device.mgt.core.application.mgt.core.dao.SPApplicationDAO; +import io.entgra.device.mgt.core.application.mgt.core.dao.VisibilityDAO; +import io.entgra.device.mgt.core.application.mgt.core.dao.common.ApplicationManagementDAOFactory; +import io.entgra.device.mgt.core.application.mgt.core.exception.ApplicationManagementDAOException; +import io.entgra.device.mgt.core.application.mgt.core.exception.BadRequestException; +import io.entgra.device.mgt.core.application.mgt.core.exception.NotFoundException; +import io.entgra.device.mgt.core.application.mgt.core.serviceprovider.ISServiceProviderApplicationService; +import io.entgra.device.mgt.core.application.mgt.core.internal.DataHolder; +import io.entgra.device.mgt.core.application.mgt.core.lifecycle.LifecycleStateManager; +import io.entgra.device.mgt.core.application.mgt.core.util.APIUtil; +import io.entgra.device.mgt.core.application.mgt.core.util.ApplicationManagementUtil; +import io.entgra.device.mgt.core.application.mgt.core.util.ConnectionManagerUtil; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/impl/SubscriptionManagerImpl.java similarity index 96% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/impl/SubscriptionManagerImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/impl/SubscriptionManagerImpl.java index a2cb17b079..36d64d543a 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/impl/SubscriptionManagerImpl.java @@ -15,9 +15,10 @@ * under the License. */ -package io.entgra.application.mgt.core.impl; +package io.entgra.device.mgt.core.application.mgt.core.impl; import com.google.gson.Gson; +import io.entgra.device.mgt.core.application.mgt.core.exception.BadRequestException; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpException; import org.apache.commons.httpclient.HttpMethodBase; @@ -31,41 +32,40 @@ 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 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; -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; -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 io.entgra.device.mgt.core.application.mgt.common.ApplicationInstallResponse; +import io.entgra.device.mgt.core.application.mgt.common.ApplicationSubscriptionInfo; +import io.entgra.device.mgt.core.application.mgt.common.ApplicationType; +import io.entgra.device.mgt.core.application.mgt.common.DeviceSubscriptionData; +import io.entgra.device.mgt.core.application.mgt.common.DeviceTypes; +import io.entgra.device.mgt.core.application.mgt.common.ExecutionStatus; +import io.entgra.device.mgt.core.application.mgt.common.SubAction; +import io.entgra.device.mgt.core.application.mgt.common.SubscriptionType; +import io.entgra.device.mgt.core.application.mgt.common.SubscribingDeviceIdHolder; +import io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationDTO; +import io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationPolicyDTO; +import io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationReleaseDTO; +import io.entgra.device.mgt.core.application.mgt.common.dto.DeviceSubscriptionDTO; +import io.entgra.device.mgt.core.application.mgt.common.dto.ScheduledSubscriptionDTO; +import io.entgra.device.mgt.core.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.device.mgt.core.application.mgt.common.exception.DBConnectionException; +import io.entgra.device.mgt.core.application.mgt.common.exception.LifecycleManagementException; +import io.entgra.device.mgt.core.application.mgt.common.exception.SubscriptionManagementException; +import io.entgra.device.mgt.core.application.mgt.common.exception.TransactionManagementException; +import io.entgra.device.mgt.core.application.mgt.common.response.Application; +import io.entgra.device.mgt.core.application.mgt.common.services.SubscriptionManager; +import io.entgra.device.mgt.core.application.mgt.core.dao.ApplicationDAO; +import io.entgra.device.mgt.core.application.mgt.core.dao.SubscriptionDAO; +import io.entgra.device.mgt.core.application.mgt.core.dao.common.ApplicationManagementDAOFactory; +import io.entgra.device.mgt.core.application.mgt.core.exception.ApplicationManagementDAOException; +import io.entgra.device.mgt.core.application.mgt.core.exception.ForbiddenException; +import io.entgra.device.mgt.core.application.mgt.core.exception.NotFoundException; +import io.entgra.device.mgt.core.application.mgt.core.internal.DataHolder; +import io.entgra.device.mgt.core.application.mgt.core.lifecycle.LifecycleStateManager; +import io.entgra.device.mgt.core.application.mgt.core.util.APIUtil; +import io.entgra.device.mgt.core.application.mgt.core.util.ConnectionManagerUtil; +import io.entgra.device.mgt.core.application.mgt.core.util.Constants; +import io.entgra.device.mgt.core.application.mgt.core.util.HelperUtil; +import io.entgra.device.mgt.core.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/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/internal/ApplicationManagementServiceComponent.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/internal/ApplicationManagementServiceComponent.java similarity index 86% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/internal/ApplicationManagementServiceComponent.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/internal/ApplicationManagementServiceComponent.java index be8cd12d46..357b62e994 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/internal/ApplicationManagementServiceComponent.java @@ -15,25 +15,25 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.internal; +package io.entgra.device.mgt.core.application.mgt.core.internal; -import io.entgra.application.mgt.common.services.SPApplicationManager; +import io.entgra.device.mgt.core.application.mgt.common.services.SPApplicationManager; +import io.entgra.device.mgt.core.application.mgt.core.impl.AppmDataHandlerImpl; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.osgi.framework.BundleContext; import org.osgi.service.component.ComponentContext; -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; -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 io.entgra.device.mgt.core.application.mgt.common.config.LifecycleState; +import io.entgra.device.mgt.core.application.mgt.common.services.ApplicationManager; +import io.entgra.device.mgt.core.application.mgt.common.services.ApplicationStorageManager; +import io.entgra.device.mgt.core.application.mgt.common.services.AppmDataHandler; +import io.entgra.device.mgt.core.application.mgt.common.services.ReviewManager; +import io.entgra.device.mgt.core.application.mgt.common.services.SubscriptionManager; +import io.entgra.device.mgt.core.application.mgt.core.config.ConfigurationManager; +import io.entgra.device.mgt.core.application.mgt.core.dao.common.ApplicationManagementDAOFactory; +import io.entgra.device.mgt.core.application.mgt.core.lifecycle.LifecycleStateManager; +import io.entgra.device.mgt.core.application.mgt.core.task.ScheduledAppSubscriptionTaskManager; +import io.entgra.device.mgt.core.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/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/internal/DataHolder.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/internal/DataHolder.java similarity index 85% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/internal/DataHolder.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/internal/DataHolder.java index f7bc6e1d8c..2d02440801 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/internal/DataHolder.java @@ -15,15 +15,15 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.internal; - -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.SPApplicationManager; -import io.entgra.application.mgt.common.services.ReviewManager; -import io.entgra.application.mgt.common.services.SubscriptionManager; -import io.entgra.application.mgt.core.lifecycle.LifecycleStateManager; +package io.entgra.device.mgt.core.application.mgt.core.internal; + +import io.entgra.device.mgt.core.application.mgt.common.services.ApplicationManager; +import io.entgra.device.mgt.core.application.mgt.common.services.ApplicationStorageManager; +import io.entgra.device.mgt.core.application.mgt.common.services.AppmDataHandler; +import io.entgra.device.mgt.core.application.mgt.common.services.SPApplicationManager; +import io.entgra.device.mgt.core.application.mgt.common.services.ReviewManager; +import io.entgra.device.mgt.core.application.mgt.common.services.SubscriptionManager; +import io.entgra.device.mgt.core.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/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/lifecycle/LifecycleStateManager.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/lifecycle/LifecycleStateManager.java similarity index 97% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/lifecycle/LifecycleStateManager.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/lifecycle/LifecycleStateManager.java index a44c708fc3..acf3086967 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/lifecycle/LifecycleStateManager.java @@ -15,13 +15,13 @@ * under the License. */ -package io.entgra.application.mgt.core.lifecycle; +package io.entgra.device.mgt.core.application.mgt.core.lifecycle; +import io.entgra.device.mgt.core.application.mgt.core.internal.DataHolder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import io.entgra.application.mgt.common.exception.LifecycleManagementException; -import io.entgra.application.mgt.core.internal.DataHolder; -import io.entgra.application.mgt.common.config.LifecycleState; +import io.entgra.device.mgt.core.application.mgt.common.exception.LifecycleManagementException; +import io.entgra.device.mgt.core.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/identityserver/serviceprovider/ISServiceProviderApplicationService.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/serviceprovider/ISServiceProviderApplicationService.java similarity index 84% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/identityserver/serviceprovider/ISServiceProviderApplicationService.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/serviceprovider/ISServiceProviderApplicationService.java index 2f603fae68..8abe94d983 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/identityserver/serviceprovider/ISServiceProviderApplicationService.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/serviceprovider/ISServiceProviderApplicationService.java @@ -15,14 +15,14 @@ * under the License. */ -package io.entgra.application.mgt.core.identityserver.serviceprovider; +package io.entgra.device.mgt.core.application.mgt.core.serviceprovider; -import io.entgra.application.mgt.common.SPApplication; -import io.entgra.application.mgt.common.SPApplicationListResponse; -import io.entgra.application.mgt.common.dto.IdentityServerDTO; -import io.entgra.application.mgt.common.exception.ApplicationManagementException; -import io.entgra.application.mgt.common.exception.InvalidConfigurationException; -import io.entgra.application.mgt.core.config.ConfigurationManager; +import io.entgra.device.mgt.core.application.mgt.common.SPApplication; +import io.entgra.device.mgt.core.application.mgt.common.SPApplicationListResponse; +import io.entgra.device.mgt.core.application.mgt.common.dto.IdentityServerDTO; +import io.entgra.device.mgt.core.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.device.mgt.core.application.mgt.common.exception.InvalidConfigurationException; +import io.entgra.device.mgt.core.application.mgt.core.config.ConfigurationManager; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/identityserver/serviceprovider/impl/WSO2IAMSPApplicationService.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/serviceprovider/impl/WSO2IAMSPApplicationService.java similarity index 91% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/identityserver/serviceprovider/impl/WSO2IAMSPApplicationService.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/serviceprovider/impl/WSO2IAMSPApplicationService.java index 4c7936746d..c440c6c6e9 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/identityserver/serviceprovider/impl/WSO2IAMSPApplicationService.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/serviceprovider/impl/WSO2IAMSPApplicationService.java @@ -15,16 +15,16 @@ * under the License. */ -package io.entgra.application.mgt.core.identityserver.serviceprovider.impl; +package io.entgra.device.mgt.core.application.mgt.core.serviceprovider.impl; import com.google.gson.Gson; -import io.entgra.application.mgt.common.SPApplication; -import io.entgra.application.mgt.common.SPApplicationListResponse; -import io.entgra.application.mgt.common.dto.IdentityServerDTO; -import io.entgra.application.mgt.common.exception.ApplicationManagementException; -import io.entgra.application.mgt.common.exception.IdentityServerManagementException; -import io.entgra.application.mgt.core.identityserver.serviceprovider.ISServiceProviderApplicationService; -import io.entgra.application.mgt.core.util.Constants; +import io.entgra.device.mgt.core.application.mgt.common.SPApplication; +import io.entgra.device.mgt.core.application.mgt.common.SPApplicationListResponse; +import io.entgra.device.mgt.core.application.mgt.common.dto.IdentityServerDTO; +import io.entgra.device.mgt.core.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.device.mgt.core.application.mgt.common.exception.IdentityServerManagementException; +import io.entgra.device.mgt.core.application.mgt.core.serviceprovider.ISServiceProviderApplicationService; +import io.entgra.device.mgt.core.application.mgt.core.util.Constants; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.http.HttpResponse; 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/task/ScheduledAppSubscriptionCleanupTask.java similarity index 85% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/task/ScheduledAppSubscriptionCleanupTask.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/task/ScheduledAppSubscriptionCleanupTask.java index 1860d2f7ff..5cdf37a271 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/task/ScheduledAppSubscriptionCleanupTask.java @@ -16,13 +16,13 @@ * under the License. */ -package io.entgra.application.mgt.core.task; +package io.entgra.device.mgt.core.application.mgt.core.task; +import io.entgra.device.mgt.core.application.mgt.core.impl.SubscriptionManagerImpl; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -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.device.mgt.core.application.mgt.common.exception.SubscriptionManagementException; +import io.entgra.device.mgt.core.application.mgt.common.services.SubscriptionManager; import org.wso2.carbon.device.mgt.core.task.impl.RandomlyAssignedScheduleTask; import java.util.Map; 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/task/ScheduledAppSubscriptionTask.java similarity index 90% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/task/ScheduledAppSubscriptionTask.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/task/ScheduledAppSubscriptionTask.java index 24df9b293f..ef72bf3b8f 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/task/ScheduledAppSubscriptionTask.java @@ -16,22 +16,22 @@ * under the License. */ -package io.entgra.application.mgt.core.task; +package io.entgra.device.mgt.core.application.mgt.core.task; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; +import io.entgra.device.mgt.core.application.mgt.core.impl.SubscriptionManagerImpl; +import io.entgra.device.mgt.core.application.mgt.core.util.Constants; 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 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; -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 io.entgra.device.mgt.core.application.mgt.common.ExecutionStatus; +import io.entgra.device.mgt.core.application.mgt.common.SubscriptionType; +import io.entgra.device.mgt.core.application.mgt.common.dto.ScheduledSubscriptionDTO; +import io.entgra.device.mgt.core.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.device.mgt.core.application.mgt.common.exception.SubscriptionManagementException; +import io.entgra.device.mgt.core.application.mgt.common.services.SubscriptionManager; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; 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/ScheduledAppSubscriptionTaskManager.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/task/ScheduledAppSubscriptionTaskManager.java similarity index 93% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/task/ScheduledAppSubscriptionTaskManager.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/task/ScheduledAppSubscriptionTaskManager.java index e56ecce89c..a2c5e5d176 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/task/ScheduledAppSubscriptionTaskManager.java @@ -16,23 +16,23 @@ * under the License. */ -package io.entgra.application.mgt.core.task; +package io.entgra.device.mgt.core.application.mgt.core.task; import com.google.gson.Gson; +import io.entgra.device.mgt.core.application.mgt.core.impl.SubscriptionManagerImpl; +import io.entgra.device.mgt.core.application.mgt.core.internal.DataHolder; +import io.entgra.device.mgt.core.application.mgt.core.util.Constants; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.quartz.CronExpression; import org.wso2.carbon.context.PrivilegedCarbonContext; -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; -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 io.entgra.device.mgt.core.application.mgt.common.SubAction; +import io.entgra.device.mgt.core.application.mgt.common.SubscriptionType; +import io.entgra.device.mgt.core.application.mgt.common.dto.ScheduledSubscriptionDTO; +import io.entgra.device.mgt.core.application.mgt.common.exception.SubscriptionManagementException; +import io.entgra.device.mgt.core.application.mgt.common.services.SubscriptionManager; +import io.entgra.device.mgt.core.application.mgt.core.exception.ApplicationOperationTaskException; import org.wso2.carbon.ntask.common.TaskException; import org.wso2.carbon.ntask.core.TaskInfo; import org.wso2.carbon.ntask.core.TaskManager; 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/APIUtil.java similarity index 92% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/APIUtil.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/APIUtil.java index 7eba303451..a1434c9c57 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/APIUtil.java @@ -16,40 +16,40 @@ * under the License. */ -package io.entgra.application.mgt.core.util; - -import io.entgra.application.mgt.common.IdentityServerResponse; -import io.entgra.application.mgt.common.dto.IdentityServerDTO; -import io.entgra.application.mgt.common.dto.IdentityServiceProviderDTO; -import io.entgra.application.mgt.common.exception.InvalidConfigurationException; -import io.entgra.application.mgt.core.config.IdentityServiceProvider; -import io.entgra.application.mgt.core.identityserver.serviceprovider.ISServiceProviderApplicationService; +package io.entgra.device.mgt.core.application.mgt.core.util; + +import io.entgra.device.mgt.core.application.mgt.common.IdentityServerResponse; +import io.entgra.device.mgt.core.application.mgt.common.dto.IdentityServerDTO; +import io.entgra.device.mgt.core.application.mgt.common.dto.IdentityServiceProviderDTO; +import io.entgra.device.mgt.core.application.mgt.common.exception.InvalidConfigurationException; +import io.entgra.device.mgt.core.application.mgt.core.config.IdentityServiceProvider; +import io.entgra.device.mgt.core.application.mgt.core.serviceprovider.ISServiceProviderApplicationService; +import io.entgra.device.mgt.core.application.mgt.core.exception.BadRequestException; +import io.entgra.device.mgt.core.application.mgt.core.exception.UnexpectedServerErrorException; import org.apache.commons.lang.StringUtils; 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 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; -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 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; -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; -import io.entgra.application.mgt.core.internal.DataHolder; +import io.entgra.device.mgt.core.application.mgt.common.ApplicationType; +import io.entgra.device.mgt.core.application.mgt.common.config.MDMConfig; +import io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationDTO; +import io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationReleaseDTO; +import io.entgra.device.mgt.core.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.device.mgt.core.application.mgt.common.response.Application; +import io.entgra.device.mgt.core.application.mgt.common.response.ApplicationRelease; +import io.entgra.device.mgt.core.application.mgt.common.services.*; +import io.entgra.device.mgt.core.application.mgt.common.ErrorResponse; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.CustomAppReleaseWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.CustomAppWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.EntAppReleaseWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.ApplicationWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.PublicAppReleaseWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.PublicAppWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.WebAppReleaseWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.WebAppWrapper; +import io.entgra.device.mgt.core.application.mgt.core.config.ConfigurationManager; +import io.entgra.device.mgt.core.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/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/ApplicationManagementUtil.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/ApplicationManagementUtil.java similarity index 85% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/ApplicationManagementUtil.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/ApplicationManagementUtil.java index bb7d65eced..0a8b8579fe 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/ApplicationManagementUtil.java @@ -15,34 +15,34 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.util; +package io.entgra.device.mgt.core.application.mgt.core.util; -import io.entgra.application.mgt.common.ApplicationArtifact; +import io.entgra.device.mgt.core.application.mgt.common.ApplicationArtifact; +import io.entgra.device.mgt.core.application.mgt.core.config.ConfigurationManager; +import io.entgra.device.mgt.core.application.mgt.core.config.Extension; +import io.entgra.device.mgt.core.application.mgt.core.exception.BadRequestException; import org.wso2.carbon.device.mgt.common.Base64File; -import io.entgra.application.mgt.common.FileDataHolder; -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.services.SPApplicationManager; -import io.entgra.application.mgt.common.wrapper.ApplicationWrapper; -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.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.device.mgt.core.application.mgt.common.FileDataHolder; +import io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationDTO; +import io.entgra.device.mgt.core.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.device.mgt.core.application.mgt.common.exception.RequestValidatingException; +import io.entgra.device.mgt.core.application.mgt.common.services.SPApplicationManager; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.ApplicationWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.CustomAppReleaseWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.CustomAppWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.EntAppReleaseWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.PublicAppReleaseWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.PublicAppWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.WebAppReleaseWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.WebAppWrapper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -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; +import io.entgra.device.mgt.core.application.mgt.common.exception.InvalidConfigurationException; +import io.entgra.device.mgt.core.application.mgt.common.services.ApplicationManager; +import io.entgra.device.mgt.core.application.mgt.common.services.ApplicationStorageManager; +import io.entgra.device.mgt.core.application.mgt.common.services.ReviewManager; +import io.entgra.device.mgt.core.application.mgt.common.services.SubscriptionManager; +import io.entgra.device.mgt.core.application.mgt.core.lifecycle.LifecycleStateManager; import org.wso2.carbon.device.mgt.core.common.util.FileUtil; import java.io.InputStream; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/ApplicationMgtDatabaseCreator.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/ApplicationMgtDatabaseCreator.java similarity index 96% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/ApplicationMgtDatabaseCreator.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/ApplicationMgtDatabaseCreator.java index 82678ada0a..9d7f32cf2b 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/ApplicationMgtDatabaseCreator.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/ApplicationMgtDatabaseCreator.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.application.mgt.core.util; +package io.entgra.device.mgt.core.application.mgt.core.util; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/ArtifactsParser.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/ArtifactsParser.java similarity index 97% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/ArtifactsParser.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/ArtifactsParser.java index d9f0ad0234..2832db1f15 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/ArtifactsParser.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/ArtifactsParser.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.application.mgt.core.util; +package io.entgra.device.mgt.core.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 io.entgra.application.mgt.core.exception.ParsingException; +import io.entgra.device.mgt.core.application.mgt.core.exception.ParsingException; import java.io.ByteArrayOutputStream; import java.io.File; 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/ConnectionManagerUtil.java similarity index 97% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/ConnectionManagerUtil.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/ConnectionManagerUtil.java index cbfa27f63e..45aaca8725 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/ConnectionManagerUtil.java @@ -15,13 +15,13 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.util; +package io.entgra.device.mgt.core.application.mgt.core.util; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -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 io.entgra.device.mgt.core.application.mgt.common.exception.DBConnectionException; +import io.entgra.device.mgt.core.application.mgt.common.exception.IllegalTransactionStateException; +import io.entgra.device.mgt.core.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/Constants.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/Constants.java similarity index 99% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/Constants.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/Constants.java index a69f28e5df..7c87e7c743 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/Constants.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/Constants.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.application.mgt.core.util; +package io.entgra.device.mgt.core.application.mgt.core.util; import org.wso2.carbon.utils.CarbonUtils; 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/DAOUtil.java similarity index 95% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/DAOUtil.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/DAOUtil.java index 88e53bfe6b..9d020e4976 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/DAOUtil.java @@ -15,23 +15,23 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.util; +package io.entgra.device.mgt.core.application.mgt.core.util; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import io.entgra.application.mgt.common.dto.IdentityServerDTO; +import io.entgra.device.mgt.core.application.mgt.common.dto.IdentityServerDTO; +import io.entgra.device.mgt.core.application.mgt.core.exception.UnexpectedServerErrorException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.json.JSONException; -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.device.mgt.core.application.mgt.common.ExecutionStatus; +import io.entgra.device.mgt.core.application.mgt.common.SubscriptionType; +import io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationDTO; -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 io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationReleaseDTO; +import io.entgra.device.mgt.core.application.mgt.common.dto.DeviceSubscriptionDTO; +import io.entgra.device.mgt.core.application.mgt.common.dto.ReviewDTO; +import io.entgra.device.mgt.core.application.mgt.common.dto.ScheduledSubscriptionDTO; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; import java.sql.PreparedStatement; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/HelperUtil.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/HelperUtil.java similarity index 97% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/HelperUtil.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/HelperUtil.java index 25fedae716..a75369741f 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/HelperUtil.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/HelperUtil.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.util; +package io.entgra.device.mgt.core.application.mgt.core.util; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/JSONUtil.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/JSONUtil.java similarity index 96% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/JSONUtil.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/JSONUtil.java index 4e57a96c77..66ce4b41f0 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/JSONUtil.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/JSONUtil.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.util; +package io.entgra.device.mgt.core.application.mgt.core.util; import org.json.JSONArray; import org.json.JSONException; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/MDMAppConstants.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/MDMAppConstants.java similarity index 98% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/MDMAppConstants.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/MDMAppConstants.java index 46a5f4fd8d..667110e80b 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/MDMAppConstants.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/MDMAppConstants.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.util; +package io.entgra.device.mgt.core.application.mgt.core.util; public class MDMAppConstants { public static final String USER = "user"; 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/OAuthUtils.java similarity index 97% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/util/OAuthUtils.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/OAuthUtils.java index 71eb214ecc..eda3b39f9c 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.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/OAuthUtils.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.application.mgt.core.util; +package io.entgra.device.mgt.core.application.mgt.core.util; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -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 io.entgra.application.mgt.common.dto.ApiRegistrationProfile; +import io.entgra.device.mgt.core.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/resources/META-INF/component.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/resources/META-INF/component.xml similarity index 93% rename from components/application-mgt/io.entgra.application.mgt.core/src/main/resources/META-INF/component.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/resources/META-INF/component.xml index 857df5b402..9245e6b0a9 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/main/resources/META-INF/component.xml +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/resources/META-INF/component.xml @@ -20,7 +20,7 @@ platforms xml - io.entgra.application.mgt.core.deployer.PlatformDeployer + io.entgra.device.mgt.core.application.mgt.core.deployer.PlatformDeployer diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/ArtifactParserTest.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/ArtifactParserTest.java similarity index 93% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/ArtifactParserTest.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/ArtifactParserTest.java index 6fa36dab72..a0527b3c13 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/ArtifactParserTest.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/ArtifactParserTest.java @@ -16,14 +16,14 @@ * under the License. */ -package io.entgra.application.mgt.core; +package io.entgra.device.mgt.core.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 io.entgra.application.mgt.core.exception.ParsingException; -import io.entgra.application.mgt.core.util.ArtifactsParser; +import io.entgra.device.mgt.core.application.mgt.core.exception.ParsingException; +import io.entgra.device.mgt.core.application.mgt.core.util.ArtifactsParser; import java.io.FileInputStream; import java.io.FileNotFoundException; 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.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/BaseTestCase.java similarity index 88% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/BaseTestCase.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/BaseTestCase.java index 13464675f9..552a2b5e58 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.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/BaseTestCase.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core; +package io.entgra.device.mgt.core.application.mgt.core; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -24,23 +24,19 @@ import org.testng.annotations.BeforeSuite; import org.w3c.dom.Document; import org.wso2.carbon.base.MultitenantConstants; import org.wso2.carbon.context.PrivilegedCarbonContext; -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; -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 io.entgra.device.mgt.core.application.mgt.common.config.LifecycleState; +import io.entgra.device.mgt.core.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.device.mgt.core.application.mgt.core.common.DataSourceConfig; +import io.entgra.device.mgt.core.application.mgt.core.config.ConfigurationManager; +import io.entgra.device.mgt.core.application.mgt.core.dao.common.ApplicationManagementDAOFactory; +import io.entgra.device.mgt.core.application.mgt.core.internal.DataHolder; +import io.entgra.device.mgt.core.application.mgt.core.lifecycle.LifecycleStateManager; +import io.entgra.device.mgt.core.application.mgt.core.util.ApplicationManagementUtil; +import io.entgra.device.mgt.core.application.mgt.core.util.ConnectionManagerUtil; import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager; import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOFactory; import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder; -import org.wso2.carbon.device.mgt.core.internal.DeviceManagementServiceComponent; import org.wso2.carbon.device.mgt.core.metadata.mgt.dao.MetadataManagementDAOFactory; -import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderServiceImpl; -import org.wso2.carbon.device.mgt.core.service.GroupManagementProviderServiceImpl; import org.wso2.carbon.registry.core.config.RegistryContext; import org.wso2.carbon.registry.core.exceptions.RegistryException; import org.wso2.carbon.registry.core.internal.RegistryDataHolder; @@ -163,7 +159,7 @@ public abstract class BaseTestCase { if (file.exists()) { System.setProperty("carbon.home", file.getAbsolutePath()); } - file = new File("io.entgra.application.mgt.core/src/test/resources/carbon-home"); + file = new File("io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home"); if (file.exists()) { System.setProperty("carbon.home", file.getAbsolutePath()); } 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.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/ConfigurationTest.java similarity index 85% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/ConfigurationTest.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/ConfigurationTest.java index 9a8609f1ae..6462e498b9 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.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/ConfigurationTest.java @@ -15,13 +15,13 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core; +package io.entgra.device.mgt.core.application.mgt.core; 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 io.entgra.application.mgt.common.config.LifecycleState; +import io.entgra.device.mgt.core.application.mgt.core.config.Configuration; +import io.entgra.device.mgt.core.application.mgt.core.config.ConfigurationManager; +import io.entgra.device.mgt.core.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.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/InitTest.java similarity index 82% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/InitTest.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/InitTest.java index 2db5d9fa98..1e3b9005b6 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.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/InitTest.java @@ -15,11 +15,11 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core; +package io.entgra.device.mgt.core.application.mgt.core; import org.testng.annotations.BeforeSuite; -import io.entgra.application.mgt.common.exception.InvalidConfigurationException; -import io.entgra.application.mgt.core.config.ConfigurationManager; +import io.entgra.device.mgt.core.application.mgt.common.exception.InvalidConfigurationException; +import io.entgra.device.mgt.core.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.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/LifeCycleStateManagerTest.java similarity index 85% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/LifeCycleStateManagerTest.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/LifeCycleStateManagerTest.java index 248cd1929f..a16cd9f3fa 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.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/LifeCycleStateManagerTest.java @@ -15,10 +15,10 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core; +package io.entgra.device.mgt.core.application.mgt.core; -import io.entgra.application.mgt.core.lifecycle.LifecycleStateManager; -import io.entgra.application.mgt.common.config.LifecycleState; +import io.entgra.device.mgt.core.application.mgt.core.lifecycle.LifecycleStateManager; +import io.entgra.device.mgt.core.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.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/LifecycleManagementTest.java similarity index 92% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/LifecycleManagementTest.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/LifecycleManagementTest.java index 6080982a5d..a867c3f3ca 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.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/LifecycleManagementTest.java @@ -15,16 +15,16 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core; +package io.entgra.device.mgt.core.application.mgt.core; import org.junit.Assert; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -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 io.entgra.application.mgt.common.config.LifecycleState; +import io.entgra.device.mgt.core.application.mgt.common.exception.LifecycleManagementException; +import io.entgra.device.mgt.core.application.mgt.core.config.Configuration; +import io.entgra.device.mgt.core.application.mgt.core.config.ConfigurationManager; +import io.entgra.device.mgt.core.application.mgt.core.lifecycle.LifecycleStateManager; +import io.entgra.device.mgt.core.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.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/StorageManagementUtilTest.java similarity index 94% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/StorageManagementUtilTest.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/StorageManagementUtilTest.java index afbe689b97..e85dd61aca 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.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/StorageManagementUtilTest.java @@ -16,13 +16,13 @@ * under the License. */ -package io.entgra.application.mgt.core; +package io.entgra.device.mgt.core.application.mgt.core; import org.junit.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import io.entgra.application.mgt.common.exception.ResourceManagementException; +import io.entgra.device.mgt.core.application.mgt.common.exception.ResourceManagementException; import org.wso2.carbon.device.mgt.core.common.exception.StorageManagementException; import org.wso2.carbon.device.mgt.core.common.util.StorageManagementUtil; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/TestUtils.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/TestUtils.java similarity index 96% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/TestUtils.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/TestUtils.java index 8ae7ba5e61..de5e631a22 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/TestUtils.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/TestUtils.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core; +package io.entgra.device.mgt.core.application.mgt.core; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/common/DataSourceConfig.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/common/DataSourceConfig.java similarity index 97% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/common/DataSourceConfig.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/common/DataSourceConfig.java index 14aa81c13a..3457fc2b99 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/common/DataSourceConfig.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/common/DataSourceConfig.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.common; +package io.entgra.device.mgt.core.application.mgt.core.common; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; 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.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/dao/ApplicationManagementDAOTest.java similarity index 83% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/dao/ApplicationManagementDAOTest.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/dao/ApplicationManagementDAOTest.java index be76b9c0b7..59775f541d 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.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/dao/ApplicationManagementDAOTest.java @@ -15,19 +15,19 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.dao; +package io.entgra.device.mgt.core.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 io.entgra.application.mgt.core.BaseTestCase; -import io.entgra.application.mgt.core.config.ConfigurationManager; -import io.entgra.application.mgt.core.dao.common.ApplicationManagementDAOFactory; -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 io.entgra.device.mgt.core.application.mgt.core.BaseTestCase; +import io.entgra.device.mgt.core.application.mgt.core.config.ConfigurationManager; +import io.entgra.device.mgt.core.application.mgt.core.dao.common.ApplicationManagementDAOFactory; +import io.entgra.device.mgt.core.application.mgt.core.dto.ApplicationsDTO; +import io.entgra.device.mgt.core.application.mgt.core.dto.DeviceTypeCreator; +import io.entgra.device.mgt.core.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/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/dto/ApplicationsDTO.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/dto/ApplicationsDTO.java similarity index 90% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/dto/ApplicationsDTO.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/dto/ApplicationsDTO.java index d13d288b62..6b07c49b94 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.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/dto/ApplicationsDTO.java @@ -15,9 +15,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.dto; +package io.entgra.device.mgt.core.application.mgt.core.dto; -import io.entgra.application.mgt.common.dto.ApplicationDTO; +import io.entgra.device.mgt.core.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/dto/DeviceTypeCreator.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/dto/DeviceTypeCreator.java similarity index 94% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/dto/DeviceTypeCreator.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/dto/DeviceTypeCreator.java index d1a862afec..d402af54eb 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/dto/DeviceTypeCreator.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/dto/DeviceTypeCreator.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.application.mgt.core.dto; +package io.entgra.device.mgt.core.application.mgt.core.dto; import org.wso2.carbon.device.mgt.core.dto.DeviceType; 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.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/management/ApplicationManagementTest.java similarity index 85% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/management/ApplicationManagementTest.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/management/ApplicationManagementTest.java index 8ab3915a28..0edfd21a60 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.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/management/ApplicationManagementTest.java @@ -15,32 +15,35 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.core.management; +package io.entgra.device.mgt.core.application.mgt.core.management; +import io.entgra.device.mgt.core.application.mgt.common.ApplicationArtifact; +import io.entgra.device.mgt.core.application.mgt.common.ApplicationList; +import io.entgra.device.mgt.core.application.mgt.common.Filter; +import io.entgra.device.mgt.core.application.mgt.common.LifecycleState; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.cxf.jaxrs.ext.multipart.Attachment; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -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; -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; -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; +import io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationDTO; +import io.entgra.device.mgt.core.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.device.mgt.core.application.mgt.common.exception.RequestValidatingException; +import io.entgra.device.mgt.core.application.mgt.common.response.Application; +import io.entgra.device.mgt.core.application.mgt.common.response.ApplicationRelease; +import io.entgra.device.mgt.core.application.mgt.common.response.Category; +import io.entgra.device.mgt.core.application.mgt.common.response.Tag; +import io.entgra.device.mgt.core.application.mgt.common.services.ApplicationManager; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.EntAppReleaseWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.ApplicationUpdateWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.ApplicationWrapper; +import io.entgra.device.mgt.core.application.mgt.core.BaseTestCase; +import io.entgra.device.mgt.core.application.mgt.core.dao.ApplicationDAO; +import io.entgra.device.mgt.core.application.mgt.core.dao.common.ApplicationManagementDAOFactory; +import io.entgra.device.mgt.core.application.mgt.core.dto.ApplicationsDTO; +import io.entgra.device.mgt.core.application.mgt.core.impl.ApplicationManagerImpl; +import io.entgra.device.mgt.core.application.mgt.core.internal.DataHolder; +import io.entgra.device.mgt.core.application.mgt.core.util.ConnectionManagerUtil; import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException; import org.wso2.carbon.device.mgt.common.Base64File; import org.wso2.carbon.device.mgt.core.common.util.FileUtil; diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/Platform.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/Platform.xml similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/Platform.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/Platform.xml diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/application-mgt.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/application-mgt.xml similarity index 91% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/application-mgt.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/application-mgt.xml index d80e94c223..67328db88f 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/application-mgt.xml +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/application-mgt.xml @@ -23,19 +23,19 @@ - io.entgra.application.mgt.core.impl.ApplicationManagerImpl + io.entgra.device.mgt.core.application.mgt.core.impl.ApplicationManagerImpl - io.entgra.application.mgt.core.impl.ReviewManagerImpl + io.entgra.device.mgt.core.application.mgt.core.impl.ReviewManagerImpl - io.entgra.application.mgt.core.lifecycle.LifecycleStateManager + io.entgra.device.mgt.core.application.mgt.core.lifecycle.LifecycleStateManager - io.entgra.application.mgt.core.impl.SubscriptionManagerImpl + io.entgra.device.mgt.core.application.mgt.core.impl.SubscriptionManagerImpl - io.entgra.application.mgt.core.impl.ApplicationStorageManagerImpl + io.entgra.device.mgt.core.application.mgt.core.impl.ApplicationStorageManagerImpl repository/resources/apps/ 6 diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/dbscripts/h2.sql b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/dbscripts/h2.sql similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/dbscripts/h2.sql rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/dbscripts/h2.sql diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/application-mgt.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/application-mgt.xml similarity index 91% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/application-mgt.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/application-mgt.xml index aafbdb712e..080b3ba270 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/application-mgt.xml +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/application-mgt.xml @@ -23,19 +23,19 @@ - io.entgra.application.mgt.core.impl.ApplicationManagerImpl + io.entgra.device.mgt.core.application.mgt.core.impl.ApplicationManagerImpl - io.entgra.application.mgt.core.impl.ReviewManagerImpl + io.entgra.device.mgt.core.application.mgt.core.impl.ReviewManagerImpl - io.entgra.application.mgt.core.lifecycle.LifecycleStateManager + io.entgra.device.mgt.core.application.mgt.core.lifecycle.LifecycleStateManager - io.entgra.application.mgt.core.impl.SubscriptionManagerImpl + io.entgra.device.mgt.core.application.mgt.core.impl.SubscriptionManagerImpl - io.entgra.application.mgt.core.impl.ApplicationStorageManagerImpl + io.entgra.device.mgt.core.application.mgt.core.impl.ApplicationStorageManagerImpl /tmp/apps/ 6 diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/carbon.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/carbon.xml similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/carbon.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/carbon.xml diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/datasources/master-datasources.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/datasources/master-datasources.xml similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/datasources/master-datasources.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/datasources/master-datasources.xml diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/jmx.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/jmx.xml similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/jmx.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/jmx.xml diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/launch.ini b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/launch.ini similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/launch.ini rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/launch.ini diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/mime.mappings b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/mime.mappings similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/mime.mappings rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/mime.mappings diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/mime.types b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/mime.types similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/mime.types rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/mime.types diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/log4j.properties b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/log4j.properties similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/log4j.properties rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/log4j.properties diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/registry.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/registry.xml similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/registry.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/registry.xml diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/security/authenticators.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/security/authenticators.xml similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/security/authenticators.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/security/authenticators.xml diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/web.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/web.xml similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/web.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/web.xml diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/user-mgt.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/user-mgt.xml similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/carbon-home/repository/conf/user-mgt.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/user-mgt.xml diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/datasource/data-source-config.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/datasource/data-source-config.xml similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/datasource/data-source-config.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/datasource/data-source-config.xml diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/h2.sql b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/h2.sql similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/h2.sql rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/h2.sql diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/log4j.properties b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/log4j.properties similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/log4j.properties rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/log4j.properties diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app1/banner1.jpg b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/samples/app1/banner1.jpg similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app1/banner1.jpg rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/samples/app1/banner1.jpg diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app1/icon.png b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/samples/app1/icon.png similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app1/icon.png rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/samples/app1/icon.png diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app1/sample.apk b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/samples/app1/sample.apk similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app1/sample.apk rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/samples/app1/sample.apk diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app1/shot1.png b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/samples/app1/shot1.png similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app1/shot1.png rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/samples/app1/shot1.png diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app1/shot2.png b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/samples/app1/shot2.png similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app1/shot2.png rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/samples/app1/shot2.png diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app1/shot3.png b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/samples/app1/shot3.png similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app1/shot3.png rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/samples/app1/shot3.png diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app2/banner1.jpg b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/samples/app2/banner1.jpg similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app2/banner1.jpg rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/samples/app2/banner1.jpg diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app2/icon.png b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/samples/app2/icon.png similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app2/icon.png rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/samples/app2/icon.png diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app2/sample_4.0.6.apk b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/samples/app2/sample_4.0.6.apk similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app2/sample_4.0.6.apk rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/samples/app2/sample_4.0.6.apk diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app2/shot1.png b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/samples/app2/shot1.png similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app2/shot1.png rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/samples/app2/shot1.png diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app2/shot2.png b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/samples/app2/shot2.png similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app2/shot2.png rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/samples/app2/shot2.png diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app2/shot3.png b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/samples/app2/shot3.png similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/samples/app2/shot3.png rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/samples/app2/shot3.png diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/testng.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/testng.xml similarity index 52% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/testng.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/testng.xml index e8b627e825..7202de3441 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/testng.xml +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/testng.xml @@ -22,14 +22,14 @@ - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/user-test/user-mgt-registry-test.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/user-test/user-mgt-registry-test.xml similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/user-test/user-mgt-registry-test.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/user-test/user-mgt-registry-test.xml diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/util/app-debug.apk b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/util/app-debug.apk similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/util/app-debug.apk rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/util/app-debug.apk diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/resources/util/iOSMDMAgent.ipa b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/util/iOSMDMAgent.ipa similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.core/src/test/resources/util/iOSMDMAgent.ipa rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/util/iOSMDMAgent.ipa diff --git a/components/application-mgt/io.entgra.application.mgt.publisher.api/pom.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.publisher.api/pom.xml similarity index 96% rename from components/application-mgt/io.entgra.application.mgt.publisher.api/pom.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.publisher.api/pom.xml index 7c557111ee..62d6e577aa 100644 --- a/components/application-mgt/io.entgra.application.mgt.publisher.api/pom.xml +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.publisher.api/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - io.entgra.application.mgt.publisher.api + io.entgra.device.mgt.core.application.mgt.publisher.api war Entgra - Application Management Publisher API Entgra - Application Management Publisher API @@ -154,12 +154,12 @@ io.entgra.device.mgt.core - io.entgra.application.mgt.core + io.entgra.device.mgt.core.application.mgt.core provided io.entgra.device.mgt.core - io.entgra.application.mgt.common + io.entgra.device.mgt.core.application.mgt.common provided @@ -218,7 +218,7 @@ io.entgra.device.mgt.core - io.entgra.application.mgt.addons + io.entgra.device.mgt.core.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.device.mgt.core.application.mgt.publisher.api/src/main/java/io/entgra/device/mgt/core/application/mgt/publisher/api/ApplicationManagementPublisherAPI.java similarity index 97% rename from components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/ApplicationManagementPublisherAPI.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.publisher.api/src/main/java/io/entgra/device/mgt/core/application/mgt/publisher/api/ApplicationManagementPublisherAPI.java index 1580219385..2c5928552a 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.device.mgt.core.application.mgt.publisher.api/src/main/java/io/entgra/device/mgt/core/application/mgt/publisher/api/ApplicationManagementPublisherAPI.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.publisher.api.services; +package io.entgra.device.mgt.core.application.mgt.publisher.api; import org.wso2.carbon.device.mgt.common.Base64File; import io.swagger.annotations.Api; @@ -30,22 +30,22 @@ import io.swagger.annotations.SwaggerDefinition; import io.swagger.annotations.Tag; import org.wso2.carbon.apimgt.annotations.api.Scope; import org.wso2.carbon.apimgt.annotations.api.Scopes; -import io.entgra.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; -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.device.mgt.core.application.mgt.common.ApplicationList; +import io.entgra.device.mgt.core.application.mgt.common.ErrorResponse; +import io.entgra.device.mgt.core.application.mgt.common.Filter; +import io.entgra.device.mgt.core.application.mgt.common.LifecycleChanger; +import io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationDTO; +import io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationReleaseDTO; +import io.entgra.device.mgt.core.application.mgt.common.response.ApplicationRelease; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.CustomAppReleaseWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.CustomAppWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.EntAppReleaseWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.ApplicationUpdateWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.ApplicationWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.PublicAppReleaseWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.PublicAppWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.WebAppReleaseWrapper; +import io.entgra.device.mgt.core.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/SPApplicationService.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.publisher.api/src/main/java/io/entgra/device/mgt/core/application/mgt/publisher/api/SPApplicationService.java similarity index 97% rename from components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/SPApplicationService.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.publisher.api/src/main/java/io/entgra/device/mgt/core/application/mgt/publisher/api/SPApplicationService.java index 3b53852aba..38cc96fe53 100644 --- a/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/SPApplicationService.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.publisher.api/src/main/java/io/entgra/device/mgt/core/application/mgt/publisher/api/SPApplicationService.java @@ -15,13 +15,13 @@ * under the License. */ -package io.entgra.application.mgt.publisher.api.services; +package io.entgra.device.mgt.core.application.mgt.publisher.api; -import io.entgra.application.mgt.common.dto.IdentityServerDTO; -import io.entgra.application.mgt.common.wrapper.ApplicationWrapper; -import io.entgra.application.mgt.common.wrapper.CustomAppWrapper; -import io.entgra.application.mgt.common.wrapper.PublicAppWrapper; -import io.entgra.application.mgt.common.wrapper.WebAppWrapper; +import io.entgra.device.mgt.core.application.mgt.common.dto.IdentityServerDTO; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.ApplicationWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.CustomAppWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.PublicAppWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.WebAppWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; 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.device.mgt.core.application.mgt.publisher.api/src/main/java/io/entgra/device/mgt/core/application/mgt/publisher/api/admin/ApplicationManagementPublisherAdminAPI.java similarity index 98% rename from components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/admin/ApplicationManagementPublisherAdminAPI.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.publisher.api/src/main/java/io/entgra/device/mgt/core/application/mgt/publisher/api/admin/ApplicationManagementPublisherAdminAPI.java index 37554f6634..069d76a770 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.device.mgt.core.application.mgt.publisher.api/src/main/java/io/entgra/device/mgt/core/application/mgt/publisher/api/admin/ApplicationManagementPublisherAdminAPI.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.publisher.api.services.admin; +package io.entgra.device.mgt.core.application.mgt.publisher.api.admin; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -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 io.entgra.application.mgt.common.ApplicationList; -import io.entgra.application.mgt.common.ErrorResponse; +import io.entgra.device.mgt.core.application.mgt.common.ApplicationList; +import io.entgra.device.mgt.core.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.device.mgt.core.application.mgt.publisher.api/src/main/java/io/entgra/device/mgt/core/application/mgt/publisher/api/admin/ReviewManagementPublisherAdminAPI.java similarity index 97% rename from components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/admin/ReviewManagementPublisherAdminAPI.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.publisher.api/src/main/java/io/entgra/device/mgt/core/application/mgt/publisher/api/admin/ReviewManagementPublisherAdminAPI.java index 6ae6cdbaeb..c04cc6bd43 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.device.mgt.core.application.mgt.publisher.api/src/main/java/io/entgra/device/mgt/core/application/mgt/publisher/api/admin/ReviewManagementPublisherAdminAPI.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.publisher.api.services.admin; +package io.entgra.device.mgt.core.application.mgt.publisher.api.admin; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -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 io.entgra.application.mgt.common.ErrorResponse; -import io.entgra.application.mgt.common.PaginationResult; +import io.entgra.device.mgt.core.application.mgt.common.ErrorResponse; +import io.entgra.device.mgt.core.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.device.mgt.core.application.mgt.publisher.api/src/main/java/io/entgra/device/mgt/core/application/mgt/publisher/api/impl/ApplicationManagementPublisherAPIImpl.java similarity index 94% rename from components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/impl/ApplicationManagementPublisherAPIImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.publisher.api/src/main/java/io/entgra/device/mgt/core/application/mgt/publisher/api/impl/ApplicationManagementPublisherAPIImpl.java index df98b1ee8a..7d8959fa43 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.device.mgt.core.application.mgt.publisher.api/src/main/java/io/entgra/device/mgt/core/application/mgt/publisher/api/impl/ApplicationManagementPublisherAPIImpl.java @@ -14,42 +14,42 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.publisher.api.services.impl; +package io.entgra.device.mgt.core.application.mgt.publisher.api.impl; -import io.entgra.application.mgt.common.ApplicationArtifact; -import io.entgra.application.mgt.common.ApplicationList; +import io.entgra.device.mgt.core.application.mgt.common.ApplicationArtifact; +import io.entgra.device.mgt.core.application.mgt.common.ApplicationList; import org.wso2.carbon.device.mgt.common.Base64File; -import io.entgra.application.mgt.common.Filter; -import io.entgra.application.mgt.common.LifecycleChanger; -import io.entgra.application.mgt.common.exception.ResourceManagementException; -import io.entgra.application.mgt.core.util.ApplicationManagementUtil; +import io.entgra.device.mgt.core.application.mgt.common.Filter; +import io.entgra.device.mgt.core.application.mgt.common.LifecycleChanger; +import io.entgra.device.mgt.core.application.mgt.common.exception.ResourceManagementException; +import io.entgra.device.mgt.core.application.mgt.core.util.ApplicationManagementUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -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; -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.publisher.api.services.ApplicationManagementPublisherAPI; -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 io.entgra.device.mgt.core.application.mgt.common.LifecycleState; +import io.entgra.device.mgt.core.application.mgt.common.exception.LifecycleManagementException; +import io.entgra.device.mgt.core.application.mgt.common.exception.RequestValidatingException; +import io.entgra.device.mgt.core.application.mgt.common.response.Application; +import io.entgra.device.mgt.core.application.mgt.common.response.ApplicationRelease; +import io.entgra.device.mgt.core.application.mgt.common.response.Category; +import io.entgra.device.mgt.core.application.mgt.common.response.Tag; +import io.entgra.device.mgt.core.application.mgt.common.services.AppmDataHandler; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.CustomAppReleaseWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.CustomAppWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.EntAppReleaseWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.ApplicationUpdateWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.ApplicationWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.PublicAppReleaseWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.PublicAppWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.WebAppReleaseWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.WebAppWrapper; +import io.entgra.device.mgt.core.application.mgt.core.exception.BadRequestException; +import io.entgra.device.mgt.core.application.mgt.core.exception.ForbiddenException; +import io.entgra.device.mgt.core.application.mgt.core.exception.UnexpectedServerErrorException; +import io.entgra.device.mgt.core.application.mgt.core.util.APIUtil; +import io.entgra.device.mgt.core.application.mgt.publisher.api.ApplicationManagementPublisherAPI; +import io.entgra.device.mgt.core.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.device.mgt.core.application.mgt.common.services.ApplicationManager; +import io.entgra.device.mgt.core.application.mgt.core.exception.NotFoundException; 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/SPApplicationServiceImpl.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.publisher.api/src/main/java/io/entgra/device/mgt/core/application/mgt/publisher/api/impl/SPApplicationServiceImpl.java similarity index 92% rename from components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/impl/SPApplicationServiceImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.publisher.api/src/main/java/io/entgra/device/mgt/core/application/mgt/publisher/api/impl/SPApplicationServiceImpl.java index 4eacf5accf..f75efac78b 100644 --- a/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/impl/SPApplicationServiceImpl.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.publisher.api/src/main/java/io/entgra/device/mgt/core/application/mgt/publisher/api/impl/SPApplicationServiceImpl.java @@ -15,24 +15,24 @@ * under the License. */ -package io.entgra.application.mgt.publisher.api.services.impl; +package io.entgra.device.mgt.core.application.mgt.publisher.api.impl; -import io.entgra.application.mgt.common.IdentityServerResponse; -import io.entgra.application.mgt.common.dto.IdentityServerDTO; -import io.entgra.application.mgt.common.SPApplicationListResponse; -import io.entgra.application.mgt.common.dto.IdentityServiceProviderDTO; -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.services.SPApplicationManager; -import io.entgra.application.mgt.common.wrapper.ApplicationWrapper; -import io.entgra.application.mgt.common.wrapper.CustomAppWrapper; -import io.entgra.application.mgt.common.wrapper.PublicAppWrapper; -import io.entgra.application.mgt.common.wrapper.WebAppWrapper; -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.publisher.api.services.SPApplicationService; +import io.entgra.device.mgt.core.application.mgt.common.IdentityServerResponse; +import io.entgra.device.mgt.core.application.mgt.common.dto.IdentityServerDTO; +import io.entgra.device.mgt.core.application.mgt.common.SPApplicationListResponse; +import io.entgra.device.mgt.core.application.mgt.common.dto.IdentityServiceProviderDTO; +import io.entgra.device.mgt.core.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.device.mgt.core.application.mgt.common.exception.RequestValidatingException; +import io.entgra.device.mgt.core.application.mgt.common.response.Application; +import io.entgra.device.mgt.core.application.mgt.common.services.SPApplicationManager; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.ApplicationWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.CustomAppWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.PublicAppWrapper; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.WebAppWrapper; +import io.entgra.device.mgt.core.application.mgt.core.exception.BadRequestException; +import io.entgra.device.mgt.core.application.mgt.core.exception.NotFoundException; +import io.entgra.device.mgt.core.application.mgt.core.util.APIUtil; +import io.entgra.device.mgt.core.application.mgt.publisher.api.SPApplicationService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; 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.device.mgt.core.application.mgt.publisher.api/src/main/java/io/entgra/device/mgt/core/application/mgt/publisher/api/impl/admin/ApplicationManagementPublisherAdminAPIImpl.java similarity index 93% rename from components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/impl/admin/ApplicationManagementPublisherAdminAPIImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.publisher.api/src/main/java/io/entgra/device/mgt/core/application/mgt/publisher/api/impl/admin/ApplicationManagementPublisherAdminAPIImpl.java index 6fd8376010..dd3b9e7d81 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.device.mgt.core.application.mgt.publisher.api/src/main/java/io/entgra/device/mgt/core/application/mgt/publisher/api/impl/admin/ApplicationManagementPublisherAdminAPIImpl.java @@ -15,17 +15,17 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.publisher.api.services.impl.admin; +package io.entgra.device.mgt.core.application.mgt.publisher.api.impl.admin; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -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; -import io.entgra.application.mgt.core.util.APIUtil; -import io.entgra.application.mgt.publisher.api.services.admin.ApplicationManagementPublisherAdminAPI; +import io.entgra.device.mgt.core.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.device.mgt.core.application.mgt.common.services.ApplicationManager; +import io.entgra.device.mgt.core.application.mgt.core.exception.BadRequestException; +import io.entgra.device.mgt.core.application.mgt.core.exception.ForbiddenException; +import io.entgra.device.mgt.core.application.mgt.core.exception.NotFoundException; +import io.entgra.device.mgt.core.application.mgt.core.util.APIUtil; +import io.entgra.device.mgt.core.application.mgt.publisher.api.admin.ApplicationManagementPublisherAdminAPI; 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/impl/admin/ReviewManagementPublisherAdminAPIImpl.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.publisher.api/src/main/java/io/entgra/device/mgt/core/application/mgt/publisher/api/impl/admin/ReviewManagementPublisherAdminAPIImpl.java similarity index 84% rename from components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/impl/admin/ReviewManagementPublisherAdminAPIImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.publisher.api/src/main/java/io/entgra/device/mgt/core/application/mgt/publisher/api/impl/admin/ReviewManagementPublisherAdminAPIImpl.java index d6be1a9f89..8b980ef729 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.device.mgt.core.application.mgt.publisher.api/src/main/java/io/entgra/device/mgt/core/application/mgt/publisher/api/impl/admin/ReviewManagementPublisherAdminAPIImpl.java @@ -14,19 +14,19 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.publisher.api.services.impl.admin; +package io.entgra.device.mgt.core.application.mgt.publisher.api.impl.admin; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -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; -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 io.entgra.device.mgt.core.application.mgt.common.PaginationRequest; +import io.entgra.device.mgt.core.application.mgt.common.PaginationResult; +import io.entgra.device.mgt.core.application.mgt.common.Rating; +import io.entgra.device.mgt.core.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.device.mgt.core.application.mgt.common.exception.ReviewManagementException; +import io.entgra.device.mgt.core.application.mgt.common.services.ReviewManager; +import io.entgra.device.mgt.core.application.mgt.core.exception.NotFoundException; +import io.entgra.device.mgt.core.application.mgt.core.util.APIUtil; +import io.entgra.device.mgt.core.application.mgt.publisher.api.admin.ReviewManagementPublisherAdminAPI; import javax.ws.rs.DefaultValue; import javax.ws.rs.GET; diff --git a/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/webapp/META-INF/permissions.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.publisher.api/src/main/webapp/META-INF/permissions.xml similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/webapp/META-INF/permissions.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.publisher.api/src/main/webapp/META-INF/permissions.xml diff --git a/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/webapp/META-INF/webapp-classloading.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.publisher.api/src/main/webapp/META-INF/webapp-classloading.xml similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/webapp/META-INF/webapp-classloading.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.publisher.api/src/main/webapp/META-INF/webapp-classloading.xml 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.device.mgt.core.application.mgt.publisher.api/src/main/webapp/WEB-INF/cxf-servlet.xml similarity index 70% rename from components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/webapp/WEB-INF/cxf-servlet.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.publisher.api/src/main/webapp/WEB-INF/cxf-servlet.xml index 3269965b0d..22f6d1552b 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.device.mgt.core.application.mgt.publisher.api/src/main/webapp/WEB-INF/cxf-servlet.xml @@ -39,7 +39,7 @@ - + @@ -51,20 +51,20 @@ - + - - - - - - + + + + + + - + 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.device.mgt.core.application.mgt.publisher.api/src/main/webapp/WEB-INF/web.xml similarity index 97% rename from components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/webapp/WEB-INF/web.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.publisher.api/src/main/webapp/WEB-INF/web.xml index 634df3e71a..8c9574ede4 100644 --- a/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/webapp/WEB-INF/web.xml +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.publisher.api/src/main/webapp/WEB-INF/web.xml @@ -73,7 +73,7 @@ ApiOriginFilter - io.entgra.application.mgt.addons.ApiOriginFilter + io.entgra.device.mgt.core.application.mgt.addons.ApiOriginFilter diff --git a/components/application-mgt/io.entgra.application.mgt.store.api/pom.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/pom.xml similarity index 96% rename from components/application-mgt/io.entgra.application.mgt.store.api/pom.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/pom.xml index e30aaeb354..c841b86332 100644 --- a/components/application-mgt/io.entgra.application.mgt.store.api/pom.xml +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - io.entgra.application.mgt.store.api + io.entgra.device.mgt.core.application.mgt.store.api war Entgra - Application Management Store API Entgra - Application Management Store API @@ -154,17 +154,17 @@ io.entgra.device.mgt.core - io.entgra.application.mgt.core + io.entgra.device.mgt.core.application.mgt.core provided io.entgra.device.mgt.core - io.entgra.application.mgt.common + io.entgra.device.mgt.core.application.mgt.common provided io.entgra.device.mgt.core - io.entgra.application.mgt.addons + io.entgra.device.mgt.core.application.mgt.addons io.entgra.device.mgt.core diff --git a/components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/beans/SubscriptionStatusBean.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/beans/SubscriptionStatusBean.java similarity index 93% rename from components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/beans/SubscriptionStatusBean.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/beans/SubscriptionStatusBean.java index 99d71f3d5f..c24e85602f 100644 --- a/components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/beans/SubscriptionStatusBean.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/beans/SubscriptionStatusBean.java @@ -1,4 +1,4 @@ -package io.entgra.application.mgt.store.api.beans; +package io.entgra.device.mgt.core.application.mgt.store.api.beans; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/ApplicationManagementAPI.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/services/ApplicationManagementAPI.java similarity index 96% rename from components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/ApplicationManagementAPI.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/services/ApplicationManagementAPI.java index 4eeab57384..7ae97088ee 100644 --- a/components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/ApplicationManagementAPI.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/services/ApplicationManagementAPI.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.store.api.services; +package io.entgra.device.mgt.core.application.mgt.store.api.services; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -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 io.entgra.application.mgt.common.ErrorResponse; -import io.entgra.application.mgt.common.Filter; -import io.entgra.application.mgt.common.dto.ApplicationDTO; -import io.entgra.application.mgt.common.ApplicationList; +import io.entgra.device.mgt.core.application.mgt.common.ErrorResponse; +import io.entgra.device.mgt.core.application.mgt.common.Filter; +import io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationDTO; +import io.entgra.device.mgt.core.application.mgt.common.ApplicationList; import javax.validation.Valid; import javax.ws.rs.Consumes; diff --git a/components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/ReviewManagementAPI.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/services/ReviewManagementAPI.java similarity index 97% rename from components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/ReviewManagementAPI.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/services/ReviewManagementAPI.java index 615173f3df..4c0910df5b 100644 --- a/components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/ReviewManagementAPI.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/services/ReviewManagementAPI.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.store.api.services; +package io.entgra.device.mgt.core.application.mgt.store.api.services; import io.swagger.annotations.ApiParam; import io.swagger.annotations.Api; @@ -29,10 +29,10 @@ 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 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; +import io.entgra.device.mgt.core.application.mgt.common.PaginationResult; +import io.entgra.device.mgt.core.application.mgt.common.ErrorResponse; +import io.entgra.device.mgt.core.application.mgt.common.response.Review; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.ReviewWrapper; import javax.validation.Valid; import javax.ws.rs.Path; diff --git a/components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/SubscriptionManagementAPI.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/services/SubscriptionManagementAPI.java similarity index 99% rename from components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/SubscriptionManagementAPI.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/services/SubscriptionManagementAPI.java index ec88df3714..117ad7bdaa 100644 --- a/components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/SubscriptionManagementAPI.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/services/SubscriptionManagementAPI.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.store.api.services; +package io.entgra.device.mgt.core.application.mgt.store.api.services; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -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 io.entgra.application.mgt.common.ErrorResponse; +import io.entgra.device.mgt.core.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.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/admin/ReviewManagementStoreAdminAPI.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/services/admin/ReviewManagementStoreAdminAPI.java similarity index 96% rename from components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/admin/ReviewManagementStoreAdminAPI.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/services/admin/ReviewManagementStoreAdminAPI.java index 7ab8cc071e..33f500ebd2 100644 --- a/components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/admin/ReviewManagementStoreAdminAPI.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/services/admin/ReviewManagementStoreAdminAPI.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.store.api.services.admin; +package io.entgra.device.mgt.core.application.mgt.store.api.services.admin; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -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 io.entgra.application.mgt.common.ErrorResponse; +import io.entgra.device.mgt.core.application.mgt.common.ErrorResponse; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; diff --git a/components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/admin/SubscriptionManagementAdminAPI.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/services/admin/SubscriptionManagementAdminAPI.java similarity index 97% rename from components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/admin/SubscriptionManagementAdminAPI.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/services/admin/SubscriptionManagementAdminAPI.java index 8660975088..b52f1eff9b 100644 --- a/components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/admin/SubscriptionManagementAdminAPI.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/services/admin/SubscriptionManagementAdminAPI.java @@ -15,9 +15,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.store.api.services.admin; +package io.entgra.device.mgt.core.application.mgt.store.api.services.admin; -import io.entgra.application.mgt.store.api.beans.SubscriptionStatusBean; +import io.entgra.device.mgt.core.application.mgt.store.api.beans.SubscriptionStatusBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -30,7 +30,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 io.entgra.application.mgt.common.ErrorResponse; +import io.entgra.device.mgt.core.application.mgt.common.ErrorResponse; import javax.validation.constraints.Size; import javax.ws.rs.Consumes; diff --git a/components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/ApplicationManagementAPIImpl.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/services/impl/ApplicationManagementAPIImpl.java similarity index 88% rename from components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/ApplicationManagementAPIImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/services/impl/ApplicationManagementAPIImpl.java index f771645a77..be7a6db2a0 100644 --- a/components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/ApplicationManagementAPIImpl.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/services/impl/ApplicationManagementAPIImpl.java @@ -14,20 +14,20 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.store.api.services.impl; +package io.entgra.device.mgt.core.application.mgt.store.api.services.impl; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -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; -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 io.entgra.device.mgt.core.application.mgt.common.ApplicationList; +import io.entgra.device.mgt.core.application.mgt.common.Filter; +import io.entgra.device.mgt.core.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.device.mgt.core.application.mgt.common.response.Application; +import io.entgra.device.mgt.core.application.mgt.common.services.ApplicationManager; +import io.entgra.device.mgt.core.application.mgt.core.exception.BadRequestException; +import io.entgra.device.mgt.core.application.mgt.core.exception.NotFoundException; +import io.entgra.device.mgt.core.application.mgt.core.exception.UnexpectedServerErrorException; +import io.entgra.device.mgt.core.application.mgt.core.util.APIUtil; +import io.entgra.device.mgt.core.application.mgt.store.api.services.ApplicationManagementAPI; import javax.validation.Valid; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; diff --git a/components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/ReviewManagementAPIImpl.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/services/impl/ReviewManagementAPIImpl.java similarity index 92% rename from components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/ReviewManagementAPIImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/services/impl/ReviewManagementAPIImpl.java index b07f1ea9c6..ffbe19fca7 100644 --- a/components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/ReviewManagementAPIImpl.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/services/impl/ReviewManagementAPIImpl.java @@ -15,24 +15,24 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.store.api.services.impl; +package io.entgra.device.mgt.core.application.mgt.store.api.services.impl; import io.swagger.annotations.ApiParam; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -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; -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 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; +import io.entgra.device.mgt.core.application.mgt.common.PaginationResult; +import io.entgra.device.mgt.core.application.mgt.common.Rating; +import io.entgra.device.mgt.core.application.mgt.common.response.Review; +import io.entgra.device.mgt.core.application.mgt.common.services.ReviewManager; +import io.entgra.device.mgt.core.application.mgt.common.wrapper.ReviewWrapper; +import io.entgra.device.mgt.core.application.mgt.core.exception.BadRequestException; +import io.entgra.device.mgt.core.application.mgt.core.exception.ForbiddenException; +import io.entgra.device.mgt.core.application.mgt.core.exception.NotFoundException; +import io.entgra.device.mgt.core.application.mgt.store.api.services.ReviewManagementAPI; +import io.entgra.device.mgt.core.application.mgt.common.PaginationRequest; +import io.entgra.device.mgt.core.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.device.mgt.core.application.mgt.common.exception.ReviewManagementException; +import io.entgra.device.mgt.core.application.mgt.core.util.APIUtil; import javax.ws.rs.DefaultValue; import javax.ws.rs.Path; diff --git a/components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/SubscriptionManagementAPIImpl.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/services/impl/SubscriptionManagementAPIImpl.java similarity index 92% rename from components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/SubscriptionManagementAPIImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/services/impl/SubscriptionManagementAPIImpl.java index ab13168e17..a29ec7f0db 100644 --- a/components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/SubscriptionManagementAPIImpl.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/services/impl/SubscriptionManagementAPIImpl.java @@ -16,30 +16,30 @@ * under the License. */ -package io.entgra.application.mgt.store.api.services.impl; +package io.entgra.device.mgt.core.application.mgt.store.api.services.impl; +import io.entgra.device.mgt.core.application.mgt.store.api.services.impl.util.RequestValidationUtil; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -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 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; -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 io.entgra.device.mgt.core.application.mgt.common.ApplicationInstallResponse; +import io.entgra.device.mgt.core.application.mgt.common.ErrorResponse; +import io.entgra.device.mgt.core.application.mgt.common.SubAction; +import io.entgra.device.mgt.core.application.mgt.common.SubscriptionType; +import io.entgra.device.mgt.core.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.device.mgt.core.application.mgt.common.services.SubscriptionManager; +import io.entgra.device.mgt.core.application.mgt.core.exception.ApplicationOperationTaskException; +import io.entgra.device.mgt.core.application.mgt.common.DeviceList; +import io.entgra.device.mgt.core.application.mgt.common.BasicUserInfo; +import io.entgra.device.mgt.core.application.mgt.common.BasicUserInfoList; +import io.entgra.device.mgt.core.application.mgt.common.RoleList; +import io.entgra.device.mgt.core.application.mgt.common.DeviceGroupList; +import io.entgra.device.mgt.core.application.mgt.core.exception.BadRequestException; +import io.entgra.device.mgt.core.application.mgt.core.exception.ForbiddenException; +import io.entgra.device.mgt.core.application.mgt.core.exception.NotFoundException; +import io.entgra.device.mgt.core.application.mgt.core.task.ScheduledAppSubscriptionTaskManager; +import io.entgra.device.mgt.core.application.mgt.core.util.APIUtil; +import io.entgra.device.mgt.core.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; @@ -258,9 +258,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 io.entgra.application.mgt.common.SubscriptionType}} + * {@see {@link io.entgra.device.mgt.core.application.mgt.common.SubscriptionType}} * @param subAction action subscription action. E.g. INSTALL/UNINSTALL - * {@see {@link io.entgra.application.mgt.common.SubAction}} + * {@see {@link io.entgra.device.mgt.core.application.mgt.common.SubAction}} * @param payload Properties sending to the device via operation * @param timestamp timestamp to schedule the application subscription * @return {@link Response} of the operation @@ -280,9 +280,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 io.entgra.application.mgt.common.SubscriptionType}} + * {@see {@link io.entgra.device.mgt.core.application.mgt.common.SubscriptionType}} * @param subAction action subscription action. E.g. INSTALL/UNINSTALL - * {@see {@link io.entgra.application.mgt.common.SubAction}} + * {@see {@link io.entgra.device.mgt.core.application.mgt.common.SubAction}} * @param timestamp timestamp to schedule the application subscription * @param payload Properties sending to the device via operation * @param isOperationReExecutingDisabled To prevent adding the application subscribing operation to devices that are diff --git a/components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/admin/ReviewManagementStoreAdminAPIImpl.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/services/impl/admin/ReviewManagementStoreAdminAPIImpl.java similarity index 80% rename from components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/admin/ReviewManagementStoreAdminAPIImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/services/impl/admin/ReviewManagementStoreAdminAPIImpl.java index 2585edaf1a..e2ef8b8252 100644 --- a/components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/admin/ReviewManagementStoreAdminAPIImpl.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/services/impl/admin/ReviewManagementStoreAdminAPIImpl.java @@ -14,16 +14,16 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.store.api.services.impl.admin; +package io.entgra.device.mgt.core.application.mgt.store.api.services.impl.admin; +import io.entgra.device.mgt.core.application.mgt.store.api.services.admin.ReviewManagementStoreAdminAPI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -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; +import io.entgra.device.mgt.core.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.device.mgt.core.application.mgt.common.exception.ReviewManagementException; +import io.entgra.device.mgt.core.application.mgt.common.services.ReviewManager; +import io.entgra.device.mgt.core.application.mgt.core.exception.NotFoundException; +import io.entgra.device.mgt.core.application.mgt.core.util.APIUtil; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; diff --git a/components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/admin/SubscriptionManagementAdminAPIImpl.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/services/impl/admin/SubscriptionManagementAdminAPIImpl.java similarity index 86% rename from components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/admin/SubscriptionManagementAdminAPIImpl.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/services/impl/admin/SubscriptionManagementAdminAPIImpl.java index 08226c72bf..0872c3bf7d 100644 --- a/components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/admin/SubscriptionManagementAdminAPIImpl.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/services/impl/admin/SubscriptionManagementAdminAPIImpl.java @@ -16,20 +16,20 @@ * under the License. */ -package io.entgra.application.mgt.store.api.services.impl.admin; +package io.entgra.device.mgt.core.application.mgt.store.api.services.impl.admin; -import io.entgra.application.mgt.common.exception.SubscriptionManagementException; -import io.entgra.application.mgt.store.api.beans.SubscriptionStatusBean; +import io.entgra.device.mgt.core.application.mgt.common.exception.SubscriptionManagementException; +import io.entgra.device.mgt.core.application.mgt.store.api.beans.SubscriptionStatusBean; +import io.entgra.device.mgt.core.application.mgt.store.api.services.admin.SubscriptionManagementAdminAPI; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -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; -import io.entgra.application.mgt.store.api.services.admin.SubscriptionManagementAdminAPI; -import io.entgra.application.mgt.store.api.services.impl.util.RequestValidationUtil; +import io.entgra.device.mgt.core.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.device.mgt.core.application.mgt.common.services.SubscriptionManager; +import io.entgra.device.mgt.core.application.mgt.core.exception.BadRequestException; +import io.entgra.device.mgt.core.application.mgt.core.exception.NotFoundException; +import io.entgra.device.mgt.core.application.mgt.core.util.APIUtil; +import io.entgra.device.mgt.core.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/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/util/RequestValidationUtil.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/services/impl/util/RequestValidationUtil.java similarity index 96% rename from components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/util/RequestValidationUtil.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/services/impl/util/RequestValidationUtil.java index d36c0e2512..18a195453e 100644 --- a/components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/util/RequestValidationUtil.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/services/impl/util/RequestValidationUtil.java @@ -16,18 +16,17 @@ * under the License. * */ -package io.entgra.application.mgt.store.api.services.impl.util; +package io.entgra.device.mgt.core.application.mgt.store.api.services.impl.util; import org.apache.commons.lang3.EnumUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import io.entgra.application.mgt.core.exception.BadRequestException; -import io.entgra.application.mgt.store.api.util.Constants; +import io.entgra.device.mgt.core.application.mgt.core.exception.BadRequestException; +import io.entgra.device.mgt.core.application.mgt.store.api.util.Constants; import org.wso2.carbon.device.mgt.common.operation.mgt.ActivityStatus; import java.util.List; -import java.util.StringJoiner; public class RequestValidationUtil { diff --git a/components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/util/Constants.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/util/Constants.java similarity index 98% rename from components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/util/Constants.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/util/Constants.java index 3c06f365d2..8fce7a8390 100644 --- a/components/application-mgt/io.entgra.application.mgt.store.api/src/main/java/io/entgra/application/mgt/store/api/util/Constants.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/java/io/entgra/device/mgt/core/application/mgt/store/api/util/Constants.java @@ -33,7 +33,7 @@ * under the License. */ -package io.entgra.application.mgt.store.api.util; +package io.entgra.device.mgt.core.application.mgt.store.api.util; /** * Holds the constants used by DeviceImpl Management Admin web application. diff --git a/components/application-mgt/io.entgra.application.mgt.store.api/src/main/webapp/META-INF/permissions.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/webapp/META-INF/permissions.xml similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.store.api/src/main/webapp/META-INF/permissions.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/webapp/META-INF/permissions.xml diff --git a/components/application-mgt/io.entgra.application.mgt.store.api/src/main/webapp/META-INF/webapp-classloading.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/webapp/META-INF/webapp-classloading.xml similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.store.api/src/main/webapp/META-INF/webapp-classloading.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/webapp/META-INF/webapp-classloading.xml diff --git a/components/application-mgt/io.entgra.application.mgt.store.api/src/main/webapp/WEB-INF/cxf-servlet.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/webapp/WEB-INF/cxf-servlet.xml similarity index 68% rename from components/application-mgt/io.entgra.application.mgt.store.api/src/main/webapp/WEB-INF/cxf-servlet.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/webapp/WEB-INF/cxf-servlet.xml index 958353c196..9981fa465e 100644 --- a/components/application-mgt/io.entgra.application.mgt.store.api/src/main/webapp/WEB-INF/cxf-servlet.xml +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/webapp/WEB-INF/cxf-servlet.xml @@ -39,7 +39,7 @@ - + @@ -51,21 +51,21 @@ - + - - - - - - - + + + + + + + - + diff --git a/components/application-mgt/io.entgra.application.mgt.store.api/src/main/webapp/WEB-INF/web.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/webapp/WEB-INF/web.xml similarity index 97% rename from components/application-mgt/io.entgra.application.mgt.store.api/src/main/webapp/WEB-INF/web.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/webapp/WEB-INF/web.xml index 09dc9ca61f..26b01b1313 100644 --- a/components/application-mgt/io.entgra.application.mgt.store.api/src/main/webapp/WEB-INF/web.xml +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/main/webapp/WEB-INF/web.xml @@ -73,7 +73,7 @@ ApiOriginFilter - io.entgra.application.mgt.addons.ApiOriginFilter + io.entgra.device.mgt.core.application.mgt.addons.ApiOriginFilter diff --git a/components/application-mgt/io.entgra.application.mgt.store.api/src/test/java/io/entgra/application/mgt/store/api/services/CommentMgtTestHelper.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/test/java/io/entgra/device/mgt/core/application/mgt/store/api/services/CommentMgtTestHelper.java similarity index 91% rename from components/application-mgt/io.entgra.application.mgt.store.api/src/test/java/io/entgra/application/mgt/store/api/services/CommentMgtTestHelper.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/test/java/io/entgra/device/mgt/core/application/mgt/store/api/services/CommentMgtTestHelper.java index d586b5f5cb..b54d380c53 100644 --- a/components/application-mgt/io.entgra.application.mgt.store.api/src/test/java/io/entgra/application/mgt/store/api/services/CommentMgtTestHelper.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/test/java/io/entgra/device/mgt/core/application/mgt/store/api/services/CommentMgtTestHelper.java @@ -15,9 +15,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.store.api.services; +package io.entgra.device.mgt.core.application.mgt.store.api.services; -import io.entgra.application.mgt.common.response.Review; +import io.entgra.device.mgt.core.application.mgt.common.response.Review; /** * Helper class for Review Management API test cases. diff --git a/components/application-mgt/io.entgra.application.mgt.store.api/src/test/java/io/entgra/application/mgt/store/api/services/ReviewManagementAPITest.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/test/java/io/entgra/device/mgt/core/application/mgt/store/api/services/ReviewManagementAPITest.java similarity index 97% rename from components/application-mgt/io.entgra.application.mgt.store.api/src/test/java/io/entgra/application/mgt/store/api/services/ReviewManagementAPITest.java rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/test/java/io/entgra/device/mgt/core/application/mgt/store/api/services/ReviewManagementAPITest.java index 52b6e5e051..ad640351e9 100644 --- a/components/application-mgt/io.entgra.application.mgt.store.api/src/test/java/io/entgra/application/mgt/store/api/services/ReviewManagementAPITest.java +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/test/java/io/entgra/device/mgt/core/application/mgt/store/api/services/ReviewManagementAPITest.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.application.mgt.store.api.services; +package io.entgra.device.mgt.core.application.mgt.store.api.services; import junit.framework.TestCase; import org.apache.commons.logging.Log; @@ -24,12 +24,12 @@ 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 io.entgra.application.mgt.common.services.ReviewManager; -import io.entgra.application.mgt.core.util.APIUtil; +import io.entgra.device.mgt.core.application.mgt.common.services.ReviewManager; +import io.entgra.device.mgt.core.application.mgt.core.util.APIUtil; @PowerMockIgnore("javax.ws.rs.*") @SuppressStaticInitializationFor({ - "io.entgra.application.mgt.api.APIUtil" }) + "io.entgra.device.mgt.core.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.mgt.store.api/src/test/resources/log4j.properties b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/test/resources/log4j.properties similarity index 100% rename from components/application-mgt/io.entgra.application.mgt.store.api/src/test/resources/log4j.properties rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/test/resources/log4j.properties diff --git a/components/application-mgt/io.entgra.application.mgt.store.api/src/test/resources/testng.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/test/resources/testng.xml similarity index 89% rename from components/application-mgt/io.entgra.application.mgt.store.api/src/test/resources/testng.xml rename to components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/test/resources/testng.xml index 68732a014c..696dcfb8cf 100644 --- a/components/application-mgt/io.entgra.application.mgt.store.api/src/test/resources/testng.xml +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/src/test/resources/testng.xml @@ -23,7 +23,7 @@ - + diff --git a/components/application-mgt/pom.xml b/components/application-mgt/pom.xml index 50a07c7bd8..5d698230c1 100644 --- a/components/application-mgt/pom.xml +++ b/components/application-mgt/pom.xml @@ -34,12 +34,12 @@ http://wso2.org - 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 + io.entgra.device.mgt.core.application.mgt.common + io.entgra.device.mgt.core.application.mgt.core + io.entgra.device.mgt.core.application.mgt.addons + io.entgra.device.mgt.core.application.mgt.publisher.api + io.entgra.device.mgt.core.application.mgt.store.api + io.entgra.device.mgt.core.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 31d5d29891..b1b6d356fc 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 @@ io.entgra.device.mgt.core - io.entgra.application.mgt.common + io.entgra.device.mgt.core.application.mgt.common provided @@ -91,8 +91,8 @@ io.entgra.device.mgt.core.policy.mgt.core, com.google.gson, org.wso2.carbon.device.mgt.core.service.*, - io.entgra.application.mgt.common.*, - io.entgra.application.mgt.common.services.* + io.entgra.device.mgt.core.application.mgt.common.*, + io.entgra.device.mgt.core.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 4ad59f212d..c05c290931 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,9 +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 io.entgra.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.device.mgt.core.application.mgt.common.exception.ApplicationManagementException; import org.wso2.carbon.device.mgt.common.Device; -import io.entgra.application.mgt.common.services.ApplicationManager; +import io.entgra.device.mgt.core.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 159ab51fa1..a73bb2e3f3 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 io.entgra.application.mgt.common.services.ApplicationManager; +import io.entgra.device.mgt.core.application.mgt.common.services.ApplicationManager; import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService; import io.entgra.device.mgt.core.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 5c47d57e18..bc0363a0d7 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 io.entgra.application.mgt.common.services.ApplicationManager; +import io.entgra.device.mgt.core.application.mgt.common.services.ApplicationManager; import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService; import io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerService; @@ -40,7 +40,7 @@ import io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerService; * bind="setPolicyManagerService" * unbind="unsetPolicyManagerService" * @scr.reference name="org.wso2.carbon.application.mgt.service" - * interface="io.entgra.application.mgt.common.services.ApplicationManager" + * interface="io.entgra.device.mgt.core.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 60cc68aa83..d88641d5f8 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 @@ io.entgra.device.mgt.core - io.entgra.application.mgt.common + io.entgra.device.mgt.core.application.mgt.common provided @@ -160,8 +160,8 @@ org.wso2.carbon.event.output.adapter.core.exception, org.wso2.carbon.device.mgt.core.operation.mgt, org.wso2.carbon.core, - io.entgra.application.mgt.common.*, - io.entgra.application.mgt.common.services.* + io.entgra.device.mgt.core.application.mgt.common.*, + io.entgra.device.mgt.core.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 71f3ad5cb9..d32b765ec5 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 @@ -417,12 +417,12 @@ io.entgra.device.mgt.core - io.entgra.application.mgt.common + io.entgra.device.mgt.core.application.mgt.common provided io.entgra.device.mgt.core - io.entgra.application.mgt.core + io.entgra.device.mgt.core.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 ed1b69cb9f..7ca4d07c2d 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 @@ -37,12 +37,12 @@ package org.wso2.carbon.device.mgt.jaxrs.service.impl; import com.google.gson.Gson; -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.ApplicationManager; -import io.entgra.application.mgt.common.services.SubscriptionManager; -import io.entgra.application.mgt.core.util.HelperUtil; +import io.entgra.device.mgt.core.application.mgt.common.ApplicationInstallResponse; +import io.entgra.device.mgt.core.application.mgt.common.SubscriptionType; +import io.entgra.device.mgt.core.application.mgt.common.exception.SubscriptionManagementException; +import io.entgra.device.mgt.core.application.mgt.common.services.ApplicationManager; +import io.entgra.device.mgt.core.application.mgt.common.services.SubscriptionManager; +import io.entgra.device.mgt.core.application.mgt.core.util.HelperUtil; import org.apache.commons.httpclient.HttpStatus; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; @@ -1045,7 +1045,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService { return Response.serverError().entity( new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build()).build(); } catch (SubscriptionManagementException | - io.entgra.application.mgt.common.exception.ApplicationManagementException + io.entgra.device.mgt.core.application.mgt.common.exception.ApplicationManagementException e) { String msg = "Error occurred while getting the " + type + "application is of device " + id + "subscribed " + "at entgra store"; @@ -1598,7 +1598,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService { String msg = "Error occurred when updating operation of device " + deviceIdentifier; log.error(msg, e); return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build(); - } catch (io.entgra.application.mgt.common.exception.ApplicationManagementException e) { + } catch (io.entgra.device.mgt.core.application.mgt.common.exception.ApplicationManagementException e) { String msg = "Error occurred when updating the application subscription status of the operation. " + "The device identifier is: " + deviceIdentifier; log.error(msg, e); 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 27a43c651b..d2014d1f9b 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 @@ -35,8 +35,8 @@ package org.wso2.carbon.device.mgt.jaxrs.util; -import io.entgra.application.mgt.common.services.ApplicationManager; -import io.entgra.application.mgt.common.services.SubscriptionManager; +import io.entgra.device.mgt.core.application.mgt.common.services.ApplicationManager; +import io.entgra.device.mgt.core.application.mgt.common.services.SubscriptionManager; import org.apache.axis2.AxisFault; import org.apache.axis2.client.Options; import org.apache.axis2.java.security.SSLProtocolSocketFactory; 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 b05b2630f1..ec04499745 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 @@ io.entgra.device.mgt.core - io.entgra.application.mgt.common + io.entgra.device.mgt.core.application.mgt.common test diff --git a/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/pom.xml b/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/pom.xml index c73ac3c9ee..605bae0d2d 100644 --- a/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/pom.xml +++ b/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/pom.xml @@ -51,8 +51,8 @@ org.osgi.framework.*;version="${imp.package.version.osgi.framework}", org.osgi.service.*;version="${imp.package.version.osgi.service}", org.apache.commons.logging, - io.entgra.application.mgt.common.*, - io.entgra.application.mgt.core.config, + io.entgra.device.mgt.core.application.mgt.common.*, + io.entgra.device.mgt.core.application.mgt.core.config, org.wso2.carbon.device.mgt.core, org.wso2.carbon.user.api, org.wso2.carbon.registry.core.exceptions, @@ -115,11 +115,11 @@ io.entgra.device.mgt.core - io.entgra.application.mgt.core + io.entgra.device.mgt.core.application.mgt.core io.entgra.device.mgt.core - io.entgra.application.mgt.common + io.entgra.device.mgt.core.application.mgt.common io.entgra.device.mgt.core diff --git a/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/src/main/java/io/entgra/device/mgt/core/tenant/mgt/core/impl/TenantManagerImpl.java b/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/src/main/java/io/entgra/device/mgt/core/tenant/mgt/core/impl/TenantManagerImpl.java index f7cd187668..064fc7d222 100644 --- a/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/src/main/java/io/entgra/device/mgt/core/tenant/mgt/core/impl/TenantManagerImpl.java +++ b/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/src/main/java/io/entgra/device/mgt/core/tenant/mgt/core/impl/TenantManagerImpl.java @@ -17,9 +17,9 @@ */ package io.entgra.device.mgt.core.tenant.mgt.core.impl; -import io.entgra.application.mgt.common.exception.ApplicationManagementException; -import io.entgra.application.mgt.core.config.ConfigurationManager; -import io.entgra.application.mgt.common.services.ApplicationManager; +import io.entgra.device.mgt.core.application.mgt.common.exception.ApplicationManagementException; +import io.entgra.device.mgt.core.application.mgt.core.config.ConfigurationManager; +import io.entgra.device.mgt.core.application.mgt.common.services.ApplicationManager; import io.entgra.device.mgt.core.tenant.mgt.core.TenantManager; import io.entgra.device.mgt.core.tenant.mgt.common.exception.TenantMgtException; import io.entgra.device.mgt.core.tenant.mgt.core.internal.TenantMgtDataHolder; diff --git a/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/src/main/java/io/entgra/device/mgt/core/tenant/mgt/core/internal/TenantMgtDataHolder.java b/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/src/main/java/io/entgra/device/mgt/core/tenant/mgt/core/internal/TenantMgtDataHolder.java index d168bb9bd7..c03bd863d8 100644 --- a/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/src/main/java/io/entgra/device/mgt/core/tenant/mgt/core/internal/TenantMgtDataHolder.java +++ b/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/src/main/java/io/entgra/device/mgt/core/tenant/mgt/core/internal/TenantMgtDataHolder.java @@ -17,7 +17,7 @@ */ package io.entgra.device.mgt.core.tenant.mgt.core.internal; -import io.entgra.application.mgt.common.services.ApplicationManager; +import io.entgra.device.mgt.core.application.mgt.common.services.ApplicationManager; import io.entgra.device.mgt.core.tenant.mgt.core.TenantManager; import org.wso2.carbon.device.mgt.common.metadata.mgt.WhiteLabelManagementService; import org.wso2.carbon.user.core.service.RealmService; diff --git a/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/src/main/java/io/entgra/device/mgt/core/tenant/mgt/core/internal/TenantMgtServiceComponent.java b/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/src/main/java/io/entgra/device/mgt/core/tenant/mgt/core/internal/TenantMgtServiceComponent.java index a335f27546..def4887478 100644 --- a/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/src/main/java/io/entgra/device/mgt/core/tenant/mgt/core/internal/TenantMgtServiceComponent.java +++ b/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/src/main/java/io/entgra/device/mgt/core/tenant/mgt/core/internal/TenantMgtServiceComponent.java @@ -17,7 +17,7 @@ */ package io.entgra.device.mgt.core.tenant.mgt.core.internal; -import io.entgra.application.mgt.common.services.ApplicationManager; +import io.entgra.device.mgt.core.application.mgt.common.services.ApplicationManager; import io.entgra.device.mgt.core.tenant.mgt.common.spi.TenantManagerService; import io.entgra.device.mgt.core.tenant.mgt.core.TenantManager; import io.entgra.device.mgt.core.tenant.mgt.core.impl.TenantManagerImpl; @@ -34,7 +34,7 @@ import org.wso2.carbon.user.core.service.RealmService; /** * @scr.component name="io.entgra.device.mgt.core.tenant.manager" immediate="true" * @scr.reference name="org.wso2.carbon.application.mgt.service" - * interface="io.entgra.application.mgt.common.services.ApplicationManager" + * interface="io.entgra.device.mgt.core.application.mgt.common.services.ApplicationManager" * cardinality="1..1" * policy="dynamic" * bind="setApplicationManager" diff --git a/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/pom.xml b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/pom.xml index e37de80356..043e993b7f 100644 --- a/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/pom.xml +++ b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/pom.xml @@ -165,7 +165,7 @@ io.entgra.device.mgt.core - io.entgra.application.mgt.core + io.entgra.device.mgt.core.application.mgt.core provided diff --git a/features/application-mgt/io.entgra.device.mgt.core.application.mgt.api.feature/pom.xml b/features/application-mgt/io.entgra.device.mgt.core.application.mgt.api.feature/pom.xml index dfb8e42e4a..90d9081ba7 100644 --- a/features/application-mgt/io.entgra.device.mgt.core.application.mgt.api.feature/pom.xml +++ b/features/application-mgt/io.entgra.device.mgt.core.application.mgt.api.feature/pom.xml @@ -49,7 +49,7 @@ io.entgra.device.mgt.core - io.entgra.application.mgt.publisher.api + io.entgra.device.mgt.core.application.mgt.publisher.api ${project.version} war @@ -72,7 +72,7 @@ io.entgra.device.mgt.core - io.entgra.application.mgt.store.api + io.entgra.device.mgt.core.application.mgt.store.api ${project.version} war @@ -95,7 +95,7 @@ io.entgra.device.mgt.core - io.entgra.application.mgt.api + io.entgra.device.mgt.core.application.mgt.api ${project.version} war diff --git a/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/pom.xml b/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/pom.xml index 2986d2c1e3..37c63ea3e6 100644 --- a/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/pom.xml +++ b/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/pom.xml @@ -38,11 +38,11 @@ io.entgra.device.mgt.core - io.entgra.application.mgt.common + io.entgra.device.mgt.core.application.mgt.common io.entgra.device.mgt.core - io.entgra.application.mgt.core + io.entgra.device.mgt.core.application.mgt.core com.googlecode.plist @@ -147,10 +147,10 @@ - io.entgra.device.mgt.core:io.entgra.application.mgt.common:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.application.mgt.common:${carbon.device.mgt.version} - io.entgra.device.mgt.core:io.entgra.application.mgt.core:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.application.mgt.core:${carbon.device.mgt.version} com.googlecode.plist:dd-plist:${googlecode.plist.version} diff --git a/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/conf/application-mgt.xml b/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/conf/application-mgt.xml index 428fc0e134..190c311b2a 100644 --- a/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/conf/application-mgt.xml +++ b/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/conf/application-mgt.xml @@ -23,22 +23,22 @@ - io.entgra.application.mgt.core.impl.SPApplicationManagerImpl + io.entgra.device.mgt.core.application.mgt.core.impl.SPApplicationManagerImpl - io.entgra.application.mgt.core.impl.ApplicationManagerImpl + io.entgra.device.mgt.core.application.mgt.core.impl.ApplicationManagerImpl - io.entgra.application.mgt.core.impl.ReviewManagerImpl + io.entgra.device.mgt.core.application.mgt.core.impl.ReviewManagerImpl - io.entgra.application.mgt.core.lifecycle.LifecycleStateManager + io.entgra.device.mgt.core.application.mgt.core.lifecycle.LifecycleStateManager - io.entgra.application.mgt.core.impl.SubscriptionManagerImpl + io.entgra.device.mgt.core.application.mgt.core.impl.SubscriptionManagerImpl - io.entgra.application.mgt.core.impl.ApplicationStorageManagerImpl + io.entgra.device.mgt.core.application.mgt.core.impl.ApplicationStorageManagerImpl repository/resources/apps/ 6 diff --git a/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/conf/identity-service-provider-config.xml b/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/conf/identity-service-provider-config.xml index bee524c54a..1826d4c9b4 100644 --- a/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/conf/identity-service-provider-config.xml +++ b/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/conf/identity-service-provider-config.xml @@ -22,7 +22,7 @@ WSO2 IAM - io.entgra.application.mgt.core.identityserver.serviceprovider.impl.WSO2IAMSPApplicationService + io.entgra.device.mgt.core.application.mgt.core.serviceprovider.impl.WSO2IAMSPApplicationService /carbon/application/list-service-providers.jsp diff --git a/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/conf_templates/templates/repository/conf/application-mgt.xml.j2 b/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/conf_templates/templates/repository/conf/application-mgt.xml.j2 index bd2cc9141c..3f1884e472 100644 --- a/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/conf_templates/templates/repository/conf/application-mgt.xml.j2 +++ b/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/conf_templates/templates/repository/conf/application-mgt.xml.j2 @@ -26,35 +26,35 @@ {% if application_mgt_conf.extension.isapplication_manager is defined %} {{application_mgt_conf.extension.isapplication_manager}} {% else %} - io.entgra.application.mgt.core.impl.SPApplicationManagerImpl + io.entgra.device.mgt.core.application.mgt.core.impl.SPApplicationManagerImpl {% endif %} {% if application_mgt_conf.extension.application_manager is defined %} {{application_mgt_conf.extension.application_manager}} {% else %} - io.entgra.application.mgt.core.impl.ApplicationManagerImpl + io.entgra.device.mgt.core.application.mgt.core.impl.ApplicationManagerImpl {% endif %} {% if application_mgt_conf.extension.review_manager is defined %} {{application_mgt_conf.extension.review_manager}} {% else %} - io.entgra.application.mgt.core.impl.ReviewManagerImpl + io.entgra.device.mgt.core.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 %} - io.entgra.application.mgt.core.lifecycle.LifecycleStateManager + io.entgra.device.mgt.core.application.mgt.core.lifecycle.LifecycleStateManager {% endif %} {% if application_mgt_conf.extension.subscription_manager is defined %} {{application_mgt_conf.extension.subscription_manager}} {% else %} - io.entgra.application.mgt.core.impl.SubscriptionManagerImpl + io.entgra.device.mgt.core.application.mgt.core.impl.SubscriptionManagerImpl {% endif %} @@ -68,7 +68,7 @@ {% endif %} {% else %} - io.entgra.application.mgt.core.impl.ApplicationStorageManagerImpl + io.entgra.device.mgt.core.application.mgt.core.impl.ApplicationStorageManagerImpl repository/resources/apps/ 6 diff --git a/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/conf_templates/templates/repository/conf/identity-service-provider-config.xml.j2 b/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/conf_templates/templates/repository/conf/identity-service-provider-config.xml.j2 index bee524c54a..47e28ef723 100644 --- a/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/conf_templates/templates/repository/conf/identity-service-provider-config.xml.j2 +++ b/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/conf_templates/templates/repository/conf/identity-service-provider-config.xml.j2 @@ -22,7 +22,7 @@ WSO2 IAM - io.entgra.application.mgt.core.identityserver.serviceprovider.impl.WSO2IAMSPApplicationService + io.entgra.device.mgt.core.application.mgt.core.identityserver.serviceprovider.impl.WSO2IAMSPApplicationService /carbon/application/list-service-providers.jsp diff --git a/pom.xml b/pom.xml index d756bed224..d4e6b289cb 100644 --- a/pom.xml +++ b/pom.xml @@ -39,25 +39,21 @@ - - + components/application-mgt components/policy-mgt components/certificate-mgt components/ui-request-interceptor components/transport-mgt components/analytics-mgt components/webapp-authenticator-framework - - components/task-mgt components/subtype-mgt components/tenant-mgt components/operation-template-mgt - - + features/application-mgt features/policy-mgt features/certificate-mgt @@ -192,27 +188,27 @@ io.entgra.device.mgt.core - io.entgra.application.mgt.addons + io.entgra.device.mgt.core.application.mgt.addons ${carbon.device.mgt.version} io.entgra.device.mgt.core - io.entgra.application.mgt.core + io.entgra.device.mgt.core.application.mgt.core ${carbon.device.mgt.version} io.entgra.device.mgt.core - io.entgra.application.mgt.common + io.entgra.device.mgt.core.application.mgt.common ${carbon.device.mgt.version} io.entgra.device.mgt.core - io.entgra.application.mgt.publisher.api + io.entgra.device.mgt.core.application.mgt.publisher.api ${carbon.device.mgt.version} io.entgra.device.mgt.core - io.entgra.application.mgt.store.api + io.entgra.device.mgt.core.application.mgt.store.api ${carbon.device.mgt.version}