From d1db123a3f3d2a2316ade2f1f46767af327b765a Mon Sep 17 00:00:00 2001
From: charithag <charitha.ws@gmail.com>
Date: Thu, 13 Aug 2015 15:54:04 +0530
Subject: [PATCH] Update build scripts for samples

---
 .../distribution/src/samples/android_sense/build.xml | 12 ++++++++++--
 modules/distribution/src/samples/arduino/build.xml   |  3 ++-
 modules/distribution/src/samples/common.xml          |  1 +
 .../src/samples/digital_display/build.xml            | 12 ++++++++++--
 modules/distribution/src/samples/firealarm/build.xml | 12 ++++++++++--
 .../distribution/src/samples/raspberrypi/build.xml   | 12 ++++++++++--
 modules/distribution/src/samples/sensebot/build.xml  | 12 ++++++++++--
 7 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/modules/distribution/src/samples/android_sense/build.xml b/modules/distribution/src/samples/android_sense/build.xml
index 5a21f172..708bd465 100644
--- a/modules/distribution/src/samples/android_sense/build.xml
+++ b/modules/distribution/src/samples/android_sense/build.xml
@@ -4,6 +4,7 @@
 
     <property name="sample_type" value="android_sense"/>
     <property name="data_source" value="AndroidSenseDM_DB"/>
+    <property name="package" value="org.wso2.carbon.device.mgt.iot.sample.android.sense"/>
 
     <target name="create-db" depends="clean">
         <mkdir dir="${db.dir}"/>
@@ -27,13 +28,20 @@
 	            ]]>
             </insert>
         </xmltask>
-
     </target>
 
-    <target name="deploy" depends="create-db">
+    <target name="build">
+        <exec dir="src" executable="sh">
+            <arg line="-c 'mvn clean install'" />
+        </exec>
+    </target>
+
+    <target name="deploy" depends="create-db,build">
         <copy toDir="${target.sketch.dir}/${sample_type}">
             <fileset dir="sketch"/>
         </copy>
+        <copy file="src/${package}.service.impl/target/${sample_type}.war" toDir="${target.webapp.dir}" overwrite="yes"/>
+        <copy file="src/${package}.plugin.impl/target/${package}.plugin.impl-${target.version}.jar" toDir="${target.dropins.dir}" overwrite="yes"/>
         <copy toDir="${target.unit.dir}/${sample_type}">
             <fileset dir="units"/>
         </copy>
diff --git a/modules/distribution/src/samples/arduino/build.xml b/modules/distribution/src/samples/arduino/build.xml
index 2ed115f2..2c255ee5 100644
--- a/modules/distribution/src/samples/arduino/build.xml
+++ b/modules/distribution/src/samples/arduino/build.xml
@@ -39,7 +39,8 @@
         <copy toDir="${target.sketch.dir}/${sample_type}">
             <fileset dir="sketch"/>
         </copy>
-        <copy file="src/${package}.service.impl/target/${package}/service/impl-${target.version}.jar" toDir="${target.dropins.dir}" overwrite="yes"/>
+        <copy file="src/${package}.service.impl/target/${sample_type}.war" toDir="${target.webapp.dir}" overwrite="yes"/>
+        <copy file="src/${package}.plugin.impl/target/${package}.plugin.impl-${target.version}.jar" toDir="${target.dropins.dir}" overwrite="yes"/>
         <copy toDir="${target.unit.dir}/${sample_type}">
             <fileset dir="units"/>
         </copy>
diff --git a/modules/distribution/src/samples/common.xml b/modules/distribution/src/samples/common.xml
index e0a19359..b32597dd 100644
--- a/modules/distribution/src/samples/common.xml
+++ b/modules/distribution/src/samples/common.xml
@@ -3,6 +3,7 @@
     <property name="iot.conf" value="../../repository/conf/iot/iot-config.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"/>
     <property name="target.sketch.dir" value="../../repository/resources/sketches"/>
     <property name="target.unit.dir" value="../../repository/deployment/server/jaggeryapps/iotserver/units"/>
     <property name="target.version" value="1.0.0-SNAPSHOT"/>
diff --git a/modules/distribution/src/samples/digital_display/build.xml b/modules/distribution/src/samples/digital_display/build.xml
index 3dcf2620..0b9ad467 100644
--- a/modules/distribution/src/samples/digital_display/build.xml
+++ b/modules/distribution/src/samples/digital_display/build.xml
@@ -4,6 +4,7 @@
 
     <property name="sample_type" value="digital_display"/>
     <property name="data_source" value="DigitalDisplayDM_DB"/>
+    <property name="package" value="org.wso2.carbon.device.mgt.iot.sample.digitaldisplay"/>
 
     <target name="create-db" depends="clean">
         <mkdir dir="${db.dir}"/>
@@ -26,13 +27,20 @@
 	            ]]>
             </insert>
         </xmltask>
-
     </target>
 
-    <target name="deploy" depends="create-db">
+    <target name="build">
+        <exec dir="src" executable="sh">
+            <arg line="-c 'mvn clean install'" />
+        </exec>
+    </target>
+
+    <target name="deploy" depends="create-db,build">
         <copy toDir="${target.sketch.dir}/${sample_type}">
             <fileset dir="sketch"/>
         </copy>
+        <copy file="src/${package}.service.impl/target/${sample_type}.war" toDir="${target.webapp.dir}" overwrite="yes"/>
+        <copy file="src/${package}.plugin.impl/target/${package}.plugin.impl-${target.version}.jar" toDir="${target.dropins.dir}" overwrite="yes"/>
         <copy toDir="${target.unit.dir}/${sample_type}">
             <fileset dir="units"/>
         </copy>
diff --git a/modules/distribution/src/samples/firealarm/build.xml b/modules/distribution/src/samples/firealarm/build.xml
index 654ee855..c41c3f3c 100644
--- a/modules/distribution/src/samples/firealarm/build.xml
+++ b/modules/distribution/src/samples/firealarm/build.xml
@@ -4,6 +4,7 @@
 
     <property name="sample_type" value="firealarm"/>
     <property name="data_source" value="FireAlarmDM_DB"/>
+    <property name="package" value="org.wso2.carbon.device.mgt.iot.sample.firealarm"/>
 
     <target name="create-db" depends="clean">
         <mkdir dir="${db.dir}"/>
@@ -27,13 +28,20 @@
 	            ]]>
             </insert>
         </xmltask>
-
     </target>
 
-    <target name="deploy" depends="create-db">
+    <target name="build">
+        <exec dir="src" executable="sh">
+            <arg line="-c 'mvn clean install'" />
+        </exec>
+    </target>
+
+    <target name="deploy" depends="create-db,build">
         <copy toDir="${target.sketch.dir}/${sample_type}">
             <fileset dir="sketch"/>
         </copy>
+        <copy file="src/${package}.service.impl/target/${sample_type}.war" toDir="${target.webapp.dir}" overwrite="yes"/>
+        <copy file="src/${package}.plugin.impl/target/${package}.plugin.impl-${target.version}.jar" toDir="${target.dropins.dir}" overwrite="yes"/>
         <copy toDir="${target.unit.dir}/${sample_type}">
             <fileset dir="units"/>
         </copy>
diff --git a/modules/distribution/src/samples/raspberrypi/build.xml b/modules/distribution/src/samples/raspberrypi/build.xml
index 903256b7..f6f4c04f 100644
--- a/modules/distribution/src/samples/raspberrypi/build.xml
+++ b/modules/distribution/src/samples/raspberrypi/build.xml
@@ -4,6 +4,7 @@
 
     <property name="sample_type" value="raspberrypi"/>
     <property name="data_source" value="RaspberrypiDM_DB"/>
+    <property name="package" value="org.wso2.carbon.device.mgt.iot.sample.raspberrypi"/>
 
     <target name="create-db" depends="clean">
         <mkdir dir="${db.dir}"/>
@@ -26,13 +27,20 @@
 	            ]]>
             </insert>
         </xmltask>
-
     </target>
 
-    <target name="deploy" depends="create-db">
+    <target name="build">
+        <exec dir="src" executable="sh">
+            <arg line="-c 'mvn clean install'" />
+        </exec>
+    </target>
+
+    <target name="deploy" depends="create-db,build">
         <copy toDir="${target.sketch.dir}/${sample_type}">
             <fileset dir="sketch"/>
         </copy>
+        <copy file="src/${package}.service.impl/target/${sample_type}.war" toDir="${target.webapp.dir}" overwrite="yes"/>
+        <copy file="src/${package}.plugin.impl/target/${package}.plugin.impl-${target.version}.jar" toDir="${target.dropins.dir}" overwrite="yes"/>
         <copy toDir="${target.unit.dir}/${sample_type}">
             <fileset dir="units"/>
         </copy>
diff --git a/modules/distribution/src/samples/sensebot/build.xml b/modules/distribution/src/samples/sensebot/build.xml
index 6a5b35fd..aaaa2c1e 100644
--- a/modules/distribution/src/samples/sensebot/build.xml
+++ b/modules/distribution/src/samples/sensebot/build.xml
@@ -4,6 +4,7 @@
 
     <property name="sample_type" value="sensebot"/>
     <property name="data_source" value="SensebotDM_DB.h2.db"/>
+    <property name="package" value="org.wso2.carbon.device.mgt.iot.sample.sensebot"/>
 
     <target name="create-db" depends="clean">
         <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/${data_source};DB_CLOSE_ON_EXIT=FALSE"/>
@@ -25,16 +26,23 @@
 	            ]]>
             </insert>
         </xmltask>
-
     </target>
 
-    <target name="deploy" depends="create-db">
+    <target name="build">
+        <exec dir="src" executable="sh">
+            <arg line="-c 'mvn clean install'" />
+        </exec>
+    </target>
+
+    <target name="deploy" depends="create-db,build">
         <copy toDir="${target.sketch.dir}/${sample_type}">
             <fileset dir="sketch"/>
         </copy>
         <copy toDir="${target.sketch.dir}/${sample_type}_wifi">
             <fileset dir="sketch_wifi"/>
         </copy>
+        <copy file="src/${package}.service.impl/target/${sample_type}.war" toDir="${target.webapp.dir}" overwrite="yes"/>
+        <copy file="src/${package}.plugin.impl/target/${package}.plugin.impl-${target.version}.jar" toDir="${target.dropins.dir}" overwrite="yes"/>
         <copy toDir="${target.unit.dir}/${sample_type}">
             <fileset dir="units"/>
         </copy>