From 078c29ab9d8d43310d143850aebe8a3684cd6c71 Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Thu, 1 Sep 2016 16:12:51 +0530
Subject: [PATCH] Now EMM mobile-base-plugin feature contains both devicemgt
 and emm-web-agent apps

---
 .../src/assembly/src.xml                                   | 7 ++++++-
 .../org.wso2.carbon.device.mgt.mobile.feature/pom.xml      | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/assembly/src.xml b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/assembly/src.xml
index 2797034e0..a73a3edaa 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/assembly/src.xml
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/assembly/src.xml
@@ -29,7 +29,12 @@
     <fileSets>
         <fileSet>
             <directory>${basedir}/src/main/resources/jaggeryapps/devicemgt</directory>
-            <outputDirectory>/</outputDirectory>
+            <outputDirectory>/devicemgt</outputDirectory>
+            <useDefaultExcludes>true</useDefaultExcludes>
+        </fileSet>
+        <fileSet>
+            <directory>${basedir}/src/main/resources/jaggeryapps/emm-web-agent</directory>
+            <outputDirectory>/emm-web-agent</outputDirectory>
             <useDefaultExcludes>true</useDefaultExcludes>
         </fileSet>
     </fileSets>
diff --git a/features/mobile-plugins-feature/mobile-base-plugin-feature/org.wso2.carbon.device.mgt.mobile.feature/pom.xml b/features/mobile-plugins-feature/mobile-base-plugin-feature/org.wso2.carbon.device.mgt.mobile.feature/pom.xml
index defd7b55b..a2997a3c3 100644
--- a/features/mobile-plugins-feature/mobile-base-plugin-feature/org.wso2.carbon.device.mgt.mobile.feature/pom.xml
+++ b/features/mobile-plugins-feature/mobile-base-plugin-feature/org.wso2.carbon.device.mgt.mobile.feature/pom.xml
@@ -111,7 +111,7 @@
                                     <type>zip</type>
                                     <overWrite>true</overWrite>
                                     <outputDirectory>
-                                        ${project.build.directory}/maven-shared-archive-resources/jaggeryapps/devicemgt
+                                        ${project.build.directory}/maven-shared-archive-resources/jaggeryapps/
                                     </outputDirectory>
                                     <includes>**/*</includes>
                                 </artifactItem>