mirror of
https://repository.entgra.net/community/device-mgt-core.git
synced 2025-10-06 02:01:45 +00:00
refactored sub type mgt component
This commit is contained in:
Amalka Subasinghe
parent
2caf5a4f28
commit
721de62362
@ -25,7 +25,7 @@
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>io.entgra.device.mgt.subtype.mgt</artifactId>
|
||||
<artifactId>io.entgra.device.mgt.core.subtype.mgt</artifactId>
|
||||
<name>Entgra IoT - Subtype Mgt Impl</name>
|
||||
<packaging>bundle</packaging>
|
||||
<description>Entgra IoT - Subtype Management Component Implementation</description>
|
||||
@ -51,7 +51,7 @@
|
||||
<Bundle-Name>${project.artifactId}</Bundle-Name>
|
||||
<Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
|
||||
<Bundle-Description>Subtype Management Bundle</Bundle-Description>
|
||||
<Private-Package>io.entgra.device.mgt.subtype.mgt.internal</Private-Package>
|
||||
<Private-Package>io.entgra.device.mgt.core.subtype.mgt.internal</Private-Package>
|
||||
<Import-Package>
|
||||
org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
|
||||
org.osgi.service.*;version="${imp.package.version.osgi.service}",
|
||||
@ -86,8 +86,8 @@
|
||||
com.google.common.cache.*,
|
||||
</Import-Package>
|
||||
<Export-Package>
|
||||
!io.entgra.device.mgt.subtype.mgt.internal,
|
||||
io.entgra.device.mgt.subtype.mgt.*
|
||||
!io.entgra.device.mgt.core.subtype.mgt.internal,
|
||||
io.entgra.device.mgt.core.subtype.mgt.*
|
||||
</Export-Package>
|
||||
</instructions>
|
||||
</configuration>
|
||||
@ -16,18 +16,18 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.subtype.mgt.cache;
|
||||
package io.entgra.device.mgt.core.subtype.mgt.cache;
|
||||
|
||||
import com.google.common.cache.CacheLoader;
|
||||
import io.entgra.device.mgt.subtype.mgt.dao.DeviceSubTypeDAO;
|
||||
import io.entgra.device.mgt.subtype.mgt.dao.DeviceSubTypeDAOFactory;
|
||||
import io.entgra.device.mgt.subtype.mgt.dao.util.ConnectionManagerUtil;
|
||||
import io.entgra.device.mgt.subtype.mgt.dto.DeviceSubType;
|
||||
import io.entgra.device.mgt.subtype.mgt.dto.DeviceSubTypeCacheKey;
|
||||
import io.entgra.device.mgt.subtype.mgt.exception.DBConnectionException;
|
||||
import io.entgra.device.mgt.subtype.mgt.exception.SubTypeMgtDAOException;
|
||||
import io.entgra.device.mgt.subtype.mgt.exception.SubTypeMgtPluginException;
|
||||
import io.entgra.device.mgt.subtype.mgt.util.DeviceSubTypeMgtUtil;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.dto.DeviceSubTypeCacheKey;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.dao.DeviceSubTypeDAO;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.dao.DeviceSubTypeDAOFactory;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.dao.util.ConnectionManagerUtil;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.dto.DeviceSubType;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.exception.DBConnectionException;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.exception.SubTypeMgtDAOException;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.exception.SubTypeMgtPluginException;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.util.DeviceSubTypeMgtUtil;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
|
||||
@ -16,10 +16,10 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.subtype.mgt.dao;
|
||||
package io.entgra.device.mgt.core.subtype.mgt.dao;
|
||||
|
||||
import io.entgra.device.mgt.subtype.mgt.dto.DeviceSubType;
|
||||
import io.entgra.device.mgt.subtype.mgt.exception.SubTypeMgtDAOException;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.exception.SubTypeMgtDAOException;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.dto.DeviceSubType;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@ -16,14 +16,14 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.subtype.mgt.dao;
|
||||
package io.entgra.device.mgt.core.subtype.mgt.dao;
|
||||
|
||||
import io.entgra.device.mgt.subtype.mgt.dao.impl.DeviceSubTypeDAOImpl;
|
||||
import io.entgra.device.mgt.subtype.mgt.dao.impl.DeviceSubTypeMySQLDAOImpl;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.dao.impl.DeviceSubTypeDAOImpl;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.dao.impl.DeviceSubTypeMySQLDAOImpl;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
|
||||
import io.entgra.device.mgt.subtype.mgt.dao.util.ConnectionManagerUtil;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.dao.util.ConnectionManagerUtil;
|
||||
import org.wso2.carbon.device.mgt.core.config.datasource.DataSourceConfig;
|
||||
|
||||
public class DeviceSubTypeDAOFactory {
|
||||
@ -16,14 +16,14 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.subtype.mgt.dao.impl;
|
||||
package io.entgra.device.mgt.core.subtype.mgt.dao.impl;
|
||||
|
||||
import io.entgra.device.mgt.subtype.mgt.dao.DeviceSubTypeDAO;
|
||||
import io.entgra.device.mgt.subtype.mgt.dao.util.ConnectionManagerUtil;
|
||||
import io.entgra.device.mgt.subtype.mgt.dto.DeviceSubType;
|
||||
import io.entgra.device.mgt.subtype.mgt.dao.util.DAOUtil;
|
||||
import io.entgra.device.mgt.subtype.mgt.exception.DBConnectionException;
|
||||
import io.entgra.device.mgt.subtype.mgt.exception.SubTypeMgtDAOException;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.exception.DBConnectionException;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.exception.SubTypeMgtDAOException;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.dao.DeviceSubTypeDAO;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.dao.util.ConnectionManagerUtil;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.dto.DeviceSubType;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.dao.util.DAOUtil;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.subtype.mgt.dao.impl;
|
||||
package io.entgra.device.mgt.core.subtype.mgt.dao.impl;
|
||||
|
||||
/**
|
||||
* Implementation for MySQL
|
||||
@ -16,9 +16,9 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.subtype.mgt.dao.util;
|
||||
package io.entgra.device.mgt.core.subtype.mgt.dao.util;
|
||||
|
||||
import io.entgra.device.mgt.subtype.mgt.exception.DBConnectionException;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.exception.DBConnectionException;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.wso2.carbon.device.mgt.common.exceptions.IllegalTransactionStateException;
|
||||
@ -16,9 +16,9 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.subtype.mgt.dao.util;
|
||||
package io.entgra.device.mgt.core.subtype.mgt.dao.util;
|
||||
|
||||
import io.entgra.device.mgt.subtype.mgt.dto.DeviceSubType;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.dto.DeviceSubType;
|
||||
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
@ -16,7 +16,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.subtype.mgt.dto;
|
||||
package io.entgra.device.mgt.core.subtype.mgt.dto;
|
||||
|
||||
|
||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
@ -16,7 +16,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.subtype.mgt.dto;
|
||||
package io.entgra.device.mgt.core.subtype.mgt.dto;
|
||||
|
||||
public class DeviceSubTypeCacheKey {
|
||||
int tenantId;
|
||||
@ -16,7 +16,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.subtype.mgt.exception;
|
||||
package io.entgra.device.mgt.core.subtype.mgt.exception;
|
||||
|
||||
/**
|
||||
* Represents the exception thrown during validating the request.
|
||||
@ -16,7 +16,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.subtype.mgt.exception;
|
||||
package io.entgra.device.mgt.core.subtype.mgt.exception;
|
||||
|
||||
/**
|
||||
* Exception thrown due to Database Connection issues.
|
||||
@ -16,7 +16,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.subtype.mgt.exception;
|
||||
package io.entgra.device.mgt.core.subtype.mgt.exception;
|
||||
|
||||
public class SubTypeMgtDAOException extends Exception {
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.subtype.mgt.exception;
|
||||
package io.entgra.device.mgt.core.subtype.mgt.exception;
|
||||
|
||||
public class SubTypeMgtPluginException extends Exception {
|
||||
|
||||
@ -16,22 +16,22 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.subtype.mgt.impl;
|
||||
package io.entgra.device.mgt.core.subtype.mgt.impl;
|
||||
|
||||
import com.google.common.cache.CacheBuilder;
|
||||
import com.google.common.cache.CacheLoader;
|
||||
import com.google.common.cache.LoadingCache;
|
||||
import io.entgra.device.mgt.subtype.mgt.cache.GetDeviceSubTypeCacheLoader;
|
||||
import io.entgra.device.mgt.subtype.mgt.dto.DeviceSubType;
|
||||
import io.entgra.device.mgt.subtype.mgt.dao.DeviceSubTypeDAO;
|
||||
import io.entgra.device.mgt.subtype.mgt.dao.DeviceSubTypeDAOFactory;
|
||||
import io.entgra.device.mgt.subtype.mgt.exception.SubTypeMgtDAOException;
|
||||
import io.entgra.device.mgt.subtype.mgt.dao.util.ConnectionManagerUtil;
|
||||
import io.entgra.device.mgt.subtype.mgt.spi.DeviceSubTypeService;
|
||||
import io.entgra.device.mgt.subtype.mgt.util.DeviceSubTypeMgtUtil;
|
||||
import io.entgra.device.mgt.subtype.mgt.exception.BadRequestException;
|
||||
import io.entgra.device.mgt.subtype.mgt.exception.DBConnectionException;
|
||||
import io.entgra.device.mgt.subtype.mgt.exception.SubTypeMgtPluginException;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.cache.GetDeviceSubTypeCacheLoader;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.exception.BadRequestException;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.exception.DBConnectionException;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.exception.SubTypeMgtDAOException;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.exception.SubTypeMgtPluginException;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.util.DeviceSubTypeMgtUtil;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.dto.DeviceSubType;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.dao.DeviceSubTypeDAO;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.dao.DeviceSubTypeDAOFactory;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.dao.util.ConnectionManagerUtil;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.spi.DeviceSubTypeService;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.wso2.carbon.context.CarbonContext;
|
||||
@ -16,9 +16,9 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.subtype.mgt.internal;
|
||||
package io.entgra.device.mgt.core.subtype.mgt.internal;
|
||||
|
||||
import io.entgra.device.mgt.subtype.mgt.spi.DeviceSubTypeService;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.spi.DeviceSubTypeService;
|
||||
import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
|
||||
import org.wso2.carbon.registry.core.service.RegistryService;
|
||||
|
||||
@ -16,11 +16,11 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.subtype.mgt.internal;
|
||||
package io.entgra.device.mgt.core.subtype.mgt.internal;
|
||||
|
||||
import io.entgra.device.mgt.subtype.mgt.dao.DeviceSubTypeDAOFactory;
|
||||
import io.entgra.device.mgt.subtype.mgt.impl.DeviceSubTypeServiceImpl;
|
||||
import io.entgra.device.mgt.subtype.mgt.spi.DeviceSubTypeService;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.impl.DeviceSubTypeServiceImpl;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.spi.DeviceSubTypeService;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.dao.DeviceSubTypeDAOFactory;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.osgi.framework.BundleContext;
|
||||
@ -33,7 +33,7 @@ import org.wso2.carbon.ndatasource.core.DataSourceService;
|
||||
import org.wso2.carbon.registry.core.service.RegistryService;
|
||||
|
||||
/**
|
||||
* @scr.component name="io.entgra.device.mgt.subtype.mgt.internal.DeviceSubTypeMgtServiceComponent" immediate="true"
|
||||
* @scr.component name="io.entgra.device.mgt.core.subtype.mgt.internal.DeviceSubTypeMgtServiceComponent" immediate="true"
|
||||
* @scr.reference name="org.wso2.carbon.device.manager"
|
||||
* interface="org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService"
|
||||
* cardinality="1..1"
|
||||
@ -16,10 +16,10 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.subtype.mgt.spi;
|
||||
package io.entgra.device.mgt.core.subtype.mgt.spi;
|
||||
|
||||
import io.entgra.device.mgt.subtype.mgt.dto.DeviceSubType;
|
||||
import io.entgra.device.mgt.subtype.mgt.exception.SubTypeMgtPluginException;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.exception.SubTypeMgtPluginException;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.dto.DeviceSubType;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@ -16,10 +16,10 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.subtype.mgt.util;
|
||||
package io.entgra.device.mgt.core.subtype.mgt.util;
|
||||
|
||||
import io.entgra.device.mgt.subtype.mgt.dto.DeviceSubType;
|
||||
import io.entgra.device.mgt.subtype.mgt.dto.DeviceSubTypeCacheKey;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.dto.DeviceSubTypeCacheKey;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.dto.DeviceSubType;
|
||||
|
||||
public class DeviceSubTypeMgtUtil {
|
||||
public static String setDeviceSubTypeCacheKey(int tenantId, String subTypeId, DeviceSubType.DeviceType deviceType) {
|
||||
@ -16,15 +16,15 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.subtype.mgt;
|
||||
package io.entgra.device.mgt.core.subtype.mgt;
|
||||
|
||||
import io.entgra.device.mgt.subtype.mgt.dao.DeviceSubTypeDAO;
|
||||
import io.entgra.device.mgt.subtype.mgt.dao.DeviceSubTypeDAOFactory;
|
||||
import io.entgra.device.mgt.subtype.mgt.dao.util.ConnectionManagerUtil;
|
||||
import io.entgra.device.mgt.subtype.mgt.dto.DeviceSubType;
|
||||
import io.entgra.device.mgt.subtype.mgt.exception.DBConnectionException;
|
||||
import io.entgra.device.mgt.subtype.mgt.exception.SubTypeMgtDAOException;
|
||||
import io.entgra.device.mgt.subtype.mgt.mock.BaseDeviceSubTypePluginTest;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.dao.DeviceSubTypeDAO;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.dao.DeviceSubTypeDAOFactory;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.dao.util.ConnectionManagerUtil;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.dto.DeviceSubType;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.exception.DBConnectionException;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.exception.SubTypeMgtDAOException;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.mock.BaseDeviceSubTypePluginTest;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.testng.annotations.BeforeClass;
|
||||
@ -16,15 +16,15 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.subtype.mgt;
|
||||
package io.entgra.device.mgt.core.subtype.mgt;
|
||||
|
||||
import io.entgra.device.mgt.subtype.mgt.dao.DeviceSubTypeDAO;
|
||||
import io.entgra.device.mgt.subtype.mgt.dao.DeviceSubTypeDAOFactory;
|
||||
import io.entgra.device.mgt.subtype.mgt.dao.util.ConnectionManagerUtil;
|
||||
import io.entgra.device.mgt.subtype.mgt.dto.DeviceSubType;
|
||||
import io.entgra.device.mgt.subtype.mgt.exception.DBConnectionException;
|
||||
import io.entgra.device.mgt.subtype.mgt.exception.SubTypeMgtDAOException;
|
||||
import io.entgra.device.mgt.subtype.mgt.mock.BaseDeviceSubTypePluginTest;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.dao.DeviceSubTypeDAO;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.dao.DeviceSubTypeDAOFactory;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.dao.util.ConnectionManagerUtil;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.dto.DeviceSubType;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.exception.DBConnectionException;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.exception.SubTypeMgtDAOException;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.mock.BaseDeviceSubTypePluginTest;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.testng.Assert;
|
||||
@ -16,7 +16,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.subtype.mgt;
|
||||
package io.entgra.device.mgt.core.subtype.mgt;
|
||||
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
@ -16,13 +16,13 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.subtype.mgt;
|
||||
package io.entgra.device.mgt.core.subtype.mgt;
|
||||
|
||||
import io.entgra.device.mgt.subtype.mgt.dto.DeviceSubType;
|
||||
import io.entgra.device.mgt.subtype.mgt.exception.SubTypeMgtPluginException;
|
||||
import io.entgra.device.mgt.subtype.mgt.impl.DeviceSubTypeServiceImpl;
|
||||
import io.entgra.device.mgt.subtype.mgt.mock.BaseDeviceSubTypePluginTest;
|
||||
import io.entgra.device.mgt.subtype.mgt.spi.DeviceSubTypeService;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.dto.DeviceSubType;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.exception.SubTypeMgtPluginException;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.impl.DeviceSubTypeServiceImpl;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.mock.BaseDeviceSubTypePluginTest;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.spi.DeviceSubTypeService;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.testng.annotations.BeforeClass;
|
||||
@ -16,13 +16,13 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.subtype.mgt;
|
||||
package io.entgra.device.mgt.core.subtype.mgt;
|
||||
|
||||
import io.entgra.device.mgt.subtype.mgt.dto.DeviceSubType;
|
||||
import io.entgra.device.mgt.subtype.mgt.exception.SubTypeMgtPluginException;
|
||||
import io.entgra.device.mgt.subtype.mgt.impl.DeviceSubTypeServiceImpl;
|
||||
import io.entgra.device.mgt.subtype.mgt.mock.BaseDeviceSubTypePluginTest;
|
||||
import io.entgra.device.mgt.subtype.mgt.spi.DeviceSubTypeService;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.dto.DeviceSubType;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.exception.SubTypeMgtPluginException;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.impl.DeviceSubTypeServiceImpl;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.mock.BaseDeviceSubTypePluginTest;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.spi.DeviceSubTypeService;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.testng.Assert;
|
||||
@ -16,10 +16,10 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.subtype.mgt;
|
||||
package io.entgra.device.mgt.core.subtype.mgt;
|
||||
|
||||
import io.entgra.device.mgt.subtype.mgt.dao.util.ConnectionManagerUtil;
|
||||
import io.entgra.device.mgt.subtype.mgt.dto.DeviceSubType;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.dao.util.ConnectionManagerUtil;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.dto.DeviceSubType;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.testng.Assert;
|
||||
@ -16,12 +16,12 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.subtype.mgt.mock;
|
||||
package io.entgra.device.mgt.core.subtype.mgt.mock;
|
||||
|
||||
import io.entgra.device.mgt.subtype.mgt.TestUtils;
|
||||
import io.entgra.device.mgt.subtype.mgt.dao.DeviceSubTypeDAOFactory;
|
||||
import io.entgra.device.mgt.subtype.mgt.DataSourceConfig;
|
||||
import io.entgra.device.mgt.subtype.mgt.dao.util.ConnectionManagerUtil;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.TestUtils;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.dao.DeviceSubTypeDAOFactory;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.DataSourceConfig;
|
||||
import io.entgra.device.mgt.core.subtype.mgt.dao.util.ConnectionManagerUtil;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.apache.tomcat.jdbc.pool.PoolProperties;
|
||||
@ -16,7 +16,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.subtype.mgt.mock;
|
||||
package io.entgra.device.mgt.core.subtype.mgt.mock;
|
||||
|
||||
import java.sql.CallableStatement;
|
||||
import java.sql.SQLWarning;
|
||||
@ -16,7 +16,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.subtype.mgt.mock;
|
||||
package io.entgra.device.mgt.core.subtype.mgt.mock;
|
||||
|
||||
import javax.sql.DataSource;
|
||||
import java.io.PrintWriter;
|
||||
@ -16,7 +16,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.subtype.mgt.mock;
|
||||
package io.entgra.device.mgt.core.subtype.mgt.mock;
|
||||
|
||||
import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.subtype.mgt.mock;
|
||||
package io.entgra.device.mgt.core.subtype.mgt.mock;
|
||||
|
||||
import java.io.InputStream;
|
||||
import java.io.Reader;
|
||||
@ -16,7 +16,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.subtype.mgt.mock;
|
||||
package io.entgra.device.mgt.core.subtype.mgt.mock;
|
||||
|
||||
import java.io.InputStream;
|
||||
import java.io.Reader;
|
||||
@ -23,15 +23,15 @@
|
||||
|
||||
<test name="DAO Unit Tests" preserve-order="true">
|
||||
<classes>
|
||||
<class name="io.entgra.device.mgt.subtype.mgt.DAOTest"/>
|
||||
<class name="io.entgra.device.mgt.subtype.mgt.DAONegativeTest"/>
|
||||
<class name="io.entgra.device.mgt.core.subtype.mgt.DAOTest"/>
|
||||
<class name="io.entgra.device.mgt.core.subtype.mgt.DAONegativeTest"/>
|
||||
</classes>
|
||||
</test>
|
||||
|
||||
<test name="Service Unit Tests" preserve-order="true">
|
||||
<classes>
|
||||
<class name="io.entgra.device.mgt.subtype.mgt.ServiceTest"/>
|
||||
<class name="io.entgra.device.mgt.subtype.mgt.ServiceNegativeTest"/>
|
||||
<class name="io.entgra.device.mgt.core.subtype.mgt.ServiceTest"/>
|
||||
<class name="io.entgra.device.mgt.core.subtype.mgt.ServiceNegativeTest"/>
|
||||
</classes>
|
||||
</test>
|
||||
</suite>
|
||||
@ -31,7 +31,7 @@
|
||||
<url>http://entgra.io</url>
|
||||
|
||||
<modules>
|
||||
<module>io.entgra.device.mgt.subtype.mgt</module>
|
||||
<module>io.entgra.device.mgt.core.subtype.mgt</module>
|
||||
</modules>
|
||||
|
||||
</project>
|
||||
@ -38,7 +38,7 @@
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>io.entgra.device.mgt.subtype.mgt</artifactId>
|
||||
<artifactId>io.entgra.device.mgt.core.subtype.mgt</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
@ -93,7 +93,7 @@
|
||||
</adviceFile>
|
||||
<bundles>
|
||||
<bundleDef>
|
||||
io.entgra.device.mgt.core:io.entgra.device.mgt.subtype.mgt:${carbon.device.mgt.version}
|
||||
io.entgra.device.mgt.core:io.entgra.device.mgt.core.subtype.mgt:${carbon.device.mgt.version}
|
||||
</bundleDef>
|
||||
</bundles>
|
||||
</configuration>
|
||||
|
||||
6
pom.xml
6
pom.xml
@ -48,7 +48,7 @@
|
||||
<!-- <module>components/webapp-authenticator-framework</module>-->
|
||||
<!-- <module>components/logger</module>-->
|
||||
<!-- <module>components/task-mgt</module>-->
|
||||
<!-- <module>components/subtype-mgt</module>-->
|
||||
<module>components/subtype-mgt</module>
|
||||
<module>components/tenant-mgt</module>
|
||||
<module>components/operation-template-mgt</module>
|
||||
<!-- <module>features/device-mgt</module>-->
|
||||
@ -65,7 +65,7 @@
|
||||
<!-- <module>features/webapp-authenticator-framework</module>-->
|
||||
<!-- <module>features/logger</module>-->
|
||||
<!-- <module>features/task-mgt</module>-->
|
||||
<!-- <module>features/subtype-mgt</module>-->
|
||||
<module>features/subtype-mgt</module>
|
||||
<module>features/tenant-mgt</module>
|
||||
<module>features/operation-template-mgt-plugin-feature</module>
|
||||
|
||||
@ -385,7 +385,7 @@
|
||||
<!-- SubType Management dependencies -->
|
||||
<dependency>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>io.entgra.device.mgt.subtype.mgt</artifactId>
|
||||
<artifactId>io.entgra.device.mgt.core.subtype.mgt</artifactId>
|
||||
<version>${carbon.device.mgt.version}</version>
|
||||
</dependency>
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user