fixing some minor bugs

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

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>

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>

modules/samples/pom.xml

@@ -675,4 +675,4 @@
 
     </repositories>
 
-</project>
+</project>

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>