From e7db5a1d8288944c9d2e845ee7236b5f92e81ba4 Mon Sep 17 00:00:00 2001
From: charithag <charitha.ws@gmail.com>
Date: Wed, 12 Aug 2015 17:44:42 +0530
Subject: [PATCH] Set to deploy arduino and raspberrypi samples automatically
 to distribution

---
 modules/distribution/pom.xml                  | 34 +++++++++++++++++--
 .../src/assembly/filter.properties            |  2 +-
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index b4aecb89..b53b167d 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -412,6 +412,9 @@
 
                                 <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/resources/scripts"/>
 
+                                <!--Default sample-->
+                                <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/resources/conf/iot"/>
+
                                 <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/statistics"/>
 
                                 <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/patches"/>
@@ -420,7 +423,7 @@
 
                                 <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps"
                                       overwrite="true">
-                                    <fileset dir="src/repository/jaggeryapps"></fileset>
+                                    <fileset dir="src/repository/jaggeryapps"/>
                                 </copy>
 
                                 <copy todir="target/wso2carbon-core-${carbon.kernel.version}/samples"
@@ -428,6 +431,12 @@
                                     <fileset dir="src/samples"/>
                                 </copy>
 
+                                <!--Default sample-->
+                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot"
+                                      overwrite="true">
+                                    <fileset file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot-config.xml"/>
+                                </copy>
+
                                 <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/resources/sketches"
                                       overwrite="true">
                                     <fileset dir="src/sketches"/>
@@ -468,6 +477,28 @@
                             <goal>run</goal>
                         </goals>
                     </execution>
+                    <!--Default sample-->
+                    <execution>
+                        <id>install_samples</id>
+                        <phase>package</phase>
+                        <configuration>
+                            <tasks>
+                                <subant target="deploy">
+                                    <fileset dir="target/wso2carbon-core-${carbon.kernel.version}/samples/arduino" includes="build.xml"/>
+                                </subant>
+                                <subant target="deploy">
+                                    <fileset dir="target/wso2carbon-core-${carbon.kernel.version}/samples/raspberrypi" includes="build.xml"/>
+                                </subant>
+                                <copy todir="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/"
+                                      overwrite="true">
+                                    <fileset file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot/iot-config.xml"/>
+                                </copy>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
                     <execution>
                         <id>clean_target</id>
                         <phase>install</phase>
@@ -479,7 +510,6 @@
                                 <delete dir="target/dependency-maven-plugin-markers"/>
                                 <delete dir="target/maven-archiver"/>
                                 <delete dir="target/wso2carbon-core-${carbon.kernel.version}"/>
-                                <delete dir="target/wso2carbon-core-${carbon.kernel.version}"/>
                                 <delete file="target/wso2dc-${project.version}.jar"/>
                                 <delete dir="target/sources"/>
                                 <delete dir="target/site"/>
diff --git a/modules/distribution/src/assembly/filter.properties b/modules/distribution/src/assembly/filter.properties
index beca3939..1dc01fef 100644
--- a/modules/distribution/src/assembly/filter.properties
+++ b/modules/distribution/src/assembly/filter.properties
@@ -3,5 +3,5 @@ product.version=1.0.0-SNAPSHOT
 product.key=DC
 hotdeployment=true
 hotupdate=true
-carbon.version=4.3.0
+carbon.version=4.4.0
 default.server.role=DeviceCloud