From 9f77e13cba3c4d4550b4b42c485b6dc6c3068aeb Mon Sep 17 00:00:00 2001
From: charithag <charitha.ws@gmail.com>
Date: Thu, 12 Nov 2015 18:44:52 +0530
Subject: [PATCH] Moved mdm-admin app to mdm specific app

---
 .../pom.xml                                   |  4 +-
 components/device-mgt/pom.xml                 |  2 +-
 .../pom.xml                                   | 25 +++++++
 .../src/main/resources/p2.inf                 |  2 +
 pom.xml                                       | 73 +++++++++++++++++++
 5 files changed, 103 insertions(+), 3 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/pom.xml
index 97fab23803..2ccbcb4cbc 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/pom.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/pom.xml
@@ -29,7 +29,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.mobile.api</artifactId>
     <version>1.9.2-SNAPSHOT</version>
-    <packaging>bundle</packaging>
+    <packaging>war</packaging>
     <name>WSO2 Carbon - Mobile Device Management API</name>
     <description>WSO2 Carbon - Mobile Device Management API</description>
     <url>http://wso2.org</url>
@@ -190,7 +190,7 @@
             <artifactId>gson</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-codec.wso2</groupId>
+            <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
         </dependency>
     </dependencies>
diff --git a/components/device-mgt/pom.xml b/components/device-mgt/pom.xml
index b52729ea56..c72eaf9329 100644
--- a/components/device-mgt/pom.xml
+++ b/components/device-mgt/pom.xml
@@ -34,7 +34,7 @@
     <url>http://wso2.org</url>
 
     <modules>
-        <!--<module>org.wso2.carbon.device.mgt.mobile.api</module>-->
+        <module>org.wso2.carbon.device.mgt.mobile.api</module>
         <module>org.wso2.carbon.device.mgt.mobile.impl</module>
         <module>org.wso2.carbon.device.mgt.mobile.url.printer</module>
     </modules>
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 6be1ceae20..3182ef8544 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
@@ -91,6 +91,31 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
+                                    <artifactId>org.wso2.carbon.device.mgt.mobile.api</artifactId>
+                                    <type>war</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${basedir}/src/main/resources/webapps/</outputDirectory>
+                                    <destFileName>mdm_admin.war</destFileName>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.wso2.maven</groupId>
                 <artifactId>carbon-p2-plugin</artifactId>
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/p2.inf b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/p2.inf
index 0dab9e7d29..64431f0314 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/p2.inf
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/p2.inf
@@ -1,3 +1,5 @@
 instructions.configure = \
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile_${feature.version}/webapps/,target:${installFolder}/../../deployment/server/webapps/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile_${feature.version}/conf/mobile-config.xml,target:${installFolder}/../../conf/mobile-config.xml,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile_${feature.version}/dbscripts/plugins/,target:${installFolder}/../../../dbscripts/cdm/plugins,overwrite:true);\
diff --git a/pom.xml b/pom.xml
index ee1ae356d2..222a47e7a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -247,6 +247,11 @@
             </dependency>
 
             <!--MDM dependencies-->
+            <dependency>
+                <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
+                <artifactId>org.wso2.carbon.device.mgt.mobile.api</artifactId>
+                <version>${carbon.mobile.device.mgt.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
                 <artifactId>org.wso2.carbon.device.mgt.mobile.impl</artifactId>
@@ -272,6 +277,63 @@
                 <version>${carbon.mobile.device.mgt.version}</version>
             </dependency>
 
+            <!--CXF dependencies (needed for mobile Jax_RS web apps)-->
+            <dependency>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-rt-frontend-jaxws</artifactId>
+                <version>${cxf.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+                <version>${cxf.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-rt-transports-http</artifactId>
+                <version>${cxf.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.ws.rs</groupId>
+                <artifactId>jsr311-api</artifactId>
+                <version>${javax.ws.rs.version}</version>
+                <!--<scope>provided</scope>-->
+            </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <scope>test</scope>
+                <version>${junit.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-httpclient.wso2</groupId>
+                <artifactId>commons-httpclient</artifactId>
+                <version>${orbit.version.commons-httpclient}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-codec</groupId>
+                <artifactId>commons-codec</artifactId>
+                <version>${commons-codec.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.wso2.carbon.commons</groupId>
+                <artifactId>org.wso2.carbon.user.mgt</artifactId>
+                <version>${carbon.commons.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.wso2.carbon.identity</groupId>
+                <artifactId>org.wso2.carbon.identity.oauth.stub</artifactId>
+                <version>${carbon.identity.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.axis2.wso2</groupId>
+                        <artifactId>axis2-client</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
             <!--Osgi dependencies-->
             <dependency>
                 <groupId>org.eclipse.osgi</groupId>
@@ -348,6 +410,10 @@
                 <artifactId>org.wso2.carbon.apimgt.impl</artifactId>
                 <version>${carbon.api.mgt.version}</version>
                 <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.axis2.wso2</groupId>
+                        <artifactId>axis2-client</artifactId>
+                    </exclusion>
                     <exclusion>
                         <groupId>org.wso2.carbon.mediation</groupId>
                         <artifactId>org.wso2.carbon.mediation.initializer</artifactId>
@@ -549,10 +615,14 @@
         <axis2.osgi.version.range>[1.6.1.wso2v11, 1.7.0)</axis2.osgi.version.range>
         <axis2.orbit.version>1.6.1.wso2v11</axis2.orbit.version>
 
+        <orbit.version.commons-httpclient>3.1.0.wso2v2</orbit.version.commons-httpclient>
+        <commons-codec.version>1.7</commons-codec.version>
+
         <!--Maven build number plugin-->
         <maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version>
 
         <!--Testing -->
+        <junit.version>4.8.2</junit.version>
         <test.framework.version>4.3.1</test.framework.version>
         <testng.version>6.8</testng.version>
 
@@ -573,6 +643,9 @@
         <!-- Carbon Commons -->
         <carbon.commons.version>4.4.8</carbon.commons.version>
 
+        <!-- Carbon API Management -->
+        <carbon.api.mgt.version>4.3.0-SNAPSHOT</carbon.api.mgt.version>
+
         <!-- Carbon Deployment -->
         <carbon.deployment.version>4.4.0</carbon.deployment.version>