Merge branch 'master' of https://github.com/geethkokila/product-cdm

Conflicts:
	pom.xml

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

@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+~ Copyright (c) 2014, 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</groupId>
         <artifactId>device-mgt</artifactId>
-        <version>4.3.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -55,7 +72,7 @@
                             org.apache.axis2.*;
                             version="${axis2.osgi.version.range}",
                             org.osgi.framework,
-			    org.osgi.service.component,
+                            org.osgi.service.component,
                             org.apache.commons.logging,
                         </Import-Package>
                         <Export-Package>
@@ -69,21 +86,6 @@
         </plugins>
     </build>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <properties>
-    </properties>
 
 </project>
 

components/device-mgt/pom.xml

@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+~ Copyright (c) 2014, 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">

pom.xml

@@ -43,17 +43,7 @@
         <module>product/modules/integration</module>
     </modules>
 
-    <properties>
-        <carbon.kernel.version>4.2.0</carbon.kernel.version>
-        <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
-        <maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version>
 
-        <!--Testing -->
-        <test.framework.version>4.3.1</test.framework.version>
-        <testng.version>6.8</testng.version>
-        <stub.version>4.3.0-SNAPSHOT</stub.version>
-        <test.automation.emm.ui.version>1.1.0</test.automation.emm.ui.version>
-    </properties>
 
 
     <dependencyManagement>
@@ -102,5 +92,17 @@
         </dependencies>
     </dependencyManagement>
 
-</project>
+    <properties>
+        <carbon.kernel.version>4.2.0</carbon.kernel.version>
+        <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
+        <maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version>
+        <axis2.osgi.version.range>[1.6.1.wso2v11, 1.7.0)</axis2.osgi.version.range>
 
+        <!--Testing -->
+        <test.framework.version>4.3.1</test.framework.version>
+        <testng.version>6.8</testng.version>
+        <stub.version>4.3.0-SNAPSHOT</stub.version>
+        <test.automation.emm.ui.version>1.1.0</test.automation.emm.ui.version>
+    </properties>
+
+</project>

product/modules/distribution/src/repository/dbscripts/cdm/h2.sql

@@ -0,0 +1,23 @@
+CREATE TABLE IF NOT EXISTS DM_DEVICE_TYPE 
+( 
+     ID   INT(11) NOT NULL, 
+     NAME VARCHAR(300) NULL DEFAULT NULL, 
+     PRIMARY KEY (ID) 
+); 
+
+CREATE TABLE IF NOT EXISTS DM_DEVICE 
+( 
+     ID                    VARCHAR(20) NOT NULL, 
+     DESCRIPTION           TEXT NULL DEFAULT NULL, 
+     NAME                  VARCHAR(100) NULL DEFAULT NULL, 
+     DATE_OF_ENROLLMENT    DATETIME NULL DEFAULT NULL, 
+     DATE_OF_LAST_UPDATE   DATETIME NULL DEFAULT NULL, 
+     OWNERSHIP             VARCHAR(45) NULL DEFAULT NULL, 
+     STATUS                VARCHAR(15) NULL DEFAULT NULL, 
+     DEVICE_TYPE_ID        INT(11) NULL DEFAULT NULL, 
+     DEVICE_IDENTIFICATION VARCHAR(300) NULL DEFAULT NULL, 
+     OWNER                 VARCHAR(45) NULL DEFAULT NULL, 
+     PRIMARY KEY (ID), 
+     CONSTRAINT fk_DM_DEVICE_DM_DEVICE_TYPE2 FOREIGN KEY (DEVICE_TYPE_ID ) 
+     REFERENCES DM_DEVICE_TYPE (ID ) ON DELETE NO ACTION ON UPDATE NO ACTION 
+); 

product/modules/distribution/src/repository/dbscripts/cdm/h2.sql~

@@ -0,0 +1,23 @@
+CREATE TABLE IF NOT EXISTS DM_DEVICE_TYPE 
+( 
+     ID   INT(11) NOT NULL, 
+     NAME VARCHAR(300) NULL DEFAULT NULL, 
+     PRIMARY KEY (ID) 
+); 
+
+CREATE TABLE IF NOT EXISTS DM_DEVICE 
+( 
+     ID                    VARCHAR(20) NOT NULL, 
+     DESCRIPTION           TEXT NULL DEFAULT NULL, 
+     NAME                  VARCHAR(100) NULL DEFAULT NULL, 
+     DATE_OF_ENROLLMENT    DATETIME NULL DEFAULT NULL, 
+     DATE_OF_LAST_UPDATE   DATETIME NULL DEFAULT NULL, 
+     OWNERSHIP             VARCHAR(45) NULL DEFAULT NULL, 
+     STATUS                VARCHAR(15) NULL DEFAULT NULL, 
+     DEVICE_TYPE_ID        INT(11) NULL DEFAULT NULL, 
+     DEVICE_IDENTIFICATION VARCHAR(300) NULL DEFAULT NULL, 
+     OWNER                 VARCHAR(45) NULL DEFAULT NULL, 
+     PRIMARY KEY (ID), 
+     CONSTRAINT fk_DM_DEVICE_DM_DEVICE_TYPE2 FOREIGN KEY (DEVICE_TYPE_ID ) 
+     REFERENCES DM_DEVICE_TYPE (ID ) ON DELETE NO ACTION ON UPDATE NO ACTION 
+); 

product/modules/distribution/src/repository/dbscripts/cdm/mysql.sql

@@ -0,0 +1,34 @@
+-- -----------------------------------------------------
+-- Table `DM_DEVICE_TYPE`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS `DM_DEVICE_TYPE` (
+  `ID` INT(11) NOT NULL ,
+  `NAME` VARCHAR(300) NULL DEFAULT NULL ,
+  PRIMARY KEY (`ID`) )
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = latin1;
+
+
+-- -----------------------------------------------------
+-- Table `DM_DEVICE`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS `DM_DEVICE` (
+  `ID` VARCHAR(20) NOT NULL ,
+  `DESCRIPTION` TEXT NULL DEFAULT NULL ,
+  `NAME` VARCHAR(100) NULL DEFAULT NULL ,
+  `DATE_OF_ENROLLMENT` DATETIME NULL DEFAULT NULL ,
+  `DATE_OF_LAST_UPDATE` DATETIME NULL DEFAULT NULL ,
+  `OWNERSHIP` VARCHAR(45) NULL DEFAULT NULL ,
+  `STATUS` VARCHAR(15) NULL DEFAULT NULL ,
+  `DEVICE_TYPE_ID` INT(11) NULL DEFAULT NULL ,
+  `DEVICE_IDENTIFICATION` VARCHAR(300) NULL DEFAULT NULL ,
+  `OWNER` VARCHAR(45) NULL DEFAULT NULL ,
+  PRIMARY KEY (`ID`) ,
+  INDEX `fk_DM_DEVICE_DM_DEVICE_TYPE2_idx` (`DEVICE_TYPE_ID` ASC) ,
+  CONSTRAINT `fk_DM_DEVICE_DM_DEVICE_TYPE2`
+    FOREIGN KEY (`DEVICE_TYPE_ID` )
+    REFERENCES `DM_DEVICE_TYPE` (`ID` )
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION)
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = latin1;

product/modules/distribution/src/repository/dbscripts/cdm/mysql.sql~

@@ -0,0 +1,36 @@
+USE `WSO2CDM_DB`;
+
+-- -----------------------------------------------------
+-- Table `DM_DEVICE_TYPE`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS `DM_DEVICE_TYPE` (
+  `ID` INT(11) NOT NULL ,
+  `NAME` VARCHAR(300) NULL DEFAULT NULL ,
+  PRIMARY KEY (`ID`) )
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = latin1;
+
+
+-- -----------------------------------------------------
+-- Table `DM_DEVICE`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS `DM_DEVICE` (
+  `ID` VARCHAR(20) NOT NULL ,
+  `DESCRIPTION` TEXT NULL DEFAULT NULL ,
+  `NAME` VARCHAR(100) NULL DEFAULT NULL ,
+  `DATE_OF_ENROLLMENT` DATETIME NULL DEFAULT NULL ,
+  `DATE_OF_LAST_UPDATE` DATETIME NULL DEFAULT NULL ,
+  `OWNERSHIP` VARCHAR(45) NULL DEFAULT NULL ,
+  `STATUS` VARCHAR(15) NULL DEFAULT NULL ,
+  `DEVICE_TYPE_ID` INT(11) NULL DEFAULT NULL ,
+  `DEVICE_IDENTIFICATION` VARCHAR(300) NULL DEFAULT NULL ,
+  `OWNER` VARCHAR(45) NULL DEFAULT NULL ,
+  PRIMARY KEY (`ID`) ,
+  INDEX `fk_DM_DEVICE_DM_DEVICE_TYPE2_idx` (`DEVICE_TYPE_ID` ASC) ,
+  CONSTRAINT `fk_DM_DEVICE_DM_DEVICE_TYPE2`
+    FOREIGN KEY (`DEVICE_TYPE_ID` )
+    REFERENCES `DM_DEVICE_TYPE` (`ID` )
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION)
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = latin1;