From e98fc6c48df4ef11105e51e6e4bd5b9043c5d659 Mon Sep 17 00:00:00 2001
From: Niranjan-K <niranjan.karu@gmail.com>
Date: Wed, 3 Dec 2014 17:42:16 +0530
Subject: [PATCH] Changed carbon version to 4.3.0-SNAPSHOT

---
 .../org.wso2.carbon.device.mgt.core/pom.xml   |  2 +-
 components/device-mgt/pom.xml                 |  2 +-
 .../modules/distribution/src/assembly/bin.xml | 55 +------------------
 .../src/assembly/filter.properties            |  8 +--
 4 files changed, 7 insertions(+), 60 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
index e8790316fe..75240f3df7 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon</groupId>
         <artifactId>device-mgt</artifactId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/device-mgt/pom.xml b/components/device-mgt/pom.xml
index c61e2ad8e2..7e9fe17b30 100644
--- a/components/device-mgt/pom.xml
+++ b/components/device-mgt/pom.xml
@@ -31,7 +31,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon</groupId>
     <artifactId>device-mgt</artifactId>
-    <version>4.2.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Device Management Component</name>
     <url>http://wso2.org</url>
diff --git a/product/modules/distribution/src/assembly/bin.xml b/product/modules/distribution/src/assembly/bin.xml
index 40398b4555..3a3fbc673a 100644
--- a/product/modules/distribution/src/assembly/bin.xml
+++ b/product/modules/distribution/src/assembly/bin.xml
@@ -42,7 +42,7 @@
         </fileSet>
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-4.3.0/dbscripts/identity/
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity/
             </directory>
             <outputDirectory>wso2emm-${project.version}/dbscripts/identity</outputDirectory>
             <includes>
@@ -192,20 +192,6 @@
                 <include>*/**</include>
             </includes>
         </fileSet>
-        <fileSet>
-            <directory>src/repository/dbscripts/storage</directory>
-            <outputDirectory>wso2emm-${project.version}/dbscripts/storage</outputDirectory>
-            <includes>
-                <include>*/**</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>src/repository/dbscripts/apimgt</directory>
-            <outputDirectory>wso2emm-${project.version}/dbscripts/apimgt</outputDirectory>
-            <includes>
-                <include>*/**</include>
-            </includes>
-        </fileSet>
         <fileSet>
             <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/service-provider
             </directory>
@@ -214,18 +200,6 @@
                 <include>*/**</include>
             </includes>
         </fileSet>
-        <!-- API Store/ API Publisher -->
-        <fileSet>
-            <directory>../apps/productapipublisher/</directory>
-            <outputDirectory>
-                ${pom.artifactId}-${project.version}/repository/deployment/server/jaggeryapps/productapipublisher
-            </outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>../apps/productapistore/</directory>
-            <outputDirectory>${pom.artifactId}-${project.version}/repository/deployment/server/jaggeryapps/productapistore
-            </outputDirectory>
-        </fileSet>
         <fileSet>
             <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/modules</directory>
             <outputDirectory>wso2emm-${project.version}/modules/</outputDirectory>
@@ -330,28 +304,7 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
-        <file>
-            <source>src/repository/conf/carbon.xml</source>
-            <outputDirectory>wso2emm-${project.version}/repository/conf/</outputDirectory>
-            <filtered>true</filtered>
-        </file>
-        <file>
-            <source>src/repository/conf/registry.xml</source>
-            <outputDirectory>wso2emm-${project.version}/repository/conf/</outputDirectory>
-            <filtered>true</filtered>
-        </file>
-
-        <file>
-            <source>src/repository/conf/wso2emm.jks</source>
-            <outputDirectory>wso2emm-${project.version}/repository/resources/security</outputDirectory>
-            <filtered>true</filtered>
-        </file>
 
-        <file>
-            <source>src/repository/conf/cipher-tool.properties</source>
-            <outputDirectory>wso2emm-${project.version}/repository/conf/security/</outputDirectory>
-            <filtered>true</filtered>
-        </file>
         <!--copy default xacml policy to repository/resources/security -->
         <file>
             <source>src/repository/resources/policies/xacml/default/admin.xml</source>
@@ -398,12 +351,6 @@
             <outputDirectory>wso2emm-${project.version}/repository/database</outputDirectory>
             <fileMode>644</fileMode>
         </file>
-        <file>
-            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml
-            </source>
-            <outputDirectory>wso2emm-${project.version}/repository/conf/</outputDirectory>
-            <filtered>true</filtered>
-        </file>
 
         <!-- nTask Component -->
         <file>
diff --git a/product/modules/distribution/src/assembly/filter.properties b/product/modules/distribution/src/assembly/filter.properties
index 4c1aba4b90..bd8f07d1e0 100644
--- a/product/modules/distribution/src/assembly/filter.properties
+++ b/product/modules/distribution/src/assembly/filter.properties
@@ -1,7 +1,7 @@
-product.name= WSO2 Enterprise Mobility Manager (EMM)
-product.version=1.1.0
+product.name=WSO2 Connected Device Manager
+product.version=2.0.0-SNAPSHOT
 product.key=EMM
 hotdeployment=true
 hotupdate=true
-carbon.version=4.2.0
-default.server.role=MobilePlatform
+carbon.version=4.3.0
+default.server.role=CDMPlatform