From d08d7cb048ac42a685e5df4845f9d503bb9812d6 Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Tue, 22 Sep 2015 19:23:06 +0530
Subject: [PATCH] added analytics commons data publisher and used dal layer to
 capture the data

---
 modules/distribution/pom.xml                  | 1195 +++++++++--------
 modules/distribution/src/assembly/bin.xml     |   39 +-
 .../src/assembly/filter.properties            |    8 +-
 .../src/repository/conf/carbon.xml            |  685 ++++++++++
 .../conf/data-bridge/data-bridge-config.xml   |   72 +
 .../src/statistics/IOT_Sensor_Analytics.car   |  Bin 8596 -> 0 bytes
 .../IOT_Sensor_Analytics.tbox                 |  Bin
 .../carbonapps/Temperature_Sensor.car         |  Bin 0 -> 8525 bytes
 modules/p2-profile-gen/pom.xml                |  194 +--
 .../impl/AndroidSenseManagerService.java      |   15 +
 .../plugin/impl/ArduinoManagerService.java    |   15 +
 .../pom.xml                                   |   10 +
 .../impl/ArduinoControllerService.java        |   33 +-
 .../src/main/webapp/WEB-INF/web.xml           |    4 +-
 .../impl/DigitalDisplayManagerService.java    |   15 +
 .../plugin/impl/FireAlarmManagerService.java  |   16 +
 modules/samples/pom.xml                       |    6 +
 .../impl/RaspberrypiManagerService.java       |   15 +
 .../plugin/impl/SensebotManagerService.java   |   16 +
 pom.xml                                       |   10 +-
 20 files changed, 1603 insertions(+), 745 deletions(-)
 create mode 100644 modules/distribution/src/repository/conf/carbon.xml
 create mode 100644 modules/distribution/src/repository/conf/data-bridge/data-bridge-config.xml
 delete mode 100644 modules/distribution/src/statistics/IOT_Sensor_Analytics.car
 rename modules/distribution/src/statistics/{ => bamtoolbox}/IOT_Sensor_Analytics.tbox (100%)
 create mode 100644 modules/distribution/src/statistics/carbonapps/Temperature_Sensor.car

diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index c15b7310..12f59031 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -17,585 +17,620 @@
 ~ under the License.
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <parent>
-        <groupId>org.wso2.iot</groupId>
-        <artifactId>wso2iot-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>wso2iot</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <name>WSO2 IoT Server - Distribution</name>
-    <description>WSO2 IoT Server Distribution</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.h2database.wso2</groupId>
-            <artifactId>h2-database-engine</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>buildnumber-maven-plugin</artifactId>
-                <version>${maven-buildnumber-plugin.version}</version>
-                <configuration>
-                    <format>{0,date,dd MMM yyyy}</format>
-                    <items>
-                        <item>timestamp</item>
-                    </items>
-                    <doCheck>false</doCheck>
-                    <doUpdate>false</doUpdate>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>create</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <inherited>false</inherited>
-                <executions>
-                    <execution>
-                        <id>2-unpack-wso2carbon</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.wso2.carbon</groupId>
-                                    <artifactId>wso2carbon-core</artifactId>
-                                    <version>${carbon.kernel.version}</version>
-                                    <type>zip</type>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>target</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-
-                    <!--============ Added with ES Features ===============-->
-
-                    <execution>
-                        <id>social-h2-table-gen</id>
-                        <phase>package</phase>
-                        <configuration>
-                            <target>
-                                <echo message="########### Create Social Database ##############"/>
-                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/dbscripts/social"
-                                      overwrite="false">
-                                    <fileset
-                                            dir="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/social/">
-                                    </fileset>
-                                </copy>
-                                <path id="h2.classpath">
-                                    <path refid="maven.compile.classpath"/>
-                                </path>
-                            </target>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                    <!--============ End with ES Features ===============-->
-
-                    <execution>
-                        <!-- Creating Device Management schema -->
-                        <id>create-device-mgt-schema</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <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}/WSO2DM_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/h2.sql"/>
-                                </sql>
-                            </tasks>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <!-- Creating API Management schema -->
-                        <id>create-api-mgt-schema</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <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}/WSO2AM_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/apimgt/h2.sql"/>
-                                </sql>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                    <!--<execution>-->
-                    <!--&lt;!&ndash; Creating IOT Management schema &ndash;&gt;-->
-                    <!--<id>create-firealarm-schema</id>-->
-                    <!--<phase>package</phase>-->
-                    <!--<goals>-->
-                    <!--<goal>run</goal>-->
-                    <!--</goals>-->
-                    <!--<configuration>-->
-                    <!--<tasks>-->
-                    <!--<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/samples/firealarm/database"/>-->
-                    <!--<property name="db.dir"-->
-                    <!--value="target/wso2carbon-core-${carbon.kernel.version}/samples/firealarm/database"/>-->
-                    <!--<property name="userid" value="wso2carbon"/>-->
-                    <!--<property name="password" value="wso2carbon"/>-->
-                    <!--<property name="dbURL"-->
-                    <!--value="jdbc:h2:file:${basedir}/${db.dir}/FireAlarmDM_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/h2_firealarm.sql"/>-->
-                    <!--</sql>-->
-                    <!--</tasks>-->
-                    <!--</configuration>-->
-                    <!--</execution>-->
-
-                    <!--<execution>-->
-                    <!--&lt;!&ndash; Creating IOT Management schema &ndash;&gt;-->
-                    <!--<id>create-sensebot-schema</id>-->
-                    <!--<phase>package</phase>-->
-                    <!--<goals>-->
-                    <!--<goal>run</goal>-->
-                    <!--</goals>-->
-                    <!--<configuration>-->
-                    <!--<tasks>-->
-                    <!--<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/samples/sensebot/database"/>-->
-                    <!--<property name="db.dir"-->
-                    <!--value="target/wso2carbon-core-${carbon.kernel.version}/samples/sensebot/database"/>-->
-                    <!--<property name="userid" value="wso2carbon"/>-->
-                    <!--<property name="password" value="wso2carbon"/>-->
-                    <!--<property name="dbURL"-->
-                    <!--value="jdbc:h2:file:${basedir}/${db.dir}/SensebotDM_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/h2_sensebot.sql"/>-->
-                    <!--</sql>-->
-                    <!--</tasks>-->
-                    <!--</configuration>-->
-                    <!--</execution>-->
-
-                    <!--<execution>-->
-                    <!--&lt;!&ndash; Creating IOT Management schema &ndash;&gt;-->
-                    <!--<id>create-arduino-schema</id>-->
-                    <!--<phase>package</phase>-->
-                    <!--<goals>-->
-                    <!--<goal>run</goal>-->
-                    <!--</goals>-->
-                    <!--<configuration>-->
-                    <!--<tasks>-->
-                    <!--<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/samples/arduino/database"/>-->
-                    <!--<property name="db.dir"-->
-                    <!--value="target/wso2carbon-core-${carbon.kernel.version}/samples/arduino/database"/>-->
-                    <!--<property name="userid" value="wso2carbon"/>-->
-                    <!--<property name="password" value="wso2carbon"/>-->
-                    <!--<property name="dbURL"-->
-                    <!--value="jdbc:h2:file:${basedir}/${db.dir}/ArduinoDM_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/h2_arduino.sql"/>-->
-                    <!--</sql>-->
-                    <!--</tasks>-->
-                    <!--</configuration>-->
-                    <!--</execution>-->
-
-                    <!--<execution>-->
-                    <!--&lt;!&ndash; Creating IOT Management schema &ndash;&gt;-->
-                    <!--<id>create-android-sense-schema</id>-->
-                    <!--<phase>package</phase>-->
-                    <!--<goals>-->
-                    <!--<goal>run</goal>-->
-                    <!--</goals>-->
-                    <!--<configuration>-->
-                    <!--<tasks>-->
-                    <!--<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/h2_android_sense.sql"/>-->
-                    <!--</sql>-->
-                    <!--</tasks>-->
-                    <!--</configuration>-->
-                    <!--</execution>-->
-
-                    <!--<execution>-->
-                    <!--&lt;!&ndash; Creating IOT Management schema &ndash;&gt;-->
-                    <!--<id>create-raspberrypi-schema</id>-->
-                    <!--<phase>package</phase>-->
-                    <!--<goals>-->
-                    <!--<goal>run</goal>-->
-                    <!--</goals>-->
-                    <!--<configuration>-->
-                    <!--<tasks>-->
-                    <!--<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}/RaspberrypiDM_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/h2_raspberrypi.sql"/>-->
-                    <!--</sql>-->
-                    <!--</tasks>-->
-                    <!--</configuration>-->
-                    <!--</execution>-->
-
-                    <!--<execution>-->
-                    <!--&lt;!&ndash; Creating IOT Management schema &ndash;&gt;-->
-                    <!--<id>create-digitaldisply-schema</id>-->
-                    <!--<phase>package</phase>-->
-                    <!--<goals>-->
-                    <!--<goal>run</goal>-->
-                    <!--</goals>-->
-                    <!--<configuration>-->
-                    <!--<tasks>-->
-                    <!--<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/samples/digital_display/database"/>-->
-                    <!--<property name="db.dir"-->
-                    <!--value="target/wso2carbon-core-${carbon.kernel.version}/samples/digital_display/database"/>-->
-                    <!--<property name="userid" value="wso2carbon"/>-->
-                    <!--<property name="password" value="wso2carbon"/>-->
-                    <!--<property name="dbURL"-->
-                    <!--value="jdbc:h2:file:${basedir}/${db.dir}/DigitalDisplayDM_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/h2_digital_display.sql"/>-->
-                    <!--</sql>-->
-                    <!--</tasks>-->
-                    <!--</configuration>-->
-                    <!--</execution>-->
-
-
-                    <execution>
-                        <id>3-extract-apps-from-components</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <property name="tempdir" value="target/apps-temp"/>
-                                <property name="jardir" value="target/jars"/>
-                                <!--<property name="shindig.version" value="2.5.0-beta5" />-->
-
-                                <mkdir dir="${tempdir}"/>
-                                <mkdir dir="${tempdir}/wso2iot-${project.version}/repository/components"/>
-                                <mkdir dir="${tempdir}/wso2iot-${project.version}/repository/deployment/server"/>
-                                <mkdir dir="${tempdir}/wso2iot-${project.version}/repository/deployment/server/webapps"/>
-                                <unzip dest="${tempdir}">
-                                    <fileset dir="target">
-                                        <include name="wso2iot-${project.version}.zip"/>
-                                    </fileset>
-                                </unzip>
-                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components"
-                                      overwrite="true">
-                                    <fileset dir="${tempdir}/wso2iot-${project.version}/repository/components"/>
-                                </copy>
-                                <!--testing -->
-                                <!--<unzip src="target/shindig/WEB-INF/lib/shindig-common-${shindig.version}.jar" dest="${jardir}/shindig-common-${shindig.version}">
-                                    <patternset>
-                                        <exclude name="**/shindig.properties" />
-                                    </patternset>
-                                </unzip>
-                                <copy file="src/repository/conf/shindig.properties" todir="${jardir}/shindig-common-${shindig.version}" />
-                                <delete file="target/shindig/WEB-INF/lib/shindig-common-${shindig.version}.jar" />
-                                <zip destfile="target/shindig/WEB-INF/lib/shindig-common-${shindig.version}.jar" basedir="${jardir}/shindig-common-${shindig.version}" />
-                                <delete>
-                                    <fileset dir="target/shindig/WEB-INF/lib" includes="slf4j*" />
-                                </delete>
-                                <copy file="src/repository/resources/shindig/index.jsp" todir="target/shindig" />-->
-
-                                <concat destfile="target/wso2carbon-core-${carbon.kernel.version}/repository/log4j.properties">
-                                    og4j.logger.net.sf.ehcache=ERROR
-                                </concat>
-
-                                <delete file="target/wso2iot-${project.version}.zip"/>
-                                <delete dir="${tempdir}"/>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy_modules_apps</id>
-                        <phase>package</phase>
-                        <configuration>
-                            <tasks>
-                                <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps"/>
-
-                                <!--Make samples directory for distribution-->
-                                <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/samples"/>
-
-                                <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/resources/sketches"/>
-
-                                <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/resources/scripts"/>
-
-                                <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/statistics"/>
-
-                                <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/lib"/>
-
-                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps"
-                                      overwrite="true">
-                                    <fileset dir="src/repository/jaggeryapps"/>
-                                </copy>
-
-                                <!--Copy samples to distribution-->
-                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/samples"
-                                      overwrite="true">
-                                    <fileset dir="../samples">
-                                        <exclude name="**/*.iml"/>
-                                        <exclude name="**/.DS_Store"/>
-                                        <exclude name="**/target/"/>
-                                    </fileset>
-                                </copy>
-
-                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/resources/sketches"
-                                      overwrite="true">
-                                    <fileset dir="src/sketches"/>
-                                </copy>
-
-                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/resources/scripts"
-                                      overwrite="true">
-                                    <fileset dir="src/scripts"/>
-                                </copy>
-
-                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/statistics"
-                                      overwrite="true">
-                                    <fileset dir="src/statistics"/>
-                                </copy>
-
-                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/lib">
-                                    <fileset dir="src/lib"/>
-                                </copy>
-
-                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/datasources"
-                                      overwrite="true">
-                                    <fileset dir="src/repository/conf/datasources"/>
-                                    <!-- Copy master-datasources.xml and cdm-datasources.xml to target -->
-                                </copy>
-                                <!--<copy todir="target/wso2carbon-core-${carbon.kernel.version}/modules" overwrite="true">
-                                    <fileset dir="src/repository/modules"></fileset>
-                                </copy>
-                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps" overwrite="true">
-                                    <fileset dir="../apps"></fileset>
-                                </copy>
-
-                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/plugins" overwrite="true">
-                                    <fileset dir="src/repository/components/patches/apimgt"></fileset>
-                                </copy>-->
-
-                            </tasks>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-
-                    <!--Install default samples-->
-                    <execution>
-                        <id>install_samples</id>
-                        <phase>package</phase>
-                        <configuration>
-                            <tasks>
-                                <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/resources/conf/iot"/>
-
-                                <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>
-
-                                <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>
-                                <move file="target/wso2carbon-core-${carbon.kernel.version}/samples/arduino/build.xml"
-                                      toFile="target/wso2carbon-core-${carbon.kernel.version}/samples/arduino/build.xml.disable"/>
-                                <move file="target/wso2carbon-core-${carbon.kernel.version}/samples/raspberrypi/build.xml"
-                                      toFile="target/wso2carbon-core-${carbon.kernel.version}/samples/raspberrypi/build.xml.disable"/>
-                                <move file="target/wso2carbon-core-${carbon.kernel.version}/samples/sample_pom.xml"
-                                      toFile="target/wso2carbon-core-${carbon.kernel.version}/samples/pom.xml"
-                                      overwrite="true"/>
-                            </tasks>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>clean_target</id>
-                        <phase>install</phase>
-                        <configuration>
-                            <tasks>
-                                <delete dir="target/jars"/>
-                                <delete dir="target/*.xml"/>
-                                <delete dir="target/archive-tmp"/>
-                                <delete dir="target/dependency-maven-plugin-markers"/>
-                                <delete dir="target/maven-archiver"/>
-                                <delete dir="target/wso2carbon-core-${carbon.kernel.version}"/>
-                                <delete file="target/wso2iot-${project.version}.jar"/>
-                                <delete dir="target/sources"/>
-                                <delete dir="target/site"/>
-                                <delete dir="target/antrun"/>
-                                <delete dir="src/site"/>
-                                <!--<delete dir="target/shindig" />-->
-                                <delete dir="target/jaxwebapps"/>
-                            </tasks>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <!--<version>2.5.2</version>-->
-                <executions>
-                    <execution>
-                        <id>1-pre-dist</id>
-                        <phase>test</phase>
-                        <!--we are creating a temporary carbon distribution for document extracting purposes during the test phase-->
-                        <goals>
-                            <goal>attached</goal>
-                        </goals>
-                        <configuration>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <filters>
-                                <filter>${basedir}/src/assembly/filter.properties</filter>
-                            </filters>
-                            <descriptors>
-                                <descriptor>${basedir}/src/assembly/dist.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>2-dist</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attached</goal>
-                        </goals>
-                        <configuration>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <filters>
-                                <filter>${basedir}/src/assembly/filter.properties</filter>
-                            </filters>
-                            <descriptors>
-                                <descriptor>${basedir}/src/assembly/bin.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!--   <plugin>
-                   <groupId>org.apache.maven.plugins</groupId>
-                   <artifactId>maven-clean-plugin</artifactId>
-                   <executions>
-                       <execution>
-                           <id>auto-clean</id>
-                           <phase>initialize</phase>
-                           <goals>
-                               <goal>clean</goal>
-                           </goals>
-                       </execution>
-                   </executions>
-               </plugin>-->
-        </plugins>
-    </build>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<parent>
+		<groupId>org.wso2.iot</groupId>
+		<artifactId>wso2iot-parent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+		<relativePath>../../pom.xml</relativePath>
+	</parent>
+
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>wso2iot</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	<name>WSO2 IoT Server - Distribution</name>
+	<description>WSO2 IoT Server Distribution</description>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.h2database.wso2</groupId>
+			<artifactId>h2-database-engine</artifactId>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>buildnumber-maven-plugin</artifactId>
+				<version>${maven-buildnumber-plugin.version}</version>
+				<configuration>
+					<format>{0,date,dd MMM yyyy}</format>
+					<items>
+						<item>timestamp</item>
+					</items>
+					<doCheck>false</doCheck>
+					<doUpdate>false</doUpdate>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>validate</phase>
+						<goals>
+							<goal>create</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<inherited>false</inherited>
+				<executions>
+					<execution>
+						<id>2-unpack-wso2carbon</id>
+						<phase>package</phase>
+						<goals>
+							<goal>unpack</goal>
+						</goals>
+						<configuration>
+							<artifactItems>
+								<artifactItem>
+									<groupId>org.wso2.carbon</groupId>
+									<artifactId>wso2carbon-core</artifactId>
+									<version>${carbon.kernel.version}</version>
+									<type>zip</type>
+									<overWrite>true</overWrite>
+									<outputDirectory>target</outputDirectory>
+								</artifactItem>
+							</artifactItems>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!--============ Add Server Roles for DAS ===============-->
+
+			<!--<execution>-->
+			<!--<id>add-server-roles</id>-->
+			<!--<phase>prepare-package</phase>-->
+			<!--<configuration>-->
+			<!--<target>-->
+			<!--<echo message="Using xml task to add server roles"/>-->
+			<!--&lt;!&ndash;<taskdef name="xmltask"&ndash;&gt;-->
+			<!--&lt;!&ndash;classname="com.oopsconsultancy.xmltask.ant.XmlTask"&ndash;&gt;-->
+			<!--&lt;!&ndash;classpathref="maven.plugin.classpath"/>&ndash;&gt;-->
+			<!--<xmltask-->
+			<!--source="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml"-->
+			<!--dest="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml"-->
+			<!--preserveType="true">-->
+			<!--<insert path="/Server/ServerRoles/">-->
+			<!--<![CDATA[-->
+			<!--<Role>DataAnalyticsServer</Role>-->
+			<!--<Role>ComplexEventProcessor</Role>-->
+			<!--]]>-->
+			<!--</insert>-->
+			<!--</xmltask>-->
+			<!--</target>-->
+			<!--</configuration>-->
+			<!--<goals>-->
+			<!--<goal>run</goal>-->
+			<!--</goals>-->
+			<!--</execution>-->
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+
+					<!--============ Added with ES Features ===============-->
+
+					<execution>
+						<id>social-h2-table-gen</id>
+						<phase>package</phase>
+						<configuration>
+							<target>
+								<echo message="########### Create Social Database ##############"/>
+								<copy todir="target/wso2carbon-core-${carbon.kernel.version}/dbscripts/social"
+									  overwrite="false">
+									<fileset
+											dir="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/social/">
+									</fileset>
+								</copy>
+								<path id="h2.classpath">
+									<path refid="maven.compile.classpath"/>
+								</path>
+							</target>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+					<!--============ End with ES Features ===============-->
+
+					<execution>
+						<!-- Creating Device Management schema -->
+						<id>create-device-mgt-schema</id>
+						<phase>package</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<tasks>
+								<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}/WSO2DM_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/h2.sql"/>
+								</sql>
+							</tasks>
+						</configuration>
+					</execution>
+
+					<execution>
+						<!-- Creating API Management schema -->
+						<id>create-api-mgt-schema</id>
+						<phase>package</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<tasks>
+								<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}/WSO2AM_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/apimgt/h2.sql"/>
+								</sql>
+							</tasks>
+						</configuration>
+					</execution>
+					<!--<execution>-->
+					<!--&lt;!&ndash; Creating IOT Management schema &ndash;&gt;-->
+					<!--<id>create-firealarm-schema</id>-->
+					<!--<phase>package</phase>-->
+					<!--<goals>-->
+					<!--<goal>run</goal>-->
+					<!--</goals>-->
+					<!--<configuration>-->
+					<!--<tasks>-->
+					<!--<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/samples/firealarm/database"/>-->
+					<!--<property name="db.dir"-->
+					<!--value="target/wso2carbon-core-${carbon.kernel.version}/samples/firealarm/database"/>-->
+					<!--<property name="userid" value="wso2carbon"/>-->
+					<!--<property name="password" value="wso2carbon"/>-->
+					<!--<property name="dbURL"-->
+					<!--value="jdbc:h2:file:${basedir}/${db.dir}/FireAlarmDM_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/h2_firealarm.sql"/>-->
+					<!--</sql>-->
+					<!--</tasks>-->
+					<!--</configuration>-->
+					<!--</execution>-->
+
+					<!--<execution>-->
+					<!--&lt;!&ndash; Creating IOT Management schema &ndash;&gt;-->
+					<!--<id>create-sensebot-schema</id>-->
+					<!--<phase>package</phase>-->
+					<!--<goals>-->
+					<!--<goal>run</goal>-->
+					<!--</goals>-->
+					<!--<configuration>-->
+					<!--<tasks>-->
+					<!--<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/samples/sensebot/database"/>-->
+					<!--<property name="db.dir"-->
+					<!--value="target/wso2carbon-core-${carbon.kernel.version}/samples/sensebot/database"/>-->
+					<!--<property name="userid" value="wso2carbon"/>-->
+					<!--<property name="password" value="wso2carbon"/>-->
+					<!--<property name="dbURL"-->
+					<!--value="jdbc:h2:file:${basedir}/${db.dir}/SensebotDM_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/h2_sensebot.sql"/>-->
+					<!--</sql>-->
+					<!--</tasks>-->
+					<!--</configuration>-->
+					<!--</execution>-->
+
+					<!--<execution>-->
+					<!--&lt;!&ndash; Creating IOT Management schema &ndash;&gt;-->
+					<!--<id>create-arduino-schema</id>-->
+					<!--<phase>package</phase>-->
+					<!--<goals>-->
+					<!--<goal>run</goal>-->
+					<!--</goals>-->
+					<!--<configuration>-->
+					<!--<tasks>-->
+					<!--<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/samples/arduino/database"/>-->
+					<!--<property name="db.dir"-->
+					<!--value="target/wso2carbon-core-${carbon.kernel.version}/samples/arduino/database"/>-->
+					<!--<property name="userid" value="wso2carbon"/>-->
+					<!--<property name="password" value="wso2carbon"/>-->
+					<!--<property name="dbURL"-->
+					<!--value="jdbc:h2:file:${basedir}/${db.dir}/ArduinoDM_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/h2_arduino.sql"/>-->
+					<!--</sql>-->
+					<!--</tasks>-->
+					<!--</configuration>-->
+					<!--</execution>-->
+
+					<!--<execution>-->
+					<!--&lt;!&ndash; Creating IOT Management schema &ndash;&gt;-->
+					<!--<id>create-android-sense-schema</id>-->
+					<!--<phase>package</phase>-->
+					<!--<goals>-->
+					<!--<goal>run</goal>-->
+					<!--</goals>-->
+					<!--<configuration>-->
+					<!--<tasks>-->
+					<!--<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/h2_android_sense.sql"/>-->
+					<!--</sql>-->
+					<!--</tasks>-->
+					<!--</configuration>-->
+					<!--</execution>-->
+
+					<!--<execution>-->
+					<!--&lt;!&ndash; Creating IOT Management schema &ndash;&gt;-->
+					<!--<id>create-raspberrypi-schema</id>-->
+					<!--<phase>package</phase>-->
+					<!--<goals>-->
+					<!--<goal>run</goal>-->
+					<!--</goals>-->
+					<!--<configuration>-->
+					<!--<tasks>-->
+					<!--<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}/RaspberrypiDM_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/h2_raspberrypi.sql"/>-->
+					<!--</sql>-->
+					<!--</tasks>-->
+					<!--</configuration>-->
+					<!--</execution>-->
+
+					<!--<execution>-->
+					<!--&lt;!&ndash; Creating IOT Management schema &ndash;&gt;-->
+					<!--<id>create-digitaldisply-schema</id>-->
+					<!--<phase>package</phase>-->
+					<!--<goals>-->
+					<!--<goal>run</goal>-->
+					<!--</goals>-->
+					<!--<configuration>-->
+					<!--<tasks>-->
+					<!--<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/samples/digital_display/database"/>-->
+					<!--<property name="db.dir"-->
+					<!--value="target/wso2carbon-core-${carbon.kernel.version}/samples/digital_display/database"/>-->
+					<!--<property name="userid" value="wso2carbon"/>-->
+					<!--<property name="password" value="wso2carbon"/>-->
+					<!--<property name="dbURL"-->
+					<!--value="jdbc:h2:file:${basedir}/${db.dir}/DigitalDisplayDM_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/h2_digital_display.sql"/>-->
+					<!--</sql>-->
+					<!--</tasks>-->
+					<!--</configuration>-->
+					<!--</execution>-->
+
+
+					<execution>
+						<id>3-extract-apps-from-components</id>
+						<phase>package</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<tasks>
+								<property name="tempdir" value="target/apps-temp"/>
+								<property name="jardir" value="target/jars"/>
+								<!--<property name="shindig.version" value="2.5.0-beta5" />-->
+
+								<mkdir dir="${tempdir}"/>
+								<mkdir dir="${tempdir}/wso2iot-${project.version}/repository/components"/>
+								<mkdir dir="${tempdir}/wso2iot-${project.version}/repository/deployment/server"/>
+								<mkdir dir="${tempdir}/wso2iot-${project.version}/repository/deployment/server/webapps"/>
+								<unzip dest="${tempdir}">
+									<fileset dir="target">
+										<include name="wso2iot-${project.version}.zip"/>
+									</fileset>
+								</unzip>
+								<copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components"
+									  overwrite="true">
+									<fileset
+											dir="${tempdir}/wso2iot-${project.version}/repository/components"/>
+								</copy>
+								<!--testing -->
+								<!--<unzip src="target/shindig/WEB-INF/lib/shindig-common-${shindig.version}.jar" dest="${jardir}/shindig-common-${shindig.version}">
+									<patternset>
+										<exclude name="**/shindig.properties" />
+									</patternset>
+								</unzip>
+								<copy file="src/repository/conf/shindig.properties" todir="${jardir}/shindig-common-${shindig.version}" />
+								<delete file="target/shindig/WEB-INF/lib/shindig-common-${shindig.version}.jar" />
+								<zip destfile="target/shindig/WEB-INF/lib/shindig-common-${shindig.version}.jar" basedir="${jardir}/shindig-common-${shindig.version}" />
+								<delete>
+									<fileset dir="target/shindig/WEB-INF/lib" includes="slf4j*" />
+								</delete>
+								<copy file="src/repository/resources/shindig/index.jsp" todir="target/shindig" />-->
+
+								<concat destfile="target/wso2carbon-core-${carbon.kernel.version}/repository/log4j.properties">
+									og4j.logger.net.sf.ehcache=ERROR
+								</concat>
+
+								<delete file="target/wso2iot-${project.version}.zip"/>
+								<delete dir="${tempdir}"/>
+							</tasks>
+						</configuration>
+					</execution>
+					<execution>
+						<id>copy_modules_apps</id>
+						<phase>package</phase>
+						<configuration>
+							<tasks>
+								<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps"/>
+
+								<!--Make samples directory for distribution-->
+								<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/samples"/>
+
+								<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/resources/sketches"/>
+
+								<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/resources/scripts"/>
+
+								<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/statistics"/>
+
+								<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/lib"/>
+
+								<copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps"
+									  overwrite="true">
+									<fileset dir="src/repository/jaggeryapps"/>
+								</copy>
+
+								<!--Copy samples to distribution-->
+								<copy todir="target/wso2carbon-core-${carbon.kernel.version}/samples"
+									  overwrite="true">
+									<fileset dir="../samples">
+										<exclude name="**/*.iml"/>
+										<exclude name="**/.DS_Store"/>
+										<exclude name="**/target/"/>
+									</fileset>
+								</copy>
+
+								<copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/resources/sketches"
+									  overwrite="true">
+									<fileset dir="src/sketches"/>
+								</copy>
+
+								<copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/resources/scripts"
+									  overwrite="true">
+									<fileset dir="src/scripts"/>
+								</copy>
+
+								<copy todir="target/wso2carbon-core-${carbon.kernel.version}/statistics"
+									  overwrite="true">
+									<fileset dir="src/statistics"/>
+								</copy>
+
+								<copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/lib">
+									<fileset dir="src/lib"/>
+								</copy>
+
+								<copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/datasources"
+									  overwrite="true">
+									<fileset dir="src/repository/conf/datasources"/>
+									<!-- Copy master-datasources.xml and cdm-datasources.xml to target -->
+								</copy>
+								<!--<copy todir="target/wso2carbon-core-${carbon.kernel.version}/modules" overwrite="true">
+									<fileset dir="src/repository/modules"></fileset>
+								</copy>
+								<copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps" overwrite="true">
+									<fileset dir="../apps"></fileset>
+								</copy>
+
+								<copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/plugins" overwrite="true">
+									<fileset dir="src/repository/components/patches/apimgt"></fileset>
+								</copy>-->
+
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+
+					<!--Install default samples-->
+					<execution>
+						<id>install_samples</id>
+						<phase>package</phase>
+						<configuration>
+							<tasks>
+								<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/resources/conf/iot"/>
+
+								<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>
+
+								<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>
+								<move file="target/wso2carbon-core-${carbon.kernel.version}/samples/arduino/build.xml"
+									  toFile="target/wso2carbon-core-${carbon.kernel.version}/samples/arduino/build.xml.disable"/>
+								<move file="target/wso2carbon-core-${carbon.kernel.version}/samples/raspberrypi/build.xml"
+									  toFile="target/wso2carbon-core-${carbon.kernel.version}/samples/raspberrypi/build.xml.disable"/>
+								<move file="target/wso2carbon-core-${carbon.kernel.version}/samples/sample_pom.xml"
+									  toFile="target/wso2carbon-core-${carbon.kernel.version}/samples/pom.xml"
+									  overwrite="true"/>
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>clean_target</id>
+						<phase>install</phase>
+						<configuration>
+							<tasks>
+								<delete dir="target/jars"/>
+								<delete dir="target/*.xml"/>
+								<delete dir="target/archive-tmp"/>
+								<delete dir="target/dependency-maven-plugin-markers"/>
+								<delete dir="target/maven-archiver"/>
+								<delete dir="target/wso2carbon-core-${carbon.kernel.version}"/>
+								<delete file="target/wso2iot-${project.version}.jar"/>
+								<delete dir="target/sources"/>
+								<delete dir="target/site"/>
+								<delete dir="target/antrun"/>
+								<delete dir="src/site"/>
+								<!--<delete dir="target/shindig" />-->
+								<delete dir="target/jaxwebapps"/>
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<!--<version>2.5.2</version>-->
+				<executions>
+					<execution>
+						<id>1-pre-dist</id>
+						<phase>test</phase>
+						<!--we are creating a temporary carbon distribution for document extracting purposes during the test phase-->
+						<goals>
+							<goal>attached</goal>
+						</goals>
+						<configuration>
+							<appendAssemblyId>false</appendAssemblyId>
+							<filters>
+								<filter>${basedir}/src/assembly/filter.properties</filter>
+							</filters>
+							<descriptors>
+								<descriptor>${basedir}/src/assembly/dist.xml</descriptor>
+							</descriptors>
+						</configuration>
+					</execution>
+
+					<execution>
+						<id>2-dist</id>
+						<phase>package</phase>
+						<goals>
+							<goal>attached</goal>
+						</goals>
+						<configuration>
+							<appendAssemblyId>false</appendAssemblyId>
+							<filters>
+								<filter>${basedir}/src/assembly/filter.properties</filter>
+							</filters>
+							<descriptors>
+								<descriptor>${basedir}/src/assembly/bin.xml</descriptor>
+							</descriptors>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				   <groupId>org.apache.maven.plugins</groupId>
+				   <artifactId>maven-clean-plugin</artifactId>
+				   <executions>
+					   <execution>
+						   <id>auto-clean</id>
+						   <phase>initialize</phase>
+						   <goals>
+							   <goal>clean</goal>
+						   </goals>
+					   </execution>
+				   </executions>
+			   </plugin>
+		</plugins>
+	</build>
 
 </project>
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index eb780e71..9d9b6232 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -278,14 +278,20 @@
 
 
         <!-- Copying Mobile plugin management related dbscripts -->
+        <!--<fileSet>-->
+            <!--<directory>-->
+                <!--../p2-profile-gen/target/wso2carbon-core-${carbon.mobile.device.mgt.version}/dbscripts/cdm/plugins-->
+            <!--</directory>-->
+            <!--<outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/cdm/plugins</outputDirectory>-->
+            <!--<includes>-->
+                <!--<include>*/**</include>-->
+            <!--</includes>-->
+        <!--</fileSet>-->
         <fileSet>
-            <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.mobile.device.mgt.version}/dbscripts/cdm/plugins
-            </directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/cdm/plugins</outputDirectory>
-            <includes>
-                <include>*/**</include>
-            </includes>
+            <directory>src/statistics/carbonapps/</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/carbonapps
+            </outputDirectory>
+            <fileMode>755</fileMode>
         </fileSet>
 
         <!-- Copying MDM Jaggery app -->
@@ -885,7 +891,9 @@
 
 
         <file>
-            <source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml</source>
+            <!--Added Server Roles-->
+            <!--<source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml</source>-->
+            <source>src/repository/conf/carbon.xml</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
             <filtered>true</filtered>
         </file>
@@ -1081,7 +1089,9 @@
 
         <!-- ************* Data bridge related files ********** -->
         <file>
-            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/data-bridge/data-bridge-config.xml</source>
+            <!--<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/data-bridge/data-bridge-config.xml</source>-->
+            <!--STORE-1101-->
+            <source>src/repository/conf/data-bridge/data-bridge-config.xml</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/data-bridge</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
@@ -1120,6 +1130,17 @@
             <fileMode>755</fileMode>
         </file>
 
+        <!-- Analytics REST APIs WebApp -->
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/analytics.war
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory>
+            <!--commented since this tag causes issues in maven assembly plugin when copying zip formats-->
+            <!--filtered>true</filtered-->
+            <fileMode>644</fileMode>
+        </file>
+
 
 
 
diff --git a/modules/distribution/src/assembly/filter.properties b/modules/distribution/src/assembly/filter.properties
index 9b5c9e59..c01b40bd 100644
--- a/modules/distribution/src/assembly/filter.properties
+++ b/modules/distribution/src/assembly/filter.properties
@@ -1,7 +1,9 @@
 product.name=WSO2 IoT Server
 product.version=1.0.0-SNAPSHOT
-product.key=DC
+product.key=IOT
 hotdeployment=true
 hotupdate=true
-carbon.version=4.4.0
-default.server.role=DeviceCloud
+carbon.version=4.4.1
+default.server.role=IoTServer
+cep.server.role=ComplexEventProcessor
+das.server.role=DataAnalyticsServer
diff --git a/modules/distribution/src/repository/conf/carbon.xml b/modules/distribution/src/repository/conf/carbon.xml
new file mode 100644
index 00000000..59af020b
--- /dev/null
+++ b/modules/distribution/src/repository/conf/carbon.xml
@@ -0,0 +1,685 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+  ~ Copyright 2005-2011 WSO2, Inc. (http://wso2.com)
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<!--
+    This is the main server configuration file
+
+    ${carbon.home} represents the carbon.home system property.
+    Other system properties can be specified in a similar manner.
+-->
+<Server xmlns="http://wso2.org/projects/carbon/carbon.xml">
+
+	<!--
+	   Product Name
+	-->
+	<Name>${product.name}</Name>
+
+	<!--
+	   machine readable unique key to identify each product
+	-->
+	<ServerKey>${product.key}</ServerKey>
+
+	<!--
+	   Product Version
+	-->
+	<Version>${product.version}</Version>
+
+	<!--
+	   Host name or IP address of the machine hosting this server
+	   e.g. www.wso2.org, 192.168.1.10
+	   This is will become part of the End Point Reference of the
+	   services deployed on this server instance.
+	-->
+	<!--HostName>www.wso2.org</HostName-->
+
+	<!--
+	Host name to be used for the Carbon management console
+	-->
+	<!--MgtHostName>mgt.wso2.org</MgtHostName-->
+
+	<!--
+		The URL of the back end server. This is where the admin services are hosted and
+		will be used by the clients in the front end server.
+		This is required only for the Front-end server. This is used when seperating BE server from FE server
+	   -->
+	<ServerURL>local:/${carbon.context}/services/</ServerURL>
+	<!--
+	<ServerURL>https://${carbon.local.ip}:${carbon.management.port}${carbon.context}/services/</ServerURL>
+	-->
+	<!--
+	 The URL of the index page. This is where the user will be redirected after signing in to the
+	 carbon server.
+	 -->
+	<!-- IndexPageURL>/carbon/admin/index.jsp</IndexPageURL-->
+
+	<!--
+	For cApp deployment, we have to identify the roles that can be acted by the current server.
+	The following property is used for that purpose. Any number of roles can be defined here.
+	Regular expressions can be used in the role.
+	Ex : <Role>.*</Role> means this server can act any role
+	-->
+	<ServerRoles>
+		<Role>${default.server.role}</Role>
+		<Role>${das.server.role}</Role>
+		<Role>${cep.server.role}</Role>
+	</ServerRoles>
+
+	<!-- uncommnet this line to subscribe to a bam instance automatically -->
+	<!--<BamServerURL>https://bamhost:bamport/services/</BamServerURL>-->
+
+	<!--
+	   The fully qualified name of the server
+	-->
+	<Package>org.wso2.carbon</Package>
+
+	<!--
+	   Webapp context root of WSO2 Carbon management console.
+	-->
+	<WebContextRoot>/</WebContextRoot>
+
+	<!--
+		Proxy context path is a useful parameter to add a proxy path when a Carbon server is fronted by reverse proxy. In addtion
+		to the proxy host and proxy port this parameter allows you add a path component to external URLs. e.g.
+			 URL of the Carbon server -> https://10.100.1.1:9443/carbon
+		   URL of the reverse proxy -> https://prod.abc.com/appserver/carbon
+
+	   appserver - proxy context path. This specially required whenever you are generating URLs to displace in
+	   Carbon UI components.
+	-->
+	<!--
+		<MgtProxyContextPath></MgtProxyContextPath>
+		<ProxyContextPath></ProxyContextPath>
+	-->
+
+	<!-- In-order to  get the registry http Port from the back-end when the default http transport is not the same-->
+	<!--RegistryHttpPort>9763</RegistryHttpPort-->
+
+	<!--
+	Number of items to be displayed on a management console page. This is used at the
+	backend server for pagination of various items.
+	-->
+	<ItemsPerPage>15</ItemsPerPage>
+
+	<!-- The endpoint URL of the cloud instance management Web service -->
+	<!--<InstanceMgtWSEndpoint>https://ec2.amazonaws.com/</InstanceMgtWSEndpoint>-->
+
+	<!--
+	   Ports used by this server
+	-->
+	<Ports>
+
+		<!-- Ports offset. This entry will set the value of the ports defined below to
+		 the define value + Offset.
+		 e.g. Offset=2 and HTTPS port=9443 will set the effective HTTPS port to 9445
+		 -->
+		<Offset>0</Offset>
+
+		<!-- The JMX Ports -->
+		<JMX>
+			<!--The port RMI registry is exposed-->
+			<RMIRegistryPort>9999</RMIRegistryPort>
+			<!--The port RMI server should be exposed-->
+			<RMIServerPort>11111</RMIServerPort>
+		</JMX>
+
+		<!-- Embedded LDAP server specific ports -->
+		<EmbeddedLDAP>
+			<!-- Port which embedded LDAP server runs -->
+			<LDAPServerPort>10389</LDAPServerPort>
+			<!-- Port which KDC (Kerberos Key Distribution Center) server runs -->
+			<KDCServerPort>8000</KDCServerPort>
+		</EmbeddedLDAP>
+
+		<!--
+				 Override datasources JNDIproviderPort defined in bps.xml and datasources.properties files
+		-->
+		<!--<JNDIProviderPort>2199</JNDIProviderPort>-->
+		<!--Override receive port of thrift based entitlement service.-->
+		<ThriftEntitlementReceivePort>10500</ThriftEntitlementReceivePort>
+
+	</Ports>
+
+	<!--
+		JNDI Configuration
+	-->
+	<JNDI>
+		<!--
+			 The fully qualified name of the default initial context factory
+		-->
+		<DefaultInitialContextFactory>org.wso2.carbon.tomcat.jndi.CarbonJavaURLContextFactory</DefaultInitialContextFactory>
+		<!--
+			 The restrictions that are done to various JNDI Contexts in a Multi-tenant environment
+		-->
+		<Restrictions>
+			<!--
+				Contexts that will be available only to the super-tenant
+			-->
+			<!-- <SuperTenantOnly>
+				<UrlContexts>
+					<UrlContext>
+						<Scheme>foo</Scheme>
+					</UrlContext>
+					<UrlContext>
+						<Scheme>bar</Scheme>
+					</UrlContext>
+				</UrlContexts>
+			</SuperTenantOnly> -->
+			<!--
+				Contexts that are common to all tenants
+			-->
+			<AllTenants>
+				<UrlContexts>
+					<UrlContext>
+						<Scheme>java</Scheme>
+					</UrlContext>
+					<!-- <UrlContext>
+						<Scheme>foo</Scheme>
+					</UrlContext> -->
+				</UrlContexts>
+			</AllTenants>
+			<!--
+				 All other contexts not mentioned above will be available on a per-tenant basis
+				 (i.e. will not be shared among tenants)
+			-->
+		</Restrictions>
+	</JNDI>
+
+	<!--
+		Property to determine if the server is running an a cloud deployment environment.
+		This property should only be used to determine deployment specific details that are
+		applicable only in a cloud deployment, i.e when the server deployed *-as-a-service.
+	-->
+	<IsCloudDeployment>false</IsCloudDeployment>
+
+	<!--
+	Property to determine whether usage data should be collected for metering purposes
+	-->
+	<EnableMetering>false</EnableMetering>
+
+	<!-- The Max time a thread should take for execution in seconds -->
+	<MaxThreadExecutionTime>600</MaxThreadExecutionTime>
+
+	<!--
+		A flag to enable or disable Ghost Deployer. By default this is set to false. That is
+		because the Ghost Deployer works only with the HTTP/S transports. If you are using
+		other transports, don't enable Ghost Deployer.
+	-->
+	<GhostDeployment>
+		<Enabled>false</Enabled>
+	</GhostDeployment>
+
+
+	<!--
+		Eager loading or lazy loading is a design pattern commonly used in computer programming which
+		will initialize an object upon creation or load on-demand. In carbon, lazy loading is used to
+		load tenant when a request is received only. Similarly Eager loading is used to enable load
+		existing tenants after carbon server starts up. Using this feature, you will be able to include
+		or exclude tenants which are to be loaded when server startup.
+
+		We can enable only one LoadingPolicy at a given time.
+
+		1. Tenant Lazy Loading
+		   This is the default behaviour and enabled by default. With this policy, tenants are not loaded at
+		   server startup, but loaded based on-demand (i.e when a request is received for a tenant).
+		   The default tenant idle time is 30 minutes.
+
+		2. Tenant Eager Loading
+		   This is by default not enabled. It can be be enabled by un-commenting the <EagerLoading> section.
+		   The eager loading configurations supported are as below. These configurations can be given as the
+		   value for <Include> element with eager loading.
+				(i)Load all tenants when server startup             -   *
+				(ii)Load all tenants except foo.com & bar.com       -   *,!foo.com,!bar.com
+				(iii)Load only foo.com &  bar.com to be included    -   foo.com,bar.com
+	-->
+	<Tenant>
+		<LoadingPolicy>
+			<LazyLoading>
+				<IdleTime>30</IdleTime>
+			</LazyLoading>
+			<!-- <EagerLoading>
+				   <Include>*,!foo.com,!bar.com</Include>
+			</EagerLoading>-->
+		</LoadingPolicy>
+	</Tenant>
+
+	<!--
+	 Caching related configurations
+	-->
+	<Cache>
+		<!-- Default cache timeout in minutes -->
+		<DefaultCacheTimeout>15</DefaultCacheTimeout>
+	</Cache>
+
+	<!--
+	Axis2 related configurations
+	-->
+	<Axis2Config>
+		<!--
+			 Location of the Axis2 Services & Modules repository
+
+			 This can be a directory in the local file system, or a URL.
+
+			 e.g.
+			 1. /home/wso2wsas/repository/ - An absolute path
+			 2. repository - In this case, the path is relative to CARBON_HOME
+			 3. file:///home/wso2wsas/repository/
+			 4. http://wso2wsas/repository/
+		-->
+		<RepositoryLocation>${carbon.home}/repository/deployment/server/</RepositoryLocation>
+
+		<!--
+		 Deployment update interval in seconds. This is the interval between repository listener
+		 executions.
+		-->
+		<DeploymentUpdateInterval>15</DeploymentUpdateInterval>
+
+		<!--
+			Location of the main Axis2 configuration descriptor file, a.k.a. axis2.xml file
+
+			This can be a file on the local file system, or a URL
+
+			e.g.
+			1. /home/repository/axis2.xml - An absolute path
+			2. conf/axis2.xml - In this case, the path is relative to CARBON_HOME
+			3. file:///home/carbon/repository/axis2.xml
+			4. http://repository/conf/axis2.xml
+		-->
+		<ConfigurationFile>${carbon.home}/repository/conf/axis2/axis2.xml</ConfigurationFile>
+
+		<!--
+		  ServiceGroupContextIdleTime, which will be set in ConfigurationContex
+		  for multiple clients which are going to access the same ServiceGroupContext
+		  Default Value is 30 Sec.
+		-->
+		<ServiceGroupContextIdleTime>30000</ServiceGroupContextIdleTime>
+
+		<!--
+		  This repository location is used to crete the client side configuration
+		  context used by the server when calling admin services.
+		-->
+		<ClientRepositoryLocation>${carbon.home}/repository/deployment/client/</ClientRepositoryLocation>
+		<!-- This axis2 xml is used in createing the configuration context by the FE server
+		 calling to BE server -->
+		<clientAxis2XmlLocation>${carbon.home}/repository/conf/axis2/axis2_client.xml</clientAxis2XmlLocation>
+		<!-- If this parameter is set, the ?wsdl on an admin service will not give the admin service wsdl. -->
+		<HideAdminServiceWSDLs>true</HideAdminServiceWSDLs>
+
+		<!--WARNING-Use With Care! Uncommenting bellow parameter would expose all AdminServices in HTTP transport.
+		With HTTP transport your credentials and data routed in public channels are vulnerable for sniffing attacks.
+		Use bellow parameter ONLY if your communication channels are confirmed to be secured by other means -->
+		<!--HttpAdminServices>*</HttpAdminServices-->
+
+	</Axis2Config>
+
+	<!--
+	   The default user roles which will be created when the server
+	   is started up for the first time.
+	-->
+	<ServiceUserRoles>
+		<Role>
+			<Name>admin</Name>
+			<Description>Default Administrator Role</Description>
+		</Role>
+		<Role>
+			<Name>user</Name>
+			<Description>Default User Role</Description>
+		</Role>
+	</ServiceUserRoles>
+
+	<!--
+	  Enable following config to allow Emails as usernames.
+	-->
+	<!--EnableEmailUserName>true</EnableEmailUserName-->
+
+	<!--
+	  Security configurations
+	-->
+	<Security>
+		<!--
+			KeyStore which will be used for encrypting/decrypting passwords
+			and other sensitive information.
+		-->
+		<KeyStore>
+			<!-- Keystore file location-->
+			<Location>${carbon.home}/repository/resources/security/wso2carbon.jks</Location>
+			<!-- Keystore type (JKS/PKCS12 etc.)-->
+			<Type>JKS</Type>
+			<!-- Keystore password-->
+			<Password>wso2carbon</Password>
+			<!-- Private Key alias-->
+			<KeyAlias>wso2carbon</KeyAlias>
+			<!-- Private Key password-->
+			<KeyPassword>wso2carbon</KeyPassword>
+		</KeyStore>
+
+		<!--
+			System wide trust-store which is used to maintain the certificates of all
+			the trusted parties.
+		-->
+		<TrustStore>
+			<!-- trust-store file location -->
+			<Location>${carbon.home}/repository/resources/security/client-truststore.jks</Location>
+			<!-- trust-store type (JKS/PKCS12 etc.) -->
+			<Type>JKS</Type>
+			<!-- trust-store password -->
+			<Password>wso2carbon</Password>
+		</TrustStore>
+
+		<!--
+			The Authenticator configuration to be used at the JVM level. We extend the
+			java.net.Authenticator to make it possible to authenticate to given servers and
+			proxies.
+		-->
+		<NetworkAuthenticatorConfig>
+			<!--
+				Below is a sample configuration for a single authenticator. Please note that
+				all child elements are mandatory. Not having some child elements would lead to
+				exceptions at runtime.
+			-->
+			<!-- <Credential> -->
+			<!--
+				the pattern that would match a subset of URLs for which this authenticator
+				would be used
+			-->
+			<!-- <Pattern>regularExpression</Pattern> -->
+			<!--
+				the type of this authenticator. Allowed values are:
+				1. server
+				2. proxy
+			-->
+			<!-- <Type>proxy</Type> -->
+			<!-- the username used to log in to server/proxy -->
+			<!-- <Username>username</Username> -->
+			<!-- the password used to log in to server/proxy -->
+			<!-- <Password>password</Password> -->
+			<!-- </Credential> -->
+		</NetworkAuthenticatorConfig>
+
+		<!--
+		 The Tomcat realm to be used for hosted Web applications. Allowed values are;
+		 1. UserManager
+		 2. Memory
+
+		 If this is set to 'UserManager', the realm will pick users & roles from the system's
+		 WSO2 User Manager. If it is set to 'memory', the realm will pick users & roles from
+		 CARBON_HOME/repository/conf/tomcat/tomcat-users.xml
+		-->
+		<TomcatRealm>UserManager</TomcatRealm>
+
+		<!--Option to disable storing of tokens issued by STS-->
+		<DisableTokenStore>false</DisableTokenStore>
+
+		<!--
+		 Security token store class name. If this is not set, default class will be
+		 org.wso2.carbon.security.util.SecurityTokenStore
+		-->
+		<!--TokenStoreClassName>org.wso2.carbon.identity.sts.store.DBTokenStore</TokenStoreClassName-->
+
+		<!--CSRFPreventionConfig>
+			<Enabled>true</Enabled>
+			<Rule>allow</Rule>
+
+			<Patterns>
+				<Pattern>carbon</Pattern>
+				<Pattern>commonauth</Pattern>
+				<Pattern>samlsso</Pattern>
+				<Pattern>authenticationendpoint</Pattern>
+				<Pattern>wso2</Pattern>
+				<Pattern>oauth2</Pattern>
+				<Pattern>openid</Pattern>
+				<Pattern>openidserver</Pattern>
+				<Pattern>passivests</Pattern>
+				<Pattern>services</Pattern>
+			</Patterns>
+
+			<WhiteList>
+				<Url>https://localhost:9443</Url>
+			</WhiteList>
+		</CSRFPreventionConfig>
+
+		<XSSPreventionConfig>
+			<Enabled>true</Enabled>
+		</XSSPreventionConfig-->
+
+	</Security>
+
+	<!--
+	   The temporary work directory
+	-->
+	<WorkDirectory>${carbon.home}/tmp/work</WorkDirectory>
+
+	<!--
+	   House-keeping configuration
+	-->
+	<HouseKeeping>
+
+		<!--
+		   true  - Start House-keeping thread on server startup
+		   false - Do not start House-keeping thread on server startup.
+				   The user will run it manually as and when he wishes.
+		-->
+		<AutoStart>true</AutoStart>
+
+		<!--
+		   The interval in *minutes*, between house-keeping runs
+		-->
+		<Interval>10</Interval>
+
+		<!--
+		  The maximum time in *minutes*, temp files are allowed to live
+		  in the system. Files/directories which were modified more than
+		  "MaxTempFileLifetime" minutes ago will be removed by the
+		  house-keeping task
+		-->
+		<MaxTempFileLifetime>30</MaxTempFileLifetime>
+	</HouseKeeping>
+
+	<!--
+	   Configuration for handling different types of file upload & other file uploading related
+	   config parameters.
+	   To map all actions to a particular FileUploadExecutor, use
+	   <Action>*</Action>
+	-->
+	<FileUploadConfig>
+		<!--
+		   The total file upload size limit in MB
+		-->
+		<TotalFileSizeLimit>100</TotalFileSizeLimit>
+
+		<Mapping>
+			<Actions>
+				<Action>keystore</Action>
+				<Action>certificate</Action>
+				<Action>*</Action>
+			</Actions>
+			<Class>org.wso2.carbon.ui.transports.fileupload.AnyFileUploadExecutor</Class>
+		</Mapping>
+
+		<Mapping>
+			<Actions>
+				<Action>jarZip</Action>
+			</Actions>
+			<Class>org.wso2.carbon.ui.transports.fileupload.JarZipUploadExecutor</Class>
+		</Mapping>
+		<Mapping>
+			<Actions>
+				<Action>dbs</Action>
+			</Actions>
+			<Class>org.wso2.carbon.ui.transports.fileupload.DBSFileUploadExecutor</Class>
+		</Mapping>
+		<Mapping>
+			<Actions>
+				<Action>tools</Action>
+			</Actions>
+			<Class>org.wso2.carbon.ui.transports.fileupload.ToolsFileUploadExecutor</Class>
+		</Mapping>
+		<Mapping>
+			<Actions>
+				<Action>toolsAny</Action>
+			</Actions>
+			<Class>org.wso2.carbon.ui.transports.fileupload.ToolsAnyFileUploadExecutor</Class>
+		</Mapping>
+	</FileUploadConfig>
+
+	<!--
+	   Processors which process special HTTP GET requests such as ?wsdl, ?policy etc.
+
+	   In order to plug in a processor to handle a special request, simply add an entry to this
+	   section.
+
+	   The value of the Item element is the first parameter in the query string(e.g. ?wsdl)
+	   which needs special processing
+
+	   The value of the Class element is a class which implements
+	   org.wso2.carbon.transport.HttpGetRequestProcessor
+	-->
+	<HttpGetRequestProcessors>
+		<Processor>
+			<Item>info</Item>
+			<Class>org.wso2.carbon.core.transports.util.InfoProcessor</Class>
+		</Processor>
+		<Processor>
+			<Item>wsdl</Item>
+			<Class>org.wso2.carbon.core.transports.util.Wsdl11Processor</Class>
+		</Processor>
+		<Processor>
+			<Item>wsdl2</Item>
+			<Class>org.wso2.carbon.core.transports.util.Wsdl20Processor</Class>
+		</Processor>
+		<Processor>
+			<Item>xsd</Item>
+			<Class>org.wso2.carbon.core.transports.util.XsdProcessor</Class>
+		</Processor>
+	</HttpGetRequestProcessors>
+
+	<!-- Deployment Synchronizer Configuration. t Enabled value to true when running with "svn based" dep sync.
+	In master nodes you need to set both AutoCommit and AutoCheckout to true
+	and in  worker nodes set only AutoCheckout to true.
+	-->
+	<DeploymentSynchronizer>
+		<Enabled>false</Enabled>
+		<AutoCommit>false</AutoCommit>
+		<AutoCheckout>true</AutoCheckout>
+		<RepositoryType>svn</RepositoryType>
+		<SvnUrl>http://svnrepo.example.com/repos/</SvnUrl>
+		<SvnUser>username</SvnUser>
+		<SvnPassword>password</SvnPassword>
+		<SvnUrlAppendTenantId>true</SvnUrlAppendTenantId>
+	</DeploymentSynchronizer>
+
+	<!-- Deployment Synchronizer Configuration. Uncomment the following section when running with "registry based" dep sync.
+		In master nodes you need to set both AutoCommit and AutoCheckout to true
+		and in  worker nodes set only AutoCheckout to true.
+	-->
+	<!--<DeploymentSynchronizer>
+		<Enabled>true</Enabled>
+		<AutoCommit>false</AutoCommit>
+		<AutoCheckout>true</AutoCheckout>
+	</DeploymentSynchronizer>-->
+
+	<!-- Mediation persistence configurations. Only valid if mediation features are available i.e. ESB -->
+	<!--<MediationConfig>
+		<LoadFromRegistry>false</LoadFromRegistry>
+		<SaveToFile>false</SaveToFile>
+		<Persistence>enabled</Persistence>
+		<RegistryPersistence>enabled</RegistryPersistence>
+	</MediationConfig>-->
+
+	<!--
+	Server intializing code, specified as implementation classes of org.wso2.carbon.core.ServerInitializer.
+	This code will be run when the Carbon server is initialized
+	-->
+	<ServerInitializers>
+		<!--<Initializer></Initializer>-->
+	</ServerInitializers>
+
+	<!--
+	Indicates whether the Carbon Servlet is required by the system, and whether it should be
+	registered
+	-->
+	<RequireCarbonServlet>${require.carbon.servlet}</RequireCarbonServlet>
+
+	<!--
+	Carbon H2 OSGI Configuration
+	By default non of the servers start.
+		name="web" - Start the web server with the H2 Console
+		name="webPort" - The port (default: 8082)
+		name="webAllowOthers" - Allow other computers to connect
+		name="webSSL" - Use encrypted (HTTPS) connections
+		name="tcp" - Start the TCP server
+		name="tcpPort" - The port (default: 9092)
+		name="tcpAllowOthers" - Allow other computers to connect
+		name="tcpSSL" - Use encrypted (SSL) connections
+		name="pg" - Start the PG server
+		name="pgPort"  - The port (default: 5435)
+		name="pgAllowOthers"  - Allow other computers to connect
+		name="trace" - Print additional trace information; for all servers
+		name="baseDir" - The base directory for H2 databases; for all servers
+	-->
+	<!--H2DatabaseConfiguration>
+		<property name="web" />
+		<property name="webPort">8082</property>
+		<property name="webAllowOthers" />
+		<property name="webSSL" />
+		<property name="tcp" />
+		<property name="tcpPort">9092</property>
+		<property name="tcpAllowOthers" />
+		<property name="tcpSSL" />
+		<property name="pg" />
+		<property name="pgPort">5435</property>
+		<property name="pgAllowOthers" />
+		<property name="trace" />
+		<property name="baseDir">${carbon.home}</property>
+	</H2DatabaseConfiguration-->
+	<!--Disabling statistics reporter by default-->
+	<StatisticsReporterDisabled>true</StatisticsReporterDisabled>
+
+	<!-- Enable accessing Admin Console via HTTP -->
+	<!-- EnableHTTPAdminConsole>true</EnableHTTPAdminConsole -->
+
+	<!--
+	   Default Feature Repository of WSO2 Carbon.
+	-->
+	<FeatureRepository>
+		<RepositoryName>default repository</RepositoryName>
+		<RepositoryURL>http://dist.wso2.org/p2/carbon/releases/4.4.1-SNAPSHOT</RepositoryURL>
+	</FeatureRepository>
+
+	<!--
+	Configure API Management
+   -->
+	<APIManagement>
+
+		<!--Uses the embedded API Manager by default. If you want to use an external
+		API Manager instance to manage APIs, configure below  externalAPIManager-->
+
+		<Enabled>true</Enabled>
+
+		<!--Uncomment and configure API Gateway and
+		Publisher URLs to use external API Manager instance-->
+
+		<!--ExternalAPIManager>
+
+			<APIGatewayURL>http://localhost:8281</APIGatewayURL>
+			<APIPublisherURL>http://localhost:8281/publisher</APIPublisherURL>
+
+		</ExternalAPIManager-->
+
+		<LoadAPIContextsInServerStartup>true</LoadAPIContextsInServerStartup>
+	</APIManagement>
+</Server>
diff --git a/modules/distribution/src/repository/conf/data-bridge/data-bridge-config.xml b/modules/distribution/src/repository/conf/data-bridge/data-bridge-config.xml
new file mode 100644
index 00000000..067101f7
--- /dev/null
+++ b/modules/distribution/src/repository/conf/data-bridge/data-bridge-config.xml
@@ -0,0 +1,72 @@
+<!--
+  ~ Copyright 2005-2011 WSO2, Inc. (http://wso2.com)
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the License);
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an AS IS BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<dataBridgeConfiguration>
+
+	<workerThreads>10</workerThreads>
+	<eventBufferCapacity>10000</eventBufferCapacity>
+	<clientTimeoutMin>30</clientTimeoutMin>
+
+	<dataReceiver name="Thrift">
+		<config name="tcpPort">7611</config>
+		<config name="sslPort">7711</config>
+	</dataReceiver>
+
+	<dataReceiver name="Binary">
+		<config name="tcpPort">9611</config>
+		<config name="sslPort">9711</config>
+		<config name="sslReceiverThreadPoolSize">100</config>
+		<config name="tcpReceiverThreadPoolSize">100</config>
+	</dataReceiver>
+
+	<!--<streamDefinitions>
+		<streamDefinition>
+			{
+			 'name':'org.wso2.esb.MediatorStatistics',
+			 'version':'1.3.0',
+			 'nickName': 'Stock Quote Information',
+			 'description': 'Some Desc',
+			 'metaData':[
+			 {'name':'ipAdd','type':'STRING'}
+			 ],
+			 'payloadData':[
+			 {'name':'symbol','type':'STRING'},
+			 {'name':'price','type':'DOUBLE'},
+			 {'name':'volume','type':'INT'},
+			 {'name':'max','type':'DOUBLE'},
+			 {'name':'min','type':'Double'}
+			 ]
+			}
+		</streamDefinition>
+		<streamDefinition domainName="wso2">
+			{
+			 'name':'org.wso2.esb.MediatorStatistics',
+			 'version':'1.3.4',
+			 'nickName': 'Stock Quote Information',
+			 'description': 'Some Other Desc',
+			 'metaData':[
+			 {'name':'ipAdd','type':'STRING'}
+			 ],
+			 'payloadData':[
+			 {'name':'symbol','type':'STRING'},
+			 {'name':'price','type':'DOUBLE'},
+			 {'name':'volume','type':'INT'}
+			 ]
+			}
+		</streamDefinition>
+	</streamDefinitions>-->
+
+</dataBridgeConfiguration>
\ No newline at end of file
diff --git a/modules/distribution/src/statistics/IOT_Sensor_Analytics.car b/modules/distribution/src/statistics/IOT_Sensor_Analytics.car
deleted file mode 100644
index 311489daf1dc2aa24ab727f01c0d7466d6bd2a0e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8596
zcmb_g2{e@b7am*oB}>_g$WoTZmh4NiZ`t>;O?JcB6|#rW7qZJ*AzP%skdQ2q6xq{i
z`IIG!tp9nNeBPO+^qupWGiS~mXP)2h-uv9=z4y`8ARwfNkf2_cv2-dB&>tm)24aKs
zb~<Nc=j|ov@8)V~LIFY63>Y4F>o@#@M-OSds-@8?PZQPKQ(-b`RUl5SroKqfz@Xo2
zGo}gm6shmlj{UYW{<4;r!z$J*lls*Z+`qJ~{dLc^qje9(#w;wukJRS*Z5XvaS@R4g
zkGpY8x8LoVvol%J>=?`AP-lO#*=t9icnf%vUA<rb!I@|xV&%DH+Xc6?Rs^Yx1%3y_
z*yQaJ4C$*)2lS85RVQ|4$%{$5#)uWuP-Q=-QPWk)yH3;oGBIfK*5!a~s>eCuy-DW{
zEQHt8vbC-!<hgDs?#m0|A~Qv<J6JKU@!gH*o$ri|%MiqqR4SC7nOaSTeXb_Z)gUHe
z<sZs=gUX5*J_MqR$`#r74B5glbH$Fz)fr#7yEhVU2Y2#?BVpcfHxD?{#@h!8hY1Nn
z1)(Q)(ig&yP9K1V&U_pe+Oa=C6I9ZN>3buP@EzEvKVUzlRcW_EX`(`Sn8K_(I>O%n
zRZNSpHate_vJQC`WmJ+(YfyAah`K|nd3cNbj1yOyS#!|UFT-kcNGn?@NVmt5KLI@i
zsl+ldeER82&OCiKR;1>${AT8*`oNI#q}IXUC_MGz&ER`mH!=o#C~VBm@jnQrj<`jx
z`JwoL27jTk8sehyZQYQ>*0RK;YtT6|&IaoQo*2eBKBp%hZ~+9OjZZqd&p??4)*0H3
z=*|+Z&gYHI-=L>Uxz2Wv;>=lXn(d&<nu2=A)^*bCPmkzpiVlsRVUbOJ#+3bn$jwQ`
zuW!SV>98!tM1xF2T3Bt(`am+nhlwl748fahhh(?;Vn0U<nMxdsUX`X<UT`T(`C3T{
zG4@&($5Y!d^^d7ozvk<Gu#5%ojKl#ppuFU?OjXD6AP_=EaCs4N^cbx`iYf>UrloLN
zN8jXo9ZMb#7y@sg4R%?9{WGAB|NQJv=z$H3n;xS7238REOQzUaGuSy;+gdMZX&Nn1
z8(q@9h<}BVfQN<!uZo2xe3e1I8)AIq;YET|Q4xd+=?qZIX&^_$B+E>L4Wg(v@JGFO
zNi2E}vnBZdfW$lU0#+9aL3De#B{Y+@Kxvfbzr|MinKuTg>JiQo8^}DNy+^B>bhW%~
ztI;W!xViD8&1BDIXW8&nk)qDF+&8+P6!a<=XIeB`H+_c><q0X;*bWxJnLOAjKWT>2
znIf5jpp=|k@BKJdJI!ABGl|Ia=^_X_V)V8wmrbQO-yO?^4Gqtj5keIw^&6M$)lFA!
z-tHPTw3JpH7**nY07QQ!?Ri2nD)Ir0=ucrqFY^b{e`kaq4#5DYgYHK<EYE7`v_dHw
zSB#bFUO;#vMzmRn+*qHTGPZgfui6t$d#^GiktMAEFMU_JrWIGedW3ikk$!FS%ICbs
zRQyJ&$7>oV<Pz5FdFog)s17bKCol`xMG{9hUKpQLRy-(#*F##=L1-^xntk5MHR{D9
zHT7Iiy6QVqYdmK!82!x`-F~t#?)eq%=F<GM<Mph}%@tBNUn><iFkXt7@sHQ6`+Ci_
zjloqjl(O&ceSt4y84}t?1bI$nh%cfJW;4A|_{V;jPKti1)uz;?zfw6w{RsV5<7;1R
zdgVK_5xr7Y^gy)j(>Yb1+qaLIQqaim!T9)B#tT%FGyOel(UZhL(q%adGuKcFuSK=$
zZolonj7hmeJ4yEfgz+~LZ03P2!TnfJ+<QU&)KwjxXv|M(z1rdOG|?d%F}BMO``#Uv
z_IJ+Lk!KcNbY_zm*i7OUP4g{193VfT<}eJq8--lxSDw<ih9K#F>S1FFNox+gKvW2!
zC1hdy$o|H0f1k|tv2LM=(~(@<ejn!QsHi5^N!L1xR-!*`mD(B@af&9w=h{-)D79WP
z<-8Y+mbgL7K>KAeim2;)!2iAk2q&cZ^>xc8saKe&T@dKA`1r_9bAiJl(w}QeyWwFq
zYpPzW&8PLhZ!JBQY`<NA(qZ25wA}aJO>Vrg$cw8h;YA|%sZKT=?prj{RyUU{n6++Q
z=a9TXCs`zr-RA>^nMGw%w{~Ur#Hl%HI5Y*?pZO-f9H!T_HQ_zK&2Z*hYuYKcNrDS*
zBxb93Uv~MA9lcm8F~Wv-cGc8BVSe`7(`iW)IYN3k>;gVeVoLRem!f+rF;EvwN&Q`|
zaqB5|t%d#=6Ni}Yl>NUIQ&KEC{xcE$Dq37hs`i8BhP^#hVNeR<h4mcU8B1NA!;de=
ztU-daQqR%fAv}4<F!`R}RqL9;tu;jH*NO*8oNe#JDy;QyD_p&o=lh`Sb+A;0Z{?t(
zjs0LQe5UFqnKoyDHY*3yjo{o%8<z+}6t45;MBVPQ6R)Z+E}UoWP!d|wn7(t0<DJdf
z!8$y%4vP}cLo+nyOPV$=7S{SNrumB|dd_Sqrid_<SR@R*r37lvvP7GegKF;y3{6#w
z!)$Mby?PRXbb$GJA%tO02yd7@+}Ftt?gdtX9bNrgJ7D<69o??u27THsQ2L;#3X`vb
zr>|c=_73l+sc3j*=d9i!`AJiA<S6CWm1|-d@wd`e@xPW$y*eMLJ<2LP9{0QyPs|wk
z7MA$<0r4H(%TIb9g>)V+cMsBGInE@I5)m_T@$1buSCqt5lb9o+`p6z}20goDEqM+H
z)eIwv{ufU`fzKdB&fxwz+elo(nA<^j3E$gY-nE(5fW*(J#Zfb?7f*%Jo2iqQEb_LD
zOdfuVBLkOd&bcMHQrNqEmd<GxQm4gzVZQb~2BxF|)GmT`Npg%7s#4q!pEdB--AxxW
zXAk9+>gNn#kK+n&Y`o#2rQtTK;yB7QON3OY3J9AlsEGDi)#GD1Kwms9;=540p3ALS
z4bPIknmcZiMhG*Nn9=!k^fmQM3Zo{^$&sg>Y3rsuhv!<x+dj$#idbX~X3F$#PnOWR
zA7tbZ3_3sKB+*2=?FZD7_x8A#7OIc6_kpGQ2-fqFZMT+4xQ!dQO2D|x4w{!I1+c{$
zd(`0F8|){!-WfCgk!x~RXyEH<&qQwS_%EcY;oMfA2ySf_6zAERm7vwyFT^l8@Vi>q
zPUxm(ziGJxfrbwhQrkoH2w4ugvVWMS>8sNC>P2z3pauU$9CFD*Dtb1ET894lx?%mc
zv-I)O{TpuS8jF3I?GA@tE0>oDwU#N_#RU2{vwj$q&Z?JY+P{>r`O!~rhDjqvhbtq-
zWsy){y0g!uA^Dw|bbG;uV4-q+%B;rLyha&a!g;wTt@lbQZZlVx00VT5kiyKC@2D<4
zoY=FMSYyhY&edNwKgmd2*<A8wrgiHqhh(0<WPw2T3oR%cTDNC=;yN8Qrkd`<QM&y|
zA>DktH~1BLfL0UY-?utM<L!YOpgkM4Q3JF$3_pLNYJukZ6aZ2AfP}ZJ*8lsXS$`&t
zO=eHs21<mj+rKM3Zso=<yvV;m#i89h9QbdwTONz*e0#GKmwL1P82k(qo}kp5UTJWd
zFJq3#=R>}{W<T{pmAiXaWdE|l2w&F(IU}8AZ@LKQY-;s|hiRG%MMLjhn)_y-F;1ks
z^_3~}%`Z=jP`yE<H5T5g$4b1M%*%1=%yi&o`NT_adqwLVKk~3TG^{R!@m!|!rSes$
zlCNB`RuPu8ye4nJpHx<55;;`tKxPidFWyI7Ahh|k7=E<r=4*JBs4#cj{6K7#IMDRd
z;@TZ~DDi%UA>gczm;$c8cP93daP%%M=<J1X-&uSsp=f=G|4YXOUx=oyH&aLGJ%9dT
z8FCJKavubThU(*!{YN!?E%q<gXUgTXR6Ub8YQNgp-q0P1=fOwuS;AwgDN}#yT)b~T
z@5j53%8!T&1S+T`UZ9^j9CR}~K5WKcIOl!&z-PapmE!BPCM2}!x<hIe=J#EquaMFB
zC*L}6P`UCHvPtO1e591}s;ZUOP?Y$?4??xljx`3?M=v5{jUC<pt{4dHtSG>roU`wf
ztK?xg!rQlj7x@WR&SY79?=hG92*rl1EGPXXOS0kErDjsYNzEy1jW$KACGJy9clb&f
zOBI{tN=k;lKP+M9e)R8Ac_znjB$TjnO^3?0zK0Fc#mf%q<l*fFG9fOZ7T47uN!#7u
zR1uiPV#N*claR8@?##Vt-(g!rgs}O_{+KpSeXdvRCHQ*AT~>~~dPOw~x-@o&ulR*k
zZyqFbiq<ZBE!+8xwaxDVf7Ky~uzy_>1PNivZ}U5OrOHQjI)|D{LfIt0neIkwpjUY~
z%65p5RWA!_unN)F`ukkif*G<*cAF&P7Tws)Ev|F^&#a0XWnV#6HbtoBo8CT!_HT$w
z_8Po{wfeBm9q^|TS+7@@X?^$dwy|vKNgE^79@RQT6w{TkVjg9~NPKBq_SF5{QO7q+
z5!!>c$dNvxab@y$E^l=QZ*3{yAHg*d(bR9cOIzdK*A&EMTMa|EC>w8$Rcxn@_HIYn
zY}gzXQ279X5r<I)m-&pi8{@rpPMG6nkC7wSS=<~0;6{}nLcg~00If2{*>(Kro_Yyn
z{~x{lMICW#Bz7Hn_CUg+i#sL#Z*@@`i=n^>fFm+&EnGnjYqLMtYM3BIj`9Q|S2kij
z>f_z1)MD9*jLjV+Y>zjKlGd?*oyatj^ncRaINx~w&ZcHglN<NJ@UYX>#O~oS)CY6O
z+)v+=QY=k>WHEN>#=^xU!)H9*CxnNK6c-#|_+44Y!|^sPvW_T_Q)aoAzZY9Oo>TSO
ziD1nT(&K+fLK5+Xi>hh1@m{E{<!tqh+7w%^G<x%6J>M+>X-(LdBvePXW2m16mWd>Y
zJ6<(}fj%4wScdv=cP|9$<9oyI%&LIl8vVm*iZ_@*WI}0zrz%c;JC;6lb<RmojU%Iy
zq%4#yOY6KMRoz`xYtB)pCn2!WLZ*=s(aF%I@u~GWscn)2y;_usyoOw>mo0+QY2~eA
zgWBdD>@}J~wv^?a9<SU!!0J$V`pf~Z6C@I)QkE&sbD>NMEzDW%VUxUCwHzwt5#Lho
zIQu|7&z_jR>D9}}B^;ky<rHauhoHw-tc8rNl(u*=-+qnVvrRPI?J$pviEtg=h7!3|
zpvpVZP8IiJF38n$vu}-af(70tA1Ix6Xt?}2OgXcjmwe`AT*oT2G$Q@Xk@$yeFZjEI
z2`CZn1>2oVr(dLvJni@3$BPnMt~vdZW5WGpRP<_Y7qKfN&1NbQG9!IV_T!<D204jG
zbSeQEJ{?CNk$z!m{t{ko-FyGlvy{9CT1jGy=BC3XA=Wo9HcT#C3Qn|WQjaAxiZsOX
zB{N41xAB+`YXzQni5fp^VpnXF+ZDY}j88iwO>#ymD$wWgMC#;ny!wshj!3uSq|zC0
z=Of~aBOR=XWp19_k!~$q9>m_+_X*vsw*u0tEULFv`x?Bg=8I0%RL(wKwi_atIJSN3
z{$gatCV6r&`{Kyq@Ouf$(16B=b6qEjUiW$NogHqsla17AN9@<!ib*dDCw@l+s6+Ss
z_`V60I`|L*(=#4E1ImouG3UWnG$n)rMYivM@`a(m=T6`Ju<A+vvFgz<zw)hjVLmDF
zqYmENrbHtHE;jgrfQJn>Q;%U>Fz^qMK~EO+5rCr&zC5<QN(wq+Q-PcSva6VeCM1v@
zdHfv&_?DXrieQL8Nd)E*yKXJmAr%GPvM@CL-yDG<&Dc3Xp9W0CU`LW4<1{%Gi}s3R
zhc{@!L7xH)#^B-t?k3oRlfgJehG_3o_V7B<#{ym_xLQB^dtkQSK`ofyVSnX`03-n9
z6L9;$(E$Dr*lps*h-Pyy*q?X`SU})wWAhY@zp0Qy0^;eO_s7LB;QnBS31QrS=8y4l
z&}%moG`#>H3T)1R`=v1SGU*-_z{M@Vl>%1-aCyL<fdWP}f1z~iw@KP-Vc4Pdj^_g|
z)X$~_m|vEtFF%g{^`?qu7+_I=V*<JoychFg#8k33@J}4u?MSqcV{;6A!lr^2)z2LJ
zT@1Kb2E+hnnFvM<1^?m%96Z|%2hB5JX9n+(d>DtRQtw#_TucKtXmC}4brifjsbd_X
zN3-W4dvOh8IYl!ASWdx|`*}?RQ|`fj2(FPB5VD=64IB_K>Vww_R*ZnQafAItEnwOQ
zUlE&HVAM^8AUY7WaE$LiKY7s=2JQ-`6A#8++xI}lL80AiqYnVq3-BP$hH-#3J<iNx
x(`IMc0B0GP<H2K@AO^5515V)IPW5PN08_oL1`+CU1A#E3Uhhz9nt2fT_J7gL-HreN

diff --git a/modules/distribution/src/statistics/IOT_Sensor_Analytics.tbox b/modules/distribution/src/statistics/bamtoolbox/IOT_Sensor_Analytics.tbox
similarity index 100%
rename from modules/distribution/src/statistics/IOT_Sensor_Analytics.tbox
rename to modules/distribution/src/statistics/bamtoolbox/IOT_Sensor_Analytics.tbox
diff --git a/modules/distribution/src/statistics/carbonapps/Temperature_Sensor.car b/modules/distribution/src/statistics/carbonapps/Temperature_Sensor.car
new file mode 100644
index 0000000000000000000000000000000000000000..88eab641ab8ed79ae9fa2785bf515089ac9d3e04
GIT binary patch
literal 8525
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

literal 0
HcmV?d00001

diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index b9c940df..e123bddb 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -99,9 +99,7 @@
                             <publishArtifactRepository>true</publishArtifactRepository>
 
                             <featureArtifacts>
-                                <!--<featureArtifactDef>
-                                    org.wso2.carbon:org.wso2.carbon.ndatasource.feature:${carbon.platform.version}
-                                </featureArtifactDef>-->
+
 
                                 <!--Device Cloud Features -->
                                 <featureArtifactDef>
@@ -128,6 +126,15 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.webapp.authenticator.framework.server.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.certificate.mgt.server.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.server.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.server.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
                                 <!-- End of Device Management Features -->
 
                                 <!-- Jaggery Features -->
@@ -163,10 +170,6 @@
                                 </featureArtifactDef>
                                 <!-- End of Carbon Deployment Features -->
 
-
-                                <!-- Carbon Utils Features -->
-                                <!-- End of Carbon Utils Features -->
-
                                 <!-- Carbon Commons Features -->
                                 <featureArtifactDef>
                                     org.wso2.carbon.commons:org.wso2.carbon.databridge.datapublisher.feature:${carbon.commons.version}
@@ -183,11 +186,7 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.commons:org.wso2.carbon.ntask.core.feature:${carbon.commons.version}
                                 </featureArtifactDef>
-                                <!-- TODO: Verify this feature is needed -->
-                                <!--<featureArtifactDef>-->
-                                    <!--org.wso2.carbon.commons:org.wso2.carbon.user.mgt.feature:${carbon.commons.version}-->
-                                <!--</featureArtifactDef>-->
-                                <!-- End of Carbon Commons Features -->
+
 
                                 <!-- Multitenancy Features -->
                                 <featureArtifactDef>
@@ -258,11 +257,9 @@
                                 <!--<featureArtifactDef>-->
                                     <!--org.wso2.carbon:org.wso2.carbon.identity.user.profile.server.feature:${carbon.identity.version}-->
                                 <!--</featureArtifactDef>-->
-                                <!-- TODO: Verify this feature is needed -->
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.saml2.sso.feature:${carbon.identity.version}
                                 </featureArtifactDef>
-                                <!-- TODO: Verify this feature is needed -->
                                 <feaureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.identity.sso.saml.feature:${carbon.identity.version}
                                 </feaureArtifactDef>
@@ -279,7 +276,6 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.identity.mgt.feature:${carbon.identity.version}
                                 </featureArtifactDef>
-                                <!-- TODO: Verify this feature is needed -->
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.identity.application.mgt.feature:${carbon.identity.version}
                                 </featureArtifactDef>
@@ -287,7 +283,6 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.directory.service.mgr.feature:${carbon.identity.version}
                                 </featureArtifactDef>
-                                <!-- TODO: Verify this feature is needed -->
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.claim.mgt.server.feature:${carbon.identity.version}
                                 </featureArtifactDef>
@@ -409,20 +404,6 @@
 								</featureArtifactDef>
 								<featureArtifactDef>org.jaggeryjs.modules:markdown.feature:${markdown.feature.version}
 								</featureArtifactDef>
-								<!-- **************************************************** -->
-								<!-- Version differences with the ES POM -->
-								<!-- **************************************************** -->
-								<!-- <jaggery.feature.version>0.10.2</jaggery.feature.version> -->
-								<!-- <sso.feature.version>1.3.2</sso.feature.version> -->
-								<!-- <carbon.feature.version>1.3.2</carbon.feature.version> -->
-								<!-- <process.feature.version>1.3.2</process.feature.version> -->
-								<!-- <uuid.feature.version>1.3.2</uuid.feature.version> -->
-								<!-- <jaggery-test.feature.version>1.3.2</jaggery-test.feature.version> -->
-								<!-- **************************************************** -->
-								<!-- End of Version differences -->
-								<!-- **************************************************** -->
-
-								<!--+++++++++++++++++++++++++++++++++++++++++++++++-->
 								<!-- End of Jaggery Features -->
 
 								<!-- Carbon Deployment Features -->
@@ -438,11 +419,6 @@
 
 
 								<!-- Store Features -->
-								<!--+++++++++++++++++++++++++++++++++++++++++++++++-->
-
-								<!--<featureArtifactDef>-->
-									<!--org.wso2.es:org.wso2.store.styles.feature:${product.es.version}-->
-								<!--</featureArtifactDef>-->
 								<featureArtifactDef>
 									org.wso2.carbon.store:org.wso2.carbon.store.feature:${carbon.store.version}
 								</featureArtifactDef>
@@ -505,69 +481,12 @@
 								<featureArtifactDef>
 									org.wso2.carbon.registry:org.wso2.carbon.registry.contentsearch.server.feature:${carbon.registry.version}
 								</featureArtifactDef>
-								<!--&lt;!&ndash; **************************************************** &ndash;&gt;-->
-								<!--&lt;!&ndash; Version differences with the ES POM &ndash;&gt;-->
-								<!--&lt;!&ndash; **************************************************** &ndash;&gt;-->
-								<!--&lt;!&ndash; <carbon.registry.version>4.4.5</carbon.registry.version> &ndash;&gt;-->
-								<!--&lt;!&ndash; <carbon.governance.version>4.5.2</carbon.governance.version> &ndash;&gt;-->
-								<!--&lt;!&ndash; **************************************************** &ndash;&gt;-->
-								<!--&lt;!&ndash; End of Version differences &ndash;&gt;-->
-								<!--&lt;!&ndash; **************************************************** &ndash;&gt;-->
-
-								<!--&lt;!&ndash;+++++++++++++++++++++++++++++++++++++++++++++++&ndash;&gt;-->
-								<!--&lt;!&ndash; End of Registry Features &ndash;&gt;-->
-
-
-								<!--&lt;!&ndash; Identity Features &ndash;&gt;-->
-								<!--&lt;!&ndash;+++++++++++++++++++++++++++++++++++++++++++++++&ndash;&gt;-->
-								<!--<featureArtifactDef>-->
-									<!--org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.saml2.sso.server.feature:${carbon.identity.version}-->
-								<!--</featureArtifactDef>-->
-								<!--<featureArtifactDef>-->
-									<!--org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature:${carbon.identity.version}-->
-								<!--</featureArtifactDef>-->
-								<!--<featureArtifactDef>-->
-									<!--org.wso2.carbon.identity:org.wso2.carbon.identity.application.mgt.server.feature:${carbon.identity.version}-->
-								<!--</featureArtifactDef>-->
-								<!--<featureArtifactDef>-->
-									<!--org.wso2.carbon.identity:org.wso2.carbon.idp.mgt.server.feature:${carbon.identity.version}-->
-								<!--</featureArtifactDef>-->
-
-
-								<!--&lt;!&ndash; **************************************************** &ndash;&gt;-->
-								<!--&lt;!&ndash; Version differences with the ES POM &ndash;&gt;-->
-								<!--&lt;!&ndash; **************************************************** &ndash;&gt;-->
-								<!--&lt;!&ndash;<carbon.identity.version>4.5.4</carbon.identity.version>&ndash;&gt;-->
-								<!--&lt;!&ndash; **************************************************** &ndash;&gt;-->
-								<!--&lt;!&ndash; End of Version differences &ndash;&gt;-->
-								<!--&lt;!&ndash; **************************************************** &ndash;&gt;-->
-
-								<!--&lt;!&ndash;+++++++++++++++++++++++++++++++++++++++++++++++&ndash;&gt;-->
-								<!--&lt;!&ndash; End of Identity Features &ndash;&gt;-->
-
 
 								<!-- Commons Features -->
 								<!--+++++++++++++++++++++++++++++++++++++++++++++++-->
 								<featureArtifactDef>
 									org.wso2.carbon.commons:org.wso2.carbon.event.feature:${carbon.commons.version}
 								</featureArtifactDef>
-								<!--<featureArtifactDef>-->
-									<!--org.wso2.carbon.commons:org.wso2.carbon.tenant.mgt.common.feature:${carbon.commons.version}-->
-								<!--</featureArtifactDef>-->
-								<!--<featureArtifactDef>-->
-									<!--org.wso2.carbon.commons:org.wso2.carbon.ntask.feature:${carbon.commons.version}-->
-								<!--</featureArtifactDef>-->
-
-								<!-- **************************************************** -->
-								<!-- Version differences with the ES POM -->
-								<!-- **************************************************** -->
-								<!--<carbon.commons.version>4.4.4</carbon.commons.version>-->
-								<!-- **************************************************** -->
-								<!-- End of Version differences -->
-								<!-- **************************************************** -->
-
-								<!--+++++++++++++++++++++++++++++++++++++++++++++++-->
-								<!-- End of Commons Features -->
 
 
 								<feaureArtifactDef>
@@ -586,10 +505,6 @@
                                     org.wso2.carbon.mediation:org.apache.synapse.wso2.feature:${carbon.mediation.version}
                                 </featureArtifactDef>
 
-                                <!--added das features-->
-                                <!--<featureArtifactDef>-->
-                                    <!--org.wso2.carbon.analytics:org.wso2.carbon.analytics.lite.feature:${carbon.analytics.version}-->
-                                <!--</featureArtifactDef>-->
 
                                 <!--APIM feature-->
                                 <featureArtifactDef>
@@ -598,9 +513,6 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.deployment:org.wso2.carbon.bam.service.agent.feature:${carbon.deployment.version}
                                 </featureArtifactDef>
-                                <!--<featureArtifactDef>-->
-                                    <!--org.wso2.carbon.mediation:org.wso2.carbon.mediation.initializer.feature:${carbon.mediation.version}-->
-                                <!--</featureArtifactDef>-->
                                 <!--End of APIM Feature-->
 
                                 <!--DAS Feature-->
@@ -624,8 +536,25 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.analytics:org.wso2.carbon.analytics.messageconsole.feature:${carbon.analytics.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.dashboard.feature:${carbon.analytics.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.activitydashboard.feature:${carbon.analytics.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.webservice.feature:${carbon.analytics.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.jsservice.feature:${carbon.analytics.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.restapi.feature:${carbon.analytics.version}
+                                </featureArtifactDef>
                                 <!-- END - Analytics features -->
 
+
+
                                 <!-- ************** START - Capp Management ********* -->
                                 <featureArtifactDef>
                                     org.wso2.carbon.commons:org.wso2.carbon.application.mgt.feature:${carbon.commons.version}
@@ -701,8 +630,6 @@
                                     org.wso2.ciphertool:org.wso2.ciphertool.feature:${cipher.tool.version}
                                 </featureArtifactDef>
                                 <!-- END - Tools -->
-
-
                                 <!--End of DAS Feature-->
                             </featureArtifacts>
                         </configuration>
@@ -755,6 +682,14 @@
                                     <id>org.wso2.carbon.webapp.authenticator.framework.server.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.certificate.mgt.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.analytics.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
                                 <!-- End of Device Management Features -->
 
                                 <!-- Jaggery Features -->
@@ -1051,11 +986,6 @@
                                     <id>org.wso2.carbon.registry.community.features.ui.feature.group</id>
                                     <version>${carbon.registry.version}</version>
                                 </feature>
-                                <!-- TODO: Verify this feature is needed -->
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.registry.community.features.feature.group</id>-->
-                                    <!--<version>${carbon.registry.version}</version>-->
-                                <!--</feature>-->
                                 <!-- End of Registry Features -->
 
                                 <!-- Governance features -->
@@ -1111,16 +1041,13 @@
                                     <version>${axis2-transports.wso2.version}</version>
                                 </feature>
 
-
-								<!--========================================================================================================-->
-								<!-- Enterprise Store Features -->
+                                <!-- Device  Store Features -->
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.enterprise.store.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
 
 								<!-- Jaggery Features -->
-								<!--+++++++++++++++++++++++++++++++++++++++++++++++-->
 								<feature>
 									<id>org.jaggeryjs.modules.caramel.feature.group</id>
 									<version>${caramel.feature.version}</version>
@@ -1129,16 +1056,13 @@
 									<id>org.jaggeryjs.modules.handlebars.feature.group</id>
 									<version>${handlebars.feature.version}</version>
 								</feature>
-								<!--+++++++++++++++++++++++++++++++++++++++++++++++-->
 								<!-- End of Jaggery Features -->
 
 								<!-- Carbon Deployment Features -->
-								<!--+++++++++++++++++++++++++++++++++++++++++++++++-->
 								<feature>
 									<id>org.wso2.carbon.webapp.mgt.server.feature.group</id>
 									<version>${carbon.deployment.version}</version>
 								</feature>
-								<!--+++++++++++++++++++++++++++++++++++++++++++++++-->
 								<!-- End of Carbon Deployment Features -->
 
 
@@ -1230,34 +1154,12 @@
 									<id>org.wso2.ciphertool.feature.group</id>
 									<version>${ciphertool.version}</version>
 								</feature>
-
-								<!--========================================================================================================-->
-								<!-- End of Enterprise Store Features -->
-
-                                <!--<feature>-->
-                                    <!--<id>org.apache.synapse.wso2.feature.group</id>-->
-                                    <!--<version>${carbon.mediation.version}</version>-->
-                                <!--</feature>-->
-
+                                <!-- End of Enterprise Store Features -->
                                 <!--APIM feature-->
                                 <feature>
                                     <id>org.wso2.carbon.system.statistics.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.bam.service.agent.feature.group</id>-->
-                                    <!--<version>${carbon.deployment.version}</version>-->
-                                <!--</feature>-->
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.mediation.initializer.feature.group</id>-->
-                                    <!--<version>${carbon.mediation.version}</version>-->
-                                <!--</feature>-->
-                                <!--End of APIM Feature-->
-                                <!--DAS Feature-->
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.analytics.lite.feature.group</id>-->
-                                    <!--<version>${carbon.analytics.version}</version>-->
-                                <!--</feature>-->
 
                                 <!-- START - Analytics Features -->
                                 <feature>
@@ -1286,6 +1188,26 @@
                                     <id>org.wso2.carbon.analytics.messageconsole.feature.group</id>
                                     <version>${carbon.analytics.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.dashboard.feature.group</id>
+                                    <version>${carbon.analytics.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.activitydashboard.feature.group</id>
+                                    <version>${carbon.analytics.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.webservice.feature.group</id>
+                                    <version>${carbon.analytics.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.jsservice.feature.group</id>
+                                    <version>${carbon.analytics.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.restapi.feature.group</id>
+                                    <version>${carbon.analytics.version}</version>
+                                </feature>
 
                                 <!-- ************** START - Capp Management ********* -->
                                 <feature>
diff --git a/modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/impl/AndroidSenseManagerService.java b/modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/impl/AndroidSenseManagerService.java
index d33dddc7..edeadc48 100644
--- a/modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/impl/AndroidSenseManagerService.java
+++ b/modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/impl/AndroidSenseManagerService.java
@@ -19,6 +19,21 @@ public class AndroidSenseManagerService implements DeviceManagementService {
 		return AndroidSenseConstants.DEVICE_TYPE;
 	}
 
+	@Override
+	public String getProviderTenantDomain() {
+		return "carbon.super";
+	}
+
+	@Override
+	public boolean isSharedWithAllTenants() {
+		return true;
+	}
+
+	@Override
+	public String[] getSharedTenantsDomain() {
+		return new String[0];
+	}
+
 	@Override
 	public void init() throws DeviceManagementException {
 		deviceManager=new AndroidSenseManager();
diff --git a/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/impl/ArduinoManagerService.java b/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/impl/ArduinoManagerService.java
index 2bf8ed58..d52390f7 100644
--- a/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/impl/ArduinoManagerService.java
+++ b/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/impl/ArduinoManagerService.java
@@ -20,6 +20,21 @@ public class ArduinoManagerService implements DeviceManagementService {
 		return ArduinoConstants.DEVICE_TYPE;
 	}
 
+	@Override
+	public String getProviderTenantDomain() {
+		return "carbon.super";
+	}
+
+	@Override
+	public boolean isSharedWithAllTenants() {
+		return true;
+	}
+
+	@Override
+	public String[] getSharedTenantsDomain() {
+		return new String[0];
+	}
+
 	@Override
 	public void init() throws DeviceManagementException {
 		deviceManager=new ArduinoManager();
diff --git a/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/pom.xml b/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/pom.xml
index 802b3b46..81fb07ea 100644
--- a/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/pom.xml
+++ b/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/pom.xml
@@ -17,6 +17,12 @@
   <name>WSO2 Carbon - IoT Server API - Arduino API</name>
 
   <dependencies>
+    <dependency>
+      <groupId>org.wso2.carbon</groupId>
+      <artifactId>org.wso2.carbon.utils</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
     <!-- CDM -->
     <dependency>
       <groupId>org.wso2.carbon.devicemgt</groupId>
@@ -78,6 +84,10 @@
       <groupId>javax.ws.rs</groupId>
       <artifactId>jsr311-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.wso2.carbon.devicemgt</groupId>
+      <artifactId>org.wso2.carbon.device.mgt.analytics</artifactId>
+    </dependency>
 
   </dependencies>
 
diff --git a/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/service/impl/ArduinoControllerService.java b/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/service/impl/ArduinoControllerService.java
index 7bbfdbcd..952154c1 100644
--- a/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/service/impl/ArduinoControllerService.java
+++ b/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/service/impl/ArduinoControllerService.java
@@ -19,6 +19,9 @@ package org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl;
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.context.PrivilegedCarbonContext;
+import org.wso2.carbon.device.mgt.analytics.exception.DataPublisherConfigurationException;
+import org.wso2.carbon.device.mgt.analytics.service.DeviceAnalyticsService;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
 import org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl.util.DeviceJSON;
 import org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl.util.MqttArduinoSubscriber;
@@ -169,20 +172,26 @@ public class ArduinoControllerService {
 
 	@Path("/test/{value}")
 	@POST
-	public void pushtData( @PathParam("value") String value,@Context HttpServletResponse response) {
-
-
+	public void pushtData(@PathParam("value") double value, @Context HttpServletResponse
+			response) {
+
+
+		PrivilegedCarbonContext.startTenantFlow();
+		PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
+		ctx.setTenantDomain("carbon.super", true);
+		DeviceAnalyticsService deviceAnalyticsService = (DeviceAnalyticsService) ctx
+				.getOSGiService(
+						DeviceAnalyticsService.class, null);
+		Object metdaData[] = {"ayyoob", "firealarm", "123", System.currentTimeMillis()};
+		Object payloadData[] = {value};
 		try {
-			DeviceController deviceController = new DeviceController();
-			deviceController.pushBamData("ayyoob", "firealarm", "deviceID1",
-										 System.currentTimeMillis(), "DeviceData" ,value, DataStreamDefinitions.StreamTypeLabel
-												 .TEMPERATURE);
-
-
-
-		} catch (UnauthorizedException e) {
-			response.setStatus(HttpStatus.SC_UNAUTHORIZED);
+			deviceAnalyticsService.publishEvent("org.wso2.iot.devices.temperature", "1.0.0",
+												metdaData, new Object[0], payloadData);
+		} catch (DataPublisherConfigurationException e) {
+			response.setStatus(HttpStatus.SC_INTERNAL_SERVER_ERROR);
 
+		} finally {
+			PrivilegedCarbonContext.endTenantFlow();
 		}
 	}
 }
diff --git a/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/webapp/WEB-INF/web.xml b/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/webapp/WEB-INF/web.xml
index 7dbfdaaa..2175bbda 100755
--- a/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/webapp/WEB-INF/web.xml
+++ b/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/webapp/WEB-INF/web.xml
@@ -4,8 +4,8 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
          metadata-complete="true">
-	<display-name>DigitalDisplay </display-name>
-	<description>DigitalDisplay</description>
+	<display-name>Arduino</display-name>
+	<description>Arduino</description>
 
 	<servlet>
 		<servlet-name>CXFServlet</servlet-name>
diff --git a/modules/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/impl/DigitalDisplayManagerService.java b/modules/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/impl/DigitalDisplayManagerService.java
index 9c29010f..d6909054 100644
--- a/modules/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/impl/DigitalDisplayManagerService.java
+++ b/modules/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/impl/DigitalDisplayManagerService.java
@@ -19,6 +19,21 @@ public class DigitalDisplayManagerService implements DeviceManagementService{
 		return DigitalDisplayConstants.DEVICE_TYPE;
 	}
 
+	@Override
+	public String getProviderTenantDomain() {
+		return "carbon.super";
+	}
+
+	@Override
+	public boolean isSharedWithAllTenants() {
+		return true;
+	}
+
+	@Override
+	public String[] getSharedTenantsDomain() {
+		return new String[0];
+	}
+
 	@Override
 	public void init() throws DeviceManagementException {
 		deviceManager= new DigitalDisplayManager();
diff --git a/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/impl/FireAlarmManagerService.java b/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/impl/FireAlarmManagerService.java
index 3853a021..22392f1e 100644
--- a/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/impl/FireAlarmManagerService.java
+++ b/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/impl/FireAlarmManagerService.java
@@ -19,6 +19,22 @@ public class FireAlarmManagerService implements DeviceManagementService{
 		return FireAlarmConstants.DEVICE_TYPE;
 	}
 
+
+	@Override
+	public String getProviderTenantDomain() {
+		return "carbon.super";
+	}
+
+	@Override
+	public boolean isSharedWithAllTenants() {
+		return true;
+	}
+
+	@Override
+	public String[] getSharedTenantsDomain() {
+		return new String[0];
+	}
+
 	@Override
 	public void init() throws DeviceManagementException {
 		this.deviceManager=new FireAlarmManager();
diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml
index b1683f02..33d20475 100644
--- a/modules/samples/pom.xml
+++ b/modules/samples/pom.xml
@@ -89,6 +89,12 @@
                 <version>${carbon.device.mgt.version}</version>
                 <scope>provided</scope>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.devicemgt</groupId>
+                <artifactId>org.wso2.carbon.device.mgt.analytics</artifactId>
+                <version>${carbon.device.mgt.version}</version>
+                <scope>provided</scope>
+            </dependency>
 
             <!--IOT dependencies-->
 
diff --git a/modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/impl/RaspberrypiManagerService.java b/modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/impl/RaspberrypiManagerService.java
index 0f0cddaa..41272c9a 100644
--- a/modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/impl/RaspberrypiManagerService.java
+++ b/modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/impl/RaspberrypiManagerService.java
@@ -21,6 +21,21 @@ public class RaspberrypiManagerService implements DeviceManagementService {
 		return RaspberrypiConstants.DEVICE_TYPE;
 	}
 
+	@Override
+	public String getProviderTenantDomain() {
+		return "carbon.super";
+	}
+
+	@Override
+	public boolean isSharedWithAllTenants() {
+		return true;
+	}
+
+	@Override
+	public String[] getSharedTenantsDomain() {
+		return new String[0];
+	}
+
 	@Override
 	public void init() throws DeviceManagementException {
 		deviceManager = new RaspberrypiManager();
diff --git a/modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/impl/SensebotManagerService.java b/modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/impl/SensebotManagerService.java
index 323ecbf7..ebd2568b 100644
--- a/modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/impl/SensebotManagerService.java
+++ b/modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/impl/SensebotManagerService.java
@@ -14,6 +14,22 @@ import java.util.List;
 
 public class SensebotManagerService implements DeviceManagementService {
 	private DeviceManager deviceManager;
+
+	@Override
+	public String getProviderTenantDomain() {
+		return "carbon.super";
+	}
+
+	@Override
+	public boolean isSharedWithAllTenants() {
+		return true;
+	}
+
+	@Override
+	public String[] getSharedTenantsDomain() {
+		return new String[0];
+	}
+
 	@Override
 	public String getType() {
 		return SensebotConstants.DEVICE_TYPE;
diff --git a/pom.xml b/pom.xml
index d960fac3..61c9005d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -407,7 +407,11 @@
                 <artifactId>org.wso2.carbon.policy.mgt.core</artifactId>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
-
+            <dependency>
+                <groupId>org.wso2.carbon.devicemgt</groupId>
+                <artifactId>org.wso2.carbon.device.mgt.analytics</artifactId>
+                <version>${carbon.device.mgt.version}</version>
+            </dependency>
 
 
             <!--IOT dependencies-->
@@ -892,13 +896,13 @@
 
         <!--DAS-->
         <carbon.analytics.version>1.0.3-SNAPSHOT</carbon.analytics.version>
-        <carbon.analytics.common.version>5.0.2-SNAPSHOT</carbon.analytics.common.version>
+        <carbon.analytics.common.version>5.0.2</carbon.analytics.common.version>
         <das.release.version>3.0.0-SNAPSHOT</das.release.version>
         <carbon.data.version>4.3.1-SNAPSHOT</carbon.data.version>
         <cipher.tool.version>1.0.0-wso2v3</cipher.tool.version>
         <shindig.version>1.0.0</shindig.version>
         <carbon.dashboard.version>1.0.1-SNAPSHOT</carbon.dashboard.version>
-        <carbon.event-processing.version>2.0.4</carbon.event-processing.version>
+        <carbon.event-processing.version>2.0.5</carbon.event-processing.version>
 
 
         <orbit.version.commons-httpclient>3.1.0.wso2v2</orbit.version.commons-httpclient>