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] 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>