From efe53204c886bc135ccfde13b0c6d3320b3f542c Mon Sep 17 00:00:00 2001
From: Menaka Madushanka <menaka12350@gmail.com>
Date: Tue, 8 Dec 2015 10:54:05 +0530
Subject: [PATCH 1/4] Added the accelerometer script

---
 .../EventReceiver_accelerometer.xml           |  8 ++++
 .../artifact.xml                              |  4 ++
 .../artifact.xml                              |  4 ++
 .../org_wso2_iot_devices_accelerometer.xml    | 44 +++++++++++++++++++
 .../artifact.xml                              |  5 +++
 ....wso2.iot.devices.accelerometer_1.0.0.json | 20 +++++++++
 .../Accelerometer_Sensor_Script.xml           | 13 ++++++
 .../Sparkscripts_1.0.0/artifact.xml           |  4 ++
 .../carbonapps/Accelerometer/artifacts.xml    | 11 +++++
 .../src/statistics/carbonapps/build.xml       |  7 +--
 10 files changed, 117 insertions(+), 3 deletions(-)
 create mode 100644 modules/distribution/src/statistics/carbonapps/Accelerometer/Eventreceiver_accelerometer_1.0.0/EventReceiver_accelerometer.xml
 create mode 100644 modules/distribution/src/statistics/carbonapps/Accelerometer/Eventreceiver_accelerometer_1.0.0/artifact.xml
 create mode 100644 modules/distribution/src/statistics/carbonapps/Accelerometer/Eventstore_accelerometer_1.0.0/artifact.xml
 create mode 100644 modules/distribution/src/statistics/carbonapps/Accelerometer/Eventstore_accelerometer_1.0.0/org_wso2_iot_devices_accelerometer.xml
 create mode 100644 modules/distribution/src/statistics/carbonapps/Accelerometer/Eventstream_accelerometer_1.0.0/artifact.xml
 create mode 100644 modules/distribution/src/statistics/carbonapps/Accelerometer/Eventstream_accelerometer_1.0.0/org.wso2.iot.devices.accelerometer_1.0.0.json
 create mode 100644 modules/distribution/src/statistics/carbonapps/Accelerometer/Sparkscripts_1.0.0/Accelerometer_Sensor_Script.xml
 create mode 100644 modules/distribution/src/statistics/carbonapps/Accelerometer/Sparkscripts_1.0.0/artifact.xml
 create mode 100644 modules/distribution/src/statistics/carbonapps/Accelerometer/artifacts.xml

diff --git a/modules/distribution/src/statistics/carbonapps/Accelerometer/Eventreceiver_accelerometer_1.0.0/EventReceiver_accelerometer.xml b/modules/distribution/src/statistics/carbonapps/Accelerometer/Eventreceiver_accelerometer_1.0.0/EventReceiver_accelerometer.xml
new file mode 100644
index 00000000..2e43c8c1
--- /dev/null
+++ b/modules/distribution/src/statistics/carbonapps/Accelerometer/Eventreceiver_accelerometer_1.0.0/EventReceiver_accelerometer.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eventReceiver name="EventReceiver_accelerometer" statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventreceiver">
+    <from eventAdapterType="wso2event">
+        <property name="events.duplicated.in.cluster">false</property>
+    </from>
+    <mapping customMapping="disable" type="wso2event"/>
+    <to streamName="org.wso2.iot.devices.accelerometer" version="1.0.0"/>
+</eventReceiver>
diff --git a/modules/distribution/src/statistics/carbonapps/Accelerometer/Eventreceiver_accelerometer_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Accelerometer/Eventreceiver_accelerometer_1.0.0/artifact.xml
new file mode 100644
index 00000000..0875edb2
--- /dev/null
+++ b/modules/distribution/src/statistics/carbonapps/Accelerometer/Eventreceiver_accelerometer_1.0.0/artifact.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<artifact name="Eventreceiver_accelerometer" version="1.0.0" type="event/receiver" serverRole="DataAnalyticsServer">
+    <file>EventReceiver_accelerometer.xml</file>
+</artifact>
diff --git a/modules/distribution/src/statistics/carbonapps/Accelerometer/Eventstore_accelerometer_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Accelerometer/Eventstore_accelerometer_1.0.0/artifact.xml
new file mode 100644
index 00000000..9e6f1e84
--- /dev/null
+++ b/modules/distribution/src/statistics/carbonapps/Accelerometer/Eventstore_accelerometer_1.0.0/artifact.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<artifact name="Eventstore_accelerometer" version="1.0.0" type="analytics/eventstore" serverRole="DataAnalyticsServer">
+    <file>org_wso2_iot_devices_accelerometer.xml</file>
+</artifact>
diff --git a/modules/distribution/src/statistics/carbonapps/Accelerometer/Eventstore_accelerometer_1.0.0/org_wso2_iot_devices_accelerometer.xml b/modules/distribution/src/statistics/carbonapps/Accelerometer/Eventstore_accelerometer_1.0.0/org_wso2_iot_devices_accelerometer.xml
new file mode 100644
index 00000000..77bec2a3
--- /dev/null
+++ b/modules/distribution/src/statistics/carbonapps/Accelerometer/Eventstore_accelerometer_1.0.0/org_wso2_iot_devices_accelerometer.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<EventStoreConfiguration>
+    <Source>
+        <StreamId>org.wso2.iot.devices.accelerometer:1.0.0</StreamId>
+    </Source>
+    <RecordStoreName>EVENT_STORE</RecordStoreName>
+    <TableSchema>
+		<ColumnDefinition>
+			<Name>meta_owner</Name>
+			<EnableIndexing>true</EnableIndexing>
+			<IsPrimaryKey>true</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>STRING</Type>
+		</ColumnDefinition>
+		<ColumnDefinition>
+			<Name>meta_deviceType</Name>
+			<EnableIndexing>true</EnableIndexing>
+			<IsPrimaryKey>true</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>STRING</Type>
+		</ColumnDefinition>
+		<ColumnDefinition>
+			<Name>meta_deviceId</Name>
+			<EnableIndexing>true</EnableIndexing>
+			<IsPrimaryKey>true</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>STRING</Type>
+		</ColumnDefinition>
+		<ColumnDefinition>
+			<Name>meta_time</Name>
+			<EnableIndexing>true</EnableIndexing>
+			<IsPrimaryKey>true</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>LONG</Type>
+		</ColumnDefinition>
+		<ColumnDefinition>
+			<Name>battery</Name>
+			<EnableIndexing>false</EnableIndexing>
+			<IsPrimaryKey>false</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>FLOAT</Type>
+		</ColumnDefinition>
+    </TableSchema>
+</EventStoreConfiguration>
\ No newline at end of file
diff --git a/modules/distribution/src/statistics/carbonapps/Accelerometer/Eventstream_accelerometer_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Accelerometer/Eventstream_accelerometer_1.0.0/artifact.xml
new file mode 100644
index 00000000..94cfa5d3
--- /dev/null
+++ b/modules/distribution/src/statistics/carbonapps/Accelerometer/Eventstream_accelerometer_1.0.0/artifact.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<artifact name="Eventstream_accelerometer" version="1.0.0" type="event/stream" serverRole="DataAnalyticsServer">
+	<file>org.wso2.iot.devices.accelerometer_1.0.0.json</file>
+</artifact>
+
diff --git a/modules/distribution/src/statistics/carbonapps/Accelerometer/Eventstream_accelerometer_1.0.0/org.wso2.iot.devices.accelerometer_1.0.0.json b/modules/distribution/src/statistics/carbonapps/Accelerometer/Eventstream_accelerometer_1.0.0/org.wso2.iot.devices.accelerometer_1.0.0.json
new file mode 100644
index 00000000..db6af8ee
--- /dev/null
+++ b/modules/distribution/src/statistics/carbonapps/Accelerometer/Eventstream_accelerometer_1.0.0/org.wso2.iot.devices.accelerometer_1.0.0.json
@@ -0,0 +1,20 @@
+{
+  "name": "org.wso2.iot.devices.accelerometer",
+  "version": "1.0.0",
+  "nickName": "accelerometer Data",
+  "description": "accelerometer data received from the Device",
+  "metaData": [
+    {"name":"owner","type":"STRING"},     
+    {"name":"deviceType","type":"STRING"},
+    {"name":"deviceId","type":"STRING"},  
+    {"name":"time","type":"LONG"}
+  ],
+  "payloadData": [
+    {
+      "name": "accelerometer","type": "FLOAT"
+    }
+  ]
+}
+	
+
+				                                    		
diff --git a/modules/distribution/src/statistics/carbonapps/Accelerometer/Sparkscripts_1.0.0/Accelerometer_Sensor_Script.xml b/modules/distribution/src/statistics/carbonapps/Accelerometer/Sparkscripts_1.0.0/Accelerometer_Sensor_Script.xml
new file mode 100644
index 00000000..b1cf3810
--- /dev/null
+++ b/modules/distribution/src/statistics/carbonapps/Accelerometer/Sparkscripts_1.0.0/Accelerometer_Sensor_Script.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Analytics>
+    <Name>Accelerometer_Sensor_Script</Name>
+<Script>
+CREATE TEMPORARY TABLE DeviceAccelerometerData USING CarbonAnalytics OPTIONS(tableName "ORG_WSO2_IOT_DEVICES_ACCELEROMETER");
+
+CREATE TEMPORARY TABLE DeviceAccelerometerSummaryData USING CarbonAnalytics OPTIONS (tableName "DEVICE_ACCELEROMETER_SUMMARY", schema "accelerometer FLOAT, deviceType STRING -i, deviceId STRING -i, owner STRING -i, time LONG -i",primaryKeys "deviceType, deviceId, owner, time");
+
+                           
+insert overwrite table DeviceAccelerometerSummaryData select accelerometer, meta_deviceType as deviceType, meta_deviceId as deviceId, meta_owner as owner, cast(meta_time/1000 as BIGINT)as time from DeviceAccelerometerData group by battery, 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/Accelerometer/Sparkscripts_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Accelerometer/Sparkscripts_1.0.0/artifact.xml
new file mode 100644
index 00000000..483e0c13
--- /dev/null
+++ b/modules/distribution/src/statistics/carbonapps/Accelerometer/Sparkscripts_1.0.0/artifact.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<artifact name="Sparkscripts" version="1.0.0" type="analytics/spark" serverRole="DataAnalyticsServer">
+    <file>Accelerometer_Sensor_Script.xml</file>
+</artifact>
diff --git a/modules/distribution/src/statistics/carbonapps/Accelerometer/artifacts.xml b/modules/distribution/src/statistics/carbonapps/Accelerometer/artifacts.xml
new file mode 100644
index 00000000..88a8d5f5
--- /dev/null
+++ b/modules/distribution/src/statistics/carbonapps/Accelerometer/artifacts.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<artifacts>
+    <artifact name="Accelerometer_CAPP" version="1.0.0" type="carbon/application">        
+
+		<dependency artifact="Eventstream_accelerometer" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+		<dependency artifact="Eventstore_accelerometer" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+		<dependency artifact="Eventreceiver_accelerometer" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+
+		<dependency artifact="Sparkscripts" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+    </artifact>
+</artifacts>
diff --git a/modules/distribution/src/statistics/carbonapps/build.xml b/modules/distribution/src/statistics/carbonapps/build.xml
index 9494cf93..129ecab7 100644
--- a/modules/distribution/src/statistics/carbonapps/build.xml
+++ b/modules/distribution/src/statistics/carbonapps/build.xml
@@ -9,6 +9,7 @@
     <property name="Light_dir" value="Light"/>
     <property name="Battery_dir" value="Battery"/>
     <property name="Magnetic_dir" value="Magnetic"/>
+    <property name="Accelerometer_dir" value="Accelerometer"/>
     <target name="clean">
         <delete dir="${target-dir}"/>
     </target>
@@ -29,8 +30,8 @@
         <zip destfile="${target-dir}/${Magnetic_dir}.car">
             <zipfileset dir="${Magnetic_dir}"/>
         </zip>
+        <zip destfile="${target-dir}/${Accelerometer_dir}.car">
+            <zipfileset dir="${Accelerometer_dir}"/>
+        </zip>
     </target>
-
-
-
 </project>

From 309d38de7260e7fb9a9029731935c4823571767e Mon Sep 17 00:00:00 2001
From: Menaka Madushanka <menaka12350@gmail.com>
Date: Tue, 8 Dec 2015 10:59:05 +0530
Subject: [PATCH 2/4] Added the accelerometer script

---
 .../carbonapps/Accelerometer/Sparkscripts_1.0.0/artifact.xml     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/distribution/src/statistics/carbonapps/Accelerometer/Sparkscripts_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Accelerometer/Sparkscripts_1.0.0/artifact.xml
index 483e0c13..9c88d819 100644
--- a/modules/distribution/src/statistics/carbonapps/Accelerometer/Sparkscripts_1.0.0/artifact.xml
+++ b/modules/distribution/src/statistics/carbonapps/Accelerometer/Sparkscripts_1.0.0/artifact.xml
@@ -2,3 +2,4 @@
 <artifact name="Sparkscripts" version="1.0.0" type="analytics/spark" serverRole="DataAnalyticsServer">
     <file>Accelerometer_Sensor_Script.xml</file>
 </artifact>
+

From 0076709626ed412eb72fa7cd2b06a6764798f763 Mon Sep 17 00:00:00 2001
From: Menaka Madushanka <menaka12350@gmail.com>
Date: Thu, 10 Dec 2015 16:54:23 +0530
Subject: [PATCH 3/4] Android sense feature added.

---
 modules/p2-profile-gen/pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index 102fdaa8..04871576 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -171,6 +171,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature:${carbon.mobile.device.mgt.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.feature:${carbon.mobile.device.mgt.version}
+                                </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.digitaldisplay.feature:${carbon.mobile.device.mgt.version}
                                 </featureArtifactDef>
@@ -877,6 +880,10 @@
                                     <id>org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature.group</id>
                                     <version>${carbon.mobile.device.mgt.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.iot.androidsense.feature.group</id>
+                                    <version>${carbon.mobile.device.mgt.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.iot.digitaldisplay.feature.group</id>
                                     <version>${carbon.mobile.device.mgt.version}</version>

From f876abf3e4b24224d1ebf04099226d4cde85c097 Mon Sep 17 00:00:00 2001
From: charithag <charitha.ws@gmail.com>
Date: Thu, 10 Dec 2015 20:24:03 +0530
Subject: [PATCH 4/4] Add carbonapps to deployment

---
 modules/distribution/src/assembly/bin.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 8a859d0a..d29edf92 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -331,6 +331,11 @@
                 <include>*/**</include>
             </includes>
         </fileSet>
+        <fileSet>
+            <directory>src/statistics/carbonapps/target</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/carbonapps
+            </outputDirectory>
+        </fileSet>
         <fileSet>
             <directory>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/resources