From e3c47656508cf47330092bfe65bc1d063173e9d1 Mon Sep 17 00:00:00 2001 From: Amalka Subasinghe Date: Wed, 10 May 2023 19:41:37 +0530 Subject: [PATCH] refactored operation mgt component --- .../pom.xml | 8 +-- .../cache/OperationTemplateCacheLoader.java | 20 +++--- .../template/dao/OperationTemplateDAO.java | 6 +- .../dao/OperationTemplateDAOFactory.java | 10 +-- .../dao/impl/OperationTemplateDAOImpl.java | 14 ++-- .../impl/OperationTemplateMySQLDAOImpl.java | 2 +- .../config/DeviceConfigurationManager.java | 4 +- .../impl/config/DeviceManagementConfig.java | 2 +- .../config/DeviceManagementRepository.java | 4 +- .../config/datasource/DataSourceConfig.java | 2 +- .../datasource/JNDILookupDefinition.java | 2 +- .../util/OperationTemplateManagementUtil.java | 4 +- .../template/dto/OperationTemplate.java | 2 +- .../dto/OperationTemplateCacheKey.java | 2 +- .../BadOperationRequestException.java | 2 +- .../exception/DBConnectionException.java | 2 +- ...erationTemplateManagementDAOException.java | 2 +- .../OperationTemplateMgtPluginException.java | 2 +- .../impl/OperationTemplateServiceImpl.java | 24 +++---- .../OperationTemplateMgtDataHolder.java | 4 +- .../OperationTemplateMgtServiceComponent.java | 14 ++-- .../spi/OperationTemplateService.java | 6 +- .../operation/template/util/AssertUtils.java | 6 +- .../template/util/ConnectionManagerUtils.java | 8 +-- .../operation/template/util/DAOUtil.java | 5 +- .../operation/template/DAONegativeTest.java | 16 ++--- .../mgt/core}/operation/template/DAOTest.java | 18 ++--- .../operation/template/DataSourceConfig.java | 2 +- .../template/ServiceNegativeTest.java | 12 ++-- .../core}/operation/template/ServiceTest.java | 12 ++-- .../core}/operation/template/TestUtils.java | 4 +- .../mock/BaseOperationTemplatePluginTest.java | 10 +-- .../template/mock/MockConnection.java | 2 +- .../template/mock/MockDataSource.java | 2 +- .../template/mock/MockDatabaseMetaData.java | 2 +- .../template/mock/MockResultSet.java | 2 +- .../template/mock/MockStatement.java | 2 +- .../carbon-home/dbscripts/dm-db-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/operation-template-mgt/pom.xml | 2 +- .../pom.xml | 4 +- pom.xml | 66 +++++++++---------- 67 files changed, 161 insertions(+), 160 deletions(-) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template => io.entgra.device.mgt.core.operation.template}/pom.xml (97%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core}/operation/template/cache/OperationTemplateCacheLoader.java (80%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core}/operation/template/dao/OperationTemplateDAO.java (85%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core}/operation/template/dao/OperationTemplateDAOFactory.java (82%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core}/operation/template/dao/impl/OperationTemplateDAOImpl.java (93%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core}/operation/template/dao/impl/OperationTemplateMySQLDAOImpl.java (92%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core}/operation/template/dao/impl/config/DeviceConfigurationManager.java (94%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core}/operation/template/dao/impl/config/DeviceManagementConfig.java (95%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core}/operation/template/dao/impl/config/DeviceManagementRepository.java (88%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core}/operation/template/dao/impl/config/datasource/DataSourceConfig.java (94%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core}/operation/template/dao/impl/config/datasource/JNDILookupDefinition.java (96%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core}/operation/template/dao/impl/util/OperationTemplateManagementUtil.java (94%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core}/operation/template/dto/OperationTemplate.java (96%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core}/operation/template/dto/OperationTemplateCacheKey.java (95%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core}/operation/template/exception/BadOperationRequestException.java (94%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core}/operation/template/exception/DBConnectionException.java (94%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core}/operation/template/exception/OperationTemplateManagementDAOException.java (94%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core}/operation/template/exception/OperationTemplateMgtPluginException.java (96%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core}/operation/template/impl/OperationTemplateServiceImpl.java (90%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core}/operation/template/internal/OperationTemplateMgtDataHolder.java (93%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core}/operation/template/internal/OperationTemplateMgtServiceComponent.java (87%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core}/operation/template/spi/OperationTemplateService.java (84%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core}/operation/template/util/AssertUtils.java (89%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core}/operation/template/util/ConnectionManagerUtils.java (96%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt => io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core}/operation/template/util/DAOUtil.java (92%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt => io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core}/operation/template/DAONegativeTest.java (80%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt => io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core}/operation/template/DAOTest.java (86%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt => io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core}/operation/template/DataSourceConfig.java (97%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt => io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core}/operation/template/ServiceNegativeTest.java (83%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt => io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core}/operation/template/ServiceTest.java (90%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt => io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core}/operation/template/TestUtils.java (96%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt => io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core}/operation/template/mock/BaseOperationTemplatePluginTest.java (94%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt => io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core}/operation/template/mock/MockConnection.java (99%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt => io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core}/operation/template/mock/MockDataSource.java (98%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt => io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core}/operation/template/mock/MockDatabaseMetaData.java (99%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt => io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core}/operation/template/mock/MockResultSet.java (99%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt => io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core}/operation/template/mock/MockStatement.java (99%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template => io.entgra.device.mgt.core.operation.template}/src/test/resources/carbon-home/dbscripts/dm-db-h2.sql (100%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template => io.entgra.device.mgt.core.operation.template}/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml (100%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template => io.entgra.device.mgt.core.operation.template}/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml (100%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template => io.entgra.device.mgt.core.operation.template}/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml (100%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template => io.entgra.device.mgt.core.operation.template}/src/test/resources/carbon-home/repository/conf/carbon.xml (100%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template => io.entgra.device.mgt.core.operation.template}/src/test/resources/carbon-home/repository/conf/cdm-config.xml (100%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template => io.entgra.device.mgt.core.operation.template}/src/test/resources/carbon-home/repository/conf/datasources/data-source-config.xml (100%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template => io.entgra.device.mgt.core.operation.template}/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt (100%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template => io.entgra.device.mgt.core.operation.template}/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties (100%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template => io.entgra.device.mgt.core.operation.template}/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml (100%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template => io.entgra.device.mgt.core.operation.template}/src/test/resources/carbon-home/repository/conf/etc/jmx.xml (100%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template => io.entgra.device.mgt.core.operation.template}/src/test/resources/carbon-home/repository/conf/etc/launch.ini (100%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template => io.entgra.device.mgt.core.operation.template}/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties (100%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template => io.entgra.device.mgt.core.operation.template}/src/test/resources/carbon-home/repository/conf/etc/mime.mappings (100%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template => io.entgra.device.mgt.core.operation.template}/src/test/resources/carbon-home/repository/conf/etc/mime.types (100%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template => io.entgra.device.mgt.core.operation.template}/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options (100%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template => io.entgra.device.mgt.core.operation.template}/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml (100%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template => io.entgra.device.mgt.core.operation.template}/src/test/resources/carbon-home/repository/conf/log4j.properties (100%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template => io.entgra.device.mgt.core.operation.template}/src/test/resources/carbon-home/repository/conf/registry.xml (100%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template => io.entgra.device.mgt.core.operation.template}/src/test/resources/carbon-home/repository/conf/security/authenticators.xml (100%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template => io.entgra.device.mgt.core.operation.template}/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml (100%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template => io.entgra.device.mgt.core.operation.template}/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml (100%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template => io.entgra.device.mgt.core.operation.template}/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml (100%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template => io.entgra.device.mgt.core.operation.template}/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml (100%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template => io.entgra.device.mgt.core.operation.template}/src/test/resources/carbon-home/repository/conf/tomcat/web.xml (100%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template => io.entgra.device.mgt.core.operation.template}/src/test/resources/carbon-home/repository/conf/user-mgt.xml (100%) rename components/operation-template-mgt/{io.entgra.device.mgt.operation.template => io.entgra.device.mgt.core.operation.template}/src/test/resources/testng.xml (76%) diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/pom.xml b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/pom.xml similarity index 97% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/pom.xml rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/pom.xml index 8830c028fd..10bdf658b5 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/pom.xml +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/pom.xml @@ -26,7 +26,7 @@ 4.0.0 - io.entgra.device.mgt.operation.template + io.entgra.device.mgt.core.operation.template bundle Entgra IoT - Operation Template Core Entgra IoT - Operation Template Core @@ -52,7 +52,7 @@ ${project.artifactId} ${carbon.device.mgt.version} IOT Operation Template Bundle - io.entgra.device.mgt.operation.template.internal + io.entgra.device.mgt.core.operation.template.internal org.osgi.framework.*;version="${imp.package.version.osgi.framework}", org.osgi.service.*;version="${imp.package.version.osgi.service}", @@ -82,8 +82,8 @@ okhttp3 - !io.entgra.device.mgt.operation.template.internal, - io.entgra.device.mgt.operation.template.* + !io.entgra.device.mgt.core.operation.template.internal, + io.entgra.device.mgt.core.operation.template.* diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/cache/OperationTemplateCacheLoader.java b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/cache/OperationTemplateCacheLoader.java similarity index 80% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/cache/OperationTemplateCacheLoader.java rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/cache/OperationTemplateCacheLoader.java index 8d548bbde5..7df671bff6 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/cache/OperationTemplateCacheLoader.java +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/cache/OperationTemplateCacheLoader.java @@ -16,18 +16,18 @@ * under the License. */ -package io.entgra.device.mgt.operation.template.cache; +package io.entgra.device.mgt.core.operation.template.cache; import com.google.common.cache.CacheLoader; -import io.entgra.device.mgt.operation.template.dao.OperationTemplateDAO; -import io.entgra.device.mgt.operation.template.dao.OperationTemplateDAOFactory; -import io.entgra.device.mgt.operation.template.dao.impl.util.OperationTemplateManagementUtil; -import io.entgra.device.mgt.operation.template.dto.OperationTemplate; -import io.entgra.device.mgt.operation.template.dto.OperationTemplateCacheKey; -import io.entgra.device.mgt.operation.template.exception.DBConnectionException; -import io.entgra.device.mgt.operation.template.exception.OperationTemplateManagementDAOException; -import io.entgra.device.mgt.operation.template.exception.OperationTemplateMgtPluginException; -import io.entgra.device.mgt.operation.template.util.ConnectionManagerUtils; +import io.entgra.device.mgt.core.operation.template.dao.OperationTemplateDAO; +import io.entgra.device.mgt.core.operation.template.dao.OperationTemplateDAOFactory; +import io.entgra.device.mgt.core.operation.template.dao.impl.util.OperationTemplateManagementUtil; +import io.entgra.device.mgt.core.operation.template.dto.OperationTemplate; +import io.entgra.device.mgt.core.operation.template.dto.OperationTemplateCacheKey; +import io.entgra.device.mgt.core.operation.template.exception.DBConnectionException; +import io.entgra.device.mgt.core.operation.template.exception.OperationTemplateManagementDAOException; +import io.entgra.device.mgt.core.operation.template.exception.OperationTemplateMgtPluginException; +import io.entgra.device.mgt.core.operation.template.util.ConnectionManagerUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/dao/OperationTemplateDAO.java b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/dao/OperationTemplateDAO.java similarity index 85% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/dao/OperationTemplateDAO.java rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/dao/OperationTemplateDAO.java index 2a760f0add..7667d9c136 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/dao/OperationTemplateDAO.java +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/dao/OperationTemplateDAO.java @@ -16,10 +16,10 @@ * under the License. */ -package io.entgra.device.mgt.operation.template.dao; +package io.entgra.device.mgt.core.operation.template.dao; -import io.entgra.device.mgt.operation.template.dto.OperationTemplate; -import io.entgra.device.mgt.operation.template.exception.OperationTemplateManagementDAOException; +import io.entgra.device.mgt.core.operation.template.dto.OperationTemplate; +import io.entgra.device.mgt.core.operation.template.exception.OperationTemplateManagementDAOException; /** * This class represents the key operations associated with persisting mobile-device related diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/dao/OperationTemplateDAOFactory.java b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/dao/OperationTemplateDAOFactory.java similarity index 82% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/dao/OperationTemplateDAOFactory.java rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/dao/OperationTemplateDAOFactory.java index 094c5d7899..0645d553ee 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/dao/OperationTemplateDAOFactory.java +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/dao/OperationTemplateDAOFactory.java @@ -16,12 +16,12 @@ * under the License. */ -package io.entgra.device.mgt.operation.template.dao; +package io.entgra.device.mgt.core.operation.template.dao; -import io.entgra.device.mgt.operation.template.dao.impl.OperationTemplateDAOImpl; -import io.entgra.device.mgt.operation.template.dao.impl.OperationTemplateMySQLDAOImpl; -import io.entgra.device.mgt.operation.template.dao.impl.config.datasource.DataSourceConfig; -import io.entgra.device.mgt.operation.template.util.ConnectionManagerUtils; +import io.entgra.device.mgt.core.operation.template.dao.impl.OperationTemplateDAOImpl; +import io.entgra.device.mgt.core.operation.template.dao.impl.OperationTemplateMySQLDAOImpl; +import io.entgra.device.mgt.core.operation.template.dao.impl.config.datasource.DataSourceConfig; +import io.entgra.device.mgt.core.operation.template.util.ConnectionManagerUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.device.mgt.common.DeviceManagementConstants; diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/dao/impl/OperationTemplateDAOImpl.java b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/dao/impl/OperationTemplateDAOImpl.java similarity index 93% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/dao/impl/OperationTemplateDAOImpl.java rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/dao/impl/OperationTemplateDAOImpl.java index a79ed3fec1..5111e48292 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/dao/impl/OperationTemplateDAOImpl.java +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/dao/impl/OperationTemplateDAOImpl.java @@ -16,15 +16,15 @@ * under the License. */ -package io.entgra.device.mgt.operation.template.dao.impl; +package io.entgra.device.mgt.core.operation.template.dao.impl; import com.google.gson.Gson; -import io.entgra.device.mgt.operation.template.dao.OperationTemplateDAO; -import io.entgra.device.mgt.operation.template.dto.OperationTemplate; -import io.entgra.device.mgt.operation.template.exception.DBConnectionException; -import io.entgra.device.mgt.operation.template.exception.OperationTemplateManagementDAOException; -import io.entgra.device.mgt.operation.template.util.ConnectionManagerUtils; -import io.entgra.device.mgt.operation.template.util.DAOUtil; +import io.entgra.device.mgt.core.operation.template.dto.OperationTemplate; +import io.entgra.device.mgt.core.operation.template.dao.OperationTemplateDAO; +import io.entgra.device.mgt.core.operation.template.exception.DBConnectionException; +import io.entgra.device.mgt.core.operation.template.exception.OperationTemplateManagementDAOException; +import io.entgra.device.mgt.core.operation.template.util.ConnectionManagerUtils; +import io.entgra.device.mgt.core.operation.template.util.DAOUtil; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/dao/impl/OperationTemplateMySQLDAOImpl.java b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/dao/impl/OperationTemplateMySQLDAOImpl.java similarity index 92% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/dao/impl/OperationTemplateMySQLDAOImpl.java rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/dao/impl/OperationTemplateMySQLDAOImpl.java index e2a99b2fab..b029a76481 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/dao/impl/OperationTemplateMySQLDAOImpl.java +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/dao/impl/OperationTemplateMySQLDAOImpl.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.device.mgt.operation.template.dao.impl; +package io.entgra.device.mgt.core.operation.template.dao.impl; /** diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/dao/impl/config/DeviceConfigurationManager.java b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/dao/impl/config/DeviceConfigurationManager.java similarity index 94% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/dao/impl/config/DeviceConfigurationManager.java rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/dao/impl/config/DeviceConfigurationManager.java index 9afea61bda..904acb9a65 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/dao/impl/config/DeviceConfigurationManager.java +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/dao/impl/config/DeviceConfigurationManager.java @@ -16,9 +16,9 @@ * under the License. */ -package io.entgra.device.mgt.operation.template.dao.impl.config; +package io.entgra.device.mgt.core.operation.template.dao.impl.config; -import io.entgra.device.mgt.operation.template.dao.impl.util.OperationTemplateManagementUtil; +import io.entgra.device.mgt.core.operation.template.dao.impl.util.OperationTemplateManagementUtil; import org.w3c.dom.Document; import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException; import org.wso2.carbon.utils.CarbonUtils; diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/dao/impl/config/DeviceManagementConfig.java b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/dao/impl/config/DeviceManagementConfig.java similarity index 95% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/dao/impl/config/DeviceManagementConfig.java rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/dao/impl/config/DeviceManagementConfig.java index 257b3dd460..571790196c 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/dao/impl/config/DeviceManagementConfig.java +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/dao/impl/config/DeviceManagementConfig.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.device.mgt.operation.template.dao.impl.config; +package io.entgra.device.mgt.core.operation.template.dao.impl.config; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/dao/impl/config/DeviceManagementRepository.java b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/dao/impl/config/DeviceManagementRepository.java similarity index 88% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/dao/impl/config/DeviceManagementRepository.java rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/dao/impl/config/DeviceManagementRepository.java index 8908412f19..cb25d1bf4c 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/dao/impl/config/DeviceManagementRepository.java +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/dao/impl/config/DeviceManagementRepository.java @@ -16,9 +16,9 @@ * under the License. */ -package io.entgra.device.mgt.operation.template.dao.impl.config; +package io.entgra.device.mgt.core.operation.template.dao.impl.config; -import io.entgra.device.mgt.operation.template.dao.impl.config.datasource.DataSourceConfig; +import io.entgra.device.mgt.core.operation.template.dao.impl.config.datasource.DataSourceConfig; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/dao/impl/config/datasource/DataSourceConfig.java b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/dao/impl/config/datasource/DataSourceConfig.java similarity index 94% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/dao/impl/config/datasource/DataSourceConfig.java rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/dao/impl/config/datasource/DataSourceConfig.java index feede01ecd..51b4b23b8e 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/dao/impl/config/datasource/DataSourceConfig.java +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/dao/impl/config/datasource/DataSourceConfig.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.device.mgt.operation.template.dao.impl.config.datasource; +package io.entgra.device.mgt.core.operation.template.dao.impl.config.datasource; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/dao/impl/config/datasource/JNDILookupDefinition.java b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/dao/impl/config/datasource/JNDILookupDefinition.java similarity index 96% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/dao/impl/config/datasource/JNDILookupDefinition.java rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/dao/impl/config/datasource/JNDILookupDefinition.java index b0ad1fab00..09cd95209f 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/dao/impl/config/datasource/JNDILookupDefinition.java +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/dao/impl/config/datasource/JNDILookupDefinition.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.device.mgt.operation.template.dao.impl.config.datasource; +package io.entgra.device.mgt.core.operation.template.dao.impl.config.datasource; import javax.xml.bind.annotation.*; import java.util.List; diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/dao/impl/util/OperationTemplateManagementUtil.java b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/dao/impl/util/OperationTemplateManagementUtil.java similarity index 94% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/dao/impl/util/OperationTemplateManagementUtil.java rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/dao/impl/util/OperationTemplateManagementUtil.java index 3026e0fec7..90346476d4 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/dao/impl/util/OperationTemplateManagementUtil.java +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/dao/impl/util/OperationTemplateManagementUtil.java @@ -16,9 +16,9 @@ * under the License. */ -package io.entgra.device.mgt.operation.template.dao.impl.util; +package io.entgra.device.mgt.core.operation.template.dao.impl.util; -import io.entgra.device.mgt.operation.template.dto.OperationTemplateCacheKey; +import io.entgra.device.mgt.core.operation.template.dto.OperationTemplateCacheKey; import org.w3c.dom.Document; import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException; diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/dto/OperationTemplate.java b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/dto/OperationTemplate.java similarity index 96% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/dto/OperationTemplate.java rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/dto/OperationTemplate.java index d9cef4dc41..8a90fd9329 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/dto/OperationTemplate.java +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/dto/OperationTemplate.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.device.mgt.operation.template.dto; +package io.entgra.device.mgt.core.operation.template.dto; public class OperationTemplate { private String subTypeId; diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/dto/OperationTemplateCacheKey.java b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/dto/OperationTemplateCacheKey.java similarity index 95% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/dto/OperationTemplateCacheKey.java rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/dto/OperationTemplateCacheKey.java index bde7b2d540..81b923f815 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/dto/OperationTemplateCacheKey.java +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/dto/OperationTemplateCacheKey.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.device.mgt.operation.template.dto; +package io.entgra.device.mgt.core.operation.template.dto; public class OperationTemplateCacheKey { diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/exception/BadOperationRequestException.java b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/exception/BadOperationRequestException.java similarity index 94% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/exception/BadOperationRequestException.java rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/exception/BadOperationRequestException.java index 96d8bb3265..6d47b492b3 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/exception/BadOperationRequestException.java +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/exception/BadOperationRequestException.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.device.mgt.operation.template.exception; +package io.entgra.device.mgt.core.operation.template.exception; /** * Represents the exception thrown during validating the request. diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/exception/DBConnectionException.java b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/exception/DBConnectionException.java similarity index 94% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/exception/DBConnectionException.java rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/exception/DBConnectionException.java index f131133ab8..197a977ddc 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/exception/DBConnectionException.java +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/exception/DBConnectionException.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.device.mgt.operation.template.exception; +package io.entgra.device.mgt.core.operation.template.exception; /** * Exception thrown due to Database Connection issues. diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/exception/OperationTemplateManagementDAOException.java b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/exception/OperationTemplateManagementDAOException.java similarity index 94% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/exception/OperationTemplateManagementDAOException.java rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/exception/OperationTemplateManagementDAOException.java index df162d11de..7532e05a14 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/exception/OperationTemplateManagementDAOException.java +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/exception/OperationTemplateManagementDAOException.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.device.mgt.operation.template.exception; +package io.entgra.device.mgt.core.operation.template.exception; public class OperationTemplateManagementDAOException extends Exception { diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/exception/OperationTemplateMgtPluginException.java b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/exception/OperationTemplateMgtPluginException.java similarity index 96% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/exception/OperationTemplateMgtPluginException.java rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/exception/OperationTemplateMgtPluginException.java index b5c6674185..1977fd1257 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/exception/OperationTemplateMgtPluginException.java +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/exception/OperationTemplateMgtPluginException.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.device.mgt.operation.template.exception; +package io.entgra.device.mgt.core.operation.template.exception; public class OperationTemplateMgtPluginException extends Exception { diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/impl/OperationTemplateServiceImpl.java b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/impl/OperationTemplateServiceImpl.java similarity index 90% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/impl/OperationTemplateServiceImpl.java rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/impl/OperationTemplateServiceImpl.java index cb82426dad..4ae9d343c1 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/impl/OperationTemplateServiceImpl.java +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/impl/OperationTemplateServiceImpl.java @@ -16,22 +16,22 @@ * under the License. */ -package io.entgra.device.mgt.operation.template.impl; +package io.entgra.device.mgt.core.operation.template.impl; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; -import io.entgra.device.mgt.operation.template.cache.OperationTemplateCacheLoader; -import io.entgra.device.mgt.operation.template.dao.OperationTemplateDAO; -import io.entgra.device.mgt.operation.template.dao.OperationTemplateDAOFactory; -import io.entgra.device.mgt.operation.template.dao.impl.util.OperationTemplateManagementUtil; -import io.entgra.device.mgt.operation.template.dto.OperationTemplate; -import io.entgra.device.mgt.operation.template.exception.DBConnectionException; -import io.entgra.device.mgt.operation.template.exception.OperationTemplateManagementDAOException; -import io.entgra.device.mgt.operation.template.exception.OperationTemplateMgtPluginException; -import io.entgra.device.mgt.operation.template.spi.OperationTemplateService; -import io.entgra.device.mgt.operation.template.util.ConnectionManagerUtils; -import io.entgra.device.mgt.operation.template.util.AssertUtils; +import io.entgra.device.mgt.core.operation.template.cache.OperationTemplateCacheLoader; +import io.entgra.device.mgt.core.operation.template.dao.OperationTemplateDAO; +import io.entgra.device.mgt.core.operation.template.dao.OperationTemplateDAOFactory; +import io.entgra.device.mgt.core.operation.template.dao.impl.util.OperationTemplateManagementUtil; +import io.entgra.device.mgt.core.operation.template.dto.OperationTemplate; +import io.entgra.device.mgt.core.operation.template.exception.DBConnectionException; +import io.entgra.device.mgt.core.operation.template.exception.OperationTemplateManagementDAOException; +import io.entgra.device.mgt.core.operation.template.exception.OperationTemplateMgtPluginException; +import io.entgra.device.mgt.core.operation.template.spi.OperationTemplateService; +import io.entgra.device.mgt.core.operation.template.util.ConnectionManagerUtils; +import io.entgra.device.mgt.core.operation.template.util.AssertUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/internal/OperationTemplateMgtDataHolder.java b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/internal/OperationTemplateMgtDataHolder.java similarity index 93% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/internal/OperationTemplateMgtDataHolder.java rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/internal/OperationTemplateMgtDataHolder.java index f28c5d02f4..ea8640a945 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/internal/OperationTemplateMgtDataHolder.java +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/internal/OperationTemplateMgtDataHolder.java @@ -16,9 +16,9 @@ * under the License. */ -package io.entgra.device.mgt.operation.template.internal; +package io.entgra.device.mgt.core.operation.template.internal; -import io.entgra.device.mgt.operation.template.spi.OperationTemplateService; +import io.entgra.device.mgt.core.operation.template.spi.OperationTemplateService; import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService; import org.wso2.carbon.registry.core.service.RegistryService; diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/internal/OperationTemplateMgtServiceComponent.java b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/internal/OperationTemplateMgtServiceComponent.java similarity index 87% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/internal/OperationTemplateMgtServiceComponent.java rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/internal/OperationTemplateMgtServiceComponent.java index dd13540c9b..2a35ebb632 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/internal/OperationTemplateMgtServiceComponent.java +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/internal/OperationTemplateMgtServiceComponent.java @@ -16,14 +16,14 @@ * under the License. */ -package io.entgra.device.mgt.operation.template.internal; +package io.entgra.device.mgt.core.operation.template.internal; -import io.entgra.device.mgt.operation.template.dao.OperationTemplateDAOFactory; -import io.entgra.device.mgt.operation.template.dao.impl.config.DeviceConfigurationManager; -import io.entgra.device.mgt.operation.template.dao.impl.config.DeviceManagementConfig; -import io.entgra.device.mgt.operation.template.dao.impl.config.datasource.DataSourceConfig; -import io.entgra.device.mgt.operation.template.impl.OperationTemplateServiceImpl; -import io.entgra.device.mgt.operation.template.spi.OperationTemplateService; +import io.entgra.device.mgt.core.operation.template.dao.OperationTemplateDAOFactory; +import io.entgra.device.mgt.core.operation.template.dao.impl.config.DeviceConfigurationManager; +import io.entgra.device.mgt.core.operation.template.dao.impl.config.DeviceManagementConfig; +import io.entgra.device.mgt.core.operation.template.dao.impl.config.datasource.DataSourceConfig; +import io.entgra.device.mgt.core.operation.template.impl.OperationTemplateServiceImpl; +import io.entgra.device.mgt.core.operation.template.spi.OperationTemplateService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.osgi.framework.BundleContext; diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/spi/OperationTemplateService.java b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/spi/OperationTemplateService.java similarity index 84% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/spi/OperationTemplateService.java rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/spi/OperationTemplateService.java index 01da583b62..af67f6b224 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/spi/OperationTemplateService.java +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/spi/OperationTemplateService.java @@ -16,10 +16,10 @@ * under the License. */ -package io.entgra.device.mgt.operation.template.spi; +package io.entgra.device.mgt.core.operation.template.spi; -import io.entgra.device.mgt.operation.template.dto.OperationTemplate; -import io.entgra.device.mgt.operation.template.exception.OperationTemplateMgtPluginException; +import io.entgra.device.mgt.core.operation.template.dto.OperationTemplate; +import io.entgra.device.mgt.core.operation.template.exception.OperationTemplateMgtPluginException; /** * Operation Template service interface. diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/util/AssertUtils.java b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/util/AssertUtils.java similarity index 89% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/util/AssertUtils.java rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/util/AssertUtils.java index 59827e1061..2882a5b6c0 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/util/AssertUtils.java +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/util/AssertUtils.java @@ -16,10 +16,10 @@ * under the License. */ -package io.entgra.device.mgt.operation.template.util; +package io.entgra.device.mgt.core.operation.template.util; -import io.entgra.device.mgt.operation.template.exception.BadOperationRequestException; -import io.entgra.device.mgt.operation.template.exception.OperationTemplateMgtPluginException; +import io.entgra.device.mgt.core.operation.template.exception.BadOperationRequestException; +import io.entgra.device.mgt.core.operation.template.exception.OperationTemplateMgtPluginException; import org.apache.commons.lang.StringUtils; public class AssertUtils { diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/util/ConnectionManagerUtils.java b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/util/ConnectionManagerUtils.java similarity index 96% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/util/ConnectionManagerUtils.java rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/util/ConnectionManagerUtils.java index ce83acc449..216616d4a7 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/util/ConnectionManagerUtils.java +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/util/ConnectionManagerUtils.java @@ -16,11 +16,11 @@ * under the License. */ -package io.entgra.device.mgt.operation.template.util; +package io.entgra.device.mgt.core.operation.template.util; -import io.entgra.device.mgt.operation.template.dao.impl.config.datasource.DataSourceConfig; -import io.entgra.device.mgt.operation.template.dao.impl.config.datasource.JNDILookupDefinition; -import io.entgra.device.mgt.operation.template.exception.DBConnectionException; +import io.entgra.device.mgt.core.operation.template.dao.impl.config.datasource.DataSourceConfig; +import io.entgra.device.mgt.core.operation.template.dao.impl.config.datasource.JNDILookupDefinition; +import io.entgra.device.mgt.core.operation.template.exception.DBConnectionException; import java.sql.Connection; import java.sql.SQLException; diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/util/DAOUtil.java b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/util/DAOUtil.java similarity index 92% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/util/DAOUtil.java rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/util/DAOUtil.java index 78d23cda74..15ab996181 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/main/java/io/entgra/device/mgt/operation/template/util/DAOUtil.java +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/util/DAOUtil.java @@ -16,11 +16,12 @@ * under the License. */ -package io.entgra.device.mgt.operation.template.util; +package io.entgra.device.mgt.core.operation.template.util; import com.google.gson.Gson; import com.google.gson.JsonSyntaxException; -import io.entgra.device.mgt.operation.template.dto.OperationTemplate; +import io.entgra.device.mgt.core.operation.template.dto.OperationTemplate; + import java.sql.ResultSet; import java.sql.SQLException; diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt/operation/template/DAONegativeTest.java b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core/operation/template/DAONegativeTest.java similarity index 80% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt/operation/template/DAONegativeTest.java rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core/operation/template/DAONegativeTest.java index fee6ecece7..d5458f398d 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt/operation/template/DAONegativeTest.java +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core/operation/template/DAONegativeTest.java @@ -16,15 +16,15 @@ * under the License. */ -package io.entgra.device.mgt.operation.template; +package io.entgra.device.mgt.core.operation.template; -import io.entgra.device.mgt.operation.template.dao.OperationTemplateDAO; -import io.entgra.device.mgt.operation.template.dao.OperationTemplateDAOFactory; -import io.entgra.device.mgt.operation.template.dto.OperationTemplate; -import io.entgra.device.mgt.operation.template.exception.DBConnectionException; -import io.entgra.device.mgt.operation.template.exception.OperationTemplateManagementDAOException; -import io.entgra.device.mgt.operation.template.mock.BaseOperationTemplatePluginTest; -import io.entgra.device.mgt.operation.template.util.ConnectionManagerUtils; +import io.entgra.device.mgt.core.operation.template.dao.OperationTemplateDAO; +import io.entgra.device.mgt.core.operation.template.dao.OperationTemplateDAOFactory; +import io.entgra.device.mgt.core.operation.template.dto.OperationTemplate; +import io.entgra.device.mgt.core.operation.template.exception.DBConnectionException; +import io.entgra.device.mgt.core.operation.template.exception.OperationTemplateManagementDAOException; +import io.entgra.device.mgt.core.operation.template.mock.BaseOperationTemplatePluginTest; +import io.entgra.device.mgt.core.operation.template.util.ConnectionManagerUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.testng.annotations.BeforeClass; diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt/operation/template/DAOTest.java b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core/operation/template/DAOTest.java similarity index 86% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt/operation/template/DAOTest.java rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core/operation/template/DAOTest.java index 7d398a7412..198c09f0f6 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt/operation/template/DAOTest.java +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core/operation/template/DAOTest.java @@ -16,15 +16,15 @@ * under the License. */ -package io.entgra.device.mgt.operation.template; - -import io.entgra.device.mgt.operation.template.dao.OperationTemplateDAO; -import io.entgra.device.mgt.operation.template.dao.OperationTemplateDAOFactory; -import io.entgra.device.mgt.operation.template.dto.OperationTemplate; -import io.entgra.device.mgt.operation.template.exception.DBConnectionException; -import io.entgra.device.mgt.operation.template.exception.OperationTemplateManagementDAOException; -import io.entgra.device.mgt.operation.template.mock.BaseOperationTemplatePluginTest; -import io.entgra.device.mgt.operation.template.util.ConnectionManagerUtils; +package io.entgra.device.mgt.core.operation.template; + +import io.entgra.device.mgt.core.operation.template.dao.OperationTemplateDAO; +import io.entgra.device.mgt.core.operation.template.dao.OperationTemplateDAOFactory; +import io.entgra.device.mgt.core.operation.template.dto.OperationTemplate; +import io.entgra.device.mgt.core.operation.template.exception.DBConnectionException; +import io.entgra.device.mgt.core.operation.template.exception.OperationTemplateManagementDAOException; +import io.entgra.device.mgt.core.operation.template.mock.BaseOperationTemplatePluginTest; +import io.entgra.device.mgt.core.operation.template.util.ConnectionManagerUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.testng.Assert; diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt/operation/template/DataSourceConfig.java b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core/operation/template/DataSourceConfig.java similarity index 97% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt/operation/template/DataSourceConfig.java rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core/operation/template/DataSourceConfig.java index d574a54536..9763ee7bdb 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt/operation/template/DataSourceConfig.java +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core/operation/template/DataSourceConfig.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.device.mgt.operation.template; +package io.entgra.device.mgt.core.operation.template; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt/operation/template/ServiceNegativeTest.java b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core/operation/template/ServiceNegativeTest.java similarity index 83% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt/operation/template/ServiceNegativeTest.java rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core/operation/template/ServiceNegativeTest.java index be5a2dee66..5b6fa1d445 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt/operation/template/ServiceNegativeTest.java +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core/operation/template/ServiceNegativeTest.java @@ -16,13 +16,13 @@ * under the License. */ -package io.entgra.device.mgt.operation.template; +package io.entgra.device.mgt.core.operation.template; -import io.entgra.device.mgt.operation.template.dto.OperationTemplate; -import io.entgra.device.mgt.operation.template.exception.OperationTemplateMgtPluginException; -import io.entgra.device.mgt.operation.template.impl.OperationTemplateServiceImpl; -import io.entgra.device.mgt.operation.template.spi.OperationTemplateService; -import io.entgra.device.mgt.operation.template.mock.BaseOperationTemplatePluginTest; +import io.entgra.device.mgt.core.operation.template.dto.OperationTemplate; +import io.entgra.device.mgt.core.operation.template.exception.OperationTemplateMgtPluginException; +import io.entgra.device.mgt.core.operation.template.impl.OperationTemplateServiceImpl; +import io.entgra.device.mgt.core.operation.template.spi.OperationTemplateService; +import io.entgra.device.mgt.core.operation.template.mock.BaseOperationTemplatePluginTest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.testng.annotations.BeforeClass; diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt/operation/template/ServiceTest.java b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core/operation/template/ServiceTest.java similarity index 90% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt/operation/template/ServiceTest.java rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core/operation/template/ServiceTest.java index aec19e0966..9a6ba49676 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt/operation/template/ServiceTest.java +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core/operation/template/ServiceTest.java @@ -16,13 +16,13 @@ * under the License. */ -package io.entgra.device.mgt.operation.template; +package io.entgra.device.mgt.core.operation.template; -import io.entgra.device.mgt.operation.template.dto.OperationTemplate; -import io.entgra.device.mgt.operation.template.exception.OperationTemplateMgtPluginException; -import io.entgra.device.mgt.operation.template.impl.OperationTemplateServiceImpl; -import io.entgra.device.mgt.operation.template.mock.BaseOperationTemplatePluginTest; -import io.entgra.device.mgt.operation.template.spi.OperationTemplateService; +import io.entgra.device.mgt.core.operation.template.dto.OperationTemplate; +import io.entgra.device.mgt.core.operation.template.exception.OperationTemplateMgtPluginException; +import io.entgra.device.mgt.core.operation.template.impl.OperationTemplateServiceImpl; +import io.entgra.device.mgt.core.operation.template.mock.BaseOperationTemplatePluginTest; +import io.entgra.device.mgt.core.operation.template.spi.OperationTemplateService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.testng.Assert; diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt/operation/template/TestUtils.java b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core/operation/template/TestUtils.java similarity index 96% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt/operation/template/TestUtils.java rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core/operation/template/TestUtils.java index fef316de62..e8ac7b67c4 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt/operation/template/TestUtils.java +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core/operation/template/TestUtils.java @@ -16,9 +16,9 @@ * under the License. */ -package io.entgra.device.mgt.operation.template; +package io.entgra.device.mgt.core.operation.template; -import io.entgra.device.mgt.operation.template.util.ConnectionManagerUtils; +import io.entgra.device.mgt.core.operation.template.util.ConnectionManagerUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt/operation/template/mock/BaseOperationTemplatePluginTest.java b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core/operation/template/mock/BaseOperationTemplatePluginTest.java similarity index 94% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt/operation/template/mock/BaseOperationTemplatePluginTest.java rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core/operation/template/mock/BaseOperationTemplatePluginTest.java index 529fe20519..875c736328 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt/operation/template/mock/BaseOperationTemplatePluginTest.java +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core/operation/template/mock/BaseOperationTemplatePluginTest.java @@ -16,12 +16,12 @@ * under the License. */ -package io.entgra.device.mgt.operation.template.mock; +package io.entgra.device.mgt.core.operation.template.mock; -import io.entgra.device.mgt.operation.template.DataSourceConfig; -import io.entgra.device.mgt.operation.template.dao.OperationTemplateDAOFactory; -import io.entgra.device.mgt.operation.template.util.ConnectionManagerUtils; -import io.entgra.device.mgt.operation.template.TestUtils; +import io.entgra.device.mgt.core.operation.template.DataSourceConfig; +import io.entgra.device.mgt.core.operation.template.dao.OperationTemplateDAOFactory; +import io.entgra.device.mgt.core.operation.template.util.ConnectionManagerUtils; +import io.entgra.device.mgt.core.operation.template.TestUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.tomcat.jdbc.pool.PoolProperties; diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt/operation/template/mock/MockConnection.java b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core/operation/template/mock/MockConnection.java similarity index 99% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt/operation/template/mock/MockConnection.java rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core/operation/template/mock/MockConnection.java index 9f605521aa..19d5c8f28c 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt/operation/template/mock/MockConnection.java +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core/operation/template/mock/MockConnection.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.device.mgt.operation.template.mock; +package io.entgra.device.mgt.core.operation.template.mock; import java.sql.CallableStatement; import java.sql.SQLWarning; diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt/operation/template/mock/MockDataSource.java b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core/operation/template/mock/MockDataSource.java similarity index 98% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt/operation/template/mock/MockDataSource.java rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core/operation/template/mock/MockDataSource.java index df69679b90..105ac2011c 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt/operation/template/mock/MockDataSource.java +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core/operation/template/mock/MockDataSource.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.device.mgt.operation.template.mock; +package io.entgra.device.mgt.core.operation.template.mock; import javax.sql.DataSource; import java.io.PrintWriter; diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt/operation/template/mock/MockDatabaseMetaData.java b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core/operation/template/mock/MockDatabaseMetaData.java similarity index 99% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt/operation/template/mock/MockDatabaseMetaData.java rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core/operation/template/mock/MockDatabaseMetaData.java index 7dbb7fb389..09cc718518 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt/operation/template/mock/MockDatabaseMetaData.java +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core/operation/template/mock/MockDatabaseMetaData.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.device.mgt.operation.template.mock; +package io.entgra.device.mgt.core.operation.template.mock; import org.wso2.carbon.device.mgt.common.DeviceManagementConstants; diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt/operation/template/mock/MockResultSet.java b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core/operation/template/mock/MockResultSet.java similarity index 99% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt/operation/template/mock/MockResultSet.java rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core/operation/template/mock/MockResultSet.java index 03720e9b59..16fb7c09c1 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt/operation/template/mock/MockResultSet.java +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core/operation/template/mock/MockResultSet.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.device.mgt.operation.template.mock; +package io.entgra.device.mgt.core.operation.template.mock; import java.io.InputStream; import java.io.Reader; diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt/operation/template/mock/MockStatement.java b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core/operation/template/mock/MockStatement.java similarity index 99% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt/operation/template/mock/MockStatement.java rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core/operation/template/mock/MockStatement.java index bcf450059a..84adadd585 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/java/io/entgra/device/mgt/operation/template/mock/MockStatement.java +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/java/io/entgra/device/mgt/core/operation/template/mock/MockStatement.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.device.mgt.operation.template.mock; +package io.entgra.device.mgt.core.operation.template.mock; import java.io.InputStream; import java.io.Reader; diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/dbscripts/dm-db-h2.sql b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/dbscripts/dm-db-h2.sql similarity index 100% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/dbscripts/dm-db-h2.sql rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/dbscripts/dm-db-h2.sql diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml similarity index 100% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml similarity index 100% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml similarity index 100% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/carbon.xml b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/carbon.xml similarity index 100% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/carbon.xml rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/carbon.xml diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/cdm-config.xml b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/cdm-config.xml similarity index 100% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/cdm-config.xml rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/cdm-config.xml diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/datasources/data-source-config.xml b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/datasources/data-source-config.xml similarity index 100% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/datasources/data-source-config.xml rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/datasources/data-source-config.xml diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt similarity index 100% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties similarity index 100% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml similarity index 100% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/etc/jmx.xml b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/etc/jmx.xml similarity index 100% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/etc/jmx.xml rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/etc/jmx.xml diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/etc/launch.ini b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/etc/launch.ini similarity index 100% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/etc/launch.ini rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/etc/launch.ini diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties similarity index 100% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/etc/mime.mappings b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/etc/mime.mappings similarity index 100% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/etc/mime.mappings rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/etc/mime.mappings diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/etc/mime.types b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/etc/mime.types similarity index 100% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/etc/mime.types rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/etc/mime.types diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options similarity index 100% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml similarity index 100% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/log4j.properties b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/log4j.properties similarity index 100% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/log4j.properties rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/log4j.properties diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/registry.xml b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/registry.xml similarity index 100% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/registry.xml rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/registry.xml diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/security/authenticators.xml b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/security/authenticators.xml similarity index 100% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/security/authenticators.xml rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/security/authenticators.xml diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml similarity index 100% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml similarity index 100% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml similarity index 100% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml similarity index 100% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/tomcat/web.xml b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/tomcat/web.xml similarity index 100% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/tomcat/web.xml rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/tomcat/web.xml diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/user-mgt.xml b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/user-mgt.xml similarity index 100% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/carbon-home/repository/conf/user-mgt.xml rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/user-mgt.xml diff --git a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/testng.xml b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/testng.xml similarity index 76% rename from components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/testng.xml rename to components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/testng.xml index b2db379989..6962ca9026 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.operation.template/src/test/resources/testng.xml +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/testng.xml @@ -24,15 +24,15 @@ - - + + - - + + diff --git a/components/operation-template-mgt/pom.xml b/components/operation-template-mgt/pom.xml index 3d28dadb40..379458beb5 100644 --- a/components/operation-template-mgt/pom.xml +++ b/components/operation-template-mgt/pom.xml @@ -33,7 +33,7 @@ http://entgra.io - io.entgra.device.mgt.operation.template + io.entgra.device.mgt.core.operation.template diff --git a/features/operation-template-mgt-plugin-feature/io.entgra.device.mgt.core.operation.template.feature/pom.xml b/features/operation-template-mgt-plugin-feature/io.entgra.device.mgt.core.operation.template.feature/pom.xml index 3eb6ffc36a..580303d937 100644 --- a/features/operation-template-mgt-plugin-feature/io.entgra.device.mgt.core.operation.template.feature/pom.xml +++ b/features/operation-template-mgt-plugin-feature/io.entgra.device.mgt.core.operation.template.feature/pom.xml @@ -40,7 +40,7 @@ io.entgra.device.mgt.core - io.entgra.device.mgt.operation.template + io.entgra.device.mgt.core.operation.template @@ -95,7 +95,7 @@ - io.entgra.device.mgt.core:io.entgra.device.mgt.operation.template:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.operation.template:${carbon.device.mgt.version} diff --git a/pom.xml b/pom.xml index 933b53b30b..7f616b4043 100644 --- a/pom.xml +++ b/pom.xml @@ -34,39 +34,39 @@ - components/heartbeat-management - components/device-mgt - components/device-mgt-extensions - components/identity-extensions - components/apimgt-extensions - components/application-mgt - components/policy-mgt - components/certificate-mgt - components/ui-request-interceptor - components/transport-mgt - components/analytics-mgt - components/webapp-authenticator-framework - components/logger - components/task-mgt - components/subtype-mgt - components/tenant-mgt + + + + + + + + + + + + + + + + components/operation-template-mgt - features/device-mgt - features/apimgt-extensions - features/application-mgt - features/policy-mgt - features/certificate-mgt - features/heartbeat-management - features/ui-request-interceptor - features/jwt-client - features/device-mgt-extensions - features/transport-mgt - features/analytics-mgt - features/webapp-authenticator-framework - features/logger - features/task-mgt - features/subtype-mgt - features/tenant-mgt + + + + + + + + + + + + + + + + features/operation-template-mgt-plugin-feature @@ -394,7 +394,7 @@ io.entgra.device.mgt.core - io.entgra.device.mgt.operation.template + io.entgra.device.mgt.core.operation.template ${carbon.device.mgt.version}