mirror of
https://repository.entgra.net/community/device-mgt-core.git
synced 2025-10-06 02:01:45 +00:00
refactored operation mgt component
This commit is contained in:
parent
fdedc2b8f4
commit
e3c4765650
@ -26,7 +26,7 @@
|
|||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<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>
|
<packaging>bundle</packaging>
|
||||||
<name>Entgra IoT - Operation Template Core</name>
|
<name>Entgra IoT - Operation Template Core</name>
|
||||||
<description>Entgra IoT - Operation Template Core</description>
|
<description>Entgra IoT - Operation Template Core</description>
|
||||||
@ -52,7 +52,7 @@
|
|||||||
<Bundle-Name>${project.artifactId}</Bundle-Name>
|
<Bundle-Name>${project.artifactId}</Bundle-Name>
|
||||||
<Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
|
<Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
|
||||||
<Bundle-Description>IOT Operation Template Bundle</Bundle-Description>
|
<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>
|
<Import-Package>
|
||||||
org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
|
org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
|
||||||
org.osgi.service.*;version="${imp.package.version.osgi.service}",
|
org.osgi.service.*;version="${imp.package.version.osgi.service}",
|
||||||
@ -82,8 +82,8 @@
|
|||||||
okhttp3
|
okhttp3
|
||||||
</Import-Package>
|
</Import-Package>
|
||||||
<Export-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>
|
</Export-Package>
|
||||||
</instructions>
|
</instructions>
|
||||||
</configuration>
|
</configuration>
|
||||||
@ -16,18 +16,18 @@
|
|||||||
* under the License.
|
* 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 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.Log;
|
||||||
import org.apache.commons.logging.LogFactory;
|
import org.apache.commons.logging.LogFactory;
|
||||||
|
|
||||||
@ -16,10 +16,10 @@
|
|||||||
* under the License.
|
* 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
|
* This class represents the key operations associated with persisting mobile-device related
|
||||||
@ -16,12 +16,12 @@
|
|||||||
* under the License.
|
* 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.Log;
|
||||||
import org.apache.commons.logging.LogFactory;
|
import org.apache.commons.logging.LogFactory;
|
||||||
import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
|
import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
|
||||||
@ -16,15 +16,15 @@
|
|||||||
* under the License.
|
* 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 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.Connection;
|
||||||
import java.sql.PreparedStatement;
|
import java.sql.PreparedStatement;
|
||||||
@ -16,7 +16,7 @@
|
|||||||
* under the License.
|
* under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package io.entgra.device.mgt.operation.template.dao.impl;
|
package io.entgra.device.mgt.core.operation.template.dao.impl;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -16,9 +16,9 @@
|
|||||||
* under the License.
|
* 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.w3c.dom.Document;
|
||||||
import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
|
import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
|
||||||
import org.wso2.carbon.utils.CarbonUtils;
|
import org.wso2.carbon.utils.CarbonUtils;
|
||||||
@ -16,7 +16,7 @@
|
|||||||
* under the License.
|
* 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.XmlElement;
|
||||||
import javax.xml.bind.annotation.XmlRootElement;
|
import javax.xml.bind.annotation.XmlRootElement;
|
||||||
@ -16,9 +16,9 @@
|
|||||||
* under the License.
|
* 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.XmlElement;
|
||||||
import javax.xml.bind.annotation.XmlRootElement;
|
import javax.xml.bind.annotation.XmlRootElement;
|
||||||
@ -16,7 +16,7 @@
|
|||||||
* under the License.
|
* 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.XmlElement;
|
||||||
import javax.xml.bind.annotation.XmlRootElement;
|
import javax.xml.bind.annotation.XmlRootElement;
|
||||||
@ -16,7 +16,7 @@
|
|||||||
* under the License.
|
* 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 javax.xml.bind.annotation.*;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -16,9 +16,9 @@
|
|||||||
* under the License.
|
* 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.w3c.dom.Document;
|
||||||
import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
|
import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
|
||||||
|
|
||||||
@ -15,7 +15,7 @@
|
|||||||
* specific language governing permissions and limitations
|
* specific language governing permissions and limitations
|
||||||
* under the License.
|
* under the License.
|
||||||
*/
|
*/
|
||||||
package io.entgra.device.mgt.operation.template.dto;
|
package io.entgra.device.mgt.core.operation.template.dto;
|
||||||
|
|
||||||
public class OperationTemplate {
|
public class OperationTemplate {
|
||||||
private String subTypeId;
|
private String subTypeId;
|
||||||
@ -16,7 +16,7 @@
|
|||||||
* under the License.
|
* under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package io.entgra.device.mgt.operation.template.dto;
|
package io.entgra.device.mgt.core.operation.template.dto;
|
||||||
|
|
||||||
public class OperationTemplateCacheKey {
|
public class OperationTemplateCacheKey {
|
||||||
|
|
||||||
@ -16,7 +16,7 @@
|
|||||||
* under the License.
|
* 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.
|
* Represents the exception thrown during validating the request.
|
||||||
@ -16,7 +16,7 @@
|
|||||||
* under the License.
|
* 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.
|
* Exception thrown due to Database Connection issues.
|
||||||
@ -16,7 +16,7 @@
|
|||||||
* under the License.
|
* 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 {
|
public class OperationTemplateManagementDAOException extends Exception {
|
||||||
|
|
||||||
@ -16,7 +16,7 @@
|
|||||||
* under the License.
|
* 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 {
|
public class OperationTemplateMgtPluginException extends Exception {
|
||||||
|
|
||||||
@ -16,22 +16,22 @@
|
|||||||
* under the License.
|
* 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.CacheBuilder;
|
||||||
import com.google.common.cache.CacheLoader;
|
import com.google.common.cache.CacheLoader;
|
||||||
import com.google.common.cache.LoadingCache;
|
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.Log;
|
||||||
import org.apache.commons.logging.LogFactory;
|
import org.apache.commons.logging.LogFactory;
|
||||||
|
|
||||||
@ -16,9 +16,9 @@
|
|||||||
* under the License.
|
* 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.device.mgt.core.service.DeviceManagementProviderService;
|
||||||
import org.wso2.carbon.registry.core.service.RegistryService;
|
import org.wso2.carbon.registry.core.service.RegistryService;
|
||||||
|
|
||||||
@ -16,14 +16,14 @@
|
|||||||
* under the License.
|
* 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.Log;
|
||||||
import org.apache.commons.logging.LogFactory;
|
import org.apache.commons.logging.LogFactory;
|
||||||
import org.osgi.framework.BundleContext;
|
import org.osgi.framework.BundleContext;
|
||||||
@ -16,10 +16,10 @@
|
|||||||
* under the License.
|
* 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.
|
* Operation Template service interface.
|
||||||
@ -16,10 +16,10 @@
|
|||||||
* under the License.
|
* 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;
|
import org.apache.commons.lang.StringUtils;
|
||||||
|
|
||||||
public class AssertUtils {
|
public class AssertUtils {
|
||||||
@ -16,11 +16,11 @@
|
|||||||
* under the License.
|
* 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.Connection;
|
||||||
import java.sql.SQLException;
|
import java.sql.SQLException;
|
||||||
@ -16,11 +16,12 @@
|
|||||||
* under the License.
|
* 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.Gson;
|
||||||
import com.google.gson.JsonSyntaxException;
|
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.ResultSet;
|
||||||
import java.sql.SQLException;
|
import java.sql.SQLException;
|
||||||
|
|
||||||
@ -16,15 +16,15 @@
|
|||||||
* under the License.
|
* 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.Log;
|
||||||
import org.apache.commons.logging.LogFactory;
|
import org.apache.commons.logging.LogFactory;
|
||||||
import org.testng.annotations.BeforeClass;
|
import org.testng.annotations.BeforeClass;
|
||||||
@ -16,15 +16,15 @@
|
|||||||
* under the License.
|
* 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.Log;
|
||||||
import org.apache.commons.logging.LogFactory;
|
import org.apache.commons.logging.LogFactory;
|
||||||
import org.testng.Assert;
|
import org.testng.Assert;
|
||||||
@ -16,7 +16,7 @@
|
|||||||
* under the License.
|
* 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.XmlElement;
|
||||||
import javax.xml.bind.annotation.XmlRootElement;
|
import javax.xml.bind.annotation.XmlRootElement;
|
||||||
@ -16,13 +16,13 @@
|
|||||||
* under the License.
|
* 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.Log;
|
||||||
import org.apache.commons.logging.LogFactory;
|
import org.apache.commons.logging.LogFactory;
|
||||||
import org.testng.annotations.BeforeClass;
|
import org.testng.annotations.BeforeClass;
|
||||||
@ -16,13 +16,13 @@
|
|||||||
* under the License.
|
* 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.Log;
|
||||||
import org.apache.commons.logging.LogFactory;
|
import org.apache.commons.logging.LogFactory;
|
||||||
import org.testng.Assert;
|
import org.testng.Assert;
|
||||||
@ -16,9 +16,9 @@
|
|||||||
* under the License.
|
* 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.Log;
|
||||||
import org.apache.commons.logging.LogFactory;
|
import org.apache.commons.logging.LogFactory;
|
||||||
|
|
||||||
@ -16,12 +16,12 @@
|
|||||||
* under the License.
|
* 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.Log;
|
||||||
import org.apache.commons.logging.LogFactory;
|
import org.apache.commons.logging.LogFactory;
|
||||||
import org.apache.tomcat.jdbc.pool.PoolProperties;
|
import org.apache.tomcat.jdbc.pool.PoolProperties;
|
||||||
@ -16,7 +16,7 @@
|
|||||||
* under the License.
|
* 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.CallableStatement;
|
||||||
import java.sql.SQLWarning;
|
import java.sql.SQLWarning;
|
||||||
@ -16,7 +16,7 @@
|
|||||||
* under the License.
|
* 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 javax.sql.DataSource;
|
||||||
import java.io.PrintWriter;
|
import java.io.PrintWriter;
|
||||||
@ -16,7 +16,7 @@
|
|||||||
* under the License.
|
* 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;
|
import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
|
||||||
|
|
||||||
@ -16,7 +16,7 @@
|
|||||||
* under the License.
|
* 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.InputStream;
|
||||||
import java.io.Reader;
|
import java.io.Reader;
|
||||||
@ -16,7 +16,7 @@
|
|||||||
* under the License.
|
* 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.InputStream;
|
||||||
import java.io.Reader;
|
import java.io.Reader;
|
||||||
@ -24,15 +24,15 @@
|
|||||||
|
|
||||||
<test name="DAO Unit Tests" preserve-order="true">
|
<test name="DAO Unit Tests" preserve-order="true">
|
||||||
<classes>
|
<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>
|
</classes>
|
||||||
</test>
|
</test>
|
||||||
|
|
||||||
<test name="Service Unit Tests" preserve-order="true">
|
<test name="Service Unit Tests" preserve-order="true">
|
||||||
<classes>
|
<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>
|
</classes>
|
||||||
</test>
|
</test>
|
||||||
</suite>
|
</suite>
|
||||||
@ -33,7 +33,7 @@
|
|||||||
<url>http://entgra.io</url>
|
<url>http://entgra.io</url>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
<module>io.entgra.device.mgt.operation.template</module>
|
<module>io.entgra.device.mgt.core.operation.template</module>
|
||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@ -40,7 +40,7 @@
|
|||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>io.entgra.device.mgt.core</groupId>
|
<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>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
@ -95,7 +95,7 @@
|
|||||||
</adviceFile>
|
</adviceFile>
|
||||||
<bundles>
|
<bundles>
|
||||||
<bundleDef>
|
<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>
|
</bundleDef>
|
||||||
</bundles>
|
</bundles>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|||||||
66
pom.xml
66
pom.xml
@ -34,39 +34,39 @@
|
|||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modules>
|
<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>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>
|
<module>features/operation-template-mgt-plugin-feature</module>
|
||||||
|
|
||||||
</modules>
|
</modules>
|
||||||
@ -394,7 +394,7 @@
|
|||||||
<!-- Operation Template Management dependencies -->
|
<!-- Operation Template Management dependencies -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>io.entgra.device.mgt.core</groupId>
|
<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>
|
<version>${carbon.device.mgt.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- End of Operation Template Management dependencies -->
|
<!-- End of Operation Template Management dependencies -->
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user