community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
manoj 2015-01-23 10:09:53 +05:30
commit 87e272a823
39 changed files with 592 additions and 369 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml
View File

@ -5,13 +5,13 @@
<parent> <parent>
<artifactId>device-mgt</artifactId> <artifactId>device-mgt</artifactId>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.carbon.device.mgt.common</artifactId> <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>WSO2 Carbon - Device Management Commons</name> <name>WSO2 Carbon - Device Management Commons</name>
<description>WSO2 Carbon - Device Management Commons</description> <description>WSO2 Carbon - Device Management Commons</description>

29
components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/Device.java
View File

@ -18,6 +18,7 @@ package org.wso2.carbon.device.mgt.common;
import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
import java.util.List; import java.util.List;
import java.util.Map;
@XmlRootElement @XmlRootElement
public class Device { public class Device {
@ -34,7 +35,7 @@ public class Device {
private String deviceIdentifier; private String deviceIdentifier;
private String owner; private String owner;
private List<Feature> features; private List<Feature> features;
private List<Device.Property> properties; private Map<String, String> properties;
@XmlElement @XmlElement
public int getId() { public int getId() {
@ -145,34 +146,12 @@ public class Device {
} }
@XmlElement @XmlElement
public List<Device.Property> getProperties() { public Map<String, String> getProperties() {
return properties; return properties;
} }
public void setProperties(List<Device.Property> properties) { public void setProperties(Map<String, String> properties) {
this.properties = properties; this.properties = properties;
} }
public static class Property {
private String name;
private String value;
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getValue() {
return value;
}
public void setValue(String value) {
this.value = value;
}
}
} }

12
components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/OperationManager.java
View File

@ -35,7 +35,7 @@ public interface OperationManager {
throws OperationManagementException; throws OperationManagementException;
/** /**
* Method to retrieve the list of available operations to a device. * Method to retrieve the list of all operations to a device.
* *
* @param deviceId DeviceIdentifier of the device * @param deviceId DeviceIdentifier of the device
* @throws OperationManagementException If some unusual behaviour is observed while fetching the * @throws OperationManagementException If some unusual behaviour is observed while fetching the
@ -44,4 +44,14 @@ public interface OperationManager {
public List<Operation> getOperations(DeviceIdentifier deviceId) public List<Operation> getOperations(DeviceIdentifier deviceId)
throws OperationManagementException; throws OperationManagementException;
/**
* Method to retrieve the list of available operations to a device.
*
* @param deviceId DeviceIdentifier of the device
* @throws OperationManagementException If some unusual behaviour is observed while fetching the
* operation list.
*/
public List<Operation> getPendingOperations(DeviceIdentifier deviceId)
throws OperationManagementException;
} }

4
components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
View File

@ -22,14 +22,14 @@
<parent> <parent>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>device-mgt</artifactId> <artifactId>device-mgt</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.device.mgt.core</artifactId> <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>WSO2 Carbon - Device Management Core</name> <name>WSO2 Carbon - Device Management Core</name>
<description>WSO2 Carbon - Device Management Core</description> <description>WSO2 Carbon - Device Management Core</description>

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

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

32
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAO.java
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;
} }

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

22
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/util/DeviceManagementDAOUtil.java
View File

@ -34,9 +34,7 @@ import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Hashtable; import java.util.Hashtable;
import java.util.List;
public final class DeviceManagementDAOUtil { public final class DeviceManagementDAOUtil {
@ -107,9 +105,10 @@ public final class DeviceManagementDAOUtil {
/** /**
* @param device - The DTO device object. * @param device - The DTO device object.
* @param deviceType - The DeviceType object associated with the device
* @return A Business Object. * @return A Business Object.
*/ */
public static org.wso2.carbon.device.mgt.common.Device convertDevice(Device device){ public static org.wso2.carbon.device.mgt.common.Device convertDevice(Device device, DeviceType deviceType){
org.wso2.carbon.device.mgt.common.Device deviceBO = org.wso2.carbon.device.mgt.common.Device deviceBO =
new org.wso2.carbon.device.mgt.common.Device(); new org.wso2.carbon.device.mgt.common.Device();
deviceBO.setDateOfEnrolment(device.getDateOfEnrollment()); deviceBO.setDateOfEnrolment(device.getDateOfEnrollment());
@ -117,6 +116,7 @@ public final class DeviceManagementDAOUtil {
deviceBO.setDescription(device.getDescription()); deviceBO.setDescription(device.getDescription());
deviceBO.setDeviceIdentifier(device.getDeviceIdentificationId()); deviceBO.setDeviceIdentifier(device.getDeviceIdentificationId());
deviceBO.setDeviceTypeId(device.getDeviceTypeId()); deviceBO.setDeviceTypeId(device.getDeviceTypeId());
deviceBO.setType(deviceType.getName());
deviceBO.setName(device.getName()); deviceBO.setName(device.getName());
deviceBO.setId(device.getId()); deviceBO.setId(device.getId());
deviceBO.setOwner(device.getOwnerId()); deviceBO.setOwner(device.getOwnerId());
@ -126,21 +126,7 @@ public final class DeviceManagementDAOUtil {
} else if (device.getStatus() == Status.INACTIVE) { } else if (device.getStatus() == Status.INACTIVE) {
deviceBO.setStatus(false); deviceBO.setStatus(false);
} }
return null; return deviceBO;
}
/**
* @param devices - DTO Device Object list.
* @return converted Business Object list.
*/
public static List<org.wso2.carbon.device.mgt.common.Device> convertDevices(
List<Device> devices) {
List<org.wso2.carbon.device.mgt.common.Device> deviceBOList =
new ArrayList<org.wso2.carbon.device.mgt.common.Device>();
for (Device device : devices) {
deviceBOList.add(convertDevice(device));
}
return deviceBOList;
} }
public static Device convertDevice(org.wso2.carbon.device.mgt.common.Device public static Device convertDevice(org.wso2.carbon.device.mgt.common.Device

4
components/device-mgt/pom.xml
View File

@ -24,14 +24,14 @@
<parent> <parent>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>wso2cdm-parent</artifactId> <artifactId>wso2cdm-parent</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>device-mgt</artifactId> <artifactId>device-mgt</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - Device Management Component</name> <name>WSO2 Carbon - Device Management Component</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>

4
components/key-mgt/org.wso2.carbon.key.mgt.handler.valve/pom.xml
View File

@ -22,14 +22,14 @@
<parent> <parent>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>key-mgt</artifactId> <artifactId>key-mgt</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.key.mgt.handler.valve</artifactId> <artifactId>org.wso2.carbon.key.mgt.handler.valve</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>WSO2 Carbon - Key Management Handler Valve</name> <name>WSO2 Carbon - Key Management Handler Valve</name>
<description>WSO2 Carbon - Key Management Handler Valve</description> <description>WSO2 Carbon - Key Management Handler Valve</description>

6
components/key-mgt/pom.xml
View File

@ -24,14 +24,14 @@
<parent> <parent>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>wso2cdm-parent</artifactId> <artifactId>wso2cdm-parent</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>key-mgt</artifactId> <artifactId>key-mgt</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - Device Management Component</name> <name>WSO2 Carbon - Device Management Component</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>
@ -61,7 +61,7 @@
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.device.mgt.common</artifactId> <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.osgi</groupId> <groupId>org.eclipse.osgi</groupId>

4
components/policy-mgt/org.wso2.carbon.policy.evalutor/pom.xml
View File

@ -21,14 +21,14 @@
<parent> <parent>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>policy-mgt</artifactId> <artifactId>policy-mgt</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.policy.evaluator</artifactId> <artifactId>org.wso2.carbon.policy.evaluator</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>WSO2 Carbon - Policy Decision Point</name> <name>WSO2 Carbon - Policy Decision Point</name>
<description>WSO2 Carbon - Policy Decision Point</description> <description>WSO2 Carbon - Policy Decision Point</description>

4
components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml
View File

@ -21,14 +21,14 @@
<parent> <parent>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>policy-mgt</artifactId> <artifactId>policy-mgt</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.policy.mgt.common</artifactId> <artifactId>org.wso2.carbon.policy.mgt.common</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>WSO2 Carbon - Policy Management Common</name> <name>WSO2 Carbon - Policy Management Common</name>
<description>WSO2 Carbon - Policy Management Common</description> <description>WSO2 Carbon - Policy Management Common</description>

4
components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml
View File

@ -21,14 +21,14 @@
<parent> <parent>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>policy-mgt</artifactId> <artifactId>policy-mgt</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.policy.mgt.core</artifactId> <artifactId>org.wso2.carbon.policy.mgt.core</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>WSO2 Carbon - Policy Management Core</name> <name>WSO2 Carbon - Policy Management Core</name>
<description>WSO2 Carbon - Policy Management Core</description> <description>WSO2 Carbon - Policy Management Core</description>

4
components/policy-mgt/pom.xml
View File

@ -23,14 +23,14 @@
<parent> <parent>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>wso2cdm-parent</artifactId> <artifactId>wso2cdm-parent</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>policy-mgt</artifactId> <artifactId>policy-mgt</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - Policy Management Component</name> <name>WSO2 Carbon - Policy Management Component</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>

4
features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
View File

@ -22,14 +22,14 @@
<parent> <parent>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>device-mgt-feature</artifactId> <artifactId>device-mgt-feature</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.carbon.device.mgt.server.feature</artifactId> <artifactId>org.wso2.carbon.device.mgt.server.feature</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<name>WSO2 Carbon - Device Management Server Feature</name> <name>WSO2 Carbon - Device Management Server Feature</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>
<description>This feature contains the core bundles required for Back-end Devvice Management functionality <description>This feature contains the core bundles required for Back-end Devvice Management functionality

4
features/device-mgt/pom.xml
View File

@ -24,14 +24,14 @@
<parent> <parent>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>wso2cdm-parent</artifactId> <artifactId>wso2cdm-parent</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>device-mgt-feature</artifactId> <artifactId>device-mgt-feature</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - Device Management Feature</name> <name>WSO2 Carbon - Device Management Feature</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>

4
features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml
View File

@ -23,14 +23,14 @@
<parent> <parent>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>policy-mgt-feature</artifactId> <artifactId>policy-mgt-feature</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.carbon.policy.mgt.server.feature</artifactId> <artifactId>org.wso2.carbon.policy.mgt.server.feature</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<name>WSO2 Carbon - Policy Management Server Feature</name> <name>WSO2 Carbon - Policy Management Server Feature</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>
<description>This feature contains the core bundles required for Back-end Devvice Management functionality <description>This feature contains the core bundles required for Back-end Devvice Management functionality

4
features/policy-mgt/pom.xml
View File

@ -23,14 +23,14 @@
<parent> <parent>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>wso2cdm-parent</artifactId> <artifactId>wso2cdm-parent</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>policy-mgt-feature</artifactId> <artifactId>policy-mgt-feature</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - Policy Management Feature</name> <name>WSO2 Carbon - Policy Management Feature</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>

5
pom.xml
View File

@ -25,7 +25,7 @@
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>wso2cdm-parent</artifactId> <artifactId>wso2cdm-parent</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<name>WSO2 CDM - Parent</name> <name>WSO2 CDM - Parent</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>
<description>WSO2 Connected Device Manager</description> <description>WSO2 Connected Device Manager</description>
@ -213,12 +213,13 @@
<axis2.osgi.version.range>[1.6.1.wso2v11, 1.7.0)</axis2.osgi.version.range> <axis2.osgi.version.range>[1.6.1.wso2v11, 1.7.0)</axis2.osgi.version.range>
<jboss-transaction-api.version>1.0.0.Final</jboss-transaction-api.version> <jboss-transaction-api.version>1.0.0.Final</jboss-transaction-api.version>
<carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version> <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
<cdm.version>2.0.0-SNAPSHOT</cdm.version> <cdm.version>1.0.0-SNAPSHOT</cdm.version>
<!--Jaggery --> <!--Jaggery -->
<jaggery.feature.version>0.9.0-SNAPSHOT</jaggery.feature.version> <jaggery.feature.version>0.9.0-SNAPSHOT</jaggery.feature.version>
<carbon.feature.version>1.1.0</carbon.feature.version> <carbon.feature.version>1.1.0</carbon.feature.version>
<process.feature.version>1.0.0</process.feature.version> <process.feature.version>1.0.0</process.feature.version>
<uuid.feature.version>1.0.0</uuid.feature.version> <uuid.feature.version>1.0.0</uuid.feature.version>
<sso.feature.version>1.1.0-SNAPSHOT</sso.feature.version>
<jaggery-test.feature.version>1.1.0</jaggery-test.feature.version> <jaggery-test.feature.version>1.1.0</jaggery-test.feature.version>
<!--Testing --> <!--Testing -->
<test.framework.version>4.3.1</test.framework.version> <test.framework.version>4.3.1</test.framework.version>

2
product/modules/distribution/pom.xml
View File

@ -24,7 +24,7 @@
<parent> <parent>
<groupId>org.wso2.cdmserver</groupId> <groupId>org.wso2.cdmserver</groupId>
<artifactId>wso2cdmserver-product</artifactId> <artifactId>wso2cdmserver-product</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

28
product/modules/distribution/src/assembly/bin.xml
View File

@ -210,7 +210,7 @@
<!-- Copying Device Management related dbscripts --> <!-- Copying Device Management related dbscripts -->
<fileSet> <fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm</directory> <directory>../distribution/src/repository/dbscripts/cdm</directory>
<outputDirectory>wso2cdm-${project.version}/dbscripts/cdm</outputDirectory> <outputDirectory>wso2cdm-${project.version}/dbscripts/cdm</outputDirectory>
<includes> <includes>
<include>*/**</include> <include>*/**</include>
@ -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>
@ -462,5 +464,15 @@
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<!-- Copying H2 database related files corresponding to default Mobile Device management repository schema -->
<!-- <file>
<source>
../distribution/src/repository/database/WSO2MobileDM_DB.h2.db
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
<destName>WSO2MobileDM_DB.h2.db</destName>
<fileMode>644</fileMode>
</file> -->
</files> </files>
</assembly> </assembly>

BIN
product/modules/distribution/src/repository/database/WSO2MobileDM_DB.h2.db Normal file
View File

Binary file not shown.

2
product/modules/distribution/src/repository/dbscripts/cdm/h2.sql
View File

@ -23,4 +23,4 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE
REFERENCES DM_DEVICE_TYPE (ID ) ON DELETE NO ACTION ON UPDATE NO ACTION REFERENCES DM_DEVICE_TYPE (ID ) ON DELETE NO ACTION ON UPDATE NO ACTION
); );
-- TO:DO - Remove this INSERT sql statement. -- TO:DO - Remove this INSERT sql statement.
Insert into DM_DEVICE_TYPE (ID,NAME) VALUES (1, 'android'); Insert into DM_DEVICE_TYPE (NAME) VALUES ('android');

13
product/modules/distribution/src/repository/dbscripts/cdm/plugins/h2.sql
View File

@ -31,13 +31,8 @@ CREATE TABLE IF NOT EXISTS `MBL_FEATURE` (
CREATE TABLE IF NOT EXISTS `MBL_OPERATION` ( CREATE TABLE IF NOT EXISTS `MBL_OPERATION` (
`OPERATION_ID` INT NOT NULL AUTO_INCREMENT , `OPERATION_ID` INT NOT NULL AUTO_INCREMENT ,
`FEATURE_CODE` VARCHAR(45) NOT NULL , `FEATURE_CODE` VARCHAR(45) NOT NULL ,
`CREATED_DATE` INT NULL , `CREATED_DATE` BIGINT NULL ,
PRIMARY KEY (`OPERATION_ID`) , PRIMARY KEY (`OPERATION_ID`));
CONSTRAINT `fk_MBL_OPERATION_MBL_FEATURES1`
FOREIGN KEY (`FEATURE_CODE` )
REFERENCES `MBL_FEATURE` (`CODE` )
ON DELETE NO ACTION
ON UPDATE NO ACTION);
-- ----------------------------------------------------- -- -----------------------------------------------------
-- Table `MBL_DEVICE_OPERATION_MAPPING` -- Table `MBL_DEVICE_OPERATION_MAPPING`
@ -45,8 +40,8 @@ CREATE TABLE IF NOT EXISTS `MBL_OPERATION` (
CREATE TABLE IF NOT EXISTS `MBL_DEVICE_OPERATION_MAPPING` ( CREATE TABLE IF NOT EXISTS `MBL_DEVICE_OPERATION_MAPPING` (
`DEVICE_ID` VARCHAR(45) NOT NULL , `DEVICE_ID` VARCHAR(45) NOT NULL ,
`OPERATION_ID` INT NOT NULL , `OPERATION_ID` INT NOT NULL ,
`SENT_DATE` INT NULL , `SENT_DATE` BIGINT NULL ,
`RECEIVED_DATE` INT NULL , `RECEIVED_DATE` BIGINT NULL ,
PRIMARY KEY (`DEVICE_ID`, `OPERATION_ID`) , PRIMARY KEY (`DEVICE_ID`, `OPERATION_ID`) ,
CONSTRAINT `fk_MBL_DEVICE_OPERATION_MBL_DEVICE` CONSTRAINT `fk_MBL_DEVICE_OPERATION_MBL_DEVICE`
FOREIGN KEY (`DEVICE_ID` ) FOREIGN KEY (`DEVICE_ID` )

38
product/modules/distribution/src/repository/dbscripts/cdm/plugins/h2.sql~
View File

@ -10,6 +10,8 @@ CREATE TABLE IF NOT EXISTS `MBL_DEVICE` (
`OS_VERSION` VARCHAR(45) NULL DEFAULT NULL , `OS_VERSION` VARCHAR(45) NULL DEFAULT NULL ,
`DEVICE_MODEL` VARCHAR(45) NULL DEFAULT NULL , `DEVICE_MODEL` VARCHAR(45) NULL DEFAULT NULL ,
`VENDOR` VARCHAR(45) NULL DEFAULT NULL , `VENDOR` VARCHAR(45) NULL DEFAULT NULL ,
`LATITUDE` VARCHAR(45) NULL DEFAULT NULL,
`LONGITUDE` VARCHAR(45) NULL DEFAULT NULL,
PRIMARY KEY (`MOBILE_DEVICE_ID`) ); PRIMARY KEY (`MOBILE_DEVICE_ID`) );
@ -18,7 +20,7 @@ CREATE TABLE IF NOT EXISTS `MBL_DEVICE` (
-- ----------------------------------------------------- -- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `MBL_FEATURE` ( CREATE TABLE IF NOT EXISTS `MBL_FEATURE` (
`FEATURE_ID` INT NOT NULL AUTO_INCREMENT , `FEATURE_ID` INT NOT NULL AUTO_INCREMENT ,
`CODE` VARCHAR(45) NULL , `CODE` VARCHAR(45) NOT NULL ,
`NAME` VARCHAR(100) NULL , `NAME` VARCHAR(100) NULL ,
`DESCRIPTION` VARCHAR(200) NULL , `DESCRIPTION` VARCHAR(200) NULL ,
PRIMARY KEY (`FEATURE_ID`) ); PRIMARY KEY (`FEATURE_ID`) );
@ -28,23 +30,18 @@ CREATE TABLE IF NOT EXISTS `MBL_FEATURE` (
-- ----------------------------------------------------- -- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `MBL_OPERATION` ( CREATE TABLE IF NOT EXISTS `MBL_OPERATION` (
`OPERATION_ID` INT NOT NULL AUTO_INCREMENT , `OPERATION_ID` INT NOT NULL AUTO_INCREMENT ,
`FEATURE_CODE` VARCHAR(45) NULL , `FEATURE_CODE` VARCHAR(45) NOT NULL ,
`CREATED_DATE` INT NULL , `CREATED_DATE` LONG NULL ,
PRIMARY KEY (`OPERATION_ID`) , PRIMARY KEY (`OPERATION_ID`));
CONSTRAINT `fk_MBL_OPERATION_MBL_FEATURES1`
FOREIGN KEY (`FEATURE_CODE` )
REFERENCES `MBL_FEATURE` (`CODE` )
ON DELETE NO ACTION
ON UPDATE NO ACTION);
-- ----------------------------------------------------- -- -----------------------------------------------------
-- Table `MBL_DEVICE_OPERATION_MAPING` -- Table `MBL_DEVICE_OPERATION_MAPPING`
-- ----------------------------------------------------- -- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `MBL_DEVICE_OPERATION_MAPING` ( CREATE TABLE IF NOT EXISTS `MBL_DEVICE_OPERATION_MAPPING` (
`DEVICE_ID` VARCHAR(45) NOT NULL , `DEVICE_ID` VARCHAR(45) NOT NULL ,
`OPERATION_ID` INT NOT NULL , `OPERATION_ID` INT NOT NULL ,
`SENT_DATE` INT NULL , `SENT_DATE` LONG NULL ,
`RECEIVED_DATE` INT NULL , `RECEIVED_DATE` LONG NULL ,
PRIMARY KEY (`DEVICE_ID`, `OPERATION_ID`) , PRIMARY KEY (`DEVICE_ID`, `OPERATION_ID`) ,
CONSTRAINT `fk_MBL_DEVICE_OPERATION_MBL_DEVICE` CONSTRAINT `fk_MBL_DEVICE_OPERATION_MBL_DEVICE`
FOREIGN KEY (`DEVICE_ID` ) FOREIGN KEY (`DEVICE_ID` )
@ -61,11 +58,10 @@ CREATE TABLE IF NOT EXISTS `MBL_DEVICE_OPERATION_MAPING` (
-- Table `MBL_OPERATION_PROPERTY` -- Table `MBL_OPERATION_PROPERTY`
-- ----------------------------------------------------- -- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `MBL_OPERATION_PROPERTY` ( CREATE TABLE IF NOT EXISTS `MBL_OPERATION_PROPERTY` (
`OPERATION_PROPERTY_ID` INT NOT NULL AUTO_INCREMENT , `OPERATION_ID` INT NOT NULL ,
`OPERATION_ID` INT NULL , `PROPERTY` VARCHAR(45) NOT NULL ,
`PROPERTY_ID` INT NULL ,
`VALUE` TEXT NULL , `VALUE` TEXT NULL ,
PRIMARY KEY (`OPERATION_PROPERTY_ID`) , PRIMARY KEY (`OPERATION_ID`, `PROPERTY`) ,
CONSTRAINT `fk_MBL_OPERATION_PROPERTY_MBL_OPERATION1` CONSTRAINT `fk_MBL_OPERATION_PROPERTY_MBL_OPERATION1`
FOREIGN KEY (`OPERATION_ID` ) FOREIGN KEY (`OPERATION_ID` )
REFERENCES `MBL_OPERATION` (`OPERATION_ID` ) REFERENCES `MBL_OPERATION` (`OPERATION_ID` )
@ -76,13 +72,11 @@ CREATE TABLE IF NOT EXISTS `MBL_OPERATION_PROPERTY` (
-- Table `MBL_FEATURE_PROPERTY` -- Table `MBL_FEATURE_PROPERTY`
-- ----------------------------------------------------- -- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `MBL_FEATURE_PROPERTY` ( CREATE TABLE IF NOT EXISTS `MBL_FEATURE_PROPERTY` (
`PROPERTY_ID` INT NOT NULL AUTO_INCREMENT , `PROPERTY` VARCHAR(45) NOT NULL ,
`PROPERTY` VARCHAR(100) NULL , `FEATURE_ID` VARCHAR(45) NOT NULL ,
`FEATURE_ID` VARCHAR(45) NULL , PRIMARY KEY (`PROPERTY`) ,
PRIMARY KEY (`PROPERTY_ID`) ,
CONSTRAINT `fk_MBL_FEATURE_PROPERTY_MBL_FEATURE1` CONSTRAINT `fk_MBL_FEATURE_PROPERTY_MBL_FEATURE1`
FOREIGN KEY (`FEATURE_ID` ) FOREIGN KEY (`FEATURE_ID` )
REFERENCES `MBL_FEATURE` (`FEATURE_ID` ) REFERENCES `MBL_FEATURE` (`FEATURE_ID` )
ON DELETE NO ACTION ON DELETE NO ACTION
ON UPDATE NO ACTION); ON UPDATE NO ACTION);

38
product/modules/distribution/src/repository/jaggeryapps/cdm/api/mobile/device-api.jag Normal file
View File

@ -0,0 +1,38 @@
<%
/*
* Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
*
* WSO2 Inc. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
* in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
var utility = require("/modules/utility.js");
var deviceManagementService = utility.getDeviceManagementService();
var devices = deviceManagementService.getAllDevices("android");
var logger = new Log();
var deviceList = [];
for (i = 0; i < devices.size(); i++) {
var device = devices.get(i);
deviceList.push({
"identifier": device.getDeviceIdentifier(),
"name": device.getName(),
"ownership": device.getOwnership(),
"owner": device.getOwner(),
"deviceType": device.getType(),
"vendor": device.getProperties().get("vendor"),
"model": device.getProperties().get("model"),
"osVersion": device.getProperties().get("osVersion")
});
}
print(deviceList);
%>

33
product/modules/distribution/src/repository/jaggeryapps/cdm/init.js
View File

@ -1 +1,32 @@
//Init js to execute /*
* Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
*
* WSO2 Inc. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
* in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
//Init js to execute
var logger = new Log();
logger.debug("running debug");
var app_TENANT_CONFIGS = 'tenant.configs';
var app_carbon = require('carbon');
var app_configs = {
"HTTPS_URL": "https://localhost:9443"
};
var app_server = new app_carbon.server.Server({
tenanted: app_configs.tenanted,
url: app_configs.HTTPS_URL + '/admin'
});
application.put("SERVER", app_server);
application.put(app_TENANT_CONFIGS, {});

10
product/modules/distribution/src/repository/jaggeryapps/cdm/jaggery.conf
View File

@ -1,6 +1,6 @@
{ {
"welcomeFiles": ["pages/dashboard.jag"], "welcomeFiles": ["pages/dashboard.jag"],
"initScripts": ["init.js"], "initScripts": ["/init.js"],
"urlMappings": [ "urlMappings": [
{ {
"url": "/devices/*", "url": "/devices/*",
@ -9,12 +9,16 @@
{ {
"url": "/dashboard", "url": "/dashboard",
"path": "/pages/dashboard.jag" "path": "/pages/dashboard.jag"
},
{
"url": "/api/devices/mobile/*",
"path": "/api/mobile/device-api.jag"
} }
], ],
"errorPages": { "errorPages": {
"500": "/error500.jag", "500": "/error500.jag",
"404": "/error404.jag", "404": "/error404.jag",
"403": "/error403.jag" "403": "/error403.jag "
}, },
"logLevel": "info" "logLevel": "debug"
} }

32
product/modules/distribution/src/repository/jaggeryapps/cdm/modules/utility.js Normal file
View File

@ -0,0 +1,32 @@
/*
* Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
*
* WSO2 Inc. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
* in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
//temporary
var PrivilegedCarbonContext = Packages.org.wso2.carbon.context.PrivilegedCarbonContext,
Class = java.lang.Class;
osgiService = function (clazz) {
return PrivilegedCarbonContext.getThreadLocalCarbonContext().getOSGiService(Class.forName(clazz));
};
var getDeviceManagementService= function(){
//server.authenticate("admin", "admin");
var realmService = osgiService('org.wso2.carbon.device.mgt.core.service.DeviceManagementService');
//var realmService = null;
return realmService;
}

69
product/modules/distribution/src/repository/jaggeryapps/cdm/pages/dashboard.jag
View File

@ -1,5 +1,22 @@
<!DOCTYPE html> <!DOCTYPE html>
<% <%
/*
* Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
*
* WSO2 Inc. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
* in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
var title="WSO2 CDM"; var title="WSO2 CDM";
%> %>
<html lang="en"> <html lang="en">
@ -14,25 +31,43 @@ var title="WSO2 CDM";
<div class="row"> <div class="row">
<div class="col-sm-9 main col-centered"> <div class="col-sm-9 main col-centered">
<h2 class="sub-header">Devices list</h2> <h2 class="sub-header">Devices list</h2>
<!--
<div class="row"> <div class="row">
<div class="col-md-1"><button type="button" class="btn btn-primary">Execute</button></div> <div class="col-md-1"><button type="button" class="btn btn-primary">Execute</button></div>
</div> </div>
<div class="table-responsive"> -->
<table id="table-pagination" data-toggle="table" data-url="data2.json" data-query-params="queryParams" data-height="400" data-pagination="true" data-search="true"> <div role="devicepanel">
<thead>
<tr> <!-- Nav tabs -->
<th data-field="state" data-checkbox="true"></th> <ul class="nav nav-tabs" role="tablist">
<th data-field="identifier" data-align="right" data-sortable="true" data-formatter="identifierFormatter">Identifier</th> <li role="presentation" class="active"><a href="#mobile" aria-controls="home" role="tab" data-toggle="tab">Mobile</a></li>
<th data-field="name" data-align="center" data-sortable="true">Name</th> <li role="presentation"><a href="#raspberrypi" aria-controls="profile" role="tab" data-toggle="tab">RaspberryPi</a></li>
<th data-field="owner" data-align="center" data-sortable="true">Owner</th> </ul>
<th data-field="ownership" data-align="center" data-sortable="true">Ownership</th>
<th data-field="deviceType" data-align="center" data-sortable="true">Device Type</th> <!-- Tab panes -->
<th data-field="vendor" data-align="center" data-sortable="true">Vendor</th> <div class="tab-content">
<th data-field="model" data-align="center" data-sortable="true">Model</th> <div role="devicepanel" class="tab-pane active" id="mobile">
<th data-field="osVersion" data-align="center" data-sortable="true">OS Version</th> <div class="table-responsive">
</tr> <table id="table-pagination" data-toggle="table" data-url="/cdm/api/devices/mobile" data-query-params="queryParams" data-height="400" data-pagination="true" data-search="true">
</thead> <thead>
</table> <tr>
<th data-field="state" data-checkbox="true"></th>
<th data-field="identifier" data-align="right" data-sortable="true" data-formatter="identifierFormatter">Identifier</th>
<th data-field="name" data-align="center" data-sortable="true">Name</th>
<th data-field="owner" data-align="center" data-sortable="true">Owner</th>
<th data-field="ownership" data-align="center" data-sortable="true">Ownership</th>
<th data-field="deviceType" data-align="center" data-sortable="true">Device Type</th>
<th data-field="vendor" data-align="center" data-sortable="true">Vendor</th>
<th data-field="model" data-align="center" data-sortable="true">Model</th>
<th data-field="osVersion" data-align="center" data-sortable="true">OS Version</th>
</tr>
</thead>
</table>
</div>
</div>
<div role="devicepanel" class="tab-pane" id="raspberrypi">sdfweroiweuroi</div>
</div>
</div> </div>
</div> </div>
</div> </div>

19
product/modules/distribution/src/repository/jaggeryapps/cdm/pages/device.jag
View File

@ -1,5 +1,22 @@
<!DOCTYPE html> <!DOCTYPE html>
<% <%
/*
* Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
*
* WSO2 Inc. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
* in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
var title="WSO2 CDM"; var title="WSO2 CDM";
%> %>
<html lang="en"> <html lang="en">

2
product/modules/integration/pom.xml
View File

@ -23,7 +23,7 @@
<parent> <parent>
<groupId>org.wso2.cdmserver</groupId> <groupId>org.wso2.cdmserver</groupId>
<artifactId>wso2cdmserver-product</artifactId> <artifactId>wso2cdmserver-product</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
product/modules/integration/tests-common/admin-clients/pom.xml
View File

@ -24,7 +24,7 @@
<parent> <parent>
<groupId>org.wso2.cdmserver</groupId> <groupId>org.wso2.cdmserver</groupId>
<artifactId>cdm-integration-tests-common</artifactId> <artifactId>cdm-integration-tests-common</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
product/modules/integration/tests-common/integration-test-utils/pom.xml
View File

@ -24,7 +24,7 @@
<parent> <parent>
<groupId>org.wso2.cdmserver</groupId> <groupId>org.wso2.cdmserver</groupId>
<artifactId>cdm-integration-tests-common</artifactId> <artifactId>cdm-integration-tests-common</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
product/modules/integration/tests-common/pom.xml
View File

@ -24,7 +24,7 @@
<parent> <parent>
<groupId>org.wso2.cdmserver</groupId> <groupId>org.wso2.cdmserver</groupId>
<artifactId>wso2cdm-integration</artifactId> <artifactId>wso2cdm-integration</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
product/modules/integration/tests-common/ui-pages/pom.xml
View File

@ -24,7 +24,7 @@
<parent> <parent>
<groupId>org.wso2.cdmserver</groupId> <groupId>org.wso2.cdmserver</groupId>
<artifactId>cdm-integration-tests-common</artifactId> <artifactId>cdm-integration-tests-common</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

45
product/modules/p2-profile-gen/pom.xml
View File

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.wso2.cdmserver</groupId> <groupId>org.wso2.cdmserver</groupId>
<artifactId>wso2cdmserver-product</artifactId> <artifactId>wso2cdmserver-product</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
@ -115,7 +115,24 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.webapp.mgt.feature:${carbon.platform.version} org.wso2.carbon:org.wso2.carbon.webapp.mgt.feature:${carbon.platform.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>
org.jaggeryjs:org.jaggeryjs.feature:${jaggery.feature.version}
</featureArtifactDef>
<featureArtifactDef>
org.jaggeryjs.modules:carbon.feature:${carbon.feature.version}
</featureArtifactDef>
<featureArtifactDef>
org.jaggeryjs.modules:process.feature:${process.feature.version}
</featureArtifactDef>
<featureArtifactDef>
org.jaggeryjs.modules:uuid.feature:${uuid.feature.version}
</featureArtifactDef>
<featureArtifactDef>
org.jaggeryjs.modules:sso.feature:${sso.feature.version}
</featureArtifactDef>
<featureArtifactDef>
org.jaggeryjs.modules:jaggery-test.feature:${jaggery-test.feature.version}
</featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.transport.mgt.feature:${carbon.platform.version} org.wso2.carbon:org.wso2.carbon.transport.mgt.feature:${carbon.platform.version}
</featureArtifactDef> </featureArtifactDef>
@ -254,6 +271,30 @@
<id>org.wso2.carbon.webapp.mgt.feature.group</id> <id>org.wso2.carbon.webapp.mgt.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.platform.version}</version>
</feature> </feature>
<feature>
<id>org.jaggeryjs.feature.group</id>
<version>${jaggery.feature.version}</version>
</feature>
<feature>
<id>org.jaggeryjs.modules.carbon.feature.group</id>
<version>${carbon.feature.version}</version>
</feature>
<feature>
<id>org.jaggeryjs.modules.process.feature.group</id>
<version>${process.feature.version}</version>
</feature>
<feature>
<id>org.jaggeryjs.modules.uuid.feature.group</id>
<version>${uuid.feature.version}</version>
</feature>
<feature>
<id>org.jaggeryjs.modules.sso.feature.group</id>
<version>${sso.feature.version}</version>
</feature>
<feature>
<id>org.jaggeryjs.modules.jaggery-test.feature.group</id>
<version>${jaggery-test.feature.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.transport.mgt.feature.group</id> <id>org.wso2.carbon.transport.mgt.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.platform.version}</version>

2
product/pom.xml
View File

@ -23,7 +23,7 @@
<parent> <parent>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>wso2cdm-parent</artifactId> <artifactId>wso2cdm-parent</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>