From 2e10d2ba2b7ac6d4bcee3aac37223b3e8afe1bee Mon Sep 17 00:00:00 2001
From: GPrathap <geesara@wso2.com>
Date: Wed, 25 May 2016 14:42:54 +0530
Subject: [PATCH 1/5] added some bundles which required for this feature

---
 .../pom.xml                                          |  1 -
 .../pom.xml                                          | 12 ++++++++++++
 .../org.wso2.carbon.device.mgt.iot.feature/pom.xml   |  9 ---------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.input.adapter.extension/pom.xml b/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.input.adapter.extension/pom.xml
index 170176ad7d..9d5353c6cb 100644
--- a/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.input.adapter.extension/pom.xml
+++ b/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.input.adapter.extension/pom.xml
@@ -53,5 +53,4 @@
             </plugin>
         </plugins>
     </build>
-
 </project>
\ No newline at end of file
diff --git a/features/iot-plugins-feature/iot-base-plugin-feature/org.wso2.carbon.device.mgt.iot.adapter.feature/pom.xml b/features/iot-plugins-feature/iot-base-plugin-feature/org.wso2.carbon.device.mgt.iot.adapter.feature/pom.xml
index 79a61d850f..e794f26778 100644
--- a/features/iot-plugins-feature/iot-base-plugin-feature/org.wso2.carbon.device.mgt.iot.adapter.feature/pom.xml
+++ b/features/iot-plugins-feature/iot-base-plugin-feature/org.wso2.carbon.device.mgt.iot.adapter.feature/pom.xml
@@ -160,6 +160,18 @@
 								<bundleDef>
 									org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.output.adapter.ui:${carbon.devicemgt.plugins.version}
 								</bundleDef>
+                                <bundleDef>
+									org.eclipse.paho:org.eclipse.paho.client.mqttv3:${eclipse.paho.version}
+								</bundleDef>
+                                <bundleDef>
+                                    org.igniterealtime.smack.wso2:smack:${smack.wso2.version}
+                                </bundleDef>
+                                <bundleDef>
+                                    org.igniterealtime.smack.wso2:smackx:${smackx.wso2.version}
+                                </bundleDef>
+                                <bundleDef>
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.stub:${carbon.identity.version}
+                                </bundleDef>
 							</bundles>
 							<importFeatures>
 								<importFeatureDef>
diff --git a/features/iot-plugins-feature/iot-base-plugin-feature/org.wso2.carbon.device.mgt.iot.feature/pom.xml b/features/iot-plugins-feature/iot-base-plugin-feature/org.wso2.carbon.device.mgt.iot.feature/pom.xml
index d29cfb369f..950d6d84df 100644
--- a/features/iot-plugins-feature/iot-base-plugin-feature/org.wso2.carbon.device.mgt.iot.feature/pom.xml
+++ b/features/iot-plugins-feature/iot-base-plugin-feature/org.wso2.carbon.device.mgt.iot.feature/pom.xml
@@ -137,15 +137,6 @@
 								<bundleDef>
 									org.json.wso2:json:${commons-json.version}
 								</bundleDef>
-								<bundleDef>
-									org.eclipse.paho:org.eclipse.paho.client.mqttv3:${eclipse.paho.version}
-								</bundleDef>
-								<bundleDef>
-									org.igniterealtime.smack.wso2:smack:${smack.wso2.version}
-								</bundleDef>
-								<bundleDef>
-									org.igniterealtime.smack.wso2:smackx:${smackx.wso2.version}
-								</bundleDef>
 							</bundles>
 							<importFeatures>
 								<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}

From 7c494d7bc07e5751f346fc61a21048aaeccb0504 Mon Sep 17 00:00:00 2001
From: GPrathap <geesara@wso2.com>
Date: Wed, 25 May 2016 14:57:38 +0530
Subject: [PATCH 2/5] added some bundles which required for this feature

---
 .../pom.xml                                   | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/features/iot-plugins-feature/iot-base-plugin-feature/org.wso2.carbon.device.mgt.iot.adapter.feature/pom.xml b/features/iot-plugins-feature/iot-base-plugin-feature/org.wso2.carbon.device.mgt.iot.adapter.feature/pom.xml
index e794f26778..941eead4fa 100644
--- a/features/iot-plugins-feature/iot-base-plugin-feature/org.wso2.carbon.device.mgt.iot.adapter.feature/pom.xml
+++ b/features/iot-plugins-feature/iot-base-plugin-feature/org.wso2.carbon.device.mgt.iot.adapter.feature/pom.xml
@@ -160,18 +160,18 @@
 								<bundleDef>
 									org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.output.adapter.ui:${carbon.devicemgt.plugins.version}
 								</bundleDef>
-                                <bundleDef>
-									org.eclipse.paho:org.eclipse.paho.client.mqttv3:${eclipse.paho.version}
-								</bundleDef>
-                                <bundleDef>
-                                    org.igniterealtime.smack.wso2:smack:${smack.wso2.version}
-                                </bundleDef>
-                                <bundleDef>
-                                    org.igniterealtime.smack.wso2:smackx:${smackx.wso2.version}
-                                </bundleDef>
-                                <bundleDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.stub:${carbon.identity.version}
-                                </bundleDef>
+                                                            <bundleDef>
+                                                                org.eclipse.paho:org.eclipse.paho.client.mqttv3:${eclipse.paho.version}
+                                                            </bundleDef>
+                                                            <bundleDef>
+                                                                org.igniterealtime.smack.wso2:smack:${smack.wso2.version}
+                                                            </bundleDef>
+                                                            <bundleDef>
+                                                                org.igniterealtime.smack.wso2:smackx:${smackx.wso2.version}
+                                                            </bundleDef>
+                                                            <bundleDef>
+                                                                org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.stub:${carbon.identity.version}
+                                                            </bundleDef>
 							</bundles>
 							<importFeatures>
 								<importFeatureDef>

From ef801d6d08216b88bdb7e50f55b6ac1c60a71fd3 Mon Sep 17 00:00:00 2001
From: GPrathap <geesara@wso2.com>
Date: Wed, 25 May 2016 15:07:26 +0530
Subject: [PATCH 3/5] fixed the formatting issue

---
 .../pom.xml                                   | 339 +++++++++---------
 1 file changed, 171 insertions(+), 168 deletions(-)

diff --git a/features/iot-plugins-feature/iot-base-plugin-feature/org.wso2.carbon.device.mgt.iot.adapter.feature/pom.xml b/features/iot-plugins-feature/iot-base-plugin-feature/org.wso2.carbon.device.mgt.iot.adapter.feature/pom.xml
index 941eead4fa..61b6faacca 100644
--- a/features/iot-plugins-feature/iot-base-plugin-feature/org.wso2.carbon.device.mgt.iot.adapter.feature/pom.xml
+++ b/features/iot-plugins-feature/iot-base-plugin-feature/org.wso2.carbon.device.mgt.iot.adapter.feature/pom.xml
@@ -18,176 +18,179 @@
   ~ under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-	<parent>
-		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-		<artifactId>iot-base-plugin-feature</artifactId>
-		<version>2.1.1-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
+    <parent>
+        <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
+        <artifactId>iot-base-plugin-feature</artifactId>
+        <version>2.1.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
 
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>org.wso2.carbon.device.mgt.iot.adapter.feature</artifactId>
-	<packaging>pom</packaging>
-	<version>2.1.1-SNAPSHOT</version>
-	<name>WSO2 Carbon - IoT Device Management Feature</name>
-	<url>http://wso2.org</url>
-	<description>This feature contains the adapter bundles required for IoT Server</description>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.wso2.carbon.device.mgt.iot.adapter.feature</artifactId>
+    <packaging>pom</packaging>
+    <version>2.1.1-SNAPSHOT</version>
+    <name>WSO2 Carbon - IoT Device Management Feature</name>
+    <url>http://wso2.org</url>
+    <description>This feature contains the adapter bundles required for IoT Server</description>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-			<artifactId>org.wso2.carbon.device.mgt.iot.output.adapter.mqtt</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-			<artifactId>org.wso2.carbon.device.mgt.iot.output.adapter.xmpp</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-			<artifactId>org.wso2.carbon.device.mgt.iot.output.adapter.ui</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-			<artifactId>org.wso2.carbon.device.mgt.iot.input.adapter.extension</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-			<artifactId>org.wso2.carbon.device.mgt.iot.input.adapter.http</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-			<artifactId>org.wso2.carbon.device.mgt.iot.input.adapter.mqtt</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-			<artifactId>org.wso2.carbon.device.mgt.iot.input.adapter.xmpp</artifactId>
-		</dependency>
-	</dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
+            <artifactId>org.wso2.carbon.device.mgt.iot.output.adapter.mqtt</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
+            <artifactId>org.wso2.carbon.device.mgt.iot.output.adapter.xmpp</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
+            <artifactId>org.wso2.carbon.device.mgt.iot.output.adapter.ui</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
+            <artifactId>org.wso2.carbon.device.mgt.iot.input.adapter.extension</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
+            <artifactId>org.wso2.carbon.device.mgt.iot.input.adapter.http</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
+            <artifactId>org.wso2.carbon.device.mgt.iot.input.adapter.mqtt</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
+            <artifactId>org.wso2.carbon.device.mgt.iot.input.adapter.xmpp</artifactId>
+        </dependency>
+    </dependencies>
 
-	<build>
-		<plugins>
-			<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.iot.output.adapter.ui.endpoint</artifactId>
-									<version>${carbon.devicemgt.plugins.version}</version>
-									<type>war</type>
-									<overWrite>true</overWrite>
-									<outputDirectory>${project.build.directory}/maven-shared-archive-resources/webapps/</outputDirectory>
-									<destFileName>secured-outputui.war</destFileName>
-								</artifactItem>
-							</artifactItems>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy-resources</id>
-						<phase>generate-resources</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>src/main/resources</outputDirectory>
-							<resources>
-								<resource>
-									<directory>resources</directory>
-									<includes>
-										<include>build.properties</include>
-										<include>p2.inf</include>
-									</includes>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.wso2.maven</groupId>
-				<artifactId>carbon-p2-plugin</artifactId>
-				<version>${carbon.p2.plugin.version}</version>
-				<executions>
-					<execution>
-						<id>p2-feature-generation</id>
-						<phase>package</phase>
-						<goals>
-							<goal>p2-feature-gen</goal>
-						</goals>
-						<configuration>
-							<id>org.wso2.carbon.device.mgt.iot.adapter</id>
-							<propertiesFile>../../../features/etc/feature.properties</propertiesFile>
-							<adviceFile>
-								<properties>
-									<propertyDef>org.wso2.carbon.p2.category.type:server</propertyDef>
-									<propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef>
-								</properties>
-							</adviceFile>
-							<bundles>
-								<bundleDef>
-									org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.output.adapter.mqtt:${carbon.devicemgt.plugins.version}
-								</bundleDef>
-								<bundleDef>
-									org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.output.adapter.xmpp:${carbon.devicemgt.plugins.version}
-								</bundleDef>
-								<bundleDef>
-									org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.input.adapter.extension:${carbon.devicemgt.plugins.version}
-								</bundleDef>
-								<bundleDef>
-									org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.input.adapter.http:${carbon.devicemgt.plugins.version}
-								</bundleDef>
-								<bundleDef>
-									org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.input.adapter.mqtt:${carbon.devicemgt.plugins.version}
-								</bundleDef>
-								<bundleDef>
-									org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.input.adapter.xmpp:${carbon.devicemgt.plugins.version}
-								</bundleDef>
-								<bundleDef>
-									org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.output.adapter.ui:${carbon.devicemgt.plugins.version}
-								</bundleDef>
-                                                            <bundleDef>
-                                                                org.eclipse.paho:org.eclipse.paho.client.mqttv3:${eclipse.paho.version}
-                                                            </bundleDef>
-                                                            <bundleDef>
-                                                                org.igniterealtime.smack.wso2:smack:${smack.wso2.version}
-                                                            </bundleDef>
-                                                            <bundleDef>
-                                                                org.igniterealtime.smack.wso2:smackx:${smackx.wso2.version}
-                                                            </bundleDef>
-                                                            <bundleDef>
-                                                                org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.stub:${carbon.identity.version}
-                                                            </bundleDef>
-							</bundles>
-							<importFeatures>
-								<importFeatureDef>
-									org.wso2.carbon.event.output.adapter.server:${carbon.analytics.common.version}
-								</importFeatureDef>
-								<importFeatureDef>
-									org.wso2.carbon.event.input.adapter.server:${carbon.analytics.common.version}
-								</importFeatureDef>
-								<importFeatureDef>
-									org.wso2.carbon.identity.jwt.client.extension:${carbon.devicemgt.version}
-								</importFeatureDef>
-							</importFeatures>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+    <build>
+        <plugins>
+            <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.iot.output.adapter.ui.endpoint</artifactId>
+                                    <version>${carbon.devicemgt.plugins.version}</version>
+                                    <type>war</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>
+                                        ${project.build.directory}/maven-shared-archive-resources/webapps/
+                                    </outputDirectory>
+                                    <destFileName>secured-outputui.war</destFileName>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>src/main/resources</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>resources</directory>
+                                    <includes>
+                                        <include>build.properties</include>
+                                        <include>p2.inf</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.wso2.maven</groupId>
+                <artifactId>carbon-p2-plugin</artifactId>
+                <version>${carbon.p2.plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>p2-feature-generation</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>p2-feature-gen</goal>
+                        </goals>
+                        <configuration>
+                            <id>org.wso2.carbon.device.mgt.iot.adapter</id>
+                            <propertiesFile>../../../features/etc/feature.properties</propertiesFile>
+                            <adviceFile>
+                                <properties>
+                                    <propertyDef>org.wso2.carbon.p2.category.type:server</propertyDef>
+                                    <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef>
+                                </properties>
+                            </adviceFile>
+                            <bundles>
+                                <bundleDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.output.adapter.mqtt:${carbon.devicemgt.plugins.version}
+                                </bundleDef>
+                                <bundleDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.output.adapter.xmpp:${carbon.devicemgt.plugins.version}
+                                </bundleDef>
+                                <bundleDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.input.adapter.extension:${carbon.devicemgt.plugins.version}
+                                </bundleDef>
+                                <bundleDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.input.adapter.http:${carbon.devicemgt.plugins.version}
+                                </bundleDef>
+                                <bundleDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.input.adapter.mqtt:${carbon.devicemgt.plugins.version}
+                                </bundleDef>
+                                <bundleDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.input.adapter.xmpp:${carbon.devicemgt.plugins.version}
+                                </bundleDef>
+                                <bundleDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.output.adapter.ui:${carbon.devicemgt.plugins.version}
+                                </bundleDef>
+                                <bundleDef>
+                                    org.eclipse.paho:org.eclipse.paho.client.mqttv3:${eclipse.paho.version}
+                                </bundleDef>
+                                <bundleDef>
+                                    org.igniterealtime.smack.wso2:smack:${smack.wso2.version}
+                                </bundleDef>
+                                <bundleDef>
+                                    org.igniterealtime.smack.wso2:smackx:${smackx.wso2.version}
+                                </bundleDef>
+                                <bundleDef>
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.stub:${carbon.identity.version}
+                                </bundleDef>
+                            </bundles>
+                            <importFeatures>
+                                <importFeatureDef>
+                                    org.wso2.carbon.event.output.adapter.server:${carbon.analytics.common.version}
+                                </importFeatureDef>
+                                <importFeatureDef>
+                                    org.wso2.carbon.event.input.adapter.server:${carbon.analytics.common.version}
+                                </importFeatureDef>
+                                <importFeatureDef>
+                                    org.wso2.carbon.identity.jwt.client.extension:${carbon.devicemgt.version}
+                                </importFeatureDef>
+                            </importFeatures>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

From 03a21752e237e98b36365480e9ff1e17e66bcfb3 Mon Sep 17 00:00:00 2001
From: prabathabey <prabathabey@git.com>
Date: Thu, 26 May 2016 11:14:31 +0530
Subject: [PATCH 4/5] Adding maven-compiler-plugin to the build profile

---
 .../org.wso2.carbon.device.mgt.mobile.android/pom.xml         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/pom.xml b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/pom.xml
index 9841815edf..acae2dc47e 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/pom.xml
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/pom.xml
@@ -35,6 +35,10 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-scr-plugin</artifactId>

From 86327ab87059599508cc7290e41659367d09575a Mon Sep 17 00:00:00 2001
From: Kasun Delgolla <kasun.mck@gmail.com>
Date: Thu, 26 May 2016 15:35:26 +0530
Subject: [PATCH 5/5] Committing android service improvements + integration

---
 .../carbon/device/mgt/mobile/impl/android/gcm/GCMUtil.java   | 5 +++--
 .../src/main/resources/p2.inf                                | 3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/gcm/GCMUtil.java b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/gcm/GCMUtil.java
index 19f594bc83..d051b16469 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/gcm/GCMUtil.java
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/gcm/GCMUtil.java
@@ -27,6 +27,7 @@ import org.wso2.carbon.device.mgt.common.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationEntry;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.TenantConfiguration;
 import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService;
+import org.wso2.carbon.device.mgt.mobile.impl.android.AndroidDeviceManagementService;
 import org.wso2.carbon.device.mgt.mobile.impl.android.util.AndroidPluginConstants;
 import org.wso2.carbon.device.mgt.mobile.internal.MobileDeviceManagementDataHolder;
 
@@ -153,12 +154,12 @@ public class GCMUtil {
     }
 
     public static String getConfigurationProperty(String property) {
-        DeviceManagementService androidDMService = MobileDeviceManagementDataHolder.getInstance().
-                getAndroidDeviceManagementService();
+        DeviceManagementService androidDMService = new AndroidDeviceManagementService();
         try {
             //Get the TenantConfiguration from cache if not we'll get it from DM service
             TenantConfiguration tenantConfiguration = getTenantConfigurationFromCache();
             if (tenantConfiguration == null) {
+                androidDMService.init();
                 tenantConfiguration = androidDMService.getDeviceManager().getConfiguration();
                 if (tenantConfiguration != null) {
                     addTenantConfigurationToCache(tenantConfiguration);
diff --git a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/p2.inf b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/p2.inf
index 9c79e2fbd7..349c097852 100644
--- a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/p2.inf
+++ b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/p2.inf
@@ -1,6 +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.android_${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.android_${feature.version}/webapps/mdm-android-agent.war,target:${installFolder}/../../deployment/server/webapps/mdm-android-agent.war,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.android_${feature.version}/jaggeryapps/,target:${installFolder}/../../deployment/server/jaggeryapps/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.android_${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.android_${feature.version}/dbscripts/plugins/,target:${installFolder}/../../../dbscripts/cdm/plugins/android,overwrite:true);\