refactored operation mgt component

components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/pom.xml

@@ -26,7 +26,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>io.entgra.device.mgt.operation.template</artifactId>
+    <artifactId>io.entgra.device.mgt.core.operation.template</artifactId>
     <packaging>bundle</packaging>
     <name>Entgra IoT - Operation Template Core</name>
     <description>Entgra IoT - Operation Template Core</description>
@@ -52,7 +52,7 @@
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
                         <Bundle-Description>IOT Operation Template Bundle</Bundle-Description>
-                        <Private-Package>io.entgra.device.mgt.operation.template.internal</Private-Package>
+                        <Private-Package>io.entgra.device.mgt.core.operation.template.internal</Private-Package>
                         <Import-Package>
                             org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
                             org.osgi.service.*;version="${imp.package.version.osgi.service}",
@@ -82,8 +82,8 @@
                             okhttp3
                         </Import-Package>
                         <Export-Package>
-                            !io.entgra.device.mgt.operation.template.internal,
+                            !io.entgra.device.mgt.core.operation.template.internal,
-                            io.entgra.device.mgt.operation.template.*
+                            io.entgra.device.mgt.core.operation.template.*
                         </Export-Package>
                     </instructions>
                 </configuration>

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.core.operation.template.dao.OperationTemplateDAO;
-import io.entgra.device.mgt.operation.template.dao.OperationTemplateDAOFactory;
+import io.entgra.device.mgt.core.operation.template.dao.OperationTemplateDAOFactory;
-import io.entgra.device.mgt.operation.template.dao.impl.util.OperationTemplateManagementUtil;
+import io.entgra.device.mgt.core.operation.template.dao.impl.util.OperationTemplateManagementUtil;
-import io.entgra.device.mgt.operation.template.dto.OperationTemplate;
+import io.entgra.device.mgt.core.operation.template.dto.OperationTemplate;
-import io.entgra.device.mgt.operation.template.dto.OperationTemplateCacheKey;
+import io.entgra.device.mgt.core.operation.template.dto.OperationTemplateCacheKey;
-import io.entgra.device.mgt.operation.template.exception.DBConnectionException;
+import io.entgra.device.mgt.core.operation.template.exception.DBConnectionException;
-import io.entgra.device.mgt.operation.template.exception.OperationTemplateManagementDAOException;
+import io.entgra.device.mgt.core.operation.template.exception.OperationTemplateManagementDAOException;
-import io.entgra.device.mgt.operation.template.exception.OperationTemplateMgtPluginException;
+import io.entgra.device.mgt.core.operation.template.exception.OperationTemplateMgtPluginException;
-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;
 

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.core.operation.template.dto.OperationTemplate;
-import io.entgra.device.mgt.operation.template.exception.OperationTemplateManagementDAOException;
+import io.entgra.device.mgt.core.operation.template.exception.OperationTemplateManagementDAOException;
 
 /**
  * This class represents the key operations associated with persisting mobile-device related

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.core.operation.template.dao.impl.OperationTemplateDAOImpl;
-import io.entgra.device.mgt.operation.template.dao.impl.OperationTemplateMySQLDAOImpl;
+import io.entgra.device.mgt.core.operation.template.dao.impl.OperationTemplateMySQLDAOImpl;
-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 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;
 import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;

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.core.operation.template.dto.OperationTemplate;
-import io.entgra.device.mgt.operation.template.dto.OperationTemplate;
+import io.entgra.device.mgt.core.operation.template.dao.OperationTemplateDAO;
-import io.entgra.device.mgt.operation.template.exception.DBConnectionException;
+import io.entgra.device.mgt.core.operation.template.exception.DBConnectionException;
-import io.entgra.device.mgt.operation.template.exception.OperationTemplateManagementDAOException;
+import io.entgra.device.mgt.core.operation.template.exception.OperationTemplateManagementDAOException;
-import io.entgra.device.mgt.operation.template.util.ConnectionManagerUtils;
+import io.entgra.device.mgt.core.operation.template.util.ConnectionManagerUtils;
-import io.entgra.device.mgt.operation.template.util.DAOUtil;
+import io.entgra.device.mgt.core.operation.template.util.DAOUtil;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

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;
 
 
 /**

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;

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;

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;

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;

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;

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;
 

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;

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 {
 

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.

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.

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 {
 

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 {
 

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.core.operation.template.cache.OperationTemplateCacheLoader;
-import io.entgra.device.mgt.operation.template.dao.OperationTemplateDAO;
+import io.entgra.device.mgt.core.operation.template.dao.OperationTemplateDAO;
-import io.entgra.device.mgt.operation.template.dao.OperationTemplateDAOFactory;
+import io.entgra.device.mgt.core.operation.template.dao.OperationTemplateDAOFactory;
-import io.entgra.device.mgt.operation.template.dao.impl.util.OperationTemplateManagementUtil;
+import io.entgra.device.mgt.core.operation.template.dao.impl.util.OperationTemplateManagementUtil;
-import io.entgra.device.mgt.operation.template.dto.OperationTemplate;
+import io.entgra.device.mgt.core.operation.template.dto.OperationTemplate;
-import io.entgra.device.mgt.operation.template.exception.DBConnectionException;
+import io.entgra.device.mgt.core.operation.template.exception.DBConnectionException;
-import io.entgra.device.mgt.operation.template.exception.OperationTemplateManagementDAOException;
+import io.entgra.device.mgt.core.operation.template.exception.OperationTemplateManagementDAOException;
-import io.entgra.device.mgt.operation.template.exception.OperationTemplateMgtPluginException;
+import io.entgra.device.mgt.core.operation.template.exception.OperationTemplateMgtPluginException;
-import io.entgra.device.mgt.operation.template.spi.OperationTemplateService;
+import io.entgra.device.mgt.core.operation.template.spi.OperationTemplateService;
-import io.entgra.device.mgt.operation.template.util.ConnectionManagerUtils;
+import io.entgra.device.mgt.core.operation.template.util.ConnectionManagerUtils;
-import io.entgra.device.mgt.operation.template.util.AssertUtils;
+import io.entgra.device.mgt.core.operation.template.util.AssertUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

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;
 

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.core.operation.template.dao.OperationTemplateDAOFactory;
-import io.entgra.device.mgt.operation.template.dao.impl.config.DeviceConfigurationManager;
+import io.entgra.device.mgt.core.operation.template.dao.impl.config.DeviceConfigurationManager;
-import io.entgra.device.mgt.operation.template.dao.impl.config.DeviceManagementConfig;
+import io.entgra.device.mgt.core.operation.template.dao.impl.config.DeviceManagementConfig;
-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 io.entgra.device.mgt.operation.template.impl.OperationTemplateServiceImpl;
+import io.entgra.device.mgt.core.operation.template.impl.OperationTemplateServiceImpl;
-import io.entgra.device.mgt.operation.template.spi.OperationTemplateService;
+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;

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.core.operation.template.dto.OperationTemplate;
-import io.entgra.device.mgt.operation.template.exception.OperationTemplateMgtPluginException;
+import io.entgra.device.mgt.core.operation.template.exception.OperationTemplateMgtPluginException;
 
 /**
  * Operation Template service interface.

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.core.operation.template.exception.BadOperationRequestException;
-import io.entgra.device.mgt.operation.template.exception.OperationTemplateMgtPluginException;
+import io.entgra.device.mgt.core.operation.template.exception.OperationTemplateMgtPluginException;
 import org.apache.commons.lang.StringUtils;
 
 public class AssertUtils {

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.core.operation.template.dao.impl.config.datasource.DataSourceConfig;
-import io.entgra.device.mgt.operation.template.dao.impl.config.datasource.JNDILookupDefinition;
+import io.entgra.device.mgt.core.operation.template.dao.impl.config.datasource.JNDILookupDefinition;
-import io.entgra.device.mgt.operation.template.exception.DBConnectionException;
+import io.entgra.device.mgt.core.operation.template.exception.DBConnectionException;
 
 import java.sql.Connection;
 import java.sql.SQLException;

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;
 

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.core.operation.template.dao.OperationTemplateDAO;
-import io.entgra.device.mgt.operation.template.dao.OperationTemplateDAOFactory;
+import io.entgra.device.mgt.core.operation.template.dao.OperationTemplateDAOFactory;
-import io.entgra.device.mgt.operation.template.dto.OperationTemplate;
+import io.entgra.device.mgt.core.operation.template.dto.OperationTemplate;
-import io.entgra.device.mgt.operation.template.exception.DBConnectionException;
+import io.entgra.device.mgt.core.operation.template.exception.DBConnectionException;
-import io.entgra.device.mgt.operation.template.exception.OperationTemplateManagementDAOException;
+import io.entgra.device.mgt.core.operation.template.exception.OperationTemplateManagementDAOException;
-import io.entgra.device.mgt.operation.template.mock.BaseOperationTemplatePluginTest;
+import io.entgra.device.mgt.core.operation.template.mock.BaseOperationTemplatePluginTest;
-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;
 import org.testng.annotations.BeforeClass;

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;
+package io.entgra.device.mgt.core.operation.template;
-
+
-import io.entgra.device.mgt.operation.template.dao.OperationTemplateDAO;
+import io.entgra.device.mgt.core.operation.template.dao.OperationTemplateDAO;
-import io.entgra.device.mgt.operation.template.dao.OperationTemplateDAOFactory;
+import io.entgra.device.mgt.core.operation.template.dao.OperationTemplateDAOFactory;
-import io.entgra.device.mgt.operation.template.dto.OperationTemplate;
+import io.entgra.device.mgt.core.operation.template.dto.OperationTemplate;
-import io.entgra.device.mgt.operation.template.exception.DBConnectionException;
+import io.entgra.device.mgt.core.operation.template.exception.DBConnectionException;
-import io.entgra.device.mgt.operation.template.exception.OperationTemplateManagementDAOException;
+import io.entgra.device.mgt.core.operation.template.exception.OperationTemplateManagementDAOException;
-import io.entgra.device.mgt.operation.template.mock.BaseOperationTemplatePluginTest;
+import io.entgra.device.mgt.core.operation.template.mock.BaseOperationTemplatePluginTest;
-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;
 import org.testng.Assert;

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;

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.core.operation.template.dto.OperationTemplate;
-import io.entgra.device.mgt.operation.template.exception.OperationTemplateMgtPluginException;
+import io.entgra.device.mgt.core.operation.template.exception.OperationTemplateMgtPluginException;
-import io.entgra.device.mgt.operation.template.impl.OperationTemplateServiceImpl;
+import io.entgra.device.mgt.core.operation.template.impl.OperationTemplateServiceImpl;
-import io.entgra.device.mgt.operation.template.spi.OperationTemplateService;
+import io.entgra.device.mgt.core.operation.template.spi.OperationTemplateService;
-import io.entgra.device.mgt.operation.template.mock.BaseOperationTemplatePluginTest;
+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;

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.core.operation.template.dto.OperationTemplate;
-import io.entgra.device.mgt.operation.template.exception.OperationTemplateMgtPluginException;
+import io.entgra.device.mgt.core.operation.template.exception.OperationTemplateMgtPluginException;
-import io.entgra.device.mgt.operation.template.impl.OperationTemplateServiceImpl;
+import io.entgra.device.mgt.core.operation.template.impl.OperationTemplateServiceImpl;
-import io.entgra.device.mgt.operation.template.mock.BaseOperationTemplatePluginTest;
+import io.entgra.device.mgt.core.operation.template.mock.BaseOperationTemplatePluginTest;
-import io.entgra.device.mgt.operation.template.spi.OperationTemplateService;
+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;

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;
 

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.core.operation.template.DataSourceConfig;
-import io.entgra.device.mgt.operation.template.dao.OperationTemplateDAOFactory;
+import io.entgra.device.mgt.core.operation.template.dao.OperationTemplateDAOFactory;
-import io.entgra.device.mgt.operation.template.util.ConnectionManagerUtils;
+import io.entgra.device.mgt.core.operation.template.util.ConnectionManagerUtils;
-import io.entgra.device.mgt.operation.template.TestUtils;
+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;

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;

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;

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;
 

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;

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;

components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/testng.xml

@@ -24,15 +24,15 @@
 
     <test name="DAO Unit Tests" preserve-order="true">
         <classes>
-            <class name="io.entgra.device.mgt.operation.template.DAOTest"/>
+            <class name="io.entgra.device.mgt.core.operation.template.DAOTest"/>
-            <class name="io.entgra.device.mgt.operation.template.DAONegativeTest"/>
+            <class name="io.entgra.device.mgt.core.operation.template.DAONegativeTest"/>
         </classes>
     </test>
 
     <test name="Service Unit Tests" preserve-order="true">
         <classes>
-            <class name="io.entgra.device.mgt.operation.template.ServiceTest"/>
+            <class name="io.entgra.device.mgt.core.operation.template.ServiceTest"/>
-            <class name="io.entgra.device.mgt.operation.template.ServiceNegativeTest"/>
+            <class name="io.entgra.device.mgt.core.operation.template.ServiceNegativeTest"/>
         </classes>
     </test>
 </suite>

components/operation-template-mgt/pom.xml

@@ -33,7 +33,7 @@
     <url>http://entgra.io</url>
 
     <modules>
-        <module>io.entgra.device.mgt.operation.template</module>
+        <module>io.entgra.device.mgt.core.operation.template</module>
     </modules>
 
 </project>

features/operation-template-mgt-plugin-feature/io.entgra.device.mgt.core.operation.template.feature/pom.xml

@@ -40,7 +40,7 @@
     <dependencies>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>io.entgra.device.mgt.operation.template</artifactId>
+            <artifactId>io.entgra.device.mgt.core.operation.template</artifactId>
         </dependency>
     </dependencies>
 
@@ -95,7 +95,7 @@
                             </adviceFile>
                             <bundles>
                                 <bundleDef>
-                                    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}
                                 </bundleDef>
                             </bundles>
                         </configuration>

pom.xml

@@ -34,39 +34,39 @@
     </parent>
 
     <modules>
-        <module>components/heartbeat-management</module>
+<!--        <module>components/heartbeat-management</module>-->
-        <module>components/device-mgt</module>
+<!--        <module>components/device-mgt</module>-->
-        <module>components/device-mgt-extensions</module>
+<!--        <module>components/device-mgt-extensions</module>-->
-        <module>components/identity-extensions</module>
+<!--        <module>components/identity-extensions</module>-->
-        <module>components/apimgt-extensions</module>
+<!--        <module>components/apimgt-extensions</module>-->
-        <module>components/application-mgt</module>
+<!--        <module>components/application-mgt</module>-->
-        <module>components/policy-mgt</module>
+<!--        <module>components/policy-mgt</module>-->
-        <module>components/certificate-mgt</module>
+<!--        <module>components/certificate-mgt</module>-->
-        <module>components/ui-request-interceptor</module>
+<!--        <module>components/ui-request-interceptor</module>-->
-        <module>components/transport-mgt</module>
+<!--        <module>components/transport-mgt</module>-->
-        <module>components/analytics-mgt</module>
+<!--        <module>components/analytics-mgt</module>-->
-        <module>components/webapp-authenticator-framework</module>
+<!--        <module>components/webapp-authenticator-framework</module>-->
-        <module>components/logger</module>
+<!--        <module>components/logger</module>-->
-        <module>components/task-mgt</module>
+<!--        <module>components/task-mgt</module>-->
-        <module>components/subtype-mgt</module>
+<!--        <module>components/subtype-mgt</module>-->
-        <module>components/tenant-mgt</module>
+<!--        <module>components/tenant-mgt</module>-->
         <module>components/operation-template-mgt</module>
-        <module>features/device-mgt</module>
+<!--        <module>features/device-mgt</module>-->
-        <module>features/apimgt-extensions</module>
+<!--        <module>features/apimgt-extensions</module>-->
-        <module>features/application-mgt</module>
+<!--        <module>features/application-mgt</module>-->
-        <module>features/policy-mgt</module>
+<!--        <module>features/policy-mgt</module>-->
-        <module>features/certificate-mgt</module>
+<!--        <module>features/certificate-mgt</module>-->
-        <module>features/heartbeat-management</module>
+<!--        <module>features/heartbeat-management</module>-->
-        <module>features/ui-request-interceptor</module>
+<!--        <module>features/ui-request-interceptor</module>-->
-        <module>features/jwt-client</module>
+<!--        <module>features/jwt-client</module>-->
-        <module>features/device-mgt-extensions</module>
+<!--        <module>features/device-mgt-extensions</module>-->
-        <module>features/transport-mgt</module>
+<!--        <module>features/transport-mgt</module>-->
-        <module>features/analytics-mgt</module>
+<!--        <module>features/analytics-mgt</module>-->
-        <module>features/webapp-authenticator-framework</module>
+<!--        <module>features/webapp-authenticator-framework</module>-->
-        <module>features/logger</module>
+<!--        <module>features/logger</module>-->
-        <module>features/task-mgt</module>
+<!--        <module>features/task-mgt</module>-->
-        <module>features/subtype-mgt</module>
+<!--        <module>features/subtype-mgt</module>-->
-        <module>features/tenant-mgt</module>
+<!--        <module>features/tenant-mgt</module>-->
         <module>features/operation-template-mgt-plugin-feature</module>
 
     </modules>
@@ -394,7 +394,7 @@
             <!-- Operation Template Management dependencies -->
             <dependency>
                 <groupId>io.entgra.device.mgt.core</groupId>
-                <artifactId>io.entgra.device.mgt.operation.template</artifactId>
+                <artifactId>io.entgra.device.mgt.core.operation.template</artifactId>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
             <!-- End of Operation Template Management dependencies -->