From a5a9d02deec97dfd69d04c3b5c747fd3215a1323 Mon Sep 17 00:00:00 2001
From: milanperera <milanharindu.ucsc@gmail.com>
Date: Tue, 14 Jul 2015 19:39:03 +0530
Subject: [PATCH 1/4] Implemented getDeviceByStatus function

---
 .../device/mgt/common/EnrolmentInfo.java      |  2 +-
 .../carbon/device/mgt/core/dao/DeviceDAO.java |  2 ++
 .../mgt/core/dao/impl/DeviceDAOImpl.java      | 28 +++++++++++++++
 .../DeviceManagementProviderService.java      |  9 +++++
 .../DeviceManagementProviderServiceImpl.java  | 36 +++++++++++++++++++
 5 files changed, 76 insertions(+), 1 deletion(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/EnrolmentInfo.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/EnrolmentInfo.java
index 82e3fb57d40..b3a594a95c3 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/EnrolmentInfo.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/EnrolmentInfo.java
@@ -21,7 +21,7 @@ package org.wso2.carbon.device.mgt.common;
 public class EnrolmentInfo {
 
     public enum Status {
-        CREATED, ACTIVE, INACTIVE, UNREACHABLE, UNCLAIMED, SUSPENDED, BLOCKED, REMOVED
+        CREATED, ACTIVE, INACTIVE, UNREACHABLE, UNCLAIMED, SUSPENDED, BLOCKED, REMOVED, DISENROLLMENT_REQUESTED
     }
 
     public enum OwnerShip {
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAO.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAO.java
index ad87c15096b..75cddd8141c 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAO.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAO.java
@@ -60,5 +60,7 @@ public interface DeviceDAO {
     EnrolmentInfo getEnrolment(DeviceIdentifier deviceId, String currentUser,
                                int tenantId) throws DeviceManagementDAOException;
 
+
+    List<Device> getDevicesByStatus(EnrolmentInfo.Status status, int tenantId) throws DeviceManagementDAOException;
 }
 
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/DeviceDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/DeviceDAOImpl.java
index 55d19152ff3..06a17f06855 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/DeviceDAOImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/DeviceDAOImpl.java
@@ -442,4 +442,32 @@ public class DeviceDAOImpl implements DeviceDAO {
         return enrolmentInfo;
     }
 
+    public List<Device> getDevicesByStatus(EnrolmentInfo.Status status, int tenantId) throws DeviceManagementDAOException {
+        Connection conn;
+        PreparedStatement stmt = null;
+        List<Device> devices = new ArrayList<Device>();
+        try {
+            conn = this.getConnection();
+            stmt = conn.prepareStatement("SELECT d.ID AS DEVICE_ID, d.DESCRIPTION, d.NAME AS DEVICE_NAME, d.DEVICE_TYPE_ID, " +
+                                         "d.DEVICE_IDENTIFICATION, e.OWNER, e.OWNERSHIP, e.STATUS, e.DATE_OF_LAST_UPDATE, " +
+                                         "e.DATE_OF_ENROLMENT FROM (SELECT e.ID, e.DEVICE_ID, e.OWNER, e.OWNERSHIP, e.STATUS, " +
+                                         "e.DATE_OF_ENROLMENT, e.DATE_OF_LAST_UPDATE FROM DM_ENROLMENT e WHERE TENANT_ID = ? " +
+                                         "AND STATUS = ?) e, DM_DEVICE d WHERE DEVICE_ID = e.DEVICE_ID AND d.TENANT_ID = ?");
+            stmt.setInt(1, tenantId);
+            stmt.setString(2, status.toString());
+            stmt.setInt(3, tenantId);
+            ResultSet rs = stmt.executeQuery();
+
+            while (rs.next()) {
+                Device device = this.loadDevice(rs);
+                devices.add(device);
+            }
+        } catch (SQLException e) {
+            throw new DeviceManagementDAOException("Error occurred while fetching the list of devices that matches to status " +
+                                                   "'" + status + "'", e);
+        } finally {
+            DeviceManagementDAOUtil.cleanupResources(stmt, null);
+        }
+        return devices;
+    }
 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java
index 9c72e0323c8..345838a1e50 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java
@@ -79,4 +79,13 @@ public interface DeviceManagementProviderService extends DeviceManager, LicenseM
     List<Device> getDevicesByName(String deviceName) throws DeviceManagementException;
 
     void updateDeviceEnrolmentInfo(Device device, EnrolmentInfo.Status active) throws DeviceManagementException;
+
+    /**
+     * This method is used to retrieve list of devices based on the device status
+     *
+     * @param status Device status
+     * @return List of devices
+     * @throws DeviceManagementException
+     */
+    List<Device> getDevicesByStatus(EnrolmentInfo.Status status) throws DeviceManagementException;
 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
index 9aa80d7e256..6e9ccdd0509 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
@@ -699,4 +699,40 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
         }
     }
 
+    public List<Device> getDevicesByStatus(EnrolmentInfo.Status status) throws DeviceManagementException {
+        List<Device> devices = new ArrayList<Device>();
+        List<Device> allDevices;
+        try {
+            DeviceManagementDAOFactory.getConnection();
+            int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
+            allDevices = deviceDAO.getDevicesByStatus(status, tenantId);
+
+        } catch (DeviceManagementDAOException e) {
+            String errorMsg = "Error occurred while fetching the list of devices that matches to status: '"
+                              + status + "'";
+            log.error(errorMsg, e);
+            throw new DeviceManagementException(errorMsg, e);
+        } finally {
+
+            try {
+                DeviceManagementDAOFactory.closeConnection();
+            } catch (DeviceManagementDAOException e) {
+                log.warn("Error occurred while closing the connection", e);
+            }
+        }
+
+        for (Device device : allDevices) {
+            Device dmsDevice =
+                    this.getPluginRepository().getDeviceManagementService(
+                            device.getType()).getDeviceManager().getDevice(
+                            new DeviceIdentifier(device.getDeviceIdentifier(), device.getType()));
+            if (dmsDevice != null) {
+                device.setFeatures(dmsDevice.getFeatures());
+                device.setProperties(dmsDevice.getProperties());
+            }
+            devices.add(device);
+        }
+        return devices;
+    }
+
 }

From a82351f53fdb5c5ea5bf181865fd409a37a94a44 Mon Sep 17 00:00:00 2001
From: milanperera <milanharindu.ucsc@gmail.com>
Date: Tue, 14 Jul 2015 20:31:37 +0530
Subject: [PATCH 2/4] Refactered getDevicesByType query

---
 .../wso2/carbon/device/mgt/core/dao/impl/DeviceDAOImpl.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/DeviceDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/DeviceDAOImpl.java
index 06a17f06855..fdb18454f70 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/DeviceDAOImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/DeviceDAOImpl.java
@@ -448,11 +448,12 @@ public class DeviceDAOImpl implements DeviceDAO {
         List<Device> devices = new ArrayList<Device>();
         try {
             conn = this.getConnection();
-            stmt = conn.prepareStatement("SELECT d.ID AS DEVICE_ID, d.DESCRIPTION, d.NAME AS DEVICE_NAME, d.DEVICE_TYPE_ID, " +
+            stmt = conn.prepareStatement("SELECT d.ID AS DEVICE_ID, d.DESCRIPTION, d.NAME AS DEVICE_NAME, t.NAME AS DEVICE_TYPE, " +
                                          "d.DEVICE_IDENTIFICATION, e.OWNER, e.OWNERSHIP, e.STATUS, e.DATE_OF_LAST_UPDATE, " +
                                          "e.DATE_OF_ENROLMENT FROM (SELECT e.ID, e.DEVICE_ID, e.OWNER, e.OWNERSHIP, e.STATUS, " +
                                          "e.DATE_OF_ENROLMENT, e.DATE_OF_LAST_UPDATE FROM DM_ENROLMENT e WHERE TENANT_ID = ? " +
-                                         "AND STATUS = ?) e, DM_DEVICE d WHERE DEVICE_ID = e.DEVICE_ID AND d.TENANT_ID = ?");
+                                         "AND STATUS = ?) e, DM_DEVICE d, DM_DEVICE_TYPE t WHERE DEVICE_ID = e.DEVICE_ID " +
+                                         "AND d.DEVICE_TYPE_ID = t.ID AND d.TENANT_ID = ?");
             stmt.setInt(1, tenantId);
             stmt.setString(2, status.toString());
             stmt.setInt(3, tenantId);

From 5a4231485569683e6fb4d6b8b1198b3b32467745 Mon Sep 17 00:00:00 2001
From: milanperera <milanharindu.ucsc@gmail.com>
Date: Thu, 16 Jul 2015 19:58:13 +0530
Subject: [PATCH 3/4] Added dynamic-client-authentication-feature

---
 carbon-devicemgt.ids                          | 197 ++++++++++++++++++
 .../pom.xml                                   | 154 ++++++++++++++
 .../src/main/resources/p2.inf                 |   2 +
 features/oauth-extensions/pom.xml             |  42 ++++
 pom.xml                                       |   1 +
 5 files changed, 396 insertions(+)
 create mode 100644 carbon-devicemgt.ids
 create mode 100644 features/oauth-extensions/org.wso2.carbon.oauth.extensions.server.feature/pom.xml
 create mode 100644 features/oauth-extensions/org.wso2.carbon.oauth.extensions.server.feature/src/main/resources/p2.inf
 create mode 100644 features/oauth-extensions/pom.xml

diff --git a/carbon-devicemgt.ids b/carbon-devicemgt.ids
new file mode 100644
index 00000000000..d0219166cff
--- /dev/null
+++ b/carbon-devicemgt.ids
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component name="dataSourceStorage">
+  <data-source name="H2 - WSO2DM_DB" uuid="562f415f-d769-4aec-b5fb-5da676b56f37">
+    <database-info product="H2" version="1.3.176 (2014-04-05)" jdbc-version="4.0" driver-name="H2 JDBC Driver" driver-version="1.3.176 (2014-04-05)">
+      <identifier-quote-string>&quot;</identifier-quote-string>
+    </database-info>
+    <case-sensitivity plain-identifiers="upper" quoted-identifiers="exact"/>
+    <schema name="PUBLIC" catalog="WSO2DM_DB"/>
+    <table name="DM_COMMAND_OPERATION" schema="PUBLIC" catalog="WSO2DM_DB" type="TABLE">
+      <column name="OPERATION_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
+      <column name="ENABLED" sqlType="BOOLEAN" precision="1" scale="0" nullable="false" jdbcType="16" def="RkFMU0U="/>
+      <primary-key name="CONSTRAINT_2" columns="OPERATION_ID"/>
+      <foreign-key name="FK_DM_OPERATION_COMMAND" columns="OPERATION_ID" ref-table="DM_OPERATION" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="1" deferrability="2"/>
+    </table>
+    <table name="DM_CONFIG_OPERATION" schema="PUBLIC" catalog="WSO2DM_DB" type="TABLE">
+      <column name="OPERATION_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
+      <primary-key name="CONSTRAINT_A" columns="OPERATION_ID"/>
+      <foreign-key name="FK_DM_OPERATION_CONFIG" columns="OPERATION_ID" ref-table="DM_OPERATION" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="1" deferrability="2"/>
+    </table>
+    <table name="DM_CRITERIA" schema="PUBLIC" catalog="WSO2DM_DB" type="TABLE">
+      <column name="ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4" def="KE5FWFQgVkFMVUUgRk9SIFBVQkxJQy5TWVNURU1fU0VRVUVOQ0VfQTEzQjM2M0FfNEFFOV80OEZEXzg5MENfNDBDQjI4RjI5ODE1KQ==" autoIncrement="true"/>
+      <column name="TENANT_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
+      <column name="NAME" sqlType="VARCHAR" precision="50" scale="0" nullable="true" jdbcType="12"/>
+      <primary-key name="CONSTRAINT_AF" columns="ID"/>
+      <exported-key name="FK_CRITERIA_POLICY_CRITERIA" table="DM_POLICY_CRITERIA" schema="PUBLIC" catalog="WSO2DM_DB" columns="CRITERIA_ID"/>
+    </table>
+    <table name="DM_DEVICE" schema="PUBLIC" catalog="WSO2DM_DB" type="TABLE">
+      <column name="ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4" def="KE5FWFQgVkFMVUUgRk9SIFBVQkxJQy5TWVNURU1fU0VRVUVOQ0VfMzlFRjdDQTlfNzkxMV80RjFGX0E1M0ZfNzUwMzFGRjYyMjdGKQ==" autoIncrement="true"/>
+      <column name="DESCRIPTION" sqlType="CLOB" precision="2147483647" scale="0" nullable="true" jdbcType="2005" def="J05VTEwn"/>
+      <column name="NAME" sqlType="VARCHAR" precision="100" scale="0" nullable="true" jdbcType="12" def="J05VTEwn"/>
+      <column name="DATE_OF_ENROLLMENT" sqlType="BIGINT" precision="19" scale="0" nullable="true" jdbcType="-5" def="TlVMTA=="/>
+      <column name="DATE_OF_LAST_UPDATE" sqlType="BIGINT" precision="19" scale="0" nullable="true" jdbcType="-5" def="TlVMTA=="/>
+      <column name="OWNERSHIP" sqlType="VARCHAR" precision="45" scale="0" nullable="true" jdbcType="12" def="J05VTEwn"/>
+      <column name="STATUS" sqlType="VARCHAR" precision="15" scale="0" nullable="true" jdbcType="12" def="J05VTEwn"/>
+      <column name="DEVICE_TYPE_ID" sqlType="INTEGER" precision="10" scale="0" nullable="true" jdbcType="4" def="TlVMTA=="/>
+      <column name="DEVICE_IDENTIFICATION" sqlType="VARCHAR" precision="300" scale="0" nullable="true" jdbcType="12" def="J05VTEwn"/>
+      <column name="OWNER" sqlType="VARCHAR" precision="45" scale="0" nullable="true" jdbcType="12" def="J05VTEwn"/>
+      <column name="TENANT_ID" sqlType="INTEGER" precision="10" scale="0" nullable="true" jdbcType="4" def="MA=="/>
+      <primary-key name="CONSTRAINT_BA" columns="ID"/>
+      <foreign-key name="FK_DM_DEVICE_DM_DEVICE_TYPE2" columns="DEVICE_TYPE_ID" ref-table="DM_DEVICE_TYPE" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="1" deferrability="2"/>
+      <exported-key name="FK_DM_DEVICE_OPERATION_MAPPING_DEVICE" table="DM_DEVICE_OPERATION_MAPPING" schema="PUBLIC" catalog="WSO2DM_DB" columns="DEVICE_ID"/>
+      <exported-key name="FK_DEVICE_DEVICE_POLICY" table="DM_DEVICE_POLICY" schema="PUBLIC" catalog="WSO2DM_DB" columns="DEVICE_ID"/>
+      <exported-key name="FK_DM_POLICY_DEVCIE_APPLIED" table="DM_DEVICE_POLICY_APPLIED" schema="PUBLIC" catalog="WSO2DM_DB" columns="DEVICE_ID"/>
+      <index name="FK_DM_DEVICE_DM_DEVICE_TYPE2_INDEX_B" unique="false" columns="DEVICE_TYPE_ID"/>
+    </table>
+    <table name="DM_DEVICE_OPERATION_MAPPING" schema="PUBLIC" catalog="WSO2DM_DB" type="TABLE">
+      <column name="ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4" def="KE5FWFQgVkFMVUUgRk9SIFBVQkxJQy5TWVNURU1fU0VRVUVOQ0VfMzE0RDA2RUJfN0I4RV80Njk4Xzg4MDJfQjgxMTJDRkNGMzU1KQ==" autoIncrement="true"/>
+      <column name="DEVICE_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
+      <column name="OPERATION_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
+      <primary-key name="CONSTRAINT_85" columns="ID"/>
+      <foreign-key name="FK_DM_DEVICE_OPERATION_MAPPING_DEVICE" columns="DEVICE_ID" ref-table="DM_DEVICE" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="1" deferrability="2"/>
+      <foreign-key name="FK_DM_DEVICE_OPERATION_MAPPING_OPERATION" columns="OPERATION_ID" ref-table="DM_OPERATION" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="1" deferrability="2"/>
+      <index name="FK_DM_DEVICE_OPERATION_MAPPING_DEVICE_INDEX_8" unique="false" columns="DEVICE_ID"/>
+      <index name="FK_DM_DEVICE_OPERATION_MAPPING_OPERATION_INDEX_8" unique="false" columns="OPERATION_ID"/>
+    </table>
+    <table name="DM_DEVICE_POLICY" schema="PUBLIC" catalog="WSO2DM_DB" type="TABLE">
+      <column name="ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4" def="KE5FWFQgVkFMVUUgRk9SIFBVQkxJQy5TWVNURU1fU0VRVUVOQ0VfMTY3NzEyNERfQjcxQl80OEMzXzg2NUNfNzg0NkUwNzc0RkE3KQ==" autoIncrement="true"/>
+      <column name="DEVICE_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
+      <column name="POLICY_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
+      <primary-key name="CONSTRAINT_D" columns="ID"/>
+      <foreign-key name="FK_DEVICE_DEVICE_POLICY" columns="DEVICE_ID" ref-table="DM_DEVICE" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="1" deferrability="2"/>
+      <foreign-key name="FK_POLICY_DEVICE_POLICY" columns="POLICY_ID" ref-table="DM_POLICY" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="1" deferrability="2"/>
+      <index name="FK_DEVICE_DEVICE_POLICY_INDEX_D" unique="false" columns="DEVICE_ID"/>
+      <index name="FK_POLICY_DEVICE_POLICY_INDEX_D" unique="false" columns="POLICY_ID"/>
+    </table>
+    <table name="DM_DEVICE_POLICY_APPLIED" schema="PUBLIC" catalog="WSO2DM_DB" type="TABLE">
+      <column name="ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4" def="KE5FWFQgVkFMVUUgRk9SIFBVQkxJQy5TWVNURU1fU0VRVUVOQ0VfOTIxN0VBQzNfMTEwQ180MjUwXzg0RkVfNjg4QTdCRjY4NDg1KQ==" autoIncrement="true"/>
+      <column name="DEVICE_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
+      <column name="POLICY_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
+      <column name="POLICY_CONTENT" sqlType="BLOB" precision="2147483647" scale="0" nullable="true" jdbcType="2004"/>
+      <column name="APPLIED" sqlType="TINYINT" precision="3" scale="0" nullable="true" jdbcType="-6"/>
+      <column name="CREATED_TIME" sqlType="TIMESTAMP" precision="23" scale="10" nullable="true" jdbcType="93"/>
+      <column name="UPDATED_TIME" sqlType="TIMESTAMP" precision="23" scale="10" nullable="true" jdbcType="93"/>
+      <column name="APPLIED_TIME" sqlType="TIMESTAMP" precision="23" scale="10" nullable="true" jdbcType="93"/>
+      <primary-key name="CONSTRAINT_4B" columns="ID"/>
+      <foreign-key name="FK_DM_POLICY_DEVCIE_APPLIED" columns="DEVICE_ID" ref-table="DM_DEVICE" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="1" deferrability="2"/>
+      <foreign-key name="FK_DM_POLICY_DEVICE_APPLIED_POLICY" columns="POLICY_ID" ref-table="DM_POLICY" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="1" deferrability="2"/>
+      <index name="FK_DM_POLICY_DEVCIE_APPLIED_INDEX_4" unique="false" columns="DEVICE_ID"/>
+      <index name="FK_DM_POLICY_DEVICE_APPLIED_POLICY_INDEX_4" unique="false" columns="POLICY_ID"/>
+    </table>
+    <table name="DM_DEVICE_TYPE" schema="PUBLIC" catalog="WSO2DM_DB" type="TABLE">
+      <column name="ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4" def="KE5FWFQgVkFMVUUgRk9SIFBVQkxJQy5TWVNURU1fU0VRVUVOQ0VfMUZGMjk1RUNfMjUxM180ODI0XzlFQkRfRTkzQUE2ODE1NjIwKQ==" autoIncrement="true"/>
+      <column name="NAME" sqlType="VARCHAR" precision="300" scale="0" nullable="true" jdbcType="12" def="J05VTEwn"/>
+      <primary-key name="CONSTRAINT_B" columns="ID"/>
+      <exported-key name="FK_DM_DEVICE_DM_DEVICE_TYPE2" table="DM_DEVICE" schema="PUBLIC" catalog="WSO2DM_DB" columns="DEVICE_TYPE_ID"/>
+      <exported-key name="FK_DEVICE_TYPE_POLICY_DEVICE_TYPE" table="DM_DEVICE_TYPE_POLICY" schema="PUBLIC" catalog="WSO2DM_DB" columns="DEVICE_TYPE_ID"/>
+      <exported-key name="DM_PROFILE_DEVICE_TYPE" table="DM_PROFILE" schema="PUBLIC" catalog="WSO2DM_DB" columns="DEVICE_TYPE_ID"/>
+    </table>
+    <table name="DM_DEVICE_TYPE_POLICY" schema="PUBLIC" catalog="WSO2DM_DB" type="TABLE">
+      <column name="ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
+      <column name="DEVICE_TYPE_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
+      <column name="POLICY_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
+      <primary-key name="CONSTRAINT_3" columns="ID"/>
+      <foreign-key name="FK_DEVICE_TYPE_POLICY_DEVICE_TYPE" columns="DEVICE_TYPE_ID" ref-table="DM_DEVICE_TYPE" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="1" deferrability="2"/>
+      <foreign-key name="FK_DEVICE_TYPE_POLICY" columns="POLICY_ID" ref-table="DM_POLICY" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="1" deferrability="2"/>
+      <index name="FK_DEVICE_TYPE_POLICY_DEVICE_TYPE_INDEX_3" unique="false" columns="DEVICE_TYPE_ID"/>
+      <index name="FK_DEVICE_TYPE_POLICY_INDEX_3" unique="false" columns="POLICY_ID"/>
+    </table>
+    <table name="DM_OPERATION" schema="PUBLIC" catalog="WSO2DM_DB" type="TABLE">
+      <column name="ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4" def="KE5FWFQgVkFMVUUgRk9SIFBVQkxJQy5TWVNURU1fU0VRVUVOQ0VfRkQ5ODgxQzhfN0YyRV80QUY5XzhCODRfMkMyRTA4NDU2Njg0KQ==" autoIncrement="true"/>
+      <column name="TYPE" sqlType="VARCHAR" precision="50" scale="0" nullable="false" jdbcType="12"/>
+      <column name="CREATED_TIMESTAMP" sqlType="TIMESTAMP" precision="23" scale="10" nullable="false" jdbcType="93"/>
+      <column name="RECEIVED_TIMESTAMP" sqlType="TIMESTAMP" precision="23" scale="10" nullable="true" jdbcType="93"/>
+      <column name="STATUS" sqlType="VARCHAR" precision="50" scale="0" nullable="true" jdbcType="12"/>
+      <column name="OPERATION_CODE" sqlType="VARCHAR" precision="1000" scale="0" nullable="false" jdbcType="12"/>
+      <primary-key name="CONSTRAINT_8" columns="ID"/>
+      <exported-key name="FK_DM_OPERATION_COMMAND" table="DM_COMMAND_OPERATION" schema="PUBLIC" catalog="WSO2DM_DB" columns="OPERATION_ID"/>
+      <exported-key name="FK_DM_OPERATION_CONFIG" table="DM_CONFIG_OPERATION" schema="PUBLIC" catalog="WSO2DM_DB" columns="OPERATION_ID"/>
+      <exported-key name="FK_DM_DEVICE_OPERATION_MAPPING_OPERATION" table="DM_DEVICE_OPERATION_MAPPING" schema="PUBLIC" catalog="WSO2DM_DB" columns="OPERATION_ID"/>
+      <exported-key name="FK_DM_OPERATION_PROFILE" table="DM_PROFILE_OPERATION" schema="PUBLIC" catalog="WSO2DM_DB" columns="OPERATION_ID"/>
+    </table>
+    <table name="DM_POLICY" schema="PUBLIC" catalog="WSO2DM_DB" type="TABLE">
+      <column name="ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4" def="KE5FWFQgVkFMVUUgRk9SIFBVQkxJQy5TWVNURU1fU0VRVUVOQ0VfODU0QjZEQzZfM0M1Rl80NTdBX0E2QTVfMTQ0RDIzMkRBMkM1KQ==" autoIncrement="true"/>
+      <column name="NAME" sqlType="VARCHAR" precision="45" scale="0" nullable="true" jdbcType="12" def="J05VTEwn"/>
+      <column name="TENANT_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
+      <column name="PROFILE_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
+      <column name="COMPLIANCE" sqlType="VARCHAR" precision="100" scale="0" nullable="true" jdbcType="12"/>
+      <column name="PRIORITY" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
+      <primary-key name="CONSTRAINT_C" columns="ID"/>
+      <foreign-key name="FK_DM_PROFILE_DM_POLICY" columns="PROFILE_ID" ref-table="DM_PROFILE" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="1" deferrability="2"/>
+      <exported-key name="FK_POLICY_DEVICE_POLICY" table="DM_DEVICE_POLICY" schema="PUBLIC" catalog="WSO2DM_DB" columns="POLICY_ID"/>
+      <exported-key name="FK_DM_POLICY_DEVICE_APPLIED_POLICY" table="DM_DEVICE_POLICY_APPLIED" schema="PUBLIC" catalog="WSO2DM_DB" columns="POLICY_ID"/>
+      <exported-key name="FK_DEVICE_TYPE_POLICY" table="DM_DEVICE_TYPE_POLICY" schema="PUBLIC" catalog="WSO2DM_DB" columns="POLICY_ID"/>
+      <exported-key name="FK_POLICY_POLICY_CRITERIA" table="DM_POLICY_CRITERIA" schema="PUBLIC" catalog="WSO2DM_DB" columns="POLICY_ID"/>
+      <exported-key name="FK_ROLE_POLICY_POLICY" table="DM_ROLE_POLICY" schema="PUBLIC" catalog="WSO2DM_DB" columns="POLICY_ID"/>
+      <exported-key name="DM_POLICY_USER_POLICY" table="DM_USER_POLICY" schema="PUBLIC" catalog="WSO2DM_DB" columns="POLICY_ID"/>
+      <index name="FK_DM_PROFILE_DM_POLICY_INDEX_C" unique="false" columns="PROFILE_ID"/>
+    </table>
+    <table name="DM_POLICY_CRITERIA" schema="PUBLIC" catalog="WSO2DM_DB" type="TABLE">
+      <column name="ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4" def="KE5FWFQgVkFMVUUgRk9SIFBVQkxJQy5TWVNURU1fU0VRVUVOQ0VfOTA5N0U4NUFfQjQ3N180QkUxX0ExMDJfMzk4MzM5MkMxNENFKQ==" autoIncrement="true"/>
+      <column name="CRITERIA_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
+      <column name="POLICY_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
+      <primary-key name="CONSTRAINT_855" columns="ID"/>
+      <foreign-key name="FK_CRITERIA_POLICY_CRITERIA" columns="CRITERIA_ID" ref-table="DM_CRITERIA" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="1" deferrability="2"/>
+      <foreign-key name="FK_POLICY_POLICY_CRITERIA" columns="POLICY_ID" ref-table="DM_POLICY" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="1" deferrability="2"/>
+      <exported-key name="FK_POLICY_CRITERIA_PROPERTIES" table="DM_POLICY_CRITERIA_PROPERTIES" schema="PUBLIC" catalog="WSO2DM_DB" columns="POLICY_CRITERION_ID"/>
+      <index name="FK_CRITERIA_POLICY_CRITERIA_INDEX_8" unique="false" columns="CRITERIA_ID"/>
+      <index name="FK_POLICY_POLICY_CRITERIA_INDEX_8" unique="false" columns="POLICY_ID"/>
+    </table>
+    <table name="DM_POLICY_CRITERIA_PROPERTIES" schema="PUBLIC" catalog="WSO2DM_DB" type="TABLE">
+      <column name="ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4" def="KE5FWFQgVkFMVUUgRk9SIFBVQkxJQy5TWVNURU1fU0VRVUVOQ0VfRTQ3RTA2OUVfQzc2N180NTBEXzk2QjlfRjY1RjM1QjVCNzlEKQ==" autoIncrement="true"/>
+      <column name="POLICY_CRITERION_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
+      <column name="PROP_KEY" sqlType="VARCHAR" precision="45" scale="0" nullable="true" jdbcType="12"/>
+      <column name="PROP_VALUE" sqlType="VARCHAR" precision="100" scale="0" nullable="true" jdbcType="12"/>
+      <column name="CONTENT" sqlType="BLOB" precision="2147483647" scale="0" nullable="true" jdbcType="2004" remarks="VGhpcyBpcyB1c2VkIHRvIA=="/>
+      <primary-key name="CONSTRAINT_DB" columns="ID"/>
+      <foreign-key name="FK_POLICY_CRITERIA_PROPERTIES" columns="POLICY_CRITERION_ID" ref-table="DM_POLICY_CRITERIA" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="0" deferrability="2"/>
+      <index name="FK_POLICY_CRITERIA_PROPERTIES_INDEX_D" unique="false" columns="POLICY_CRITERION_ID"/>
+    </table>
+    <table name="DM_PROFILE" schema="PUBLIC" catalog="WSO2DM_DB" type="TABLE">
+      <column name="ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4" def="KE5FWFQgVkFMVUUgRk9SIFBVQkxJQy5TWVNURU1fU0VRVUVOQ0VfNjU5NjdFNjVfRjQ0RV80OTY2XzlBNzRfRkUyQzYxQUFENEVEKQ==" autoIncrement="true"/>
+      <column name="PROFILE_NAME" sqlType="VARCHAR" precision="45" scale="0" nullable="false" jdbcType="12"/>
+      <column name="TENANT_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
+      <column name="DEVICE_TYPE_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
+      <column name="CREATED_TIME" sqlType="TIMESTAMP" precision="23" scale="10" nullable="false" jdbcType="93"/>
+      <column name="UPDATED_TIME" sqlType="TIMESTAMP" precision="23" scale="10" nullable="false" jdbcType="93"/>
+      <primary-key name="CONSTRAINT_21" columns="ID"/>
+      <foreign-key name="DM_PROFILE_DEVICE_TYPE" columns="DEVICE_TYPE_ID" ref-table="DM_DEVICE_TYPE" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="1" deferrability="2"/>
+      <exported-key name="FK_DM_PROFILE_DM_POLICY" table="DM_POLICY" schema="PUBLIC" catalog="WSO2DM_DB" columns="PROFILE_ID"/>
+      <exported-key name="FK_DM_PROFILE_DM_POLICY_FEATURES" table="DM_PROFILE_FEATURES" schema="PUBLIC" catalog="WSO2DM_DB" columns="PROFILE_ID"/>
+      <index name="DM_PROFILE_DEVICE_TYPE_INDEX_2" unique="false" columns="DEVICE_TYPE_ID"/>
+    </table>
+    <table name="DM_PROFILE_FEATURES" schema="PUBLIC" catalog="WSO2DM_DB" type="TABLE">
+      <column name="ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4" def="KE5FWFQgVkFMVUUgRk9SIFBVQkxJQy5TWVNURU1fU0VRVUVOQ0VfMTY3QzAyQjZfRTg1Ml80RUFFXzlCNTVfOUY2NzUyN0U5NUIyKQ==" autoIncrement="true"/>
+      <column name="PROFILE_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
+      <column name="FEATURE_CODE" sqlType="VARCHAR" precision="30" scale="0" nullable="false" jdbcType="12"/>
+      <column name="DEVICE_TYPE_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
+      <column name="CONTENT" sqlType="BLOB" precision="2147483647" scale="0" nullable="true" jdbcType="2004" def="TlVMTA=="/>
+      <primary-key name="CONSTRAINT_4" columns="ID"/>
+      <foreign-key name="FK_DM_PROFILE_DM_POLICY_FEATURES" columns="PROFILE_ID" ref-table="DM_PROFILE" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="1" deferrability="2"/>
+      <index name="FK_DM_PROFILE_DM_POLICY_FEATURES_INDEX_4" unique="false" columns="PROFILE_ID"/>
+    </table>
+    <table name="DM_PROFILE_OPERATION" schema="PUBLIC" catalog="WSO2DM_DB" type="TABLE">
+      <column name="OPERATION_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
+      <column name="ENABLED" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4" def="MA=="/>
+      <column name="OPERATION_DETAILS" sqlType="BLOB" precision="2147483647" scale="0" nullable="true" jdbcType="2004" def="TlVMTA=="/>
+      <primary-key name="CONSTRAINT_6" columns="OPERATION_ID"/>
+      <foreign-key name="FK_DM_OPERATION_PROFILE" columns="OPERATION_ID" ref-table="DM_OPERATION" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="1" deferrability="2"/>
+    </table>
+    <table name="DM_ROLE_POLICY" schema="PUBLIC" catalog="WSO2DM_DB" type="TABLE">
+      <column name="ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4" def="KE5FWFQgVkFMVUUgRk9SIFBVQkxJQy5TWVNURU1fU0VRVUVOQ0VfRDZCRENDRENfMTgzMF80MUFFXzlFQjVfRkJDNEU2NUJBQjhDKQ==" autoIncrement="true"/>
+      <column name="ROLE_NAME" sqlType="VARCHAR" precision="45" scale="0" nullable="false" jdbcType="12"/>
+      <column name="POLICY_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
+      <primary-key name="CONSTRAINT_DD" columns="ID"/>
+      <foreign-key name="FK_ROLE_POLICY_POLICY" columns="POLICY_ID" ref-table="DM_POLICY" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="1" deferrability="2"/>
+      <index name="FK_ROLE_POLICY_POLICY_INDEX_D" unique="false" columns="POLICY_ID"/>
+    </table>
+    <table name="DM_USER_POLICY" schema="PUBLIC" catalog="WSO2DM_DB" type="TABLE">
+      <column name="ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4" def="KE5FWFQgVkFMVUUgRk9SIFBVQkxJQy5TWVNURU1fU0VRVUVOQ0VfMzREQTYxMTFfRUVCQV80MDUyXzg4REZfOUZERjRDQzVFRTJCKQ==" autoIncrement="true"/>
+      <column name="POLICY_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
+      <column name="USERNAME" sqlType="VARCHAR" precision="45" scale="0" nullable="false" jdbcType="12"/>
+      <primary-key name="CONSTRAINT_A6" columns="ID"/>
+      <foreign-key name="DM_POLICY_USER_POLICY" columns="POLICY_ID" ref-table="DM_POLICY" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="1" deferrability="2"/>
+      <index name="DM_POLICY_USER_POLICY_INDEX_A" unique="false" columns="POLICY_ID"/>
+    </table>
+  </data-source>
+</component>
\ No newline at end of file
diff --git a/features/oauth-extensions/org.wso2.carbon.oauth.extensions.server.feature/pom.xml b/features/oauth-extensions/org.wso2.carbon.oauth.extensions.server.feature/pom.xml
new file mode 100644
index 00000000000..a20ebb17c68
--- /dev/null
+++ b/features/oauth-extensions/org.wso2.carbon.oauth.extensions.server.feature/pom.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ 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.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <parent>
+        <groupId>org.wso2.carbon.devicemgt</groupId>
+        <artifactId>oauth-extentions-feature</artifactId>
+        <version>0.9.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.wso2.carbon.oauth.extensions.server.feature</artifactId>
+    <packaging>pom</packaging>
+    <version>0.9.2-SNAPSHOT</version>
+    <name>WSO2 Carbon - Oauth Extensions Server Feature</name>
+    <url>http://wso2.org</url>
+    <description>This feature contains oauth functionality
+    </description>
+
+    <!--<dependencies>-->
+
+        <!--<dependency>-->
+            <!--<groupId>org.wso2.mdm</groupId>-->
+            <!--<artifactId>dynamic-client-manager</artifactId>-->
+        <!--</dependency>-->
+    <!--</dependencies>-->
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>src/main/resources</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>resources</directory>
+                                    <includes>
+                                        <include>build.properties</include>
+                                        <include>p2.inf</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.4</version>
+                <executions>
+                    <execution>
+                        <id>copy</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.wso2.mdm</groupId>
+                                    <artifactId>dynamic-client-manager</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>war</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${basedir}/src/main/resources/</outputDirectory>
+                                    <destFileName>dynamic-client-manager.war</destFileName>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+
+
+            <plugin>
+                <groupId>org.wso2.maven</groupId>
+                <artifactId>carbon-p2-plugin</artifactId>
+                <version>${carbon.p2.plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>p2-feature-generation</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>p2-feature-gen</goal>
+                        </goals>
+                        <configuration>
+                            <id>org.wso2.carbon.oauth.extensions.server</id>
+                            <propertiesFile>../../../features/etc/feature.properties</propertiesFile>
+                            <adviceFile>
+                                <properties>
+                                    <propertyDef>org.wso2.carbon.p2.category.type:server</propertyDef>
+                                    <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef>
+                                </properties>
+                            </adviceFile>
+                            <!--<bundles>-->
+                                <!--<bundleDef>-->
+                                    <!--org.wso2.carbon.devicemgt:org.wso2.carbon.policy.mgt.core:${carbon.device.mgt.version}-->
+                                <!--</bundleDef>-->
+                                <!--<bundleDef>-->
+                                    <!--org.wso2.carbon.devicemgt:org.wso2.carbon.policy.mgt.common:${carbon.device.mgt.version}-->
+                                <!--</bundleDef>-->
+                                <!--<bundleDef>-->
+                                    <!--org.wso2.carbon.devicemgt:org.wso2.carbon.simple.policy.decision.point:${carbon.device.mgt.version}-->
+                                <!--</bundleDef>-->
+                                <!--<bundleDef>-->
+                                    <!--org.wso2.carbon.devicemgt:org.wso2.carbon.policy.information.point:${carbon.device.mgt.version}-->
+                                <!--</bundleDef>-->
+                            <!--</bundles>-->
+                            <importFeatures>
+                                <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
+                                </importFeatureDef>
+                            </importFeatures>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+
+
+
+        </plugins>
+    </build>
+</project>
diff --git a/features/oauth-extensions/org.wso2.carbon.oauth.extensions.server.feature/src/main/resources/p2.inf b/features/oauth-extensions/org.wso2.carbon.oauth.extensions.server.feature/src/main/resources/p2.inf
new file mode 100644
index 00000000000..3143c5e9dfb
--- /dev/null
+++ b/features/oauth-extensions/org.wso2.carbon.oauth.extensions.server.feature/src/main/resources/p2.inf
@@ -0,0 +1,2 @@
+instructions.configure = \
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.oauth.extensions.server_${feature.version}/dynamic-client-manager.war,target:${installFolder}/../../deployment/server/webapps/dynamic-client-manager.war,overwrite:true);\
\ No newline at end of file
diff --git a/features/oauth-extensions/pom.xml b/features/oauth-extensions/pom.xml
new file mode 100644
index 00000000000..87ed9a7ef07
--- /dev/null
+++ b/features/oauth-extensions/pom.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ 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.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <parent>
+        <groupId>org.wso2.carbon.devicemgt</groupId>
+        <artifactId>carbon-devicemgt</artifactId>
+        <version>0.9.2-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.wso2.carbon.devicemgt</groupId>
+    <artifactId>oauth-extentions-feature</artifactId>
+    <version>0.9.2-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>WSO2 Carbon - Policy Management Feature</name>
+    <url>http://wso2.org</url>
+
+    <modules>
+        <module>org.wso2.carbon.oauth.extensions.server.feature</module>
+    </modules>
+
+</project>
diff --git a/pom.xml b/pom.xml
index f31068a4572..ffd4eda2ebe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,7 @@
         <module>features/device-mgt</module>
         <module>features/policy-mgt</module>
         <module>features/webapp-authenticator-framework</module>
+        <module>features/oauth-extensions</module>
     </modules>
 
     <dependencyManagement>

From f20037432075d5dfca0893b9bd48cec9c46655a1 Mon Sep 17 00:00:00 2001
From: milanperera <milanharindu.ucsc@gmail.com>
Date: Thu, 16 Jul 2015 20:05:09 +0530
Subject: [PATCH 4/4] removing ids

---
 carbon-devicemgt.ids | 197 -------------------------------------------
 1 file changed, 197 deletions(-)
 delete mode 100644 carbon-devicemgt.ids

diff --git a/carbon-devicemgt.ids b/carbon-devicemgt.ids
deleted file mode 100644
index d0219166cff..00000000000
--- a/carbon-devicemgt.ids
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component name="dataSourceStorage">
-  <data-source name="H2 - WSO2DM_DB" uuid="562f415f-d769-4aec-b5fb-5da676b56f37">
-    <database-info product="H2" version="1.3.176 (2014-04-05)" jdbc-version="4.0" driver-name="H2 JDBC Driver" driver-version="1.3.176 (2014-04-05)">
-      <identifier-quote-string>&quot;</identifier-quote-string>
-    </database-info>
-    <case-sensitivity plain-identifiers="upper" quoted-identifiers="exact"/>
-    <schema name="PUBLIC" catalog="WSO2DM_DB"/>
-    <table name="DM_COMMAND_OPERATION" schema="PUBLIC" catalog="WSO2DM_DB" type="TABLE">
-      <column name="OPERATION_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
-      <column name="ENABLED" sqlType="BOOLEAN" precision="1" scale="0" nullable="false" jdbcType="16" def="RkFMU0U="/>
-      <primary-key name="CONSTRAINT_2" columns="OPERATION_ID"/>
-      <foreign-key name="FK_DM_OPERATION_COMMAND" columns="OPERATION_ID" ref-table="DM_OPERATION" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="1" deferrability="2"/>
-    </table>
-    <table name="DM_CONFIG_OPERATION" schema="PUBLIC" catalog="WSO2DM_DB" type="TABLE">
-      <column name="OPERATION_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
-      <primary-key name="CONSTRAINT_A" columns="OPERATION_ID"/>
-      <foreign-key name="FK_DM_OPERATION_CONFIG" columns="OPERATION_ID" ref-table="DM_OPERATION" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="1" deferrability="2"/>
-    </table>
-    <table name="DM_CRITERIA" schema="PUBLIC" catalog="WSO2DM_DB" type="TABLE">
-      <column name="ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4" def="KE5FWFQgVkFMVUUgRk9SIFBVQkxJQy5TWVNURU1fU0VRVUVOQ0VfQTEzQjM2M0FfNEFFOV80OEZEXzg5MENfNDBDQjI4RjI5ODE1KQ==" autoIncrement="true"/>
-      <column name="TENANT_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
-      <column name="NAME" sqlType="VARCHAR" precision="50" scale="0" nullable="true" jdbcType="12"/>
-      <primary-key name="CONSTRAINT_AF" columns="ID"/>
-      <exported-key name="FK_CRITERIA_POLICY_CRITERIA" table="DM_POLICY_CRITERIA" schema="PUBLIC" catalog="WSO2DM_DB" columns="CRITERIA_ID"/>
-    </table>
-    <table name="DM_DEVICE" schema="PUBLIC" catalog="WSO2DM_DB" type="TABLE">
-      <column name="ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4" def="KE5FWFQgVkFMVUUgRk9SIFBVQkxJQy5TWVNURU1fU0VRVUVOQ0VfMzlFRjdDQTlfNzkxMV80RjFGX0E1M0ZfNzUwMzFGRjYyMjdGKQ==" autoIncrement="true"/>
-      <column name="DESCRIPTION" sqlType="CLOB" precision="2147483647" scale="0" nullable="true" jdbcType="2005" def="J05VTEwn"/>
-      <column name="NAME" sqlType="VARCHAR" precision="100" scale="0" nullable="true" jdbcType="12" def="J05VTEwn"/>
-      <column name="DATE_OF_ENROLLMENT" sqlType="BIGINT" precision="19" scale="0" nullable="true" jdbcType="-5" def="TlVMTA=="/>
-      <column name="DATE_OF_LAST_UPDATE" sqlType="BIGINT" precision="19" scale="0" nullable="true" jdbcType="-5" def="TlVMTA=="/>
-      <column name="OWNERSHIP" sqlType="VARCHAR" precision="45" scale="0" nullable="true" jdbcType="12" def="J05VTEwn"/>
-      <column name="STATUS" sqlType="VARCHAR" precision="15" scale="0" nullable="true" jdbcType="12" def="J05VTEwn"/>
-      <column name="DEVICE_TYPE_ID" sqlType="INTEGER" precision="10" scale="0" nullable="true" jdbcType="4" def="TlVMTA=="/>
-      <column name="DEVICE_IDENTIFICATION" sqlType="VARCHAR" precision="300" scale="0" nullable="true" jdbcType="12" def="J05VTEwn"/>
-      <column name="OWNER" sqlType="VARCHAR" precision="45" scale="0" nullable="true" jdbcType="12" def="J05VTEwn"/>
-      <column name="TENANT_ID" sqlType="INTEGER" precision="10" scale="0" nullable="true" jdbcType="4" def="MA=="/>
-      <primary-key name="CONSTRAINT_BA" columns="ID"/>
-      <foreign-key name="FK_DM_DEVICE_DM_DEVICE_TYPE2" columns="DEVICE_TYPE_ID" ref-table="DM_DEVICE_TYPE" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="1" deferrability="2"/>
-      <exported-key name="FK_DM_DEVICE_OPERATION_MAPPING_DEVICE" table="DM_DEVICE_OPERATION_MAPPING" schema="PUBLIC" catalog="WSO2DM_DB" columns="DEVICE_ID"/>
-      <exported-key name="FK_DEVICE_DEVICE_POLICY" table="DM_DEVICE_POLICY" schema="PUBLIC" catalog="WSO2DM_DB" columns="DEVICE_ID"/>
-      <exported-key name="FK_DM_POLICY_DEVCIE_APPLIED" table="DM_DEVICE_POLICY_APPLIED" schema="PUBLIC" catalog="WSO2DM_DB" columns="DEVICE_ID"/>
-      <index name="FK_DM_DEVICE_DM_DEVICE_TYPE2_INDEX_B" unique="false" columns="DEVICE_TYPE_ID"/>
-    </table>
-    <table name="DM_DEVICE_OPERATION_MAPPING" schema="PUBLIC" catalog="WSO2DM_DB" type="TABLE">
-      <column name="ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4" def="KE5FWFQgVkFMVUUgRk9SIFBVQkxJQy5TWVNURU1fU0VRVUVOQ0VfMzE0RDA2RUJfN0I4RV80Njk4Xzg4MDJfQjgxMTJDRkNGMzU1KQ==" autoIncrement="true"/>
-      <column name="DEVICE_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
-      <column name="OPERATION_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
-      <primary-key name="CONSTRAINT_85" columns="ID"/>
-      <foreign-key name="FK_DM_DEVICE_OPERATION_MAPPING_DEVICE" columns="DEVICE_ID" ref-table="DM_DEVICE" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="1" deferrability="2"/>
-      <foreign-key name="FK_DM_DEVICE_OPERATION_MAPPING_OPERATION" columns="OPERATION_ID" ref-table="DM_OPERATION" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="1" deferrability="2"/>
-      <index name="FK_DM_DEVICE_OPERATION_MAPPING_DEVICE_INDEX_8" unique="false" columns="DEVICE_ID"/>
-      <index name="FK_DM_DEVICE_OPERATION_MAPPING_OPERATION_INDEX_8" unique="false" columns="OPERATION_ID"/>
-    </table>
-    <table name="DM_DEVICE_POLICY" schema="PUBLIC" catalog="WSO2DM_DB" type="TABLE">
-      <column name="ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4" def="KE5FWFQgVkFMVUUgRk9SIFBVQkxJQy5TWVNURU1fU0VRVUVOQ0VfMTY3NzEyNERfQjcxQl80OEMzXzg2NUNfNzg0NkUwNzc0RkE3KQ==" autoIncrement="true"/>
-      <column name="DEVICE_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
-      <column name="POLICY_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
-      <primary-key name="CONSTRAINT_D" columns="ID"/>
-      <foreign-key name="FK_DEVICE_DEVICE_POLICY" columns="DEVICE_ID" ref-table="DM_DEVICE" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="1" deferrability="2"/>
-      <foreign-key name="FK_POLICY_DEVICE_POLICY" columns="POLICY_ID" ref-table="DM_POLICY" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="1" deferrability="2"/>
-      <index name="FK_DEVICE_DEVICE_POLICY_INDEX_D" unique="false" columns="DEVICE_ID"/>
-      <index name="FK_POLICY_DEVICE_POLICY_INDEX_D" unique="false" columns="POLICY_ID"/>
-    </table>
-    <table name="DM_DEVICE_POLICY_APPLIED" schema="PUBLIC" catalog="WSO2DM_DB" type="TABLE">
-      <column name="ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4" def="KE5FWFQgVkFMVUUgRk9SIFBVQkxJQy5TWVNURU1fU0VRVUVOQ0VfOTIxN0VBQzNfMTEwQ180MjUwXzg0RkVfNjg4QTdCRjY4NDg1KQ==" autoIncrement="true"/>
-      <column name="DEVICE_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
-      <column name="POLICY_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
-      <column name="POLICY_CONTENT" sqlType="BLOB" precision="2147483647" scale="0" nullable="true" jdbcType="2004"/>
-      <column name="APPLIED" sqlType="TINYINT" precision="3" scale="0" nullable="true" jdbcType="-6"/>
-      <column name="CREATED_TIME" sqlType="TIMESTAMP" precision="23" scale="10" nullable="true" jdbcType="93"/>
-      <column name="UPDATED_TIME" sqlType="TIMESTAMP" precision="23" scale="10" nullable="true" jdbcType="93"/>
-      <column name="APPLIED_TIME" sqlType="TIMESTAMP" precision="23" scale="10" nullable="true" jdbcType="93"/>
-      <primary-key name="CONSTRAINT_4B" columns="ID"/>
-      <foreign-key name="FK_DM_POLICY_DEVCIE_APPLIED" columns="DEVICE_ID" ref-table="DM_DEVICE" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="1" deferrability="2"/>
-      <foreign-key name="FK_DM_POLICY_DEVICE_APPLIED_POLICY" columns="POLICY_ID" ref-table="DM_POLICY" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="1" deferrability="2"/>
-      <index name="FK_DM_POLICY_DEVCIE_APPLIED_INDEX_4" unique="false" columns="DEVICE_ID"/>
-      <index name="FK_DM_POLICY_DEVICE_APPLIED_POLICY_INDEX_4" unique="false" columns="POLICY_ID"/>
-    </table>
-    <table name="DM_DEVICE_TYPE" schema="PUBLIC" catalog="WSO2DM_DB" type="TABLE">
-      <column name="ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4" def="KE5FWFQgVkFMVUUgRk9SIFBVQkxJQy5TWVNURU1fU0VRVUVOQ0VfMUZGMjk1RUNfMjUxM180ODI0XzlFQkRfRTkzQUE2ODE1NjIwKQ==" autoIncrement="true"/>
-      <column name="NAME" sqlType="VARCHAR" precision="300" scale="0" nullable="true" jdbcType="12" def="J05VTEwn"/>
-      <primary-key name="CONSTRAINT_B" columns="ID"/>
-      <exported-key name="FK_DM_DEVICE_DM_DEVICE_TYPE2" table="DM_DEVICE" schema="PUBLIC" catalog="WSO2DM_DB" columns="DEVICE_TYPE_ID"/>
-      <exported-key name="FK_DEVICE_TYPE_POLICY_DEVICE_TYPE" table="DM_DEVICE_TYPE_POLICY" schema="PUBLIC" catalog="WSO2DM_DB" columns="DEVICE_TYPE_ID"/>
-      <exported-key name="DM_PROFILE_DEVICE_TYPE" table="DM_PROFILE" schema="PUBLIC" catalog="WSO2DM_DB" columns="DEVICE_TYPE_ID"/>
-    </table>
-    <table name="DM_DEVICE_TYPE_POLICY" schema="PUBLIC" catalog="WSO2DM_DB" type="TABLE">
-      <column name="ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
-      <column name="DEVICE_TYPE_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
-      <column name="POLICY_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
-      <primary-key name="CONSTRAINT_3" columns="ID"/>
-      <foreign-key name="FK_DEVICE_TYPE_POLICY_DEVICE_TYPE" columns="DEVICE_TYPE_ID" ref-table="DM_DEVICE_TYPE" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="1" deferrability="2"/>
-      <foreign-key name="FK_DEVICE_TYPE_POLICY" columns="POLICY_ID" ref-table="DM_POLICY" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="1" deferrability="2"/>
-      <index name="FK_DEVICE_TYPE_POLICY_DEVICE_TYPE_INDEX_3" unique="false" columns="DEVICE_TYPE_ID"/>
-      <index name="FK_DEVICE_TYPE_POLICY_INDEX_3" unique="false" columns="POLICY_ID"/>
-    </table>
-    <table name="DM_OPERATION" schema="PUBLIC" catalog="WSO2DM_DB" type="TABLE">
-      <column name="ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4" def="KE5FWFQgVkFMVUUgRk9SIFBVQkxJQy5TWVNURU1fU0VRVUVOQ0VfRkQ5ODgxQzhfN0YyRV80QUY5XzhCODRfMkMyRTA4NDU2Njg0KQ==" autoIncrement="true"/>
-      <column name="TYPE" sqlType="VARCHAR" precision="50" scale="0" nullable="false" jdbcType="12"/>
-      <column name="CREATED_TIMESTAMP" sqlType="TIMESTAMP" precision="23" scale="10" nullable="false" jdbcType="93"/>
-      <column name="RECEIVED_TIMESTAMP" sqlType="TIMESTAMP" precision="23" scale="10" nullable="true" jdbcType="93"/>
-      <column name="STATUS" sqlType="VARCHAR" precision="50" scale="0" nullable="true" jdbcType="12"/>
-      <column name="OPERATION_CODE" sqlType="VARCHAR" precision="1000" scale="0" nullable="false" jdbcType="12"/>
-      <primary-key name="CONSTRAINT_8" columns="ID"/>
-      <exported-key name="FK_DM_OPERATION_COMMAND" table="DM_COMMAND_OPERATION" schema="PUBLIC" catalog="WSO2DM_DB" columns="OPERATION_ID"/>
-      <exported-key name="FK_DM_OPERATION_CONFIG" table="DM_CONFIG_OPERATION" schema="PUBLIC" catalog="WSO2DM_DB" columns="OPERATION_ID"/>
-      <exported-key name="FK_DM_DEVICE_OPERATION_MAPPING_OPERATION" table="DM_DEVICE_OPERATION_MAPPING" schema="PUBLIC" catalog="WSO2DM_DB" columns="OPERATION_ID"/>
-      <exported-key name="FK_DM_OPERATION_PROFILE" table="DM_PROFILE_OPERATION" schema="PUBLIC" catalog="WSO2DM_DB" columns="OPERATION_ID"/>
-    </table>
-    <table name="DM_POLICY" schema="PUBLIC" catalog="WSO2DM_DB" type="TABLE">
-      <column name="ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4" def="KE5FWFQgVkFMVUUgRk9SIFBVQkxJQy5TWVNURU1fU0VRVUVOQ0VfODU0QjZEQzZfM0M1Rl80NTdBX0E2QTVfMTQ0RDIzMkRBMkM1KQ==" autoIncrement="true"/>
-      <column name="NAME" sqlType="VARCHAR" precision="45" scale="0" nullable="true" jdbcType="12" def="J05VTEwn"/>
-      <column name="TENANT_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
-      <column name="PROFILE_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
-      <column name="COMPLIANCE" sqlType="VARCHAR" precision="100" scale="0" nullable="true" jdbcType="12"/>
-      <column name="PRIORITY" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
-      <primary-key name="CONSTRAINT_C" columns="ID"/>
-      <foreign-key name="FK_DM_PROFILE_DM_POLICY" columns="PROFILE_ID" ref-table="DM_PROFILE" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="1" deferrability="2"/>
-      <exported-key name="FK_POLICY_DEVICE_POLICY" table="DM_DEVICE_POLICY" schema="PUBLIC" catalog="WSO2DM_DB" columns="POLICY_ID"/>
-      <exported-key name="FK_DM_POLICY_DEVICE_APPLIED_POLICY" table="DM_DEVICE_POLICY_APPLIED" schema="PUBLIC" catalog="WSO2DM_DB" columns="POLICY_ID"/>
-      <exported-key name="FK_DEVICE_TYPE_POLICY" table="DM_DEVICE_TYPE_POLICY" schema="PUBLIC" catalog="WSO2DM_DB" columns="POLICY_ID"/>
-      <exported-key name="FK_POLICY_POLICY_CRITERIA" table="DM_POLICY_CRITERIA" schema="PUBLIC" catalog="WSO2DM_DB" columns="POLICY_ID"/>
-      <exported-key name="FK_ROLE_POLICY_POLICY" table="DM_ROLE_POLICY" schema="PUBLIC" catalog="WSO2DM_DB" columns="POLICY_ID"/>
-      <exported-key name="DM_POLICY_USER_POLICY" table="DM_USER_POLICY" schema="PUBLIC" catalog="WSO2DM_DB" columns="POLICY_ID"/>
-      <index name="FK_DM_PROFILE_DM_POLICY_INDEX_C" unique="false" columns="PROFILE_ID"/>
-    </table>
-    <table name="DM_POLICY_CRITERIA" schema="PUBLIC" catalog="WSO2DM_DB" type="TABLE">
-      <column name="ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4" def="KE5FWFQgVkFMVUUgRk9SIFBVQkxJQy5TWVNURU1fU0VRVUVOQ0VfOTA5N0U4NUFfQjQ3N180QkUxX0ExMDJfMzk4MzM5MkMxNENFKQ==" autoIncrement="true"/>
-      <column name="CRITERIA_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
-      <column name="POLICY_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
-      <primary-key name="CONSTRAINT_855" columns="ID"/>
-      <foreign-key name="FK_CRITERIA_POLICY_CRITERIA" columns="CRITERIA_ID" ref-table="DM_CRITERIA" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="1" deferrability="2"/>
-      <foreign-key name="FK_POLICY_POLICY_CRITERIA" columns="POLICY_ID" ref-table="DM_POLICY" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="1" deferrability="2"/>
-      <exported-key name="FK_POLICY_CRITERIA_PROPERTIES" table="DM_POLICY_CRITERIA_PROPERTIES" schema="PUBLIC" catalog="WSO2DM_DB" columns="POLICY_CRITERION_ID"/>
-      <index name="FK_CRITERIA_POLICY_CRITERIA_INDEX_8" unique="false" columns="CRITERIA_ID"/>
-      <index name="FK_POLICY_POLICY_CRITERIA_INDEX_8" unique="false" columns="POLICY_ID"/>
-    </table>
-    <table name="DM_POLICY_CRITERIA_PROPERTIES" schema="PUBLIC" catalog="WSO2DM_DB" type="TABLE">
-      <column name="ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4" def="KE5FWFQgVkFMVUUgRk9SIFBVQkxJQy5TWVNURU1fU0VRVUVOQ0VfRTQ3RTA2OUVfQzc2N180NTBEXzk2QjlfRjY1RjM1QjVCNzlEKQ==" autoIncrement="true"/>
-      <column name="POLICY_CRITERION_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
-      <column name="PROP_KEY" sqlType="VARCHAR" precision="45" scale="0" nullable="true" jdbcType="12"/>
-      <column name="PROP_VALUE" sqlType="VARCHAR" precision="100" scale="0" nullable="true" jdbcType="12"/>
-      <column name="CONTENT" sqlType="BLOB" precision="2147483647" scale="0" nullable="true" jdbcType="2004" remarks="VGhpcyBpcyB1c2VkIHRvIA=="/>
-      <primary-key name="CONSTRAINT_DB" columns="ID"/>
-      <foreign-key name="FK_POLICY_CRITERIA_PROPERTIES" columns="POLICY_CRITERION_ID" ref-table="DM_POLICY_CRITERIA" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="0" deferrability="2"/>
-      <index name="FK_POLICY_CRITERIA_PROPERTIES_INDEX_D" unique="false" columns="POLICY_CRITERION_ID"/>
-    </table>
-    <table name="DM_PROFILE" schema="PUBLIC" catalog="WSO2DM_DB" type="TABLE">
-      <column name="ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4" def="KE5FWFQgVkFMVUUgRk9SIFBVQkxJQy5TWVNURU1fU0VRVUVOQ0VfNjU5NjdFNjVfRjQ0RV80OTY2XzlBNzRfRkUyQzYxQUFENEVEKQ==" autoIncrement="true"/>
-      <column name="PROFILE_NAME" sqlType="VARCHAR" precision="45" scale="0" nullable="false" jdbcType="12"/>
-      <column name="TENANT_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
-      <column name="DEVICE_TYPE_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
-      <column name="CREATED_TIME" sqlType="TIMESTAMP" precision="23" scale="10" nullable="false" jdbcType="93"/>
-      <column name="UPDATED_TIME" sqlType="TIMESTAMP" precision="23" scale="10" nullable="false" jdbcType="93"/>
-      <primary-key name="CONSTRAINT_21" columns="ID"/>
-      <foreign-key name="DM_PROFILE_DEVICE_TYPE" columns="DEVICE_TYPE_ID" ref-table="DM_DEVICE_TYPE" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="1" deferrability="2"/>
-      <exported-key name="FK_DM_PROFILE_DM_POLICY" table="DM_POLICY" schema="PUBLIC" catalog="WSO2DM_DB" columns="PROFILE_ID"/>
-      <exported-key name="FK_DM_PROFILE_DM_POLICY_FEATURES" table="DM_PROFILE_FEATURES" schema="PUBLIC" catalog="WSO2DM_DB" columns="PROFILE_ID"/>
-      <index name="DM_PROFILE_DEVICE_TYPE_INDEX_2" unique="false" columns="DEVICE_TYPE_ID"/>
-    </table>
-    <table name="DM_PROFILE_FEATURES" schema="PUBLIC" catalog="WSO2DM_DB" type="TABLE">
-      <column name="ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4" def="KE5FWFQgVkFMVUUgRk9SIFBVQkxJQy5TWVNURU1fU0VRVUVOQ0VfMTY3QzAyQjZfRTg1Ml80RUFFXzlCNTVfOUY2NzUyN0U5NUIyKQ==" autoIncrement="true"/>
-      <column name="PROFILE_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
-      <column name="FEATURE_CODE" sqlType="VARCHAR" precision="30" scale="0" nullable="false" jdbcType="12"/>
-      <column name="DEVICE_TYPE_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
-      <column name="CONTENT" sqlType="BLOB" precision="2147483647" scale="0" nullable="true" jdbcType="2004" def="TlVMTA=="/>
-      <primary-key name="CONSTRAINT_4" columns="ID"/>
-      <foreign-key name="FK_DM_PROFILE_DM_POLICY_FEATURES" columns="PROFILE_ID" ref-table="DM_PROFILE" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="1" deferrability="2"/>
-      <index name="FK_DM_PROFILE_DM_POLICY_FEATURES_INDEX_4" unique="false" columns="PROFILE_ID"/>
-    </table>
-    <table name="DM_PROFILE_OPERATION" schema="PUBLIC" catalog="WSO2DM_DB" type="TABLE">
-      <column name="OPERATION_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
-      <column name="ENABLED" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4" def="MA=="/>
-      <column name="OPERATION_DETAILS" sqlType="BLOB" precision="2147483647" scale="0" nullable="true" jdbcType="2004" def="TlVMTA=="/>
-      <primary-key name="CONSTRAINT_6" columns="OPERATION_ID"/>
-      <foreign-key name="FK_DM_OPERATION_PROFILE" columns="OPERATION_ID" ref-table="DM_OPERATION" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="1" deferrability="2"/>
-    </table>
-    <table name="DM_ROLE_POLICY" schema="PUBLIC" catalog="WSO2DM_DB" type="TABLE">
-      <column name="ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4" def="KE5FWFQgVkFMVUUgRk9SIFBVQkxJQy5TWVNURU1fU0VRVUVOQ0VfRDZCRENDRENfMTgzMF80MUFFXzlFQjVfRkJDNEU2NUJBQjhDKQ==" autoIncrement="true"/>
-      <column name="ROLE_NAME" sqlType="VARCHAR" precision="45" scale="0" nullable="false" jdbcType="12"/>
-      <column name="POLICY_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
-      <primary-key name="CONSTRAINT_DD" columns="ID"/>
-      <foreign-key name="FK_ROLE_POLICY_POLICY" columns="POLICY_ID" ref-table="DM_POLICY" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="1" deferrability="2"/>
-      <index name="FK_ROLE_POLICY_POLICY_INDEX_D" unique="false" columns="POLICY_ID"/>
-    </table>
-    <table name="DM_USER_POLICY" schema="PUBLIC" catalog="WSO2DM_DB" type="TABLE">
-      <column name="ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4" def="KE5FWFQgVkFMVUUgRk9SIFBVQkxJQy5TWVNURU1fU0VRVUVOQ0VfMzREQTYxMTFfRUVCQV80MDUyXzg4REZfOUZERjRDQzVFRTJCKQ==" autoIncrement="true"/>
-      <column name="POLICY_ID" sqlType="INTEGER" precision="10" scale="0" nullable="false" jdbcType="4"/>
-      <column name="USERNAME" sqlType="VARCHAR" precision="45" scale="0" nullable="false" jdbcType="12"/>
-      <primary-key name="CONSTRAINT_A6" columns="ID"/>
-      <foreign-key name="DM_POLICY_USER_POLICY" columns="POLICY_ID" ref-table="DM_POLICY" ref-schema="PUBLIC" ref-catalog="WSO2DM_DB" ref-columns="ID" update-rule="1" delete-rule="1" deferrability="2"/>
-      <index name="DM_POLICY_USER_POLICY_INDEX_A" unique="false" columns="POLICY_ID"/>
-    </table>
-  </data-source>
-</component>
\ No newline at end of file