From 721de623623fda0d99e1d5e0c308a6b3fe7d5d5e Mon Sep 17 00:00:00 2001 From: Amalka Subasinghe Date: Wed, 10 May 2023 19:55:42 +0530 Subject: [PATCH] refactored sub type mgt component --- .../pom.xml | 8 +++---- .../cache/GetDeviceSubTypeCacheLoader.java | 20 ++++++++-------- .../subtype/mgt/dao/DeviceSubTypeDAO.java | 6 ++--- .../mgt/dao/DeviceSubTypeDAOFactory.java | 8 +++---- .../mgt/dao/impl/DeviceSubTypeDAOImpl.java | 16 ++++++------- .../dao/impl/DeviceSubTypeMySQLDAOImpl.java | 2 +- .../mgt/dao/util/ConnectionManagerUtil.java | 4 ++-- .../core}/subtype/mgt/dao/util/DAOUtil.java | 4 ++-- .../core}/subtype/mgt/dto/DeviceSubType.java | 2 +- .../mgt/dto/DeviceSubTypeCacheKey.java | 2 +- .../mgt/exception/BadRequestException.java | 2 +- .../mgt/exception/DBConnectionException.java | 2 +- .../mgt/exception/SubTypeMgtDAOException.java | 2 +- .../exception/SubTypeMgtPluginException.java | 2 +- .../mgt/impl/DeviceSubTypeServiceImpl.java | 24 +++++++++---------- .../internal/DeviceSubTypeMgtDataHolder.java | 4 ++-- .../DeviceSubTypeMgtServiceComponent.java | 10 ++++---- .../subtype/mgt/spi/DeviceSubTypeService.java | 6 ++--- .../mgt/util/DeviceSubTypeMgtUtil.java | 6 ++--- .../core}/subtype/mgt/DAONegativeTest.java | 16 ++++++------- .../device/mgt/core}/subtype/mgt/DAOTest.java | 18 +++++++------- .../core}/subtype/mgt/DataSourceConfig.java | 2 +- .../subtype/mgt/ServiceNegativeTest.java | 12 +++++----- .../mgt/core}/subtype/mgt/ServiceTest.java | 12 +++++----- .../mgt/core}/subtype/mgt/TestUtils.java | 6 ++--- .../mgt/mock/BaseDeviceSubTypePluginTest.java | 10 ++++---- .../subtype/mgt/mock/MockConnection.java | 2 +- .../subtype/mgt/mock/MockDataSource.java | 2 +- .../mgt/mock/MockDatabaseMetaData.java | 2 +- .../core}/subtype/mgt/mock/MockResultSet.java | 2 +- .../core}/subtype/mgt/mock/MockStatement.java | 2 +- .../carbon-home/dbscripts/dm-db-h2.sql | 0 .../resources/carbon-home/dbscripts/h2.sql | 0 .../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/data-source-config.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 .../src/test/resources/testng.xml | 8 +++---- components/subtype-mgt/pom.xml | 2 +- .../pom.xml | 4 ++-- pom.xml | 6 ++--- 62 files changed, 118 insertions(+), 118 deletions(-) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt => io.entgra.device.mgt.core.subtype.mgt}/pom.xml (98%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core}/subtype/mgt/cache/GetDeviceSubTypeCacheLoader.java (79%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core}/subtype/mgt/dao/DeviceSubTypeDAO.java (89%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core}/subtype/mgt/dao/DeviceSubTypeDAOFactory.java (87%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core}/subtype/mgt/dao/impl/DeviceSubTypeDAOImpl.java (95%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core}/subtype/mgt/dao/impl/DeviceSubTypeMySQLDAOImpl.java (93%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core}/subtype/mgt/dao/util/ConnectionManagerUtil.java (98%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core}/subtype/mgt/dao/util/DAOUtil.java (94%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core}/subtype/mgt/dto/DeviceSubType.java (97%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core}/subtype/mgt/dto/DeviceSubTypeCacheKey.java (96%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core}/subtype/mgt/exception/BadRequestException.java (94%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core}/subtype/mgt/exception/DBConnectionException.java (94%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core}/subtype/mgt/exception/SubTypeMgtDAOException.java (96%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core}/subtype/mgt/exception/SubTypeMgtPluginException.java (96%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core}/subtype/mgt/impl/DeviceSubTypeServiceImpl.java (92%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core}/subtype/mgt/internal/DeviceSubTypeMgtDataHolder.java (94%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core}/subtype/mgt/internal/DeviceSubTypeMgtServiceComponent.java (93%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core}/subtype/mgt/spi/DeviceSubTypeService.java (89%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core}/subtype/mgt/util/DeviceSubTypeMgtUtil.java (88%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt => io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core}/subtype/mgt/DAONegativeTest.java (92%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt => io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core}/subtype/mgt/DAOTest.java (91%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt => io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core}/subtype/mgt/DataSourceConfig.java (97%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt => io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core}/subtype/mgt/ServiceNegativeTest.java (90%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt => io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core}/subtype/mgt/ServiceTest.java (92%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt => io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core}/subtype/mgt/TestUtils.java (95%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt => io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core}/subtype/mgt/mock/BaseDeviceSubTypePluginTest.java (94%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt => io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core}/subtype/mgt/mock/MockConnection.java (99%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt => io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core}/subtype/mgt/mock/MockDataSource.java (98%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt => io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core}/subtype/mgt/mock/MockDatabaseMetaData.java (99%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt => io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core}/subtype/mgt/mock/MockResultSet.java (99%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt => io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core}/subtype/mgt/mock/MockStatement.java (99%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt => io.entgra.device.mgt.core.subtype.mgt}/src/test/resources/carbon-home/dbscripts/dm-db-h2.sql (100%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt => io.entgra.device.mgt.core.subtype.mgt}/src/test/resources/carbon-home/dbscripts/h2.sql (100%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt => io.entgra.device.mgt.core.subtype.mgt}/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml (100%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt => io.entgra.device.mgt.core.subtype.mgt}/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml (100%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt => io.entgra.device.mgt.core.subtype.mgt}/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml (100%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt => io.entgra.device.mgt.core.subtype.mgt}/src/test/resources/carbon-home/repository/conf/carbon.xml (100%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt => io.entgra.device.mgt.core.subtype.mgt}/src/test/resources/carbon-home/repository/conf/cdm-config.xml (100%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt => io.entgra.device.mgt.core.subtype.mgt}/src/test/resources/carbon-home/repository/conf/datasources/data-source-config.xml (100%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt => io.entgra.device.mgt.core.subtype.mgt}/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt (100%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt => io.entgra.device.mgt.core.subtype.mgt}/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties (100%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt => io.entgra.device.mgt.core.subtype.mgt}/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml (100%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt => io.entgra.device.mgt.core.subtype.mgt}/src/test/resources/carbon-home/repository/conf/etc/jmx.xml (100%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt => io.entgra.device.mgt.core.subtype.mgt}/src/test/resources/carbon-home/repository/conf/etc/launch.ini (100%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt => io.entgra.device.mgt.core.subtype.mgt}/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties (100%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt => io.entgra.device.mgt.core.subtype.mgt}/src/test/resources/carbon-home/repository/conf/etc/mime.mappings (100%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt => io.entgra.device.mgt.core.subtype.mgt}/src/test/resources/carbon-home/repository/conf/etc/mime.types (100%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt => io.entgra.device.mgt.core.subtype.mgt}/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options (100%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt => io.entgra.device.mgt.core.subtype.mgt}/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml (100%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt => io.entgra.device.mgt.core.subtype.mgt}/src/test/resources/carbon-home/repository/conf/log4j.properties (100%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt => io.entgra.device.mgt.core.subtype.mgt}/src/test/resources/carbon-home/repository/conf/registry.xml (100%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt => io.entgra.device.mgt.core.subtype.mgt}/src/test/resources/carbon-home/repository/conf/security/authenticators.xml (100%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt => io.entgra.device.mgt.core.subtype.mgt}/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml (100%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt => io.entgra.device.mgt.core.subtype.mgt}/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml (100%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt => io.entgra.device.mgt.core.subtype.mgt}/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml (100%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt => io.entgra.device.mgt.core.subtype.mgt}/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml (100%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt => io.entgra.device.mgt.core.subtype.mgt}/src/test/resources/carbon-home/repository/conf/tomcat/web.xml (100%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt => io.entgra.device.mgt.core.subtype.mgt}/src/test/resources/carbon-home/repository/conf/user-mgt.xml (100%) rename components/subtype-mgt/{io.entgra.device.mgt.subtype.mgt => io.entgra.device.mgt.core.subtype.mgt}/src/test/resources/testng.xml (77%) diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/pom.xml b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/pom.xml similarity index 98% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/pom.xml rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/pom.xml index 9d0c1d5daa..bd5fe07765 100644 --- a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/pom.xml +++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/pom.xml @@ -25,7 +25,7 @@ 4.0.0 - io.entgra.device.mgt.subtype.mgt + io.entgra.device.mgt.core.subtype.mgt Entgra IoT - Subtype Mgt Impl bundle Entgra IoT - Subtype Management Component Implementation @@ -51,7 +51,7 @@ ${project.artifactId} ${carbon.device.mgt.version} Subtype Management Bundle - io.entgra.device.mgt.subtype.mgt.internal + io.entgra.device.mgt.core.subtype.mgt.internal org.osgi.framework.*;version="${imp.package.version.osgi.framework}", org.osgi.service.*;version="${imp.package.version.osgi.service}", @@ -86,8 +86,8 @@ com.google.common.cache.*, - !io.entgra.device.mgt.subtype.mgt.internal, - io.entgra.device.mgt.subtype.mgt.* + !io.entgra.device.mgt.core.subtype.mgt.internal, + io.entgra.device.mgt.core.subtype.mgt.* diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/cache/GetDeviceSubTypeCacheLoader.java b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/cache/GetDeviceSubTypeCacheLoader.java similarity index 79% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/cache/GetDeviceSubTypeCacheLoader.java rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/cache/GetDeviceSubTypeCacheLoader.java index d6296e4a73..50350deadf 100644 --- a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/cache/GetDeviceSubTypeCacheLoader.java +++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/cache/GetDeviceSubTypeCacheLoader.java @@ -16,18 +16,18 @@ * under the License. */ -package io.entgra.device.mgt.subtype.mgt.cache; +package io.entgra.device.mgt.core.subtype.mgt.cache; import com.google.common.cache.CacheLoader; -import io.entgra.device.mgt.subtype.mgt.dao.DeviceSubTypeDAO; -import io.entgra.device.mgt.subtype.mgt.dao.DeviceSubTypeDAOFactory; -import io.entgra.device.mgt.subtype.mgt.dao.util.ConnectionManagerUtil; -import io.entgra.device.mgt.subtype.mgt.dto.DeviceSubType; -import io.entgra.device.mgt.subtype.mgt.dto.DeviceSubTypeCacheKey; -import io.entgra.device.mgt.subtype.mgt.exception.DBConnectionException; -import io.entgra.device.mgt.subtype.mgt.exception.SubTypeMgtDAOException; -import io.entgra.device.mgt.subtype.mgt.exception.SubTypeMgtPluginException; -import io.entgra.device.mgt.subtype.mgt.util.DeviceSubTypeMgtUtil; +import io.entgra.device.mgt.core.subtype.mgt.dto.DeviceSubTypeCacheKey; +import io.entgra.device.mgt.core.subtype.mgt.dao.DeviceSubTypeDAO; +import io.entgra.device.mgt.core.subtype.mgt.dao.DeviceSubTypeDAOFactory; +import io.entgra.device.mgt.core.subtype.mgt.dao.util.ConnectionManagerUtil; +import io.entgra.device.mgt.core.subtype.mgt.dto.DeviceSubType; +import io.entgra.device.mgt.core.subtype.mgt.exception.DBConnectionException; +import io.entgra.device.mgt.core.subtype.mgt.exception.SubTypeMgtDAOException; +import io.entgra.device.mgt.core.subtype.mgt.exception.SubTypeMgtPluginException; +import io.entgra.device.mgt.core.subtype.mgt.util.DeviceSubTypeMgtUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/dao/DeviceSubTypeDAO.java b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/dao/DeviceSubTypeDAO.java similarity index 89% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/dao/DeviceSubTypeDAO.java rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/dao/DeviceSubTypeDAO.java index 9e3b889713..0ab0163d26 100644 --- a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/dao/DeviceSubTypeDAO.java +++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/dao/DeviceSubTypeDAO.java @@ -16,10 +16,10 @@ * under the License. */ -package io.entgra.device.mgt.subtype.mgt.dao; +package io.entgra.device.mgt.core.subtype.mgt.dao; -import io.entgra.device.mgt.subtype.mgt.dto.DeviceSubType; -import io.entgra.device.mgt.subtype.mgt.exception.SubTypeMgtDAOException; +import io.entgra.device.mgt.core.subtype.mgt.exception.SubTypeMgtDAOException; +import io.entgra.device.mgt.core.subtype.mgt.dto.DeviceSubType; import java.util.List; diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/dao/DeviceSubTypeDAOFactory.java b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/dao/DeviceSubTypeDAOFactory.java similarity index 87% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/dao/DeviceSubTypeDAOFactory.java rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/dao/DeviceSubTypeDAOFactory.java index 79ab3f304a..0471aab86b 100644 --- a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/dao/DeviceSubTypeDAOFactory.java +++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/dao/DeviceSubTypeDAOFactory.java @@ -16,14 +16,14 @@ * under the License. */ -package io.entgra.device.mgt.subtype.mgt.dao; +package io.entgra.device.mgt.core.subtype.mgt.dao; -import io.entgra.device.mgt.subtype.mgt.dao.impl.DeviceSubTypeDAOImpl; -import io.entgra.device.mgt.subtype.mgt.dao.impl.DeviceSubTypeMySQLDAOImpl; +import io.entgra.device.mgt.core.subtype.mgt.dao.impl.DeviceSubTypeDAOImpl; +import io.entgra.device.mgt.core.subtype.mgt.dao.impl.DeviceSubTypeMySQLDAOImpl; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.device.mgt.common.DeviceManagementConstants; -import io.entgra.device.mgt.subtype.mgt.dao.util.ConnectionManagerUtil; +import io.entgra.device.mgt.core.subtype.mgt.dao.util.ConnectionManagerUtil; import org.wso2.carbon.device.mgt.core.config.datasource.DataSourceConfig; public class DeviceSubTypeDAOFactory { diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/dao/impl/DeviceSubTypeDAOImpl.java b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/dao/impl/DeviceSubTypeDAOImpl.java similarity index 95% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/dao/impl/DeviceSubTypeDAOImpl.java rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/dao/impl/DeviceSubTypeDAOImpl.java index 2b18e261b7..a6aa286013 100644 --- a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/dao/impl/DeviceSubTypeDAOImpl.java +++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/dao/impl/DeviceSubTypeDAOImpl.java @@ -16,14 +16,14 @@ * under the License. */ -package io.entgra.device.mgt.subtype.mgt.dao.impl; - -import io.entgra.device.mgt.subtype.mgt.dao.DeviceSubTypeDAO; -import io.entgra.device.mgt.subtype.mgt.dao.util.ConnectionManagerUtil; -import io.entgra.device.mgt.subtype.mgt.dto.DeviceSubType; -import io.entgra.device.mgt.subtype.mgt.dao.util.DAOUtil; -import io.entgra.device.mgt.subtype.mgt.exception.DBConnectionException; -import io.entgra.device.mgt.subtype.mgt.exception.SubTypeMgtDAOException; +package io.entgra.device.mgt.core.subtype.mgt.dao.impl; + +import io.entgra.device.mgt.core.subtype.mgt.exception.DBConnectionException; +import io.entgra.device.mgt.core.subtype.mgt.exception.SubTypeMgtDAOException; +import io.entgra.device.mgt.core.subtype.mgt.dao.DeviceSubTypeDAO; +import io.entgra.device.mgt.core.subtype.mgt.dao.util.ConnectionManagerUtil; +import io.entgra.device.mgt.core.subtype.mgt.dto.DeviceSubType; +import io.entgra.device.mgt.core.subtype.mgt.dao.util.DAOUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/dao/impl/DeviceSubTypeMySQLDAOImpl.java b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/dao/impl/DeviceSubTypeMySQLDAOImpl.java similarity index 93% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/dao/impl/DeviceSubTypeMySQLDAOImpl.java rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/dao/impl/DeviceSubTypeMySQLDAOImpl.java index 972d16e1c5..2beefdfa58 100644 --- a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/dao/impl/DeviceSubTypeMySQLDAOImpl.java +++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/dao/impl/DeviceSubTypeMySQLDAOImpl.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.device.mgt.subtype.mgt.dao.impl; +package io.entgra.device.mgt.core.subtype.mgt.dao.impl; /** * Implementation for MySQL diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/dao/util/ConnectionManagerUtil.java b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/dao/util/ConnectionManagerUtil.java similarity index 98% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/dao/util/ConnectionManagerUtil.java rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/dao/util/ConnectionManagerUtil.java index 7663ae94fc..ce8b78a02c 100644 --- a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/dao/util/ConnectionManagerUtil.java +++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/dao/util/ConnectionManagerUtil.java @@ -16,9 +16,9 @@ * under the License. */ -package io.entgra.device.mgt.subtype.mgt.dao.util; +package io.entgra.device.mgt.core.subtype.mgt.dao.util; -import io.entgra.device.mgt.subtype.mgt.exception.DBConnectionException; +import io.entgra.device.mgt.core.subtype.mgt.exception.DBConnectionException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.device.mgt.common.exceptions.IllegalTransactionStateException; diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/dao/util/DAOUtil.java b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/dao/util/DAOUtil.java similarity index 94% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/dao/util/DAOUtil.java rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/dao/util/DAOUtil.java index a50c75f703..ab8baa5f89 100644 --- a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/dao/util/DAOUtil.java +++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/dao/util/DAOUtil.java @@ -16,9 +16,9 @@ * under the License. */ -package io.entgra.device.mgt.subtype.mgt.dao.util; +package io.entgra.device.mgt.core.subtype.mgt.dao.util; -import io.entgra.device.mgt.subtype.mgt.dto.DeviceSubType; +import io.entgra.device.mgt.core.subtype.mgt.dto.DeviceSubType; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/dto/DeviceSubType.java b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/dto/DeviceSubType.java similarity index 97% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/dto/DeviceSubType.java rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/dto/DeviceSubType.java index 8918588f6c..d312a25a5d 100644 --- a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/dto/DeviceSubType.java +++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/dto/DeviceSubType.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.device.mgt.subtype.mgt.dto; +package io.entgra.device.mgt.core.subtype.mgt.dto; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/dto/DeviceSubTypeCacheKey.java b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/dto/DeviceSubTypeCacheKey.java similarity index 96% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/dto/DeviceSubTypeCacheKey.java rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/dto/DeviceSubTypeCacheKey.java index 206a57461d..9c43e4c51a 100644 --- a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/dto/DeviceSubTypeCacheKey.java +++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/dto/DeviceSubTypeCacheKey.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.device.mgt.subtype.mgt.dto; +package io.entgra.device.mgt.core.subtype.mgt.dto; public class DeviceSubTypeCacheKey { int tenantId; diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/exception/BadRequestException.java b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/exception/BadRequestException.java similarity index 94% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/exception/BadRequestException.java rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/exception/BadRequestException.java index 57138e35f8..bde2bbe671 100644 --- a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/exception/BadRequestException.java +++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/exception/BadRequestException.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.device.mgt.subtype.mgt.exception; +package io.entgra.device.mgt.core.subtype.mgt.exception; /** * Represents the exception thrown during validating the request. diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/exception/DBConnectionException.java b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/exception/DBConnectionException.java similarity index 94% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/exception/DBConnectionException.java rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/exception/DBConnectionException.java index ec2920d8fb..7d9ee7afd0 100644 --- a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/exception/DBConnectionException.java +++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/exception/DBConnectionException.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.device.mgt.subtype.mgt.exception; +package io.entgra.device.mgt.core.subtype.mgt.exception; /** * Exception thrown due to Database Connection issues. diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/exception/SubTypeMgtDAOException.java b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/exception/SubTypeMgtDAOException.java similarity index 96% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/exception/SubTypeMgtDAOException.java rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/exception/SubTypeMgtDAOException.java index d80793b778..db6cf23041 100644 --- a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/exception/SubTypeMgtDAOException.java +++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/exception/SubTypeMgtDAOException.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.device.mgt.subtype.mgt.exception; +package io.entgra.device.mgt.core.subtype.mgt.exception; public class SubTypeMgtDAOException extends Exception { diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/exception/SubTypeMgtPluginException.java b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/exception/SubTypeMgtPluginException.java similarity index 96% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/exception/SubTypeMgtPluginException.java rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/exception/SubTypeMgtPluginException.java index 5b0c355184..6fef36dd35 100644 --- a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/exception/SubTypeMgtPluginException.java +++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/exception/SubTypeMgtPluginException.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.device.mgt.subtype.mgt.exception; +package io.entgra.device.mgt.core.subtype.mgt.exception; public class SubTypeMgtPluginException extends Exception { diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/impl/DeviceSubTypeServiceImpl.java b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/impl/DeviceSubTypeServiceImpl.java similarity index 92% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/impl/DeviceSubTypeServiceImpl.java rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/impl/DeviceSubTypeServiceImpl.java index 24c5f2750a..bc5a4511bb 100644 --- a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/impl/DeviceSubTypeServiceImpl.java +++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/impl/DeviceSubTypeServiceImpl.java @@ -16,22 +16,22 @@ * under the License. */ -package io.entgra.device.mgt.subtype.mgt.impl; +package io.entgra.device.mgt.core.subtype.mgt.impl; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; -import io.entgra.device.mgt.subtype.mgt.cache.GetDeviceSubTypeCacheLoader; -import io.entgra.device.mgt.subtype.mgt.dto.DeviceSubType; -import io.entgra.device.mgt.subtype.mgt.dao.DeviceSubTypeDAO; -import io.entgra.device.mgt.subtype.mgt.dao.DeviceSubTypeDAOFactory; -import io.entgra.device.mgt.subtype.mgt.exception.SubTypeMgtDAOException; -import io.entgra.device.mgt.subtype.mgt.dao.util.ConnectionManagerUtil; -import io.entgra.device.mgt.subtype.mgt.spi.DeviceSubTypeService; -import io.entgra.device.mgt.subtype.mgt.util.DeviceSubTypeMgtUtil; -import io.entgra.device.mgt.subtype.mgt.exception.BadRequestException; -import io.entgra.device.mgt.subtype.mgt.exception.DBConnectionException; -import io.entgra.device.mgt.subtype.mgt.exception.SubTypeMgtPluginException; +import io.entgra.device.mgt.core.subtype.mgt.cache.GetDeviceSubTypeCacheLoader; +import io.entgra.device.mgt.core.subtype.mgt.exception.BadRequestException; +import io.entgra.device.mgt.core.subtype.mgt.exception.DBConnectionException; +import io.entgra.device.mgt.core.subtype.mgt.exception.SubTypeMgtDAOException; +import io.entgra.device.mgt.core.subtype.mgt.exception.SubTypeMgtPluginException; +import io.entgra.device.mgt.core.subtype.mgt.util.DeviceSubTypeMgtUtil; +import io.entgra.device.mgt.core.subtype.mgt.dto.DeviceSubType; +import io.entgra.device.mgt.core.subtype.mgt.dao.DeviceSubTypeDAO; +import io.entgra.device.mgt.core.subtype.mgt.dao.DeviceSubTypeDAOFactory; +import io.entgra.device.mgt.core.subtype.mgt.dao.util.ConnectionManagerUtil; +import io.entgra.device.mgt.core.subtype.mgt.spi.DeviceSubTypeService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.context.CarbonContext; diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/internal/DeviceSubTypeMgtDataHolder.java b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/internal/DeviceSubTypeMgtDataHolder.java similarity index 94% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/internal/DeviceSubTypeMgtDataHolder.java rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/internal/DeviceSubTypeMgtDataHolder.java index 58652dfafb..2a18adc11d 100644 --- a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/internal/DeviceSubTypeMgtDataHolder.java +++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/internal/DeviceSubTypeMgtDataHolder.java @@ -16,9 +16,9 @@ * under the License. */ -package io.entgra.device.mgt.subtype.mgt.internal; +package io.entgra.device.mgt.core.subtype.mgt.internal; -import io.entgra.device.mgt.subtype.mgt.spi.DeviceSubTypeService; +import io.entgra.device.mgt.core.subtype.mgt.spi.DeviceSubTypeService; import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService; import org.wso2.carbon.registry.core.service.RegistryService; diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/internal/DeviceSubTypeMgtServiceComponent.java b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/internal/DeviceSubTypeMgtServiceComponent.java similarity index 93% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/internal/DeviceSubTypeMgtServiceComponent.java rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/internal/DeviceSubTypeMgtServiceComponent.java index ecf22a6581..910d3b9a35 100644 --- a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/internal/DeviceSubTypeMgtServiceComponent.java +++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/internal/DeviceSubTypeMgtServiceComponent.java @@ -16,11 +16,11 @@ * under the License. */ -package io.entgra.device.mgt.subtype.mgt.internal; +package io.entgra.device.mgt.core.subtype.mgt.internal; -import io.entgra.device.mgt.subtype.mgt.dao.DeviceSubTypeDAOFactory; -import io.entgra.device.mgt.subtype.mgt.impl.DeviceSubTypeServiceImpl; -import io.entgra.device.mgt.subtype.mgt.spi.DeviceSubTypeService; +import io.entgra.device.mgt.core.subtype.mgt.impl.DeviceSubTypeServiceImpl; +import io.entgra.device.mgt.core.subtype.mgt.spi.DeviceSubTypeService; +import io.entgra.device.mgt.core.subtype.mgt.dao.DeviceSubTypeDAOFactory; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.osgi.framework.BundleContext; @@ -33,7 +33,7 @@ import org.wso2.carbon.ndatasource.core.DataSourceService; import org.wso2.carbon.registry.core.service.RegistryService; /** - * @scr.component name="io.entgra.device.mgt.subtype.mgt.internal.DeviceSubTypeMgtServiceComponent" immediate="true" + * @scr.component name="io.entgra.device.mgt.core.subtype.mgt.internal.DeviceSubTypeMgtServiceComponent" immediate="true" * @scr.reference name="org.wso2.carbon.device.manager" * interface="org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService" * cardinality="1..1" diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/spi/DeviceSubTypeService.java b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/spi/DeviceSubTypeService.java similarity index 89% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/spi/DeviceSubTypeService.java rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/spi/DeviceSubTypeService.java index 24aa2fd431..bcd412c80f 100644 --- a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/spi/DeviceSubTypeService.java +++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/spi/DeviceSubTypeService.java @@ -16,10 +16,10 @@ * under the License. */ -package io.entgra.device.mgt.subtype.mgt.spi; +package io.entgra.device.mgt.core.subtype.mgt.spi; -import io.entgra.device.mgt.subtype.mgt.dto.DeviceSubType; -import io.entgra.device.mgt.subtype.mgt.exception.SubTypeMgtPluginException; +import io.entgra.device.mgt.core.subtype.mgt.exception.SubTypeMgtPluginException; +import io.entgra.device.mgt.core.subtype.mgt.dto.DeviceSubType; import java.util.List; diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/util/DeviceSubTypeMgtUtil.java b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/util/DeviceSubTypeMgtUtil.java similarity index 88% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/util/DeviceSubTypeMgtUtil.java rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/util/DeviceSubTypeMgtUtil.java index 171d621945..ed5216c663 100644 --- a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/main/java/io/entgra/device/mgt/subtype/mgt/util/DeviceSubTypeMgtUtil.java +++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/main/java/io/entgra/device/mgt/core/subtype/mgt/util/DeviceSubTypeMgtUtil.java @@ -16,10 +16,10 @@ * under the License. */ -package io.entgra.device.mgt.subtype.mgt.util; +package io.entgra.device.mgt.core.subtype.mgt.util; -import io.entgra.device.mgt.subtype.mgt.dto.DeviceSubType; -import io.entgra.device.mgt.subtype.mgt.dto.DeviceSubTypeCacheKey; +import io.entgra.device.mgt.core.subtype.mgt.dto.DeviceSubTypeCacheKey; +import io.entgra.device.mgt.core.subtype.mgt.dto.DeviceSubType; public class DeviceSubTypeMgtUtil { public static String setDeviceSubTypeCacheKey(int tenantId, String subTypeId, DeviceSubType.DeviceType deviceType) { diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt/subtype/mgt/DAONegativeTest.java b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core/subtype/mgt/DAONegativeTest.java similarity index 92% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt/subtype/mgt/DAONegativeTest.java rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core/subtype/mgt/DAONegativeTest.java index fd0b659fda..b0ad5b8045 100644 --- a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt/subtype/mgt/DAONegativeTest.java +++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core/subtype/mgt/DAONegativeTest.java @@ -16,15 +16,15 @@ * under the License. */ -package io.entgra.device.mgt.subtype.mgt; +package io.entgra.device.mgt.core.subtype.mgt; -import io.entgra.device.mgt.subtype.mgt.dao.DeviceSubTypeDAO; -import io.entgra.device.mgt.subtype.mgt.dao.DeviceSubTypeDAOFactory; -import io.entgra.device.mgt.subtype.mgt.dao.util.ConnectionManagerUtil; -import io.entgra.device.mgt.subtype.mgt.dto.DeviceSubType; -import io.entgra.device.mgt.subtype.mgt.exception.DBConnectionException; -import io.entgra.device.mgt.subtype.mgt.exception.SubTypeMgtDAOException; -import io.entgra.device.mgt.subtype.mgt.mock.BaseDeviceSubTypePluginTest; +import io.entgra.device.mgt.core.subtype.mgt.dao.DeviceSubTypeDAO; +import io.entgra.device.mgt.core.subtype.mgt.dao.DeviceSubTypeDAOFactory; +import io.entgra.device.mgt.core.subtype.mgt.dao.util.ConnectionManagerUtil; +import io.entgra.device.mgt.core.subtype.mgt.dto.DeviceSubType; +import io.entgra.device.mgt.core.subtype.mgt.exception.DBConnectionException; +import io.entgra.device.mgt.core.subtype.mgt.exception.SubTypeMgtDAOException; +import io.entgra.device.mgt.core.subtype.mgt.mock.BaseDeviceSubTypePluginTest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.testng.annotations.BeforeClass; diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt/subtype/mgt/DAOTest.java b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core/subtype/mgt/DAOTest.java similarity index 91% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt/subtype/mgt/DAOTest.java rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core/subtype/mgt/DAOTest.java index 5592326962..b9c769108e 100644 --- a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt/subtype/mgt/DAOTest.java +++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core/subtype/mgt/DAOTest.java @@ -16,15 +16,15 @@ * under the License. */ -package io.entgra.device.mgt.subtype.mgt; - -import io.entgra.device.mgt.subtype.mgt.dao.DeviceSubTypeDAO; -import io.entgra.device.mgt.subtype.mgt.dao.DeviceSubTypeDAOFactory; -import io.entgra.device.mgt.subtype.mgt.dao.util.ConnectionManagerUtil; -import io.entgra.device.mgt.subtype.mgt.dto.DeviceSubType; -import io.entgra.device.mgt.subtype.mgt.exception.DBConnectionException; -import io.entgra.device.mgt.subtype.mgt.exception.SubTypeMgtDAOException; -import io.entgra.device.mgt.subtype.mgt.mock.BaseDeviceSubTypePluginTest; +package io.entgra.device.mgt.core.subtype.mgt; + +import io.entgra.device.mgt.core.subtype.mgt.dao.DeviceSubTypeDAO; +import io.entgra.device.mgt.core.subtype.mgt.dao.DeviceSubTypeDAOFactory; +import io.entgra.device.mgt.core.subtype.mgt.dao.util.ConnectionManagerUtil; +import io.entgra.device.mgt.core.subtype.mgt.dto.DeviceSubType; +import io.entgra.device.mgt.core.subtype.mgt.exception.DBConnectionException; +import io.entgra.device.mgt.core.subtype.mgt.exception.SubTypeMgtDAOException; +import io.entgra.device.mgt.core.subtype.mgt.mock.BaseDeviceSubTypePluginTest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.testng.Assert; diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt/subtype/mgt/DataSourceConfig.java b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core/subtype/mgt/DataSourceConfig.java similarity index 97% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt/subtype/mgt/DataSourceConfig.java rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core/subtype/mgt/DataSourceConfig.java index 1bb8afee84..a453307900 100644 --- a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt/subtype/mgt/DataSourceConfig.java +++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core/subtype/mgt/DataSourceConfig.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.device.mgt.subtype.mgt; +package io.entgra.device.mgt.core.subtype.mgt; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt/subtype/mgt/ServiceNegativeTest.java b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core/subtype/mgt/ServiceNegativeTest.java similarity index 90% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt/subtype/mgt/ServiceNegativeTest.java rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core/subtype/mgt/ServiceNegativeTest.java index 3562525ade..a019334a37 100644 --- a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt/subtype/mgt/ServiceNegativeTest.java +++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core/subtype/mgt/ServiceNegativeTest.java @@ -16,13 +16,13 @@ * under the License. */ -package io.entgra.device.mgt.subtype.mgt; +package io.entgra.device.mgt.core.subtype.mgt; -import io.entgra.device.mgt.subtype.mgt.dto.DeviceSubType; -import io.entgra.device.mgt.subtype.mgt.exception.SubTypeMgtPluginException; -import io.entgra.device.mgt.subtype.mgt.impl.DeviceSubTypeServiceImpl; -import io.entgra.device.mgt.subtype.mgt.mock.BaseDeviceSubTypePluginTest; -import io.entgra.device.mgt.subtype.mgt.spi.DeviceSubTypeService; +import io.entgra.device.mgt.core.subtype.mgt.dto.DeviceSubType; +import io.entgra.device.mgt.core.subtype.mgt.exception.SubTypeMgtPluginException; +import io.entgra.device.mgt.core.subtype.mgt.impl.DeviceSubTypeServiceImpl; +import io.entgra.device.mgt.core.subtype.mgt.mock.BaseDeviceSubTypePluginTest; +import io.entgra.device.mgt.core.subtype.mgt.spi.DeviceSubTypeService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.testng.annotations.BeforeClass; diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt/subtype/mgt/ServiceTest.java b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core/subtype/mgt/ServiceTest.java similarity index 92% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt/subtype/mgt/ServiceTest.java rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core/subtype/mgt/ServiceTest.java index 07694bcce7..940cc867fd 100644 --- a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt/subtype/mgt/ServiceTest.java +++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core/subtype/mgt/ServiceTest.java @@ -16,13 +16,13 @@ * under the License. */ -package io.entgra.device.mgt.subtype.mgt; +package io.entgra.device.mgt.core.subtype.mgt; -import io.entgra.device.mgt.subtype.mgt.dto.DeviceSubType; -import io.entgra.device.mgt.subtype.mgt.exception.SubTypeMgtPluginException; -import io.entgra.device.mgt.subtype.mgt.impl.DeviceSubTypeServiceImpl; -import io.entgra.device.mgt.subtype.mgt.mock.BaseDeviceSubTypePluginTest; -import io.entgra.device.mgt.subtype.mgt.spi.DeviceSubTypeService; +import io.entgra.device.mgt.core.subtype.mgt.dto.DeviceSubType; +import io.entgra.device.mgt.core.subtype.mgt.exception.SubTypeMgtPluginException; +import io.entgra.device.mgt.core.subtype.mgt.impl.DeviceSubTypeServiceImpl; +import io.entgra.device.mgt.core.subtype.mgt.mock.BaseDeviceSubTypePluginTest; +import io.entgra.device.mgt.core.subtype.mgt.spi.DeviceSubTypeService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.testng.Assert; diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt/subtype/mgt/TestUtils.java b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core/subtype/mgt/TestUtils.java similarity index 95% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt/subtype/mgt/TestUtils.java rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core/subtype/mgt/TestUtils.java index d8e913831c..47139e7547 100644 --- a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt/subtype/mgt/TestUtils.java +++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core/subtype/mgt/TestUtils.java @@ -16,10 +16,10 @@ * under the License. */ -package io.entgra.device.mgt.subtype.mgt; +package io.entgra.device.mgt.core.subtype.mgt; -import io.entgra.device.mgt.subtype.mgt.dao.util.ConnectionManagerUtil; -import io.entgra.device.mgt.subtype.mgt.dto.DeviceSubType; +import io.entgra.device.mgt.core.subtype.mgt.dao.util.ConnectionManagerUtil; +import io.entgra.device.mgt.core.subtype.mgt.dto.DeviceSubType; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.testng.Assert; diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt/subtype/mgt/mock/BaseDeviceSubTypePluginTest.java b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core/subtype/mgt/mock/BaseDeviceSubTypePluginTest.java similarity index 94% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt/subtype/mgt/mock/BaseDeviceSubTypePluginTest.java rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core/subtype/mgt/mock/BaseDeviceSubTypePluginTest.java index 166bafc281..fcb5a32928 100644 --- a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt/subtype/mgt/mock/BaseDeviceSubTypePluginTest.java +++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core/subtype/mgt/mock/BaseDeviceSubTypePluginTest.java @@ -16,12 +16,12 @@ * under the License. */ -package io.entgra.device.mgt.subtype.mgt.mock; +package io.entgra.device.mgt.core.subtype.mgt.mock; -import io.entgra.device.mgt.subtype.mgt.TestUtils; -import io.entgra.device.mgt.subtype.mgt.dao.DeviceSubTypeDAOFactory; -import io.entgra.device.mgt.subtype.mgt.DataSourceConfig; -import io.entgra.device.mgt.subtype.mgt.dao.util.ConnectionManagerUtil; +import io.entgra.device.mgt.core.subtype.mgt.TestUtils; +import io.entgra.device.mgt.core.subtype.mgt.dao.DeviceSubTypeDAOFactory; +import io.entgra.device.mgt.core.subtype.mgt.DataSourceConfig; +import io.entgra.device.mgt.core.subtype.mgt.dao.util.ConnectionManagerUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.tomcat.jdbc.pool.PoolProperties; diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt/subtype/mgt/mock/MockConnection.java b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core/subtype/mgt/mock/MockConnection.java similarity index 99% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt/subtype/mgt/mock/MockConnection.java rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core/subtype/mgt/mock/MockConnection.java index 2ce68a6ded..0c57ddd085 100644 --- a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt/subtype/mgt/mock/MockConnection.java +++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core/subtype/mgt/mock/MockConnection.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.device.mgt.subtype.mgt.mock; +package io.entgra.device.mgt.core.subtype.mgt.mock; import java.sql.CallableStatement; import java.sql.SQLWarning; diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt/subtype/mgt/mock/MockDataSource.java b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core/subtype/mgt/mock/MockDataSource.java similarity index 98% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt/subtype/mgt/mock/MockDataSource.java rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core/subtype/mgt/mock/MockDataSource.java index 1fd43e0ab3..7c9ce51d58 100644 --- a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt/subtype/mgt/mock/MockDataSource.java +++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core/subtype/mgt/mock/MockDataSource.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.device.mgt.subtype.mgt.mock; +package io.entgra.device.mgt.core.subtype.mgt.mock; import javax.sql.DataSource; import java.io.PrintWriter; diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt/subtype/mgt/mock/MockDatabaseMetaData.java b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core/subtype/mgt/mock/MockDatabaseMetaData.java similarity index 99% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt/subtype/mgt/mock/MockDatabaseMetaData.java rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core/subtype/mgt/mock/MockDatabaseMetaData.java index 0bf75cc2bb..c1a9a9322d 100644 --- a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt/subtype/mgt/mock/MockDatabaseMetaData.java +++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core/subtype/mgt/mock/MockDatabaseMetaData.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.device.mgt.subtype.mgt.mock; +package io.entgra.device.mgt.core.subtype.mgt.mock; import org.wso2.carbon.device.mgt.common.DeviceManagementConstants; diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt/subtype/mgt/mock/MockResultSet.java b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core/subtype/mgt/mock/MockResultSet.java similarity index 99% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt/subtype/mgt/mock/MockResultSet.java rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core/subtype/mgt/mock/MockResultSet.java index 0a4208f634..c040106fe8 100644 --- a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt/subtype/mgt/mock/MockResultSet.java +++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core/subtype/mgt/mock/MockResultSet.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.device.mgt.subtype.mgt.mock; +package io.entgra.device.mgt.core.subtype.mgt.mock; import java.io.InputStream; import java.io.Reader; diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt/subtype/mgt/mock/MockStatement.java b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core/subtype/mgt/mock/MockStatement.java similarity index 99% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt/subtype/mgt/mock/MockStatement.java rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core/subtype/mgt/mock/MockStatement.java index 44483abe1e..2d87ce2819 100644 --- a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/java/io/entgra/device/mgt/subtype/mgt/mock/MockStatement.java +++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/java/io/entgra/device/mgt/core/subtype/mgt/mock/MockStatement.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.device.mgt.subtype.mgt.mock; +package io.entgra.device.mgt.core.subtype.mgt.mock; import java.io.InputStream; import java.io.Reader; diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/dbscripts/dm-db-h2.sql b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/dbscripts/dm-db-h2.sql similarity index 100% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/dbscripts/dm-db-h2.sql rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/dbscripts/dm-db-h2.sql diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/dbscripts/h2.sql b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/dbscripts/h2.sql similarity index 100% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/dbscripts/h2.sql rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/dbscripts/h2.sql diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml similarity index 100% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml similarity index 100% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml similarity index 100% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/carbon.xml b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/carbon.xml similarity index 100% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/carbon.xml rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/carbon.xml diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/cdm-config.xml b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/cdm-config.xml similarity index 100% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/cdm-config.xml rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/cdm-config.xml diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/datasources/data-source-config.xml b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/datasources/data-source-config.xml similarity index 100% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/datasources/data-source-config.xml rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/datasources/data-source-config.xml diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt similarity index 100% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties similarity index 100% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml similarity index 100% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/jmx.xml b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/jmx.xml similarity index 100% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/jmx.xml rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/jmx.xml diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/launch.ini b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/launch.ini similarity index 100% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/launch.ini rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/launch.ini diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties similarity index 100% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/mime.mappings b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/mime.mappings similarity index 100% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/mime.mappings rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/mime.mappings diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/mime.types b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/mime.types similarity index 100% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/mime.types rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/mime.types diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options similarity index 100% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml similarity index 100% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/log4j.properties b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/log4j.properties similarity index 100% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/log4j.properties rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/log4j.properties diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/registry.xml b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/registry.xml similarity index 100% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/registry.xml rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/registry.xml diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/security/authenticators.xml b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/security/authenticators.xml similarity index 100% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/security/authenticators.xml rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/security/authenticators.xml diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml similarity index 100% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml similarity index 100% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml similarity index 100% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml similarity index 100% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/tomcat/web.xml b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/tomcat/web.xml similarity index 100% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/tomcat/web.xml rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/tomcat/web.xml diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/user-mgt.xml b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/user-mgt.xml similarity index 100% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/repository/conf/user-mgt.xml rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/user-mgt.xml diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/testng.xml b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/testng.xml similarity index 77% rename from components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/testng.xml rename to components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/testng.xml index c245837db6..8a2b16b9bb 100644 --- a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/testng.xml +++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/testng.xml @@ -23,15 +23,15 @@ - - + + - - + + diff --git a/components/subtype-mgt/pom.xml b/components/subtype-mgt/pom.xml index 8ac75f440f..084bef5b28 100644 --- a/components/subtype-mgt/pom.xml +++ b/components/subtype-mgt/pom.xml @@ -31,7 +31,7 @@ http://entgra.io - io.entgra.device.mgt.subtype.mgt + io.entgra.device.mgt.core.subtype.mgt \ No newline at end of file diff --git a/features/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt.feature/pom.xml b/features/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt.feature/pom.xml index 8537a46111..6bc7df365f 100644 --- a/features/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt.feature/pom.xml +++ b/features/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt.feature/pom.xml @@ -38,7 +38,7 @@ io.entgra.device.mgt.core - io.entgra.device.mgt.subtype.mgt + io.entgra.device.mgt.core.subtype.mgt @@ -93,7 +93,7 @@ - io.entgra.device.mgt.core:io.entgra.device.mgt.subtype.mgt:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.subtype.mgt:${carbon.device.mgt.version} diff --git a/pom.xml b/pom.xml index 9891f33f0a..b63361b233 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ - + components/subtype-mgt components/tenant-mgt components/operation-template-mgt @@ -65,7 +65,7 @@ - + features/subtype-mgt features/tenant-mgt features/operation-template-mgt-plugin-feature @@ -385,7 +385,7 @@ io.entgra.device.mgt.core - io.entgra.device.mgt.subtype.mgt + io.entgra.device.mgt.core.subtype.mgt ${carbon.device.mgt.version}