From 82740dec44b0fd64fbe79cdeaa46dcad72a2c2c1 Mon Sep 17 00:00:00 2001
From: charithag <charitha.ws@gmail.com>
Date: Fri, 23 Oct 2015 12:29:38 +0530
Subject: [PATCH] Revert pom changes to previous

---
 modules/distribution/pom.xml                  |  6 +-
 .../pom.xml                                   | 76 -------------------
 .../service/impl/dto/DeviceRecord.java        |  0
 3 files changed, 3 insertions(+), 79 deletions(-)
 delete mode 100644 modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/virtual/firealarm/service/impl/dto/DeviceRecord.java

diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 2de47da5..fdb98b9d 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -340,11 +340,11 @@
 											file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot/iot-config.xml"/>
 								</copy>
 								<move file="target/wso2carbon-core-${carbon.kernel.version}/samples/arduino/build.xml"
-									  toFile="target/wso2carbon-core-${carbon.kernel.version}/samples/arduino/build.xml"/>
+									  toFile="target/wso2carbon-core-${carbon.kernel.version}/samples/arduino/build.xml.disable"/>
 								<move file="target/wso2carbon-core-${carbon.kernel.version}/samples/raspberrypi/build.xml"
-									  toFile="target/wso2carbon-core-${carbon.kernel.version}/samples/raspberrypi/build.xml"/>
+									  toFile="target/wso2carbon-core-${carbon.kernel.version}/samples/raspberrypi/build.xml.disable"/>
 								<move file="target/wso2carbon-core-${carbon.kernel.version}/samples/virtual_firealarm/build.xml"
-									  toFile="target/wso2carbon-core-${carbon.kernel.version}/samples/virtual_firealarm/build.xml"/>
+									  toFile="target/wso2carbon-core-${carbon.kernel.version}/samples/virtual_firealarm/build.xml.disable"/>
 								<move file="target/wso2carbon-core-${carbon.kernel.version}/samples/sample_pom.xml"
 									  toFile="target/wso2carbon-core-${carbon.kernel.version}/samples/pom.xml"
 									  overwrite="true"/>
diff --git a/modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/pom.xml b/modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/pom.xml
index dba89dc2..3db470bd 100644
--- a/modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/pom.xml
+++ b/modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/pom.xml
@@ -58,16 +58,6 @@
 		<dependency>
 			<groupId>org.wso2.carbon.device.mgt.iot</groupId>
 			<artifactId>org.wso2.carbon.device.mgt.iot.common</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>org.igniterealtime.smack.wso2</groupId>
-					<artifactId>smack</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.igniterealtime.smack.wso2</groupId>
-					<artifactId>smackx</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
@@ -102,77 +92,11 @@
 		<dependency>
 			<groupId>org.wso2.carbon</groupId>
 			<artifactId>org.wso2.carbon.utils</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>org.bouncycastle.wso2</groupId>
-					<artifactId>bcprov-jdk15on</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.wso2.carbon</groupId>
-					<artifactId>org.wso2.carbon.user.api</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.wso2.carbon</groupId>
-					<artifactId>org.wso2.carbon.queuing</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.wso2.carbon</groupId>
-					<artifactId>org.wso2.carbon.base</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.apache.axis2.wso2</groupId>
-					<artifactId>axis2</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.igniterealtime.smack.wso2</groupId>
-					<artifactId>smack</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.igniterealtime.smack.wso2</groupId>
-					<artifactId>smackx</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>jaxen</groupId>
-					<artifactId>jaxen</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>commons-fileupload.wso2</groupId>
-					<artifactId>commons-fileupload</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.apache.ant.wso2</groupId>
-					<artifactId>ant</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.apache.ant.wso2</groupId>
-					<artifactId>ant</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>commons-httpclient.wso2</groupId>
-					<artifactId>commons-httpclient</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.eclipse.equinox</groupId>
-					<artifactId>javax.servlet</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.wso2.carbon</groupId>
-					<artifactId>org.wso2.carbon.registry.api</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.wso2.carbon.devicemgt</groupId>
 			<artifactId>org.wso2.carbon.device.mgt.analytics</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.igniterealtime.smack.wso2</groupId>
-			<artifactId>smack</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.igniterealtime.smack.wso2</groupId>
-			<artifactId>smackx</artifactId>
-		</dependency>
 
 	</dependencies>
 
diff --git a/modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/virtual/firealarm/service/impl/dto/DeviceRecord.java b/modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/virtual/firealarm/service/impl/dto/DeviceRecord.java
deleted file mode 100644
index e69de29b..00000000