From 1d2d57259b3700e395a75606becc7ed33a75c02e Mon Sep 17 00:00:00 2001
From: Ace <ruwany.ace@gmail.com>
Date: Fri, 30 Oct 2015 19:43:13 +0530
Subject: [PATCH] fixing some minor bugs

---
 modules/distribution/pom.xml                                 | 4 ++--
 .../Magnetic/Sparkscripts_1.0.0/Magnetic_Sensor_Script.xml   | 5 ++---
 .../carbonapps/Magnetic/Sparkscripts_1.0.0/artifact.xml      | 2 +-
 modules/samples/pom.xml                                      | 2 +-
 .../src/main/webapp/WEB-INF/web.xml                          | 4 ++++
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 1ee51cb7..3fda1155 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -339,11 +339,11 @@
 											dir="target/wso2carbon-core-${carbon.kernel.version}/samples/raspberrypi"
 											includes="build.xml"/>
 								</subant>
-								<subant target="deploy">
+								<!--subant target="deploy">
 									<fileset
 											dir="target/wso2carbon-core-${carbon.kernel.version}/samples/virtual_firealarm"
 											includes="build.xml"/>
-								</subant>
+								</subant-->
 								<copy todir="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/"
 									  overwrite="true">
 									<fileset
diff --git a/modules/distribution/src/statistics/carbonapps/Magnetic/Sparkscripts_1.0.0/Magnetic_Sensor_Script.xml b/modules/distribution/src/statistics/carbonapps/Magnetic/Sparkscripts_1.0.0/Magnetic_Sensor_Script.xml
index 6293f817..7df6931e 100644
--- a/modules/distribution/src/statistics/carbonapps/Magnetic/Sparkscripts_1.0.0/Magnetic_Sensor_Script.xml
+++ b/modules/distribution/src/statistics/carbonapps/Magnetic/Sparkscripts_1.0.0/Magnetic_Sensor_Script.xml
@@ -2,12 +2,11 @@
 <Analytics>
     <Name>IoTServer_Sensor_Script</Name>
 <Script>
-CREATE TEMPORARY TABLE DeviceMagneticData USING CarbonAnalytics OPTIONS(tableName "ORG_WSO2_IOT_DEVICES_MAGNETIC"); 	
+CREATE TEMPORARY TABLE DeviceMagneticData USING CarbonAnalytics OPTIONS(tableName "ORG_WSO2_IOT_DEVICES_MAGNETIC");
 
 CREATE TEMPORARY TABLE DeviceMagneticSummaryData USING CarbonAnalytics OPTIONS (tableName "DEVICE_MAGNETIC_SUMMARY", schema "magnetic FLOAT, deviceType STRING -i, deviceId STRING -i, owner STRING -i, time LONG -i",primaryKeys "deviceType, deviceId, owner, time");
 
-                           
-insert overwrite table DeviceMagneticSummaryData select magnetic, meta_deviceType as deviceType, meta_deviceId as deviceId, meta_owner as owner, cast(meta_time/1000 as BIGINT)as time from DeviceMagneticData group by magnetic, meta_deviceType, meta_deviceId, meta_owner, cast(meta_time/1000 as BIGINT);                         
+insert overwrite table DeviceMagneticSummaryData select magnetic, meta_deviceType as deviceType, meta_deviceId as deviceId, meta_owner as owner, cast(meta_time/1000 as BIGINT)as time from DeviceMagneticData group by magnetic, meta_deviceType, meta_deviceId, meta_owner, cast(meta_time/1000 as BIGINT);
 </Script>
     <CronExpression>0 * * * * ?</CronExpression>
 </Analytics>
diff --git a/modules/distribution/src/statistics/carbonapps/Magnetic/Sparkscripts_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Magnetic/Sparkscripts_1.0.0/artifact.xml
index 20cc0bbe..81a49e1f 100644
--- a/modules/distribution/src/statistics/carbonapps/Magnetic/Sparkscripts_1.0.0/artifact.xml
+++ b/modules/distribution/src/statistics/carbonapps/Magnetic/Sparkscripts_1.0.0/artifact.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <artifact name="Sparkscripts" version="1.0.0" type="analytics/spark" serverRole="DataAnalyticsServer">
-    <file>magnetic_Sensor_Script.xml</file>
+    <file>Magnetic_Sensor_Script.xml</file>
 </artifact>
diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml
index 7aacf6fd..8241162f 100644
--- a/modules/samples/pom.xml
+++ b/modules/samples/pom.xml
@@ -675,4 +675,4 @@
 
     </repositories>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/webapp/WEB-INF/web.xml b/modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/webapp/WEB-INF/web.xml
index f9386313..176c126d 100755
--- a/modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/webapp/WEB-INF/web.xml
+++ b/modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/webapp/WEB-INF/web.xml
@@ -53,6 +53,10 @@
 		<param-name>managed-api-context</param-name>
 		<param-value>/virtual_firealarm</param-value>
 	</context-param>
+        <context-param>
+                <param-name>managed-api-context-template</param-name>
+                <param-value>/virtual_firealarm/{version}</param-value>
+        </context-param>
 	<context-param>
 		<param-name>managed-api-isSecured</param-name>
 		<param-value>true</param-value>