From c32caa6067b170680b0ccebae0fb941485db643d Mon Sep 17 00:00:00 2001
From: charithag <charitha.ws@gmail.com>
Date: Mon, 14 Dec 2015 12:25:57 +0530
Subject: [PATCH 1/3] Copy cdmf related uuf contents from devicemgt-cdmf

---
 modules/distribution/src/assembly/bin.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 210658b6..d7201a85 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -394,6 +394,18 @@
             </excludes>
         </fileSet>
 
+        <fileSet>
+            <directory>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/devicemgt-cdmf/
+            </directory>
+            <outputDirectory>
+                ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/devicemgt
+            </outputDirectory>
+            <excludes>
+                <exclude>jaggery.conf</exclude>
+            </excludes>
+        </fileSet>
+
         <fileSet>
             <directory>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/devicemgt/

From 99b123bf74a98ebe51c996a604dba1efe139432b Mon Sep 17 00:00:00 2001
From: charithag <charitha.ws@gmail.com>
Date: Mon, 14 Dec 2015 13:54:30 +0530
Subject: [PATCH 2/3] Add jaggery conf from cdmf

---
 modules/distribution/src/assembly/bin.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index d7201a85..c0066eb1 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -401,9 +401,6 @@
             <outputDirectory>
                 ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/devicemgt
             </outputDirectory>
-            <excludes>
-                <exclude>jaggery.conf</exclude>
-            </excludes>
         </fileSet>
 
         <fileSet>

From a9bc546253d6aa7fac253de8e50b656eb9b29381 Mon Sep 17 00:00:00 2001
From: sajithar <sajithar@wso2.com>
Date: Mon, 14 Dec 2015 15:33:26 +0530
Subject: [PATCH 3/3] changed bin.xml to exclude 'app-conf.json' from UUF and
 CDMF apps.

---
 modules/distribution/src/assembly/bin.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index c0066eb1..511cdfaa 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -391,6 +391,7 @@
             </outputDirectory>
             <excludes>
                 <exclude>jaggery.conf</exclude>
+                <exclude>app/conf/app-conf.json</exclude>
             </excludes>
         </fileSet>
 
@@ -401,8 +402,11 @@
             <outputDirectory>
                 ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/devicemgt
             </outputDirectory>
+            <excludes>
+                <exclude>app/conf/app-conf.json</exclude>
+            </excludes>
         </fileSet>
-
+        
         <fileSet>
             <directory>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/devicemgt/