From bc93ff08a43bfac037c57e2f47bd97da1a8f7485 Mon Sep 17 00:00:00 2001
From: Geeth Munasinghe <geeth@wso2.com>
Date: Wed, 21 Jan 2015 20:14:55 +0530
Subject: [PATCH] Changing cdm to mdm

---
 components/device-mgt/pom.xml                 |  2 +-
 components/key-mgt/pom.xml                    | 59 +------------------
 .../pom.xml                                   |  4 +-
 pom.xml                                       | 24 ++++++--
 product/modules/distribution/pom.xml          |  4 +-
 product/modules/integration/pom.xml           |  4 +-
 .../tests-common/admin-clients/pom.xml        |  2 +-
 .../integration-test-utils/pom.xml            |  2 +-
 .../modules/integration/tests-common/pom.xml  |  4 +-
 .../integration/tests-common/ui-pages/pom.xml |  2 +-
 .../agents/android/jax-rs/pom.xml             |  4 +-
 .../agents/windows/jax-rs/pom.xml             |  6 +-
 product/modules/mobileservices/pom.xml        |  8 +--
 product/modules/p2-profile-gen/pom.xml        | 16 ++---
 product/modules/rest-api/pom.xml              |  4 +-
 product/pom.xml                               |  4 +-
 16 files changed, 53 insertions(+), 96 deletions(-)

diff --git a/components/device-mgt/pom.xml b/components/device-mgt/pom.xml
index ea411b77f..f17b54bf4 100644
--- a/components/device-mgt/pom.xml
+++ b/components/device-mgt/pom.xml
@@ -33,7 +33,7 @@
     <artifactId>device-mgt</artifactId>
     <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>WSO2 Carbon - Device Management Component</name>
+    <name>WSO2 Carbon - Mobile Device Management Component</name>
     <url>http://wso2.org</url>
 
     <modules>
diff --git a/components/key-mgt/pom.xml b/components/key-mgt/pom.xml
index f00b618ce..2ffc219ae 100644
--- a/components/key-mgt/pom.xml
+++ b/components/key-mgt/pom.xml
@@ -33,64 +33,13 @@
     <artifactId>key-mgt</artifactId>
     <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>WSO2 Carbon - Device Management Component</name>
+    <name>WSO2 Carbon - Oauth Key Management Component</name>
     <url>http://wso2.org</url>
 
     <modules>
         <module>org.wso2.carbon.key.mgt.handler.valve</module>
     </modules>
 
-<!--
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.eclipse.osgi</groupId>
-                <artifactId>org.eclipse.osgi</artifactId>
-                <version>3.8.1.v20120830-144521</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.equinox</groupId>
-                <artifactId>org.eclipse.equinox.common</artifactId>
-                <version>3.6.100.v20120522-1841</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.logging</artifactId>
-                <version>4.3.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
-                <version>2.0.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.osgi</groupId>
-                <artifactId>org.eclipse.osgi.services</artifactId>
-                <version>3.3.100.v20120522-1822</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.apimgt.core</artifactId>
-                <version>${apim.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.apimgt.impl</artifactId>
-                <version>${apim.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.tomcat.wso2</groupId>
-                <artifactId>tomcat</artifactId>
-                <version>${orbit.version.tomcat}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.tomcat.ext</artifactId>
-                <version>4.3.0-SNAPSHOT</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
--->
 
     <build>
         <pluginManagement>
@@ -111,9 +60,5 @@
             </plugins>
         </pluginManagement>
     </build>
-<!--    <properties>
-        <orbit.version.h2.engine>1.2.140.wso2v3</orbit.version.h2.engine>
-        <apim.version>1.2.1</apim.version>
-        <orbit.version.tomcat>7.0.52.wso2v5</orbit.version.tomcat>
-    </properties>-->
+
 </project>
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/pom.xml
index 5dd10889c..0ef1dd711 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/pom.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/pom.xml
@@ -39,12 +39,10 @@
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.device.mgt.mobile.impl</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
-            <version>${project.version}</version>
         </dependency>
     </dependencies>
 
@@ -102,7 +100,7 @@
                             <importFeatures>
                                 <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
                                 </importFeatureDef>
-                                <importFeatureDef>org.wso2.carbon.device.mgt.server:${project.version}
+                                <importFeatureDef>org.wso2.carbon.device.mgt.server:${cdm.core.version}
                                 </importFeatureDef>
                             </importFeatures>
                         </configuration>
diff --git a/pom.xml b/pom.xml
index a583f57d6..322c9df85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,23 +100,29 @@
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
-                <version>${project.version}</version>
+                <version>${cdm.core.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
+                <version>${cdm.core.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.device.mgt.mobile.impl</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.policy.mgt.common</artifactId>
-                <version>${project.version}</version>
+                <version>${cdm.core.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.policy.mgt.core</artifactId>
-                <version>${project.version}</version>
+                <version>${cdm.core.version}</version>
             </dependency>
 
 
@@ -197,8 +203,18 @@
     </dependencyManagement>
 
     <properties>
-        <testng.version>6.1.1</testng.version>
+
+        <!--Carbon kernel versions-->
         <carbon.kernel.version>4.3.0</carbon.kernel.version>
+        <carbon.kernel.version.range>[4.3.0, 4.4.0)</carbon.kernel.version.range>
+
+        <!--CDM versions-->
+        <cdm.core.version>1.0.0-SNAPSHOT</cdm.core.version>
+        <cdm.core.version.range>[1.0.0, 2.0.0)</cdm.core.version.range>
+
+
+        <testng.version>6.1.1</testng.version>
+
         <carbon.platform.version>4.3.0-SNAPSHOT</carbon.platform.version>
         <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
         <maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version>
diff --git a/product/modules/distribution/pom.xml b/product/modules/distribution/pom.xml
index c7ac210bf..45758abc6 100644
--- a/product/modules/distribution/pom.xml
+++ b/product/modules/distribution/pom.xml
@@ -22,8 +22,8 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.wso2.cdmserver</groupId>
-        <artifactId>wso2cdmserver-product</artifactId>
+        <groupId>org.wso2.mdmserver</groupId>
+        <artifactId>wso2mdmserver-product</artifactId>
         <version>2.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
diff --git a/product/modules/integration/pom.xml b/product/modules/integration/pom.xml
index fb2ef0f59..12a6cc955 100644
--- a/product/modules/integration/pom.xml
+++ b/product/modules/integration/pom.xml
@@ -21,8 +21,8 @@
          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.cdmserver</groupId>
-        <artifactId>wso2cdmserver-product</artifactId>
+        <groupId>org.wso2.mdmserver</groupId>
+        <artifactId>wso2mdmserver-product</artifactId>
         <version>2.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
diff --git a/product/modules/integration/tests-common/admin-clients/pom.xml b/product/modules/integration/tests-common/admin-clients/pom.xml
index 10da72790..9cca8ec0b 100644
--- a/product/modules/integration/tests-common/admin-clients/pom.xml
+++ b/product/modules/integration/tests-common/admin-clients/pom.xml
@@ -22,7 +22,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.wso2.cdmserver</groupId>
+        <groupId>org.wso2.mdmserver</groupId>
         <artifactId>cdm-integration-tests-common</artifactId>
         <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
diff --git a/product/modules/integration/tests-common/integration-test-utils/pom.xml b/product/modules/integration/tests-common/integration-test-utils/pom.xml
index 28aee1ab9..38504e3a2 100644
--- a/product/modules/integration/tests-common/integration-test-utils/pom.xml
+++ b/product/modules/integration/tests-common/integration-test-utils/pom.xml
@@ -22,7 +22,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.wso2.cdmserver</groupId>
+        <groupId>org.wso2.mdmserver</groupId>
         <artifactId>cdm-integration-tests-common</artifactId>
         <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
diff --git a/product/modules/integration/tests-common/pom.xml b/product/modules/integration/tests-common/pom.xml
index e79e88cbf..c491a9e58 100644
--- a/product/modules/integration/tests-common/pom.xml
+++ b/product/modules/integration/tests-common/pom.xml
@@ -22,7 +22,7 @@
 
 
     <parent>
-        <groupId>org.wso2.cdmserver</groupId>
+        <groupId>org.wso2.mdmserver</groupId>
         <artifactId>wso2cdm-integration</artifactId>
         <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
@@ -30,7 +30,7 @@
 
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.wso2.cdmserver</groupId>
+    <groupId>org.wso2.mdmserver</groupId>
     <artifactId>cdm-integration-tests-common</artifactId>
     <packaging>pom</packaging>
     <name>WSO2 CDM Integration Test Common</name>
diff --git a/product/modules/integration/tests-common/ui-pages/pom.xml b/product/modules/integration/tests-common/ui-pages/pom.xml
index 2906ce7f4..1efdae6d7 100644
--- a/product/modules/integration/tests-common/ui-pages/pom.xml
+++ b/product/modules/integration/tests-common/ui-pages/pom.xml
@@ -22,7 +22,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.wso2.cdmserver</groupId>
+        <groupId>org.wso2.mdmserver</groupId>
         <artifactId>cdm-integration-tests-common</artifactId>
         <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
diff --git a/product/modules/mobileservices/agents/android/jax-rs/pom.xml b/product/modules/mobileservices/agents/android/jax-rs/pom.xml
index 54dfb6b31..808416943 100644
--- a/product/modules/mobileservices/agents/android/jax-rs/pom.xml
+++ b/product/modules/mobileservices/agents/android/jax-rs/pom.xml
@@ -21,8 +21,8 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
-        <groupId>org.wso2.cdmserver</groupId>
-        <artifactId>wso2cdmserver-product-mobileservices</artifactId>
+        <groupId>org.wso2.mdmserver</groupId>
+        <artifactId>wso2mdmserver-product-mobileservices</artifactId>
         <version>2.0.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
diff --git a/product/modules/mobileservices/agents/windows/jax-rs/pom.xml b/product/modules/mobileservices/agents/windows/jax-rs/pom.xml
index e0c51bde9..a713de08a 100644
--- a/product/modules/mobileservices/agents/windows/jax-rs/pom.xml
+++ b/product/modules/mobileservices/agents/windows/jax-rs/pom.xml
@@ -19,8 +19,8 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
-        <groupId>org.wso2.cdmserver</groupId>
-        <artifactId>wso2cdmserver-product-mobileservices</artifactId>
+        <groupId>org.wso2.mdmserver</groupId>
+        <artifactId>wso2mdmserver-product-mobileservices</artifactId>
         <version>2.0.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
@@ -152,13 +152,11 @@
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/product/modules/mobileservices/pom.xml b/product/modules/mobileservices/pom.xml
index 8f10c5562..5d7b134e4 100644
--- a/product/modules/mobileservices/pom.xml
+++ b/product/modules/mobileservices/pom.xml
@@ -3,15 +3,15 @@
          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>
-        <artifactId>wso2cdmserver-product</artifactId>
-        <groupId>org.wso2.cdmserver</groupId>
+        <artifactId>wso2mdmserver-product</artifactId>
+        <groupId>org.wso2.mdmserver</groupId>
         <version>2.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.wso2.cdmserver</groupId>
-    <artifactId>wso2cdmserver-product-mobileservices</artifactId>
+    <groupId>org.wso2.mdmserver</groupId>
+    <artifactId>wso2mdmserver-product-mobileservices</artifactId>
     <packaging>pom</packaging>
     <modules>
         <module>agents/windows/jax-rs</module>
diff --git a/product/modules/p2-profile-gen/pom.xml b/product/modules/p2-profile-gen/pom.xml
index ce4f57f58..d221a0402 100644
--- a/product/modules/p2-profile-gen/pom.xml
+++ b/product/modules/p2-profile-gen/pom.xml
@@ -20,15 +20,15 @@
          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.cdmserver</groupId>
-        <artifactId>wso2cdmserver-product</artifactId>
+        <groupId>org.wso2.mdmserver</groupId>
+        <artifactId>wso2mdmserver-product</artifactId>
         <version>2.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>wso2cdm-profile-gen</artifactId>
-    <name>WSO2 Connected Device Manager (CDM) - P2 Profile Gen</name>
+    <artifactId>wso2mdm-profile-gen</artifactId>
+    <name>WSO2 Mobile Device Manager (MDM) - P2 Profile Gen</name>
     <packaging>pom</packaging>
 
     <build>
@@ -104,13 +104,13 @@
                                     org.wso2.carbon:org.wso2.carbon.ndatasource.feature:${carbon.platform.version}
                                 </featureArtifactDef>-->
                                 <featureArtifactDef>
-                                    org.wso2.carbon:org.wso2.carbon.device.mgt.server.feature:${project.version}
+                                    org.wso2.carbon:org.wso2.carbon.device.mgt.server.feature:${cdm.core.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon:org.wso2.carbon.device.mgt.mobile.feature:${project.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon:org.wso2.carbon.policy.mgt.server.feature:${project.version}
+                                    org.wso2.carbon:org.wso2.carbon.policy.mgt.server.feature:${cdm.core.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon:org.wso2.carbon.webapp.mgt.feature:${carbon.platform.version}
@@ -251,7 +251,7 @@
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.server.feature.group</id>
-                                    <version>${project.version}</version>
+                                    <version>${cdm.core.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.mobile.feature.group</id>
@@ -259,7 +259,7 @@
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.policy.mgt.server.feature.group</id>
-                                    <version>${project.version}</version>
+                                    <version>${cdm.core.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.webapp.mgt.feature.group</id>
diff --git a/product/modules/rest-api/pom.xml b/product/modules/rest-api/pom.xml
index a6d7552c0..e8671c5a0 100644
--- a/product/modules/rest-api/pom.xml
+++ b/product/modules/rest-api/pom.xml
@@ -1,8 +1,8 @@
 <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.cdmserver</groupId>
-    <artifactId>wso2cdmserver-product</artifactId>
+    <groupId>org.wso2.mdmserver</groupId>
+    <artifactId>wso2mdmserver-product</artifactId>
     <version>2.0.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
diff --git a/product/pom.xml b/product/pom.xml
index 479f83dae..7c80f315b 100644
--- a/product/pom.xml
+++ b/product/pom.xml
@@ -28,8 +28,8 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.wso2.cdmserver</groupId>
-    <artifactId>wso2cdmserver-product</artifactId>
+    <groupId>org.wso2.mdmserver</groupId>
+    <artifactId>wso2mdmserver-product</artifactId>
     <packaging>pom</packaging>
     <name>WSO2 Connected Device Manager (CDM) - Parent</name>