Merged with master

components/identity-extensions/dynamic-client-registration/dynamic-client-web/pom.xml

@@ -63,8 +63,18 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.cxf</groupId>
+            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>cxf-rt-frontend-jaxws</artifactId>
+            <artifactId>axiom-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ws.commons.axiom</groupId>
+            <artifactId>axiom-impl</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ws.commons.axiom.wso2</groupId>
+            <artifactId>axiom</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -134,12 +144,34 @@
             <groupId>org.wso2.carbon.identity</groupId>
             <artifactId>org.wso2.carbon.identity.application.mgt</artifactId>
             <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.neethi.wso2</groupId>
+                    <artifactId>neethi</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.neethi</groupId>
+                    <artifactId>neethi</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.googlecode.json-simple.wso2</groupId>
             <artifactId>json-simple</artifactId>
             <scope>provided</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.neethi.wso2</groupId>
+            <artifactId>neethi</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.neethi</groupId>
+            <artifactId>neethi</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-jaxrs</artifactId>

features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mssql.sql

@@ -1,9 +1,16 @@
 CREATE TABLE DM_DEVICE_TYPE (
-     ID INT IDENTITY NOT NULL,
+     ID INTEGER IDENTITY NOT NULL,
      NAME VARCHAR(300) DEFAULT NULL,
      PRIMARY KEY (ID)
 );
 
+CREATE TABLE DM_DEVICE_CERTIFICATE (
+      ID                    INTEGER IDENTITY NOT NULL,
+      SERIAL_NUMBER            VARCHAR(500) DEFAULT NULL,
+    	CERTIFICATE                  VARBINARY(max) DEFAULT NULL,
+    	PRIMARY KEY (ID)
+);
+
 CREATE TABLE DM_DEVICE (
      ID                    INTEGER identity NOT NULL,
      DESCRIPTION           VARCHAR(max) DEFAULT NULL,

features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mysql.sql

@@ -4,6 +4,12 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_TYPE (
      PRIMARY KEY (ID)
 )ENGINE = InnoDB;
 
+CREATE TABLE IF NOT EXISTS DM_DEVICE_CERTIFICATE (
+      ID                    INTEGER auto_increment NOT NULL,
+      SERIAL_NUMBER            VARCHAR(500) DEFAULT NULL,
+    	CERTIFICATE                  BLOB DEFAULT NULL,
+    	PRIMARY KEY (ID)
+)ENGINE = InnoDB;
 
 CREATE TABLE IF NOT EXISTS DM_DEVICE (
      ID                    INTEGER AUTO_INCREMENT NOT NULL,

features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/oracle.sql

@@ -18,6 +18,24 @@ WHEN (NEW.ID IS NULL)
   END;
 /
 
+CREATE TABLE DM_DEVICE_CERTIFICATE (
+  ID                    NUMBER(10) NOT NULL,
+  SERIAL_NUMBER         VARCHAR2(500) DEFAULT NULL,
+  CERTIFICATE           BLOB DEFAULT NULL,
+  PRIMARY KEY (ID)
+)
+/
+-- Generate ID using sequence and trigger
+CREATE SEQUENCE DM_DEVICE_CERTIFICATE_seq START WITH 1 INCREMENT BY 1 NOCACHE
+/
+CREATE OR REPLACE TRIGGER DM_DEVICE_CERTIFICATE_seq_tr
+BEFORE INSERT ON DM_DEVICE_CERTIFICATE FOR EACH ROW
+WHEN (NEW.ID IS NULL)
+  BEGIN
+    SELECT DM_DEVICE_CERTIFICATE_seq.NEXTVAL INTO :NEW.ID FROM DUAL;
+  END;
+/
+
 CREATE TABLE DM_DEVICE (
   ID                    NUMBER(10) NOT NULL,
   DESCRIPTION           CLOB DEFAULT NULL,

features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/postgresql.sql

@@ -3,6 +3,13 @@ CREATE TABLE IF NOT EXISTS  DM_DEVICE_TYPE (
   NAME VARCHAR(300) DEFAULT NULL
 );
 
+CREATE TABLE IF NOT EXISTS DM_DEVICE_CERTIFICATE (
+  ID                    BIGSERIAL PRIMARY KEY,
+  SERIAL_NUMBER         VARCHAR(500) DEFAULT NULL,
+  CERTIFICATE           BYTEA DEFAULT NULL,
+  PRIMARY KEY (ID)
+);
+
 CREATE TABLE IF NOT EXISTS  DM_DEVICE (
   ID                    BIGSERIAL NOT NULL PRIMARY KEY,
   DESCRIPTION           TEXT DEFAULT NULL,

pom.xml

@@ -1252,6 +1252,17 @@
                 <artifactId>httpclient</artifactId>
                 <version>${apache.http.version}</version>
             </dependency>
+            <!-- Removing neethi configs from webapp-->
+            <dependency>
+                <groupId>org.apache.neethi.wso2</groupId>
+                <artifactId>neethi</artifactId>
+                <version>${neethi.wso2.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.neethi</groupId>
+                <artifactId>neethi</artifactId>
+                <version>${neethi.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -1549,6 +1560,10 @@
         <commons.logging.version>1.2</commons.logging.version>
         <apache.http.version>4.5.1</apache.http.version>
 
+        <!-- Neethi version-->
+        <neethi.version>2.0.4</neethi.version>
+        <neethi.wso2.version>2.0.4.wso2v4</neethi.wso2.version>
+
 	<!-- Release plugin ID for github-->
 	<project.scm.id>github-scm</project.scm.id>
     </properties>