From 888bdb88733764ae1e81c199a954c35a583a9738 Mon Sep 17 00:00:00 2001
From: charithag <charitha.ws@gmail.com>
Date: Wed, 2 Sep 2015 17:00:45 +0530
Subject: [PATCH] Update sample distributions to add datasource definitions
 directly to master-datasources.xml

---
 modules/samples/android_sense/build.xml   | 29 +++++++++++++++++++++++
 modules/samples/arduino/build.xml         | 29 +++++++++++++++++++++++
 modules/samples/common.xml                |  1 +
 modules/samples/digital_display/build.xml | 29 +++++++++++++++++++++++
 modules/samples/firealarm/build.xml       | 29 +++++++++++++++++++++++
 modules/samples/raspberrypi/build.xml     | 29 +++++++++++++++++++++++
 modules/samples/sensebot/build.xml        | 29 +++++++++++++++++++++++
 7 files changed, 175 insertions(+)

diff --git a/modules/samples/android_sense/build.xml b/modules/samples/android_sense/build.xml
index a47db292..dd7b7205 100644
--- a/modules/samples/android_sense/build.xml
+++ b/modules/samples/android_sense/build.xml
@@ -28,6 +28,32 @@
 	            ]]>
             </insert>
         </xmltask>
+        <xmltask source="${datasources.conf}" dest="${datasources.conf}" report="true">
+            <insert path="/datasources-configuration/datasources[1]">
+                <![CDATA[
+        <datasource>
+            <name>${data_source}</name>
+            <description>The datasource used for Arduino database</description>
+            <jndiConfig>
+                <name>jdbc/${data_source}</name>
+            </jndiConfig>
+            <definition type="RDBMS">
+                <configuration>
+                    <url>jdbc:h2:repository/database/${data_source};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>
+        	            ]]>
+            </insert>
+        </xmltask>
     </target>
 
     <target name="build">
@@ -56,6 +82,9 @@
         <xmltask source="${iot.conf}" dest="${iot.conf}" report="true">
             <remove path="/IoTDeviceTypeConfigManager/IotDeviceTypeConfig[type='${sample_type}']"/>
         </xmltask>
+        <xmltask source="${datasources.conf}" dest="${datasources.conf}" report="true">
+            <remove path="/datasources-configuration/datasources/datasource[name='${data_source}']"/>
+        </xmltask>
     </target>
 
 </project>
\ No newline at end of file
diff --git a/modules/samples/arduino/build.xml b/modules/samples/arduino/build.xml
index 43b504f7..8dfd9c4a 100644
--- a/modules/samples/arduino/build.xml
+++ b/modules/samples/arduino/build.xml
@@ -27,6 +27,32 @@
 	            ]]>
             </insert>
         </xmltask>
+        <xmltask source="${datasources.conf}" dest="${datasources.conf}" report="true">
+            <insert path="/datasources-configuration/datasources[1]">
+                <![CDATA[
+        <datasource>
+            <name>${data_source}</name>
+            <description>The datasource used for Arduino database</description>
+            <jndiConfig>
+                <name>jdbc/${data_source}</name>
+            </jndiConfig>
+            <definition type="RDBMS">
+                <configuration>
+                    <url>jdbc:h2:repository/database/${data_source};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>
+        	            ]]>
+            </insert>
+        </xmltask>
     </target>
 
     <target name="build">
@@ -55,6 +81,9 @@
         <xmltask source="${iot.conf}" dest="${iot.conf}" report="true">
             <remove path="/IoTDeviceTypeConfigManager/IotDeviceTypeConfig[type='${sample_type}']"/>
         </xmltask>
+        <xmltask source="${datasources.conf}" dest="${datasources.conf}" report="true">
+            <remove path="/datasources-configuration/datasources/datasource[name='${data_source}']"/>
+        </xmltask>
     </target>
 
 </project>
\ No newline at end of file
diff --git a/modules/samples/common.xml b/modules/samples/common.xml
index 042d6486..7693f6d9 100644
--- a/modules/samples/common.xml
+++ b/modules/samples/common.xml
@@ -1,6 +1,7 @@
 <project>
     <property name="lib.dir" value="../../repository/components/plugins"/>
     <property name="iot.conf" value="../../repository/conf/iot/iot-config.xml"/>
+    <property name="datasources.conf" value="../../repository/conf/datasources/master-datasources.xml"/>
     <property name="target.db.dir" value="../../repository/database"/>
     <property name="target.dropins.dir" value="../../repository/components/dropins"/>
     <property name="target.webapp.dir" value="../../repository/deployment/server/webapps"/>
diff --git a/modules/samples/digital_display/build.xml b/modules/samples/digital_display/build.xml
index c54a411f..fdd60784 100644
--- a/modules/samples/digital_display/build.xml
+++ b/modules/samples/digital_display/build.xml
@@ -27,6 +27,32 @@
 	            ]]>
             </insert>
         </xmltask>
+        <xmltask source="${datasources.conf}" dest="${datasources.conf}" report="true">
+            <insert path="/datasources-configuration/datasources[1]">
+                <![CDATA[
+        <datasource>
+            <name>${data_source}</name>
+            <description>The datasource used for Arduino database</description>
+            <jndiConfig>
+                <name>jdbc/${data_source}</name>
+            </jndiConfig>
+            <definition type="RDBMS">
+                <configuration>
+                    <url>jdbc:h2:repository/database/${data_source};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>
+        	            ]]>
+            </insert>
+        </xmltask>
     </target>
 
     <target name="build">
@@ -55,6 +81,9 @@
         <xmltask source="${iot.conf}" dest="${iot.conf}" report="true">
             <remove path="/IoTDeviceTypeConfigManager/IotDeviceTypeConfig[type='${sample_type}']"/>
         </xmltask>
+        <xmltask source="${datasources.conf}" dest="${datasources.conf}" report="true">
+            <remove path="/datasources-configuration/datasources/datasource[name='${data_source}']"/>
+        </xmltask>
     </target>
 
 </project>
\ No newline at end of file
diff --git a/modules/samples/firealarm/build.xml b/modules/samples/firealarm/build.xml
index e7aa2140..8c190e19 100644
--- a/modules/samples/firealarm/build.xml
+++ b/modules/samples/firealarm/build.xml
@@ -28,6 +28,32 @@
 	            ]]>
             </insert>
         </xmltask>
+        <xmltask source="${datasources.conf}" dest="${datasources.conf}" report="true">
+            <insert path="/datasources-configuration/datasources[1]">
+                <![CDATA[
+        <datasource>
+            <name>${data_source}</name>
+            <description>The datasource used for Arduino database</description>
+            <jndiConfig>
+                <name>jdbc/${data_source}</name>
+            </jndiConfig>
+            <definition type="RDBMS">
+                <configuration>
+                    <url>jdbc:h2:repository/database/${data_source};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>
+        	            ]]>
+            </insert>
+        </xmltask>
     </target>
 
     <target name="build">
@@ -56,6 +82,9 @@
         <xmltask source="${iot.conf}" dest="${iot.conf}" report="true">
             <remove path="/IoTDeviceTypeConfigManager/IotDeviceTypeConfig[type='${sample_type}']"/>
         </xmltask>
+        <xmltask source="${datasources.conf}" dest="${datasources.conf}" report="true">
+            <remove path="/datasources-configuration/datasources/datasource[name='${data_source}']"/>
+        </xmltask>
     </target>
 
 </project>
\ No newline at end of file
diff --git a/modules/samples/raspberrypi/build.xml b/modules/samples/raspberrypi/build.xml
index 99318ed4..93d38ae3 100644
--- a/modules/samples/raspberrypi/build.xml
+++ b/modules/samples/raspberrypi/build.xml
@@ -27,6 +27,32 @@
 	            ]]>
             </insert>
         </xmltask>
+        <xmltask source="${datasources.conf}" dest="${datasources.conf}" report="true">
+            <insert path="/datasources-configuration/datasources[1]">
+                <![CDATA[
+        <datasource>
+            <name>${data_source}</name>
+            <description>The datasource used for Arduino database</description>
+            <jndiConfig>
+                <name>jdbc/${data_source}</name>
+            </jndiConfig>
+            <definition type="RDBMS">
+                <configuration>
+                    <url>jdbc:h2:repository/database/${data_source};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>
+        	            ]]>
+            </insert>
+        </xmltask>
     </target>
 
     <target name="build">
@@ -55,6 +81,9 @@
         <xmltask source="${iot.conf}" dest="${iot.conf}" report="true">
             <remove path="/IoTDeviceTypeConfigManager/IotDeviceTypeConfig[type='${sample_type}']"/>
         </xmltask>
+        <xmltask source="${datasources.conf}" dest="${datasources.conf}" report="true">
+            <remove path="/datasources-configuration/datasources/datasource[name='${data_source}']"/>
+        </xmltask>
     </target>
 
 </project>
\ No newline at end of file
diff --git a/modules/samples/sensebot/build.xml b/modules/samples/sensebot/build.xml
index e7cea4bd..463b3192 100644
--- a/modules/samples/sensebot/build.xml
+++ b/modules/samples/sensebot/build.xml
@@ -26,6 +26,32 @@
 	            ]]>
             </insert>
         </xmltask>
+        <xmltask source="${datasources.conf}" dest="${datasources.conf}" report="true">
+            <insert path="/datasources-configuration/datasources[1]">
+                <![CDATA[
+        <datasource>
+            <name>${data_source}</name>
+            <description>The datasource used for Arduino database</description>
+            <jndiConfig>
+                <name>jdbc/${data_source}</name>
+            </jndiConfig>
+            <definition type="RDBMS">
+                <configuration>
+                    <url>jdbc:h2:repository/database/${data_source};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>
+        	            ]]>
+            </insert>
+        </xmltask>
     </target>
 
     <target name="build">
@@ -58,6 +84,9 @@
         <xmltask source="${iot.conf}" dest="${iot.conf}" report="true">
             <remove path="/IoTDeviceTypeConfigManager/IotDeviceTypeConfig[type='${sample_type}']"/>
         </xmltask>
+        <xmltask source="${datasources.conf}" dest="${datasources.conf}" report="true">
+            <remove path="/datasources-configuration/datasources/datasource[name='${data_source}']"/>
+        </xmltask>
     </target>
 
 </project>
\ No newline at end of file