From 47c4c170120c0a5786699824072e06fbeeebda43 Mon Sep 17 00:00:00 2001
From: menaka <menaka@wso2.com>
Date: Thu, 10 Dec 2015 21:10:18 +0530
Subject: [PATCH 1/4] Android sense db added

---
 modules/distribution/pom.xml | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index cee5578e..e489627c 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -259,6 +259,39 @@
                             </tasks>
                         </configuration>
                     </execution>
+
+                    <execution>
+                        <!-- Creating Android Sense Plugin Management schema -->
+                        <id>create-android-sense-plugin-mgt-schema</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <echo message="########### Create Android Sense plugin Management H2 Schema ###########"/>
+                                <property name="db.dir"
+                                          value="target/wso2carbon-core-${carbon.kernel.version}/repository/database"/>
+                                <property name="userid" value="wso2carbon"/>
+                                <property name="password" value="wso2carbon"/>
+                                <property name="dbURL"
+                                          value="jdbc:h2:file:${basedir}/${db.dir}/AndroidSenseDM_DB;DB_CLOSE_ON_EXIT=FALSE"/>
+
+                                <sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}"
+                                     password="${password}"
+                                     autocommit="true" onerror="continue">
+                                    <classpath refid="maven.dependency.classpath"/>
+                                    <classpath refid="maven.compile.classpath"/>
+                                    <classpath refid="maven.runtime.classpath"/>
+
+                                    <fileset
+                                            file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/android_sense/h2.sql"/>
+                                </sql>
+                                <echo message="##################### END ####################"/>
+                            </tasks>
+                        </configuration>
+                    </execution>
+
                     <!--<execution>-->
                     <!--&lt;!&ndash; Creating IDP Management schema &ndash;&gt;-->
                     <!--<id>create-idp-mgt-schema</id>-->

From 75d4344f6cad1c0d59409a2270d1538af8f0c787 Mon Sep 17 00:00:00 2001
From: menaka <menaka@wso2.com>
Date: Fri, 11 Dec 2015 11:02:20 +0530
Subject: [PATCH 2/4] DB schema for android sense and script change

---
 modules/distribution/pom.xml                  |  2 +-
 .../conf/datasources/master-datasources.xml   | 21 +++++++++++++++++++
 .../org_wso2_iot_devices_accelerometer.xml    |  2 +-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index e489627c..b4ee390e 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -285,7 +285,7 @@
                                     <classpath refid="maven.runtime.classpath"/>
 
                                     <fileset
-                                            file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/android_sense/h2.sql"/>
+                                            file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/androidsense/h2.sql"/>
                                 </sql>
                                 <echo message="##################### END ####################"/>
                             </tasks>
diff --git a/modules/distribution/src/repository/conf/datasources/master-datasources.xml b/modules/distribution/src/repository/conf/datasources/master-datasources.xml
index 1627f55f..32840e8e 100755
--- a/modules/distribution/src/repository/conf/datasources/master-datasources.xml
+++ b/modules/distribution/src/repository/conf/datasources/master-datasources.xml
@@ -217,5 +217,26 @@
                 </configuration>
             </definition>
         </datasource>
+        <datasource>
+            <name>AndroidSenseDM_DB</name>
+            <description>The datasource used for the Android-Sense database</description>
+            <jndiConfig>
+                <name>jdbc/AndroidSenseDM_DB</name>
+            </jndiConfig>
+            <definition type="RDBMS">
+                <configuration>
+                    <url>jdbc:h2:repository/database/AndroidSenseDM_DB;DB_CLOSE_ON_EXIT=FALSE
+                    </url>
+                    <username>wso2carbon</username>
+                    <password>wso2carbon</password>
+                    <driverClassName>org.h2.Driver</driverClassName>
+                    <maxActive>50</maxActive>
+                    <maxWait>60000</maxWait>
+                    <testOnBorrow>true</testOnBorrow>
+                    <validationQuery>SELECT 1</validationQuery>
+                    <validationInterval>30000</validationInterval>
+                </configuration>
+            </definition>
+        </datasource>
     </datasources>
 </datasources-configuration>
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
index 77bec2a3..3312516e 100644
--- 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
@@ -34,7 +34,7 @@
 			<Type>LONG</Type>
 		</ColumnDefinition>
 		<ColumnDefinition>
-			<Name>battery</Name>
+			<Name>accelerometer</Name>
 			<EnableIndexing>false</EnableIndexing>
 			<IsPrimaryKey>false</IsPrimaryKey>
 			<EnableScoreParam>false</EnableScoreParam>

From b7661d286b4b687ec026f050a0e977b39137ef05 Mon Sep 17 00:00:00 2001
From: menaka <menaka@wso2.com>
Date: Fri, 11 Dec 2015 11:15:00 +0530
Subject: [PATCH 3/4] DB schema for android sense and script change

---
 modules/distribution/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index b17357ee..8b4d6540 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -260,7 +260,7 @@
                         </configuration>
                     </execution>
                     <execution>
-                        <!-- Creating Virtual Firealarm Plugin Management schema -->
+                        <!-- Creating Android Sense Plugin Management schema -->
                         <id>create-android-sense-plugin-mgt-schema</id>
                         <phase>package</phase>
                         <goals>

From de857cfc6ed62f30fe516b44d16dfb95a7da72b5 Mon Sep 17 00:00:00 2001
From: charithag <charitha.ws@gmail.com>
Date: Fri, 11 Dec 2015 12:12:42 +0530
Subject: [PATCH 4/4] Fix issue in script

---
 .../conf/datasources/master-datasources.xml   | 21 -------------------
 .../Accelerometer_Sensor_Script.xml           |  2 +-
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/modules/distribution/src/repository/conf/datasources/master-datasources.xml b/modules/distribution/src/repository/conf/datasources/master-datasources.xml
index 32840e8e..1627f55f 100755
--- a/modules/distribution/src/repository/conf/datasources/master-datasources.xml
+++ b/modules/distribution/src/repository/conf/datasources/master-datasources.xml
@@ -217,26 +217,5 @@
                 </configuration>
             </definition>
         </datasource>
-        <datasource>
-            <name>AndroidSenseDM_DB</name>
-            <description>The datasource used for the Android-Sense database</description>
-            <jndiConfig>
-                <name>jdbc/AndroidSenseDM_DB</name>
-            </jndiConfig>
-            <definition type="RDBMS">
-                <configuration>
-                    <url>jdbc:h2:repository/database/AndroidSenseDM_DB;DB_CLOSE_ON_EXIT=FALSE
-                    </url>
-                    <username>wso2carbon</username>
-                    <password>wso2carbon</password>
-                    <driverClassName>org.h2.Driver</driverClassName>
-                    <maxActive>50</maxActive>
-                    <maxWait>60000</maxWait>
-                    <testOnBorrow>true</testOnBorrow>
-                    <validationQuery>SELECT 1</validationQuery>
-                    <validationInterval>30000</validationInterval>
-                </configuration>
-            </definition>
-        </datasource>
     </datasources>
 </datasources-configuration>
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
index b1cf3810..80cf89b5 100644
--- 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
@@ -7,7 +7,7 @@ CREATE TEMPORARY TABLE DeviceAccelerometerData USING CarbonAnalytics OPTIONS(tab
 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);
+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 accelerometer, meta_deviceType, meta_deviceId, meta_owner, cast(meta_time/1000 as BIGINT);
 </Script>
     <CronExpression>0 * * * * ?</CronExpression>
 </Analytics>