Merge pull request #342 from rasika/master

Separating CDMF base app and uuf-template app

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/assembly/src.xml

@@ -28,13 +28,15 @@
     <baseDirectory>${basedir}/src</baseDirectory>
     <fileSets>
         <fileSet>
+            <!-- CDMF base app -->
             <directory>${basedir}/src/main/resources/jaggeryapps/devicemgt</directory>
             <outputDirectory>/jaggeryapps/devicemgt-cdmf/</outputDirectory>
             <useDefaultExcludes>true</useDefaultExcludes>
         </fileSet>
         <fileSet>
+            <!-- UUF framework app -->
             <directory>${basedir}/src/main/resources/jaggeryapps/uuf-template-app</directory>
-            <outputDirectory>/jaggeryapps/devicemgt-cdmf/</outputDirectory>
+            <outputDirectory>/jaggeryapps/uuf-template-app/</outputDirectory>
             <useDefaultExcludes>true</useDefaultExcludes>
         </fileSet>
         <fileSet>

features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/src/main/resources/p2.inf

@@ -1,4 +1,6 @@
 instructions.configure = \
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/jaggeryapps/devicemgt-cdmf);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.ui_${feature.version}/jaggeryapps/devicemgt-cdmf,target:${installFolder}/../../deployment/server/jaggeryapps/devicemgt-cdmf,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/jaggeryapps/uuf-template-app);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.ui_${feature.version}/jaggeryapps/uuf-template-app,target:${installFolder}/../../deployment/server/jaggeryapps/uuf-template-app,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.ui_${feature.version}/jaggery-modules/utils/,target:${installFolder}/../../modules/utils,overwrite:true);\