inosh
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2 from dulichan/master

Browse Source 
Implements the getDevice method of DeviceManager
4.x.x
Prabath Abeysekara 10 years ago
parent 793786f020 5e68735625
commit 0ffa15f463
4 changed files with 313 additions and 266 deletions
Show Stats Download Patch File Download Diff File

266
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagerImpl.java
Unescape View File

@ -35,136 +35,140 @@ import java.util.List;
public class DeviceManagerImpl implements DeviceManager { public class DeviceManagerImpl implements DeviceManager {
private DeviceDAO deviceDAO; private DeviceDAO deviceDAO;
private DeviceTypeDAO deviceTypeDAO; private DeviceTypeDAO deviceTypeDAO;
private DeviceManagementConfig config; private DeviceManagementConfig config;
private DeviceManagementRepository pluginRepository; private DeviceManagementRepository pluginRepository;
public DeviceManagerImpl(DeviceManagementConfig config, DeviceManagementRepository pluginRepository) { public DeviceManagerImpl(DeviceManagementConfig config, DeviceManagementRepository pluginRepository) {
this.config = config; this.config = config;
this.pluginRepository = pluginRepository; this.pluginRepository = pluginRepository;
this.deviceDAO = DeviceManagementDAOFactory.getDeviceDAO(); this.deviceDAO = DeviceManagementDAOFactory.getDeviceDAO();
this.deviceTypeDAO = DeviceManagementDAOFactory.getDeviceTypeDAO(); this.deviceTypeDAO = DeviceManagementDAOFactory.getDeviceTypeDAO();
} }
@Override @Override public boolean enrollDevice(Device device) throws DeviceManagementException {
public boolean enrollDevice(Device device) throws DeviceManagementException { DeviceManagerService dms = this.getPluginRepository().getDeviceManagementProvider(device.getType());
DeviceManagerService dms = this.getPluginRepository().getDeviceManagementProvider(device.getType()); boolean status = dms.enrollDevice(device);
boolean status = dms.enrollDevice(device);
try {
try { org.wso2.carbon.device.mgt.core.dto.Device deviceDto = DeviceManagementDAOUtil.convertDevice(device);
org.wso2.carbon.device.mgt.core.dto.Device deviceDto = DeviceManagementDAOUtil.convertDevice(device); Integer deviceTypeId = this.getDeviceTypeDAO().getDeviceTypeIdByDeviceTypeName(device.getType());
Integer deviceTypeId = this.getDeviceTypeDAO().getDeviceTypeIdByDeviceTypeName(device.getType()); deviceDto.setDeviceTypeId(deviceTypeId);
deviceDto.setDeviceTypeId(deviceTypeId); this.getDeviceDAO().addDevice(deviceDto);
this.getDeviceDAO().addDevice(deviceDto);
} catch (DeviceManagementDAOException e) {
} catch (DeviceManagementDAOException e) { throw new DeviceManagementException("Error occurred while enrolling the device '" + device.getId() + "'",
throw new DeviceManagementException("Error occurred while enrolling the device '" + device.getId() + "'", e); e);
} }
return status; return status;
} }
@Override @Override public boolean modifyEnrollment(Device device) throws DeviceManagementException {
public boolean modifyEnrollment(Device device) throws DeviceManagementException { DeviceManagerService dms = this.getPluginRepository().getDeviceManagementProvider(device.getType());
DeviceManagerService dms = this.getPluginRepository().getDeviceManagementProvider(device.getType()); boolean status = dms.modifyEnrollment(device);
boolean status = dms.modifyEnrollment(device); try {
try { this.getDeviceDAO().updateDevice(DeviceManagementDAOUtil.convertDevice(device));
this.getDeviceDAO().updateDevice(DeviceManagementDAOUtil.convertDevice(device)); } catch (DeviceManagementDAOException e) {
} catch (DeviceManagementDAOException e) { throw new DeviceManagementException("Error occurred while modifying the device '" + device.getId() + "'",
throw new DeviceManagementException("Error occurred while modifying the device '" + device.getId() + "'", e);
e); }
} return status;
return status; }
}
@Override public boolean disenrollDevice(DeviceIdentifier deviceId) throws DeviceManagementException {
@Override DeviceManagerService dms = this.getPluginRepository().getDeviceManagementProvider(deviceId.getType());
public boolean disenrollDevice(DeviceIdentifier deviceId) throws DeviceManagementException { return dms.disenrollDevice(deviceId);
DeviceManagerService dms = this.getPluginRepository().getDeviceManagementProvider(deviceId.getType()); }
return dms.disenrollDevice(deviceId);
} @Override public boolean isEnrolled(DeviceIdentifier deviceId) throws DeviceManagementException {
DeviceManagerService dms = this.getPluginRepository().getDeviceManagementProvider(deviceId.getType());
@Override return dms.isEnrolled(deviceId);
public boolean isEnrolled(DeviceIdentifier deviceId) throws DeviceManagementException { }
DeviceManagerService dms = this.getPluginRepository().getDeviceManagementProvider(deviceId.getType());
return dms.isEnrolled(deviceId); @Override public boolean isActive(DeviceIdentifier deviceId) throws DeviceManagementException {
} DeviceManagerService dms = this.getPluginRepository().getDeviceManagementProvider(deviceId.getType());
return dms.isActive(deviceId);
@Override }
public boolean isActive(DeviceIdentifier deviceId) throws DeviceManagementException {
DeviceManagerService dms = this.getPluginRepository().getDeviceManagementProvider(deviceId.getType()); @Override public boolean setActive(DeviceIdentifier deviceId, boolean status) throws DeviceManagementException {
return dms.isActive(deviceId); DeviceManagerService dms = this.getPluginRepository().getDeviceManagementProvider(deviceId.getType());
} return dms.setActive(deviceId, status);
}
@Override
public boolean setActive(DeviceIdentifier deviceId, boolean status) @Override public List<Device> getAllDevices(String type) throws DeviceManagementException {
throws DeviceManagementException { DeviceManagerService dms = this.getPluginRepository().getDeviceManagementProvider(type);
DeviceManagerService dms = List<Device> devicesList = new ArrayList<Device>();
this.getPluginRepository().getDeviceManagementProvider(deviceId.getType()); try {
return dms.setActive(deviceId, status); Integer deviceTypeId = this.getDeviceTypeDAO().getDeviceTypeIdByDeviceTypeName(type);
} List<org.wso2.carbon.device.mgt.core.dto.Device> devices = this.getDeviceDAO().getDevices(deviceTypeId);
@Override for (org.wso2.carbon.device.mgt.core.dto.Device device : devices) {
public List<Device> getAllDevices(String type) throws DeviceManagementException { DeviceType deviceType = this.deviceTypeDAO.getDeviceType(device.getDeviceTypeId());
DeviceManagerService dms = Device convertedDevice = DeviceManagementDAOUtil.convertDevice(device, deviceType);
this.getPluginRepository().getDeviceManagementProvider(type); DeviceIdentifier deviceIdentifier = DeviceManagementDAOUtil.createDeviceIdentifier(device, deviceType);
List<Device> devicesList = new ArrayList<Device>(); Device dmsDevice = dms.getDevice(deviceIdentifier);
try { if (dmsDevice != null) {
Integer deviceTypeId = this.getDeviceTypeDAO().getDeviceTypeIdByDeviceTypeName(type); convertedDevice.setProperties(dmsDevice.getProperties());
List<org.wso2.carbon.device.mgt.core.dto.Device> devices = convertedDevice.setFeatures(dmsDevice.getFeatures());
this.getDeviceDAO().getDevices(deviceTypeId); }
devicesList.add(convertedDevice);
for (org.wso2.carbon.device.mgt.core.dto.Device device : devices) { }
DeviceType deviceType = this.deviceTypeDAO.getDeviceType(device.getDeviceTypeId()); } catch (DeviceManagementDAOException e) {
Device convertedDevice = DeviceManagementDAOUtil.convertDevice(device, deviceType); throw new DeviceManagementException("Error occurred while obtaining the device for type '" + type + "'", e);
DeviceIdentifier deviceIdentifier = }
DeviceManagementDAOUtil.createDeviceIdentifier(device, deviceType); return devicesList;
Device dmsDevice = dms.getDevice(deviceIdentifier); }
if (dmsDevice != null) {
convertedDevice.setProperties(dmsDevice.getProperties()); @Override public Device getDevice(DeviceIdentifier deviceId) throws DeviceManagementException {
convertedDevice.setFeatures(dmsDevice.getFeatures()); DeviceManagerService dms = this.getPluginRepository().getDeviceManagementProvider(deviceId.getType());
} Device convertedDevice = null;
devicesList.add(convertedDevice); try {
} Integer deviceTypeId = this.getDeviceTypeDAO().getDeviceTypeIdByDeviceTypeName(deviceId.getType());
} catch (DeviceManagementDAOException e) { org.wso2.carbon.device.mgt.core.dto.Device device =
throw new DeviceManagementException("Error occurred while obtaining the device for type '" + type + "'", this.getDeviceDAO().getDeviceByDeviceIdentifier(deviceTypeId, deviceId.getId());
e); if (device != null) {
} convertedDevice = DeviceManagementDAOUtil
return devicesList; .convertDevice(device, this.getDeviceTypeDAO().getDeviceType(deviceTypeId));
} Device dmsDevice = dms.getDevice(deviceId);
if (dmsDevice != null) {
@Override convertedDevice.setProperties(dmsDevice.getProperties());
public Device getDevice(DeviceIdentifier deviceId) throws DeviceManagementException { convertedDevice.setFeatures(dmsDevice.getFeatures());
DeviceManagerService dms = this.getPluginRepository().getDeviceManagementProvider(deviceId.getType()); }
return dms.getDevice(deviceId); }
} } catch (DeviceManagementDAOException e) {
throw new DeviceManagementException(
@Override "Error occurred while obtaining the device for id '" + deviceId.getId() + "'", e);
public boolean updateDeviceInfo(Device device) throws DeviceManagementException { }
DeviceManagerService dms = this.getPluginRepository().getDeviceManagementProvider(device.getType()); return convertedDevice;
return dms.updateDeviceInfo(device); }
}
@Override public boolean updateDeviceInfo(Device device) throws DeviceManagementException {
@Override DeviceManagerService dms = this.getPluginRepository().getDeviceManagementProvider(device.getType());
public boolean setOwnership(DeviceIdentifier deviceId, String ownershipType) throws DeviceManagementException { return dms.updateDeviceInfo(device);
DeviceManagerService dms = this.getPluginRepository().getDeviceManagementProvider(deviceId.getType()); }
return dms.setOwnership(deviceId, ownershipType);
} @Override public boolean setOwnership(DeviceIdentifier deviceId, String ownershipType)
throws DeviceManagementException {
public OperationManager getOperationManager(String type) throws DeviceManagementException { DeviceManagerService dms = this.getPluginRepository().getDeviceManagementProvider(deviceId.getType());
DeviceManagerService dms = this.getPluginRepository().getDeviceManagementProvider(type); return dms.setOwnership(deviceId, ownershipType);
return dms.getOperationManager(); }
}
public OperationManager getOperationManager(String type) throws DeviceManagementException {
public DeviceDAO getDeviceDAO() { DeviceManagerService dms = this.getPluginRepository().getDeviceManagementProvider(type);
return deviceDAO; return dms.getOperationManager();
} }
public DeviceTypeDAO getDeviceTypeDAO() { public DeviceDAO getDeviceDAO() {
return deviceTypeDAO; return deviceDAO;
} }
public DeviceManagementRepository getPluginRepository() { public DeviceTypeDAO getDeviceTypeDAO() {
return pluginRepository; return deviceTypeDAO;
} }
public DeviceManagementRepository getPluginRepository() {
return pluginRepository;
}
} }

32
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAO.java
Unescape View File

@ -28,22 +28,30 @@ import java.util.List;
*/ */
public interface DeviceDAO { public interface DeviceDAO {
void addDevice(Device device) throws DeviceManagementDAOException; void addDevice(Device device) throws DeviceManagementDAOException;
void updateDevice(Device device) throws DeviceManagementDAOException; void updateDevice(Device device) throws DeviceManagementDAOException;
void updateDeviceStatus(Long deviceId, Status status) throws DeviceManagementDAOException; void updateDeviceStatus(Long deviceId, Status status) throws DeviceManagementDAOException;
void deleteDevice(Long deviceId) throws DeviceManagementDAOException; void deleteDevice(Long deviceId) throws DeviceManagementDAOException;
Device getDeviceByDeviceId(Long deviceId) throws DeviceManagementDAOException; Device getDeviceByDeviceId(Long deviceId) throws DeviceManagementDAOException;
List<Device> getDevices() throws DeviceManagementDAOException; /**
* @param type - Device type.
* @param identifier - Device identifier.
* @return
* @throws DeviceManagementDAOException
*/
Device getDeviceByDeviceIdentifier(Integer type, String identifier) throws DeviceManagementDAOException;
/** List<Device> getDevices() throws DeviceManagementDAOException;
* @param type - The device type id.
* @return a list of devices based on the type id. /**
* @throws DeviceManagementDAOException * @param type - The device type id.
*/ * @return a list of devices based on the type id.
List<Device> getDevices(Integer type) throws DeviceManagementDAOException; * @throws DeviceManagementDAOException
*/
List<Device> getDevices(Integer type) throws DeviceManagementDAOException;
} }

265
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/DeviceDAOImpl.java
Unescape View File

@ -21,8 +21,8 @@ package org.wso2.carbon.device.mgt.core.dao.impl;
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.core.dao.DeviceDAO; import org.wso2.carbon.device.mgt.core.dao.DeviceDAO;
import org.wso2.carbon.device.mgt.core.dao.util.DeviceManagementDAOUtil;
import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOException; import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOException;
import org.wso2.carbon.device.mgt.core.dao.util.DeviceManagementDAOUtil;
import org.wso2.carbon.device.mgt.core.dto.Device; import org.wso2.carbon.device.mgt.core.dto.Device;
import org.wso2.carbon.device.mgt.core.dto.Status; import org.wso2.carbon.device.mgt.core.dto.Status;
@ -37,120 +37,153 @@ import java.util.List;
public class DeviceDAOImpl implements DeviceDAO { public class DeviceDAOImpl implements DeviceDAO {
private DataSource dataSource; private DataSource dataSource;
private static final Log log = LogFactory.getLog(DeviceDAOImpl.class); private static final Log log = LogFactory.getLog(DeviceDAOImpl.class);
public DeviceDAOImpl(DataSource dataSource) {
public DeviceDAOImpl(DataSource dataSource) { this.dataSource = dataSource;
this.dataSource = dataSource; }
}
@Override public void addDevice(Device device) throws DeviceManagementDAOException {
@Override Connection conn = null;
public void addDevice(Device device) throws DeviceManagementDAOException { PreparedStatement stmt = null;
Connection conn = null; try {
PreparedStatement stmt = null; conn = this.getConnection();
try { String createDBQuery =
conn = this.getConnection(); "INSERT INTO DM_DEVICE(DESCRIPTION, NAME, DATE_OF_ENROLLMENT, DATE_OF_LAST_UPDATE, OWNERSHIP," +
String createDBQuery = "STATUS, DEVICE_TYPE_ID, DEVICE_IDENTIFICATION, OWNER, TENANT_ID) VALUES " +
"INSERT INTO DM_DEVICE(DESCRIPTION, NAME, DATE_OF_ENROLLMENT, DATE_OF_LAST_UPDATE, OWNERSHIP," + "(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
"STATUS, DEVICE_TYPE_ID, DEVICE_IDENTIFICATION, OWNER, TENANT_ID) VALUES " +
"(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; stmt = conn.prepareStatement(createDBQuery);
stmt.setString(1, device.getDescription());
stmt = conn.prepareStatement(createDBQuery); stmt.setString(2, device.getName());
stmt.setString(1, device.getDescription()); stmt.setLong(3, new Date().getTime());
stmt.setString(2, device.getName()); stmt.setLong(4, new Date().getTime());
stmt.setLong(3, new Date().getTime()); stmt.setString(5, device.getOwnerShip());
stmt.setLong(4, new Date().getTime()); stmt.setString(6, device.getStatus().toString());
stmt.setString(5, device.getOwnerShip()); stmt.setInt(7, device.getDeviceTypeId());
stmt.setString(6, device.getStatus().toString()); stmt.setString(8, device.getDeviceIdentificationId());
stmt.setInt(7, device.getDeviceTypeId()); stmt.setString(9, device.getOwnerId());
stmt.setString(8, device.getDeviceIdentificationId()); stmt.setInt(10, device.getTenantId());
stmt.setString(9, device.getOwnerId()); stmt.executeUpdate();
stmt.setInt(10, device.getTenantId()); } catch (SQLException e) {
stmt.executeUpdate(); String msg = "Error occurred while enrolling device '" + device.getName() + "'";
} catch (SQLException e) { log.error(msg, e);
String msg = "Error occurred while enrolling device '" + device.getName() + "'"; throw new DeviceManagementDAOException(msg, e);
log.error(msg, e); } finally {
throw new DeviceManagementDAOException(msg, e); DeviceManagementDAOUtil.cleanupResources(conn, stmt, null);
} finally { }
DeviceManagementDAOUtil.cleanupResources(conn, stmt, null); }
}
} @Override public void updateDevice(Device device) throws DeviceManagementDAOException {
@Override }
public void updateDevice(Device device) throws DeviceManagementDAOException {
@Override public void updateDeviceStatus(Long deviceId, Status status) throws DeviceManagementDAOException {
}
}
@Override
public void updateDeviceStatus(Long deviceId, Status status) throws DeviceManagementDAOException { @Override public void deleteDevice(Long deviceId) throws DeviceManagementDAOException {
} }
@Override @Override public Device getDeviceByDeviceId(Long deviceId) throws DeviceManagementDAOException {
public void deleteDevice(Long deviceId) throws DeviceManagementDAOException { return null;
}
}
@Override public Device getDeviceByDeviceIdentifier(Integer type, String identifier)
@Override throws DeviceManagementDAOException {
public Device getDeviceByDeviceId(Long deviceId) Connection conn = null;
throws DeviceManagementDAOException { PreparedStatement stmt = null;
return null; ResultSet resultSet = null;
} Device device = null;
try {
@Override conn = this.getConnection();
public List<Device> getDevices() throws DeviceManagementDAOException { String selectDBQueryForType = "SELECT ID, DESCRIPTION, NAME, DATE_OF_ENROLLMENT, " +
return null; "DATE_OF_LAST_UPDATE, OWNERSHIP, STATUS, DEVICE_TYPE_ID, " +
} "DEVICE_IDENTIFICATION, OWNER, TENANT_ID FROM DM_DEVICE " +
"WHERE DM_DEVICE.DEVICE_TYPE_ID=? AND DM_DEVICE.DEVICE_IDENTIFICATION=?";
@Override public List<Device> getDevices(Integer type) throws DeviceManagementDAOException { stmt = conn.prepareStatement(selectDBQueryForType);
Connection conn = null; stmt.setInt(1, type);
PreparedStatement stmt = null; stmt.setString(2, identifier);
ResultSet resultSet = null; resultSet = stmt.executeQuery();
List<Device> devicesList = null; while (resultSet.next()) {
try { device = new Device();
conn = this.getConnection(); device.setId(resultSet.getInt(1));
String selectDBQueryForType = "SELECT ID, DESCRIPTION, NAME, DATE_OF_ENROLLMENT, " + device.setDescription(resultSet.getString(2));
"DATE_OF_LAST_UPDATE, OWNERSHIP, STATUS, DEVICE_TYPE_ID, " + device.setName(resultSet.getString(3));
"DEVICE_IDENTIFICATION, OWNER, TENANT_ID FROM DM_DEVICE " + device.setDateOfEnrollment(resultSet.getLong(4));
"WHERE DM_DEVICE.DEVICE_TYPE_ID=?"; device.setDateOfLastUpdate(resultSet.getLong(5));
stmt = conn.prepareStatement(selectDBQueryForType); //TODO:- Ownership is not a enum in DeviceDAO
stmt.setInt(1, type); device.setOwnerShip(resultSet.getString(6));
resultSet = stmt.executeQuery(); device.setStatus(Status.valueOf(resultSet.getString(7)));
devicesList = new ArrayList<Device>(); device.setDeviceTypeId(resultSet.getInt(8));
while (resultSet.next()) { device.setDeviceIdentificationId(resultSet.getString(9));
Device device = new Device(); device.setOwnerId(resultSet.getString(10));
device.setId(resultSet.getInt(1)); device.setTenantId(resultSet.getInt(11));
device.setDescription(resultSet.getString(2)); }
device.setName(resultSet.getString(3)); } catch (SQLException e) {
device.setDateOfEnrollment(resultSet.getLong(4)); String msg = "Error occurred while listing devices for type '" + type + "'";
device.setDateOfLastUpdate(resultSet.getLong(5)); log.error(msg, e);
//TODO:- Ownership is not a enum in DeviceDAO throw new DeviceManagementDAOException(msg, e);
device.setOwnerShip(resultSet.getString(6)); } finally {
device.setStatus(Status.valueOf(resultSet.getString(7))); DeviceManagementDAOUtil.cleanupResources(conn, stmt, resultSet);
device.setDeviceTypeId(resultSet.getInt(8)); }
device.setDeviceIdentificationId(resultSet.getString(9)); return device;
device.setOwnerId(resultSet.getString(10)); }
device.setTenantId(resultSet.getInt(11));
devicesList.add(device); @Override public List<Device> getDevices() throws DeviceManagementDAOException {
} return null;
} catch (SQLException e) { }
String msg = "Error occurred while listing devices for type '" + type + "'";
log.error(msg, e); @Override public List<Device> getDevices(Integer type) throws DeviceManagementDAOException {
throw new DeviceManagementDAOException(msg, e); Connection conn = null;
} finally { PreparedStatement stmt = null;
DeviceManagementDAOUtil.cleanupResources(conn, stmt, resultSet); ResultSet resultSet = null;
} List<Device> devicesList = null;
return devicesList; try {
} conn = this.getConnection();
String selectDBQueryForType = "SELECT ID, DESCRIPTION, NAME, DATE_OF_ENROLLMENT, " +
private Connection getConnection() throws DeviceManagementDAOException { "DATE_OF_LAST_UPDATE, OWNERSHIP, STATUS, DEVICE_TYPE_ID, " +
try { "DEVICE_IDENTIFICATION, OWNER, TENANT_ID FROM DM_DEVICE " +
return dataSource.getConnection(); "WHERE DM_DEVICE.DEVICE_TYPE_ID=?";
} catch (SQLException e) { stmt = conn.prepareStatement(selectDBQueryForType);
throw new DeviceManagementDAOException("Error occurred while obtaining a connection from the device " + stmt.setInt(1, type);
"management metadata repository datasource", e); resultSet = stmt.executeQuery();
} devicesList = new ArrayList<Device>();
} while (resultSet.next()) {
Device device = new Device();
device.setId(resultSet.getInt(1));
device.setDescription(resultSet.getString(2));
device.setName(resultSet.getString(3));
device.setDateOfEnrollment(resultSet.getLong(4));
device.setDateOfLastUpdate(resultSet.getLong(5));
//TODO:- Ownership is not a enum in DeviceDAO
device.setOwnerShip(resultSet.getString(6));
device.setStatus(Status.valueOf(resultSet.getString(7)));
device.setDeviceTypeId(resultSet.getInt(8));
device.setDeviceIdentificationId(resultSet.getString(9));
device.setOwnerId(resultSet.getString(10));
device.setTenantId(resultSet.getInt(11));
devicesList.add(device);
}
} catch (SQLException e) {
String msg = "Error occurred while listing devices for type '" + type + "'";
log.error(msg, e);
throw new DeviceManagementDAOException(msg, e);
} finally {
DeviceManagementDAOUtil.cleanupResources(conn, stmt, resultSet);
}
return devicesList;
}
private Connection getConnection() throws DeviceManagementDAOException {
try {
return dataSource.getConnection();
} catch (SQLException e) {
throw new DeviceManagementDAOException("Error occurred while obtaining a connection from the device " +
"management metadata repository datasource", e);
}
}
} }

16
product/modules/distribution/src/assembly/bin.xml
Unescape View File

@ -223,13 +223,15 @@
<outputDirectory>${project.artifactId}-${project.version}/repository/resources <outputDirectory>${project.artifactId}-${project.version}/repository/resources
</outputDirectory> </outputDirectory>
</fileSet> </fileSet>
<!-- copy cdm jaggery app --> <!-- copy cdm jaggery app
<fileSet> Commented the section since the repo was moved to MDM
<directory>src/repository/jaggeryapps</directory> -->
<outputDirectory>wso2cdm-${project.version}/repository/deployment/server/jaggeryapps <!--<fileSet>-->
</outputDirectory> <!--<directory>src/repository/jaggeryapps</directory>-->
<fileMode>755</fileMode> <!--<outputDirectory>wso2cdm-${project.version}/repository/deployment/server/jaggeryapps-->
</fileSet> <!--</outputDirectory>-->
<!--<fileMode>755</fileMode>-->
<!--</fileSet>-->
</fileSets> </fileSets>
<dependencySets> <dependencySets>

Write Preview
Loading…
Cancel
Save