From fd814c7e2455c615fd06d2b8dc38e183e9b3bd8b Mon Sep 17 00:00:00 2001
From: Geeth Munasinghe <geeth@wso2.com>
Date: Thu, 22 Jan 2015 16:41:34 +0530
Subject: [PATCH] Fixing version issues and changing cdm to mdm

---
 product/modules/distribution/pom.xml          | 20 ++---
 .../modules/distribution/src/assembly/bin.xml | 80 +++++++++----------
 .../distribution/src/assembly/dist.xml        |  2 +-
 .../src/assembly/filter.properties            |  8 +-
 product/modules/rest-api/pom.xml              |  2 -
 5 files changed, 55 insertions(+), 57 deletions(-)

diff --git a/product/modules/distribution/pom.xml b/product/modules/distribution/pom.xml
index 45758abc60..6db365a131 100644
--- a/product/modules/distribution/pom.xml
+++ b/product/modules/distribution/pom.xml
@@ -29,10 +29,10 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>wso2cdm</artifactId>
+    <artifactId>wso2mdm</artifactId>
     <packaging>jar</packaging>
-    <name>WSO2 Connected Device Manager (CDM) - Distribution</name>
-    <description>WSO2 Connected Device Manager (CDM) Distribution</description>
+    <name>WSO2 Mobile Device Manager (MDM) - Distribution</name>
+    <description>WSO2 Mobile Device Manager (MDM) Distribution</description>
 
     <dependencies>
 	<dependency>
@@ -213,18 +213,18 @@
                                 <!--<property name="shindig.version" value="2.5.0-beta5"/>-->
 
                                 <mkdir dir="${tempdir}"/>
-                                <mkdir dir="${tempdir}/wso2cdm-${project.version}/repository/components"/>
-                                <mkdir dir="${tempdir}/wso2cdm-${project.version}/repository/deployment/server"/>
-                                <mkdir dir="${tempdir}/wso2cdm-${project.version}/repository/deployment/server/webapps"/>
+                                <mkdir dir="${tempdir}/wso2mdm-${project.version}/repository/components"/>
+                                <mkdir dir="${tempdir}/wso2mdm-${project.version}/repository/deployment/server"/>
+                                <mkdir dir="${tempdir}/wso2mdm-${project.version}/repository/deployment/server/webapps"/>
                                 <unzip dest="${tempdir}">
                                     <fileset dir="target">
-                                        <include name="wso2cdm-${project.version}.zip"/>
+                                        <include name="wso2mdm-${project.version}.zip"/>
                                     </fileset>
                                 </unzip>
                                 <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components"
                                       overwrite="true">
                                     <fileset
-                                            dir="${tempdir}/wso2cdm-${project.version}/repository/components"></fileset>
+                                            dir="${tempdir}/wso2mdm-${project.version}/repository/components"></fileset>
                                 </copy>
                                 <!--testing -->
                                 <!--<unzip src="target/shindig/WEB-INF/lib/shindig-common-${shindig.version}.jar"
@@ -248,7 +248,7 @@
                                     og4j.logger.net.sf.ehcache=ERROR
                                 </concat>
 
-                                <delete file="target/wso2cdm-${project.version}.zip"/>
+                                <delete file="target/wso2mdm-${project.version}.zip"/>
                                 <delete dir="${tempdir}"/>
                             </tasks>
                         </configuration>
@@ -292,7 +292,7 @@
                                 <delete dir="target/maven-archiver"/>
                                 <delete dir="target/wso2carbon-core-${carbon.kernel.version}"/>
                                 <delete dir="target/wso2carbon-core-${carbon.kernel.version}"/>
-                                <delete file="target/wso2cdm-${project.version}.jar"/>
+                                <delete file="target/wso2mdm-${project.version}.jar"/>
                                 <delete dir="target/sources"/>
                                 <delete dir="target/site"/>
                                 <delete dir="target/antrun"/>
diff --git a/product/modules/distribution/src/assembly/bin.xml b/product/modules/distribution/src/assembly/bin.xml
index 1478107e94..d9f01fee5b 100644
--- a/product/modules/distribution/src/assembly/bin.xml
+++ b/product/modules/distribution/src/assembly/bin.xml
@@ -8,7 +8,7 @@
     <fileSets>
         <fileSet>
             <directory>target/wso2carbon-core-${carbon.kernel.version}</directory>
-            <outputDirectory>wso2cdm-${pom.version}</outputDirectory>
+            <outputDirectory>wso2mdm-${pom.version}</outputDirectory>
             <!--           <excludes>
                            <exclude>**/*.sh</exclude>
                            <exclude>**/README*</exclude>
@@ -29,14 +29,14 @@
             <directory>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/runtimes
             </directory>
-            <outputDirectory>wso2cdm-${pom.version}/lib/runtimes/</outputDirectory>
+            <outputDirectory>wso2mdm-${pom.version}/lib/runtimes/</outputDirectory>
             <includes>
                 <include>*/**</include>
             </includes>
         </fileSet>
         <fileSet>
             <directory>target/wso2carbon-core-${carbon.kernel.version}</directory>
-            <outputDirectory>wso2cdm-${pom.version}</outputDirectory>
+            <outputDirectory>wso2mdm-${pom.version}</outputDirectory>
             <includes>
                 <include>**/*.sh</include>
             </includes>
@@ -48,7 +48,7 @@
             <directory>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/
             </directory>
-            <outputDirectory>wso2cdm-${project.version}/repository/conf/multitenancy
+            <outputDirectory>wso2mdm-${project.version}/repository/conf/multitenancy
             </outputDirectory>
             <includes>
                 <include>**/stratos.xml</include>
@@ -62,7 +62,7 @@
             <directory>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/
             </directory>
-            <outputDirectory>wso2cdm-${project.version}/repository/conf</outputDirectory>
+            <outputDirectory>wso2mdm-${project.version}/repository/conf</outputDirectory>
             <includes>
                 <include>**/tenant-mgt.xml</include>
             </includes>
@@ -70,7 +70,7 @@
 
         <fileSet>
             <directory>src/repository/resources/styles/css</directory>
-            <outputDirectory>wso2cdm-${project.version}/resources/allthemes/Default/admin
+            <outputDirectory>wso2mdm-${project.version}/resources/allthemes/Default/admin
             </outputDirectory>
             <includes>
                 <include>**/**.css</include>
@@ -78,7 +78,7 @@
         </fileSet>
         <fileSet>
             <directory>src/repository/resources/styles/images</directory>
-            <outputDirectory>wso2cdm-${project.version}/resources/allthemes/Default/images
+            <outputDirectory>wso2mdm-${project.version}/resources/allthemes/Default/images
             </outputDirectory>
             <includes>
                 <include>**/**.gif</include>
@@ -89,7 +89,7 @@
         <!-- copy documentation -->
         <fileSet>
             <directory>target/site</directory>
-            <outputDirectory>wso2cdm-${project.version}/docs</outputDirectory>
+            <outputDirectory>wso2mdm-${project.version}/docs</outputDirectory>
             <fileMode>755</fileMode>
         </fileSet>
         <!-- copy the landing page webapp -->
@@ -109,7 +109,7 @@
 
         <fileSet>
             <directory>src/repository/conf</directory>
-            <outputDirectory>wso2cdm-${project.version}/repository/conf</outputDirectory>
+            <outputDirectory>wso2mdm-${project.version}/repository/conf</outputDirectory>
             <includes>
                 <include>**/api-manager.xml</include>
                 <include>**/sso-idp-config.xml</include>
@@ -120,7 +120,7 @@
             <directory>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/
             </directory>
-            <outputDirectory>wso2cdm-${project.version}/repository/conf/security/</outputDirectory>
+            <outputDirectory>wso2mdm-${project.version}/repository/conf/security/</outputDirectory>
             <includes>
                 <include>**/entitlement.properties</include>
                 <include>**/trusted-idp-config.xml</include>
@@ -131,12 +131,12 @@
             <directory>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/resources/rxts/
             </directory>
-            <outputDirectory>wso2cdm-${project.version}/repository/resources/rxts/</outputDirectory>
+            <outputDirectory>wso2mdm-${project.version}/repository/resources/rxts/</outputDirectory>
         </fileSet>
 
         <fileSet>
             <directory>src/repository/conf/datasources</directory>
-            <outputDirectory>wso2cdm-${project.version}/repository/conf/datasources
+            <outputDirectory>wso2mdm-${project.version}/repository/conf/datasources
             </outputDirectory>
             <includes>
                 <include>**/master-datasources.xml</include>
@@ -145,7 +145,7 @@
         </fileSet>
         <fileSet>
             <directory>src/repository/resources</directory>
-            <outputDirectory>wso2cdm-${project.version}/repository/resources</outputDirectory>
+            <outputDirectory>wso2mdm-${project.version}/repository/resources</outputDirectory>
             <includes>
                 <include>*/**</include>
             </includes>
@@ -153,7 +153,7 @@
         <!--data-bridge configuration-->
         <fileSet>
             <directory>src/repository/conf/data-bridge</directory>
-            <outputDirectory>wso2cdm-${project.version}/repository/conf/data-bridge
+            <outputDirectory>wso2mdm-${project.version}/repository/conf/data-bridge
             </outputDirectory>
             <fileMode>755</fileMode>
         </fileSet>
@@ -161,7 +161,7 @@
             <directory>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/runtimes
             </directory>
-            <outputDirectory>wso2cdm-${project.version}/lib/runtimes/</outputDirectory>
+            <outputDirectory>wso2mdm-${project.version}/lib/runtimes/</outputDirectory>
             <includes>
                 <include>*/**</include>
             </includes>
@@ -170,7 +170,7 @@
             <directory>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/service-provider
             </directory>
-            <outputDirectory>wso2cdm-${project.version}/dbscripts/service-provider</outputDirectory>
+            <outputDirectory>wso2mdm-${project.version}/dbscripts/service-provider</outputDirectory>
             <includes>
                 <include>*/**</include>
             </includes>
@@ -181,7 +181,7 @@
             <directory>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity
             </directory>
-            <outputDirectory>wso2cdm-${project.version}/dbscripts/identity</outputDirectory>
+            <outputDirectory>wso2mdm-${project.version}/dbscripts/identity</outputDirectory>
             <includes>
                 <include>*/**</include>
             </includes>
@@ -192,7 +192,7 @@
             <directory>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/apimgt
             </directory>
-            <outputDirectory>wso2cdm-${project.version}/dbscripts/apimgt</outputDirectory>
+            <outputDirectory>wso2mdm-${project.version}/dbscripts/apimgt</outputDirectory>
             <includes>
                 <include>*/**</include>
             </includes>
@@ -202,7 +202,7 @@
             <directory>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/modules
             </directory>
-            <outputDirectory>wso2cdm-${project.version}/modules/</outputDirectory>
+            <outputDirectory>wso2mdm-${project.version}/modules/</outputDirectory>
             <includes>
                 <include>*/**</include>
             </includes>
@@ -211,7 +211,7 @@
         <!-- Copying Device Management related dbscripts -->
         <fileSet>
             <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm</directory>
-            <outputDirectory>wso2cdm-${project.version}/dbscripts/cdm</outputDirectory>
+            <outputDirectory>wso2mdm-${project.version}/dbscripts/cdm</outputDirectory>
             <includes>
                 <include>*/**</include>
             </includes>
@@ -226,7 +226,7 @@
         <!-- copy cdm jaggery app -->
         <fileSet>
             <directory>src/repository/jaggeryapps</directory>
-            <outputDirectory>wso2cdm-${project.version}/repository/deployment/server/jaggeryapps
+            <outputDirectory>wso2mdm-${project.version}/repository/deployment/server/jaggeryapps
             </outputDirectory>
             <fileMode>755</fileMode>
         </fileSet>
@@ -234,13 +234,13 @@
     
     <dependencySets>
         <dependencySet>
-            <outputDirectory>wso2cdm-${project.version}/lib/endorsed</outputDirectory>
+            <outputDirectory>wso2mdm-${project.version}/lib/endorsed</outputDirectory>
             <includes>
                 <include>javax.el:el-api:jar</include>
             </includes>
         </dependencySet>
         <dependencySet>
-            <outputDirectory>wso2cdm-${project.version}/repository/deployment/client/modules
+            <outputDirectory>wso2mdm-${project.version}/repository/deployment/client/modules
             </outputDirectory>
             <includes>
                 <include>org.hibernate.wso2:hibernate:jar</include>
@@ -252,13 +252,13 @@
     <files>
         <file>
             <source>../mobileservices/agents/android/jax-rs/target/cdm-android-api.war</source>
-            <outputDirectory>wso2cdm-${pom.version}/repository/deployment/server/webapps
+            <outputDirectory>wso2mdm-${pom.version}/repository/deployment/server/webapps
             </outputDirectory>
             <fileMode>755</fileMode>
         </file>
         <file>
             <source>../rest-api/target/wso2cdm-api.war</source>
-            <outputDirectory>wso2cdm-${pom.version}/repository/deployment/server/webapps
+            <outputDirectory>wso2mdm-${pom.version}/repository/deployment/server/webapps
             </outputDirectory>
             <fileMode>755</fileMode>
         </file>
@@ -280,7 +280,7 @@
          </file>-->
         <file>
             <source>src/repository/conf/tomcat/context.xml</source>
-            <outputDirectory>wso2cdm-${project.version}/repository/conf/tomcat</outputDirectory>
+            <outputDirectory>wso2mdm-${project.version}/repository/conf/tomcat</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
@@ -294,37 +294,37 @@
 
         <file>
             <source>INSTALL.txt</source>
-            <outputDirectory>wso2cdm-${project.version}</outputDirectory>
+            <outputDirectory>wso2mdm-${project.version}</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
         <file>
             <source>README.txt</source>
-            <outputDirectory>wso2cdm-${project.version}</outputDirectory>
+            <outputDirectory>wso2mdm-${project.version}</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
         <file>
             <source>LICENSE.txt</source>
-            <outputDirectory>wso2cdm-${project.version}</outputDirectory>
+            <outputDirectory>wso2mdm-${project.version}</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
         <file>
             <source>release-notes.html</source>
-            <outputDirectory>wso2cdm-${project.version}</outputDirectory>
+            <outputDirectory>wso2mdm-${project.version}</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
         <file>
             <source>target/wso2carbon-core-${carbon.kernel.version}/bin/README.txt</source>
-            <outputDirectory>wso2cdm-${project.version}/bin/</outputDirectory>
+            <outputDirectory>wso2mdm-${project.version}/bin/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
         <file>
             <source>target/wso2carbon-core-${carbon.kernel.version}/bin/version.txt</source>
-            <outputDirectory>wso2cdm-${project.version}/bin/</outputDirectory>
+            <outputDirectory>wso2mdm-${project.version}/bin/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
@@ -334,7 +334,7 @@
             <source>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/logging-config.xml
             </source>
-            <outputDirectory>wso2cdm-${project.version}/repository/conf/etc</outputDirectory>
+            <outputDirectory>wso2mdm-${project.version}/repository/conf/etc</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
@@ -344,7 +344,7 @@
             <source>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml
             </source>
-            <outputDirectory>wso2cdm-${project.version}/repository/conf</outputDirectory>
+            <outputDirectory>wso2mdm-${project.version}/repository/conf</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
@@ -354,7 +354,7 @@
             <source>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/application-authentication.xml
             </source>
-            <outputDirectory>wso2cdm-${project.version}/repository/conf/security</outputDirectory>
+            <outputDirectory>wso2mdm-${project.version}/repository/conf/security</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
@@ -364,14 +364,14 @@
             <source>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/thrift-authentication.xml
             </source>
-            <outputDirectory>wso2cdm-${project.version}/repository/conf</outputDirectory>
+            <outputDirectory>wso2mdm-${project.version}/repository/conf</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
 
         <file>
             <source>src/repository/conf/multitenancy/cloud-services-desc.xml</source>
-            <outputDirectory>wso2cdm-${project.version}/repository/conf/multitenancy/
+            <outputDirectory>wso2mdm-${project.version}/repository/conf/multitenancy/
             </outputDirectory>
             <filtered>true</filtered>
         </file>
@@ -383,19 +383,19 @@
         </file>-->
         <file>
             <source>src/repository/conf/application-authenticators.xml</source>
-            <outputDirectory>wso2cdm-${project.version}/repository/conf/security/</outputDirectory>
+            <outputDirectory>wso2mdm-${project.version}/repository/conf/security/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
         <file>
             <source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/README</source>
-            <outputDirectory>wso2cdm-${project.version}/repository/conf/</outputDirectory>
+            <outputDirectory>wso2mdm-${project.version}/repository/conf/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
         <file>
             <source>src/repository/conf/identity.xml</source>
-            <outputDirectory>wso2cdm-${project.version}/repository/conf</outputDirectory>
+            <outputDirectory>wso2mdm-${project.version}/repository/conf</outputDirectory>
             <fileMode>644</fileMode>
         </file>
 
diff --git a/product/modules/distribution/src/assembly/dist.xml b/product/modules/distribution/src/assembly/dist.xml
index d0a9a55a8d..beff318242 100644
--- a/product/modules/distribution/src/assembly/dist.xml
+++ b/product/modules/distribution/src/assembly/dist.xml
@@ -26,7 +26,7 @@
         <!-- Copying p2 profile and osgi bundles-->
         <fileSet>
             <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/components</directory>
-            <outputDirectory>wso2cdm-${project.version}/repository/components</outputDirectory>
+            <outputDirectory>wso2mdm-${project.version}/repository/components</outputDirectory>
             <excludes>
                 <exclude>**/eclipse.ini</exclude>
                 <exclude>**/*.lock</exclude>
diff --git a/product/modules/distribution/src/assembly/filter.properties b/product/modules/distribution/src/assembly/filter.properties
index a0ebf6302a..19404cf6e9 100644
--- a/product/modules/distribution/src/assembly/filter.properties
+++ b/product/modules/distribution/src/assembly/filter.properties
@@ -1,7 +1,7 @@
-product.name=WSO2 Connected Device Manager
-product.version=2.0.0-SNAPSHOT
-product.key=CDM
+product.name=WSO2 Mobile Device Manager
+product.version=1.0.0-SNAPSHOT
+product.key=MDM
 hotdeployment=true
 hotupdate=true
 carbon.version=4.3.0
-default.server.role=CDMPlatform
+default.server.role=MDMPlatform
diff --git a/product/modules/rest-api/pom.xml b/product/modules/rest-api/pom.xml
index e8671c5a0c..354dbdb2d9 100644
--- a/product/modules/rest-api/pom.xml
+++ b/product/modules/rest-api/pom.xml
@@ -134,13 +134,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>