From 2ccc35f9bdb49e925802f053d2054d673417339c Mon Sep 17 00:00:00 2001
From: Geeth Munasinghe <geeth@wso2.com>
Date: Mon, 9 Feb 2015 20:26:39 +0530
Subject: [PATCH] Fixing the product mdm repo with released device mgt
 component -version 0.9.0

---
 .../pom.xml                                   |  6 +--
 .../pom.xml                                   |  2 +-
 pom.xml                                       | 24 ++++++------
 .../modules/distribution/src/assembly/bin.xml |  4 +-
 .../distribution/src/assembly/docs.xml        |  2 +-
 .../modules/integration/tests-common/pom.xml  |  2 +-
 .../agents/android/jax-rs/pom.xml             |  4 +-
 .../agents/windows/jax-rs/pom.xml             |  4 +-
 product/modules/p2-profile-gen/pom.xml        | 38 +++++++++----------
 product/modules/rest-api/pom.xml              |  4 +-
 10 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml
index 85212b6543..40dfc0797f 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml
@@ -107,15 +107,15 @@
             <artifactId>org.wso2.carbon.utils</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon.cdm</groupId>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
             <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon</groupId>
+            <groupId>org.wso2.carbon.apimgt</groupId>
             <artifactId>org.wso2.carbon.apimgt.api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon</groupId>
+            <groupId>org.wso2.carbon.apimgt</groupId>
             <artifactId>org.wso2.carbon.apimgt.impl</artifactId>
         </dependency>
         <dependency>
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 8e4422afbc..2071e688fb 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
@@ -43,7 +43,7 @@
             <artifactId>org.wso2.carbon.device.mgt.mobile.impl</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon.cdm</groupId>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
             <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
         </dependency>
     </dependencies>
diff --git a/pom.xml b/pom.xml
index 2e6e8961ae..7b18445935 100644
--- a/pom.xml
+++ b/pom.xml
@@ -327,22 +327,22 @@
 
             <!--CDM core dependencies-->
             <dependency>
-                <groupId>org.wso2.carbon.cdm</groupId>
+                <groupId>org.wso2.carbon.devicemgt</groupId>
                 <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
                 <version>${cdm.core.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon.cdm</groupId>
+                <groupId>org.wso2.carbon.devicemgt</groupId>
                 <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
                 <version>${cdm.core.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon</groupId>
+                <groupId>org.wso2.carbon.devicemgt</groupId>
                 <artifactId>org.wso2.carbon.policy.mgt.common</artifactId>
                 <version>${cdm.core.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon</groupId>
+                <groupId>org.wso2.carbon.devicemgt</groupId>
                 <artifactId>org.wso2.carbon.policy.mgt.core</artifactId>
                 <version>${cdm.core.version}</version>
             </dependency>
@@ -409,7 +409,7 @@
 
             <!--APIM dependencies-->
             <dependency>
-                <groupId>org.wso2.carbon</groupId>
+                <groupId>org.wso2.carbon.apimgt</groupId>
                 <artifactId>org.wso2.carbon.apimgt.core</artifactId>
                 <version>${carbon.api.mgt.version}</version>
                 <exclusions>
@@ -420,7 +420,7 @@
                 </exclusions>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon</groupId>
+                <groupId>org.wso2.carbon.apimgt</groupId>
                 <artifactId>org.wso2.carbon.apimgt.api</artifactId>
                 <version>${carbon.api.mgt.version}</version>
                 <exclusions>
@@ -431,7 +431,7 @@
                 </exclusions>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon</groupId>
+                <groupId>org.wso2.carbon.apimgt</groupId>
                 <artifactId>org.wso2.carbon.apimgt.impl</artifactId>
                 <version>${carbon.api.mgt.version}</version>
                 <exclusions>
@@ -611,8 +611,8 @@
         <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>
+        <cdm.core.version>0.9.0</cdm.core.version>
+        <cdm.core.version.range>[0.8.0, 2.0.0)</cdm.core.version.range>
 
         <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
 
@@ -658,7 +658,7 @@
         <carbon.deployment.version>4.3.1</carbon.deployment.version>
 
         <!-- Identity -->
-        <carbon.identity.version>4.3.2</carbon.identity.version>
+        <carbon.identity.version>4.3.3</carbon.identity.version>
 
         <!-- Multi-tenancy -->
         <carbon.multitenancy.version>4.3.3</carbon.multitenancy.version>
@@ -670,13 +670,13 @@
         <carbon.governance.version>4.3.0</carbon.governance.version>
 
         <!-- Device Management -->
-        <carbon.device.mgt.version>1.0.0-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.version>0.9.0</carbon.device.mgt.version>
 
         <!-- Mobile Device Management -->
         <carbon.mobile.device.mgt.version>2.0.0-SNAPSHOT</carbon.mobile.device.mgt.version>
 
         <!-- API Management -->
-        <carbon.api.mgt.version>4.3.0-SNAPSHOT</carbon.api.mgt.version>
+        <carbon.api.mgt.version>1.3.1</carbon.api.mgt.version>
 
         <!-- Third Party Dependencies-->
         <spongycastle.version>1.51.0.0</spongycastle.version>
diff --git a/product/modules/distribution/src/assembly/bin.xml b/product/modules/distribution/src/assembly/bin.xml
index 82d7af1402..c5538347c9 100644
--- a/product/modules/distribution/src/assembly/bin.xml
+++ b/product/modules/distribution/src/assembly/bin.xml
@@ -306,13 +306,13 @@
 
     <files>
         <file>
-            <source>../mobileservices/agents/android/jax-rs/target/cdm-android-api.war</source>
+            <source>../mobileservices/agents/android/jax-rs/target/mdm-android-api.war</source>
             <outputDirectory>wso2mdm-${pom.version}/repository/deployment/server/webapps
             </outputDirectory>
             <fileMode>755</fileMode>
         </file>
         <file>
-            <source>../rest-api/target/wso2cdm-api.war</source>
+            <source>../rest-api/target/wso2mdm-api.war</source>
             <outputDirectory>wso2mdm-${pom.version}/repository/deployment/server/webapps
             </outputDirectory>
             <fileMode>755</fileMode>
diff --git a/product/modules/distribution/src/assembly/docs.xml b/product/modules/distribution/src/assembly/docs.xml
index ee8addd399..afc8d43c90 100644
--- a/product/modules/distribution/src/assembly/docs.xml
+++ b/product/modules/distribution/src/assembly/docs.xml
@@ -29,7 +29,7 @@
         </fileSet>
         <fileSet>
             <directory>../../modules/documentation/src/site/xdoc/user-core</directory>
-            <outputDirectory>wso2mobileserver-${carbon.mobile.device.mgt.version}-docs/user-core</outputDirectory>
+            <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}-docs/user-core</outputDirectory>
             <fileMode>755</fileMode>
             <includes>
                 <include>user-mgt-actdir.xml</include>
diff --git a/product/modules/integration/tests-common/pom.xml b/product/modules/integration/tests-common/pom.xml
index ba87264c01..bcb6cf8585 100644
--- a/product/modules/integration/tests-common/pom.xml
+++ b/product/modules/integration/tests-common/pom.xml
@@ -39,7 +39,7 @@
     <modules>
         <module>admin-clients</module>
         <module>integration-test-utils</module>
-        <module>ui-pages</module>
+        <!--<module>ui-pages</module>-->
     </modules>
 
 </project>
diff --git a/product/modules/mobileservices/agents/android/jax-rs/pom.xml b/product/modules/mobileservices/agents/android/jax-rs/pom.xml
index 4d03a5fdb1..2f72af1644 100644
--- a/product/modules/mobileservices/agents/android/jax-rs/pom.xml
+++ b/product/modules/mobileservices/agents/android/jax-rs/pom.xml
@@ -146,12 +146,12 @@
 
         <!--CDM Dependencies-->
         <dependency>
-            <groupId>org.wso2.carbon.cdm</groupId>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
             <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon.cdm</groupId>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
             <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/product/modules/mobileservices/agents/windows/jax-rs/pom.xml b/product/modules/mobileservices/agents/windows/jax-rs/pom.xml
index 542c988fc0..08e92a45ec 100644
--- a/product/modules/mobileservices/agents/windows/jax-rs/pom.xml
+++ b/product/modules/mobileservices/agents/windows/jax-rs/pom.xml
@@ -169,12 +169,12 @@
             <artifactId>jackson-jaxrs</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon.cdm</groupId>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
             <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon.cdm</groupId>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
             <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/product/modules/p2-profile-gen/pom.xml b/product/modules/p2-profile-gen/pom.xml
index deb80b56c4..39495bf7d7 100644
--- a/product/modules/p2-profile-gen/pom.xml
+++ b/product/modules/p2-profile-gen/pom.xml
@@ -106,10 +106,10 @@
 
                                 <!-- Device Management Features -->
                                 <featureArtifactDef>
-                                    org.wso2.carbon.cdm:org.wso2.carbon.device.mgt.server.feature:${carbon.device.mgt.version}
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.server.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.cdm:org.wso2.carbon.policy.mgt.server.feature:${carbon.device.mgt.version}
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.policy.mgt.server.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
                                 <!-- End of Device Management Features -->
 
@@ -157,13 +157,13 @@
 
                                 <!-- API Management Features -->
                                 <featureArtifactDef>
-                                    org.wso2.carbon:org.wso2.carbon.apimgt.core.feature:${carbon.api.mgt.version}
+                                    org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.core.feature:${carbon.api.mgt.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon:org.wso2.carbon.apimgt.publisher.feature:${carbon.api.mgt.version}
+                                    org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.publisher.feature:${carbon.api.mgt.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon:org.wso2.carbon.apimgt.store.feature:${carbon.api.mgt.version}
+                                    org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.store.feature:${carbon.api.mgt.version}
                                 </featureArtifactDef>
                                 <!-- End of API Management Features -->
 
@@ -198,9 +198,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.um.ws.service.server.feature:${carbon.identity.version}
                                 </featureArtifactDef>
-                                <!--<featureArtifactDef>-->
-                                <!--org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.feature:${carbon.identity.version}-->
-                                <!--</featureArtifactDef>-->
+                                <featureArtifactDef>
+                                org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.feature:${carbon.identity.version}
+                                </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.common.feature:${carbon.identity.version}
                                 </featureArtifactDef>
@@ -213,9 +213,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.identity.core.feature:${carbon.identity.version}
                                 </featureArtifactDef>
-                                <!--<featureArtifactDef>-->
-                                <!--org.wso2.carbon.identity:org.wso2.carbon.idp.mgt.feature:${carbon.identity.version}-->
-                                <!--</featureArtifactDef>-->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity:org.wso2.carbon.idp.mgt.feature:${carbon.identity.version}
+                                </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.identity.relying.party.server.feature:${carbon.identity.version}
                                 </featureArtifactDef>
@@ -421,10 +421,10 @@
                                     <id>org.wso2.carbon.um.ws.service.server.feature.group</id>
                                     <version>${carbon.identity.version}</version>
                                 </feature>
-                                <!--<feature>-->
-                                <!--<id>org.wso2.carbon.identity.oauth.server.feature.group</id>-->
-                                <!--<version>${carbon.identity.version}</version>-->
-                                <!--</feature>-->
+                                <feature>
+                                <id>org.wso2.carbon.identity.oauth.server.feature.group</id>
+                                <version>${carbon.identity.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.oauth.common.feature.group</id>
                                     <version>${carbon.identity.version}</version>
@@ -441,10 +441,10 @@
                                     <id>org.wso2.carbon.identity.core.feature.group</id>
                                     <version>${carbon.identity.version}</version>
                                 </feature>
-                                <!--<feature>-->
-                                <!--<id>org.wso2.carbon.idp.mgt.feature.group</id>-->
-                                <!--<version>${carbon.identity.version}</version>-->
-                                <!--</feature>-->
+                                <feature>
+                                <id>org.wso2.carbon.idp.mgt.feature.group</id>
+                                <version>${carbon.identity.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.relying.party.server.feature.group</id>
                                     <version>${carbon.identity.version}</version>
diff --git a/product/modules/rest-api/pom.xml b/product/modules/rest-api/pom.xml
index 40f4891ac0..2ddd11f78e 100644
--- a/product/modules/rest-api/pom.xml
+++ b/product/modules/rest-api/pom.xml
@@ -160,12 +160,12 @@
             <version>1.9.0</version>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon.cdm</groupId>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
             <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon.cdm</groupId>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
             <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
             <scope>provided</scope>
         </dependency>