From ce2e3a9a053e8aa3ae491a8046c1651d6e256011 Mon Sep 17 00:00:00 2001
From: Menaka Madushanka <menaka12350@gmail.com>
Date: Wed, 23 Dec 2015 10:17:31 +0530
Subject: [PATCH 01/10] Added feature annotation

---
 .../pom.xml                                   |  5 ++++
 .../service/impl/AndroidSenseService.java     | 24 ++++++++++---------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.api/pom.xml b/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.api/pom.xml
index 69bb002679..3181026d16 100644
--- a/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.api/pom.xml
+++ b/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.api/pom.xml
@@ -171,6 +171,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>org.wso2.carbon.apimgt.annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
 
diff --git a/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/AndroidSenseService.java b/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/AndroidSenseService.java
index b99470644a..2e95c7a865 100644
--- a/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/AndroidSenseService.java
+++ b/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/AndroidSenseService.java
@@ -18,6 +18,7 @@ package org.wso2.carbon.device.mgt.iot.androidsense.service.impl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.apimgt.annotations.device.DeviceType;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.analytics.exception.DataPublisherConfigurationException;
 import org.wso2.carbon.device.mgt.analytics.service.DeviceAnalyticsService;
@@ -29,18 +30,11 @@ import org.wso2.carbon.device.mgt.iot.DeviceManagement;
 import org.wso2.carbon.device.mgt.iot.androidsense.plugin.constants.AndroidSenseConstants;
 import org.wso2.carbon.device.mgt.iot.androidsense.service.impl.util.DeviceJSON;
 import org.wso2.carbon.device.mgt.iot.androidsense.service.impl.util.SensorJSON;
-import org.wso2.carbon.device.mgt.iot.apimgt.AccessTokenInfo;
-import org.wso2.carbon.device.mgt.iot.apimgt.TokenClient;
-import org.wso2.carbon.device.mgt.iot.controlqueue.xmpp.XmppAccount;
-import org.wso2.carbon.device.mgt.iot.controlqueue.xmpp.XmppConfig;
-import org.wso2.carbon.device.mgt.iot.controlqueue.xmpp.XmppServerClient;
-import org.wso2.carbon.device.mgt.iot.exception.AccessTokenException;
 import org.wso2.carbon.device.mgt.iot.exception.DeviceControllerException;
 import org.wso2.carbon.device.mgt.iot.sensormgt.SensorDataManager;
 import org.wso2.carbon.device.mgt.iot.sensormgt.SensorRecord;
-import org.wso2.carbon.device.mgt.iot.util.ZipArchive;
-import org.wso2.carbon.device.mgt.iot.util.ZipUtil;
 import org.wso2.carbon.utils.CarbonUtils;
+import org.wso2.carbon.apimgt.annotations.device.feature.Feature;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.ws.rs.*;
@@ -48,11 +42,9 @@ import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import java.io.File;
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
 import java.util.Date;
-import java.util.UUID;
 
+@DeviceType( value = "android_sense" )
 public class AndroidSenseService {
 
     private static final String BATTERY_STREAM_DEFINITION = "org.wso2.iot.devices.battery";
@@ -361,6 +353,7 @@ public class AndroidSenseService {
     @GET
     @Consumes("application/json")
     @Produces("application/json")
+    @Feature(code = "readlight", name = "Light", description = "Read Light data from the device", type = "monitor")
     public SensorRecord readLight(
             @HeaderParam("owner") String owner, @HeaderParam("deviceId") String deviceId,
             @Context HttpServletResponse response) {
@@ -380,6 +373,7 @@ public class AndroidSenseService {
     @GET
     @Consumes("application/json")
     @Produces("application/json")
+    @Feature(code = "readbattery", name = "Battery", description = "Read Battery data from the device", type = "monitor")
     public SensorRecord readBattery(
             @HeaderParam("owner") String owner, @HeaderParam("deviceId") String deviceId,
             @Context HttpServletResponse response) {
@@ -399,6 +393,7 @@ public class AndroidSenseService {
     @GET
     @Consumes("application/json")
     @Produces("application/json")
+    @Feature(code = "readgps", name = "gps", description = "Read GPS data from the device", type = "monitor")
     public SensorRecord readGPS(
             @HeaderParam("owner") String owner, @HeaderParam("deviceId") String deviceId,
             @Context HttpServletResponse response) {
@@ -418,6 +413,7 @@ public class AndroidSenseService {
     @GET
     @Consumes("application/json")
     @Produces("application/json")
+    @Feature(code = "readmagnetic", name = "Magnetic", description = "Read Magnetic data from the device", type = "monitor")
     public SensorRecord readMagnetic(
             @HeaderParam("owner") String owner, @HeaderParam("deviceId") String deviceId,
             @Context HttpServletResponse response) {
@@ -437,6 +433,7 @@ public class AndroidSenseService {
     @GET
     @Consumes("application/json")
     @Produces("application/json")
+    @Feature(code = "readaccelerometer", name = "Accelerometer", description = "Read Accelerometer data from the device", type = "monitor")
     public SensorRecord readAccelerometer(
             @HeaderParam("owner") String owner, @HeaderParam("deviceId") String deviceId,
             @Context HttpServletResponse response) {
@@ -456,6 +453,7 @@ public class AndroidSenseService {
     @GET
     @Consumes("application/json")
     @Produces("application/json")
+    @Feature(code = "readrotation", name = "Rotation", description = "Read Rotational Vector data from the device", type = "monitor")
     public SensorRecord readRotation(
             @HeaderParam("owner") String owner, @HeaderParam("deviceId") String deviceId,
             @Context HttpServletResponse response) {
@@ -475,6 +473,7 @@ public class AndroidSenseService {
     @GET
     @Consumes("application/json")
     @Produces("application/json")
+    @Feature(code = "readproximity", name = "Proximity", description = "Read Proximity data from the device", type = "monitor")
     public SensorRecord readProximity(
             @HeaderParam("owner") String owner, @HeaderParam("deviceId") String deviceId,
             @Context HttpServletResponse response) {
@@ -494,6 +493,7 @@ public class AndroidSenseService {
     @GET
     @Consumes("application/json")
     @Produces("application/json")
+    @Feature(code = "readgyroscope", name = "Gyroscope", description = "Read Gyroscope data from the device", type = "monitor")
     public SensorRecord readGyroscope(
             @HeaderParam("owner") String owner, @HeaderParam("deviceId") String deviceId,
             @Context HttpServletResponse response) {
@@ -513,6 +513,7 @@ public class AndroidSenseService {
     @GET
     @Consumes("application/json")
     @Produces("application/json")
+    @Feature(code = "readpressure", name = "Pressure", description = "Read Pressure data from the device", type = "monitor")
     public SensorRecord readPressure(
             @HeaderParam("owner") String owner, @HeaderParam("deviceId") String deviceId,
             @Context HttpServletResponse response) {
@@ -532,6 +533,7 @@ public class AndroidSenseService {
     @GET
     @Consumes("application/json")
     @Produces("application/json")
+    @Feature(code = "readgravity", name = "Gravity", description = "Read Gravity data from the device", type = "monitor")
     public SensorRecord readGravity(
             @HeaderParam("owner") String owner, @HeaderParam("deviceId") String deviceId,
             @Context HttpServletResponse response) {

From cd46ef34654976e4a04fee855badf292efc97086 Mon Sep 17 00:00:00 2001
From: Menaka Madushanka <menaka12350@gmail.com>
Date: Wed, 23 Dec 2015 15:13:34 +0530
Subject: [PATCH 02/10] Added feature annotation

---
 .../service/impl/AndroidSenseService.java     |  2 +
 .../src/main/webapp/WEB-INF/web.xml           | 56 +++++++++----------
 2 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/AndroidSenseService.java b/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/AndroidSenseService.java
index 2e95c7a865..0e2ffcba7f 100644
--- a/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/AndroidSenseService.java
+++ b/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/AndroidSenseService.java
@@ -18,6 +18,7 @@ package org.wso2.carbon.device.mgt.iot.androidsense.service.impl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.apimgt.annotations.api.API;
 import org.wso2.carbon.apimgt.annotations.device.DeviceType;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.analytics.exception.DataPublisherConfigurationException;
@@ -45,6 +46,7 @@ import java.io.File;
 import java.util.Date;
 
 @DeviceType( value = "android_sense" )
+@API( name="android_sense", version="1.0.0", context="/android_sense")
 public class AndroidSenseService {
 
     private static final String BATTERY_STREAM_DEFINITION = "org.wso2.iot.devices.battery";
diff --git a/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/webapp/WEB-INF/web.xml b/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/webapp/WEB-INF/web.xml
index db5733aaff..d3b03b4c27 100644
--- a/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/webapp/WEB-INF/web.xml
+++ b/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/webapp/WEB-INF/web.xml
@@ -29,34 +29,34 @@
 	<!--</context-param>-->
 
 	<!--publish to apim-->
-	<!--<context-param>-->
-		<!--<param-name>managed-api-enabled</param-name>-->
-		<!--<param-value>true</param-value>-->
-	<!--</context-param>-->
-	<!--<context-param>-->
-		<!--<param-name>managed-api-owner</param-name>-->
-		<!--<param-value>admin</param-value>-->
-	<!--</context-param>-->
-	<!--<context-param>-->
-		<!--<param-name>managed-api-name</param-name>-->
-		<!--<param-value>android_sense</param-value>-->
-	<!--</context-param>-->
-	<!--<context-param>-->
-		<!--<param-name>managed-api-endpoint</param-name>-->
-		<!--<param-value>http://localhost:9763/android_sense</param-value>-->
-	<!--</context-param>-->
-	<!--<context-param>-->
-		<!--<param-name>managed-api-version</param-name>-->
-		<!--<param-value>1.0.0</param-value>-->
-	<!--</context-param>-->
-	<!--<context-param>-->
-		<!--<param-name>managed-api-context</param-name>-->
-		<!--<param-value>/android_sense</param-value>-->
-	<!--</context-param>-->
-	<!--<context-param>-->
-		<!--<param-name>managed-api-isSecured</param-name>-->
-		<!--<param-value>true</param-value>-->
-	<!--</context-param>-->
+	<context-param>
+		<param-name>managed-api-enabled</param-name>
+		<param-value>true</param-value>
+	</context-param>
+	<context-param>
+		<param-name>managed-api-owner</param-name>
+		<param-value>admin</param-value>
+	</context-param>
+	<context-param>
+		<param-name>managed-api-name</param-name>
+		<param-value>android_sense</param-value>
+	</context-param>
+	<context-param>
+		<param-name>managed-api-endpoint</param-name>
+		<param-value>http://localhost:9763/android_sense</param-value>
+	</context-param>
+	<context-param>
+		<param-name>managed-api-version</param-name>
+		<param-value>1.0.0</param-value>
+	</context-param>
+	<context-param>
+		<param-name>managed-api-context</param-name>
+		<param-value>/android_sense</param-value>
+	</context-param>
+	<context-param>
+		<param-name>managed-api-isSecured</param-name>
+		<param-value>true</param-value>
+	</context-param>
 
 	<!-- Below configuration is used to redirect http requests to https -->
 	<!--<security-constraint>-->

From b430590543653e14906566ccbb8222451cfa5e79 Mon Sep 17 00:00:00 2001
From: Menaka Madushanka <menaka12350@gmail.com>
Date: Wed, 23 Dec 2015 17:25:04 +0530
Subject: [PATCH 03/10] Corrected _war -> _mgt

---
 .../org.wso2.carbon.device.mgt.iot.androidsense.api/pom.xml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.api/pom.xml b/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.api/pom.xml
index 78595f59f2..1a07767662 100644
--- a/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.api/pom.xml
+++ b/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.api/pom.xml
@@ -192,7 +192,7 @@
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
-                    <warName>android_sense_war</warName>
+                    <warName>android_sense_mgt</warName>
                 </configuration>
             </plugin>
         </plugins>

From 151d7ba087696aa1be096206b8da13f9cc7c3c68 Mon Sep 17 00:00:00 2001
From: Menaka Madushanka <menaka12350@gmail.com>
Date: Mon, 4 Jan 2016 10:33:57 +0530
Subject: [PATCH 04/10] arranged to ascending order

---
 .../service/impl/AndroidSenseService.java     | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/AndroidSenseService.java b/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/AndroidSenseService.java
index 0e2ffcba7f..92e14a1012 100644
--- a/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/AndroidSenseService.java
+++ b/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/AndroidSenseService.java
@@ -49,27 +49,27 @@ import java.util.Date;
 @API( name="android_sense", version="1.0.0", context="/android_sense")
 public class AndroidSenseService {
 
+    private static final String ACCELEROMETER_STREAM_DEFINITION = "org.wso2.iot.devices.accelerometer";
     private static final String BATTERY_STREAM_DEFINITION = "org.wso2.iot.devices.battery";
-    private static final String LIGHT_STREAM_DEFINITION = "org.wso2.iot.devices.light";
     private static final String GPS_STREAM_DEFINITION = "org.wso2.iot.devices.gps";
-    private static final String MAGNETIC_STREAM_DEFINITION = "org.wso2.iot.devices.magnetic";
-    private static final String ACCELEROMETER_STREAM_DEFINITION = "org.wso2.iot.devices.accelerometer";
+    private static final String GRAVITY_STREAM_DEFINITION = "org.wso2.iot.devices.gravity";
     private static final String GYROSCOPE_STREAM_DEFINITION = "org.wso2.iot.devices.gyroscope";
+    private static final String LIGHT_STREAM_DEFINITION = "org.wso2.iot.devices.light";
+    private static final String MAGNETIC_STREAM_DEFINITION = "org.wso2.iot.devices.magnetic";
     private static final String PRESSURE_STREAM_DEFINITION = "org.wso2.iot.devices.pressure";
-    private static final String GRAVITY_STREAM_DEFINITION = "org.wso2.iot.devices.gravity";
-    private static final String ROTATION_STREAM_DEFINITION = "org.wso2.iot.devices.rotation";
     private static final String PROXIMITY_STREAM_DEFINITION = "org.wso2.iot.devices.proximity";
+    private static final String ROTATION_STREAM_DEFINITION = "org.wso2.iot.devices.rotation";
 
     private static final String SENSOR_ACCELEROMETER = "accelerometer";
-    private static final String SENSOR_GYROSCOPE = "gyroscope";
-    private static final String SENSOR_PRESSURE = "pressure";
+    private static final String SENSOR_BATTERY = "battery";
+    private static final String SENSOR_GPS = "gps";
     private static final String SENSOR_GRAVITY = "gravity";
-    private static final String SENSOR_ROTATION = "rotation";
+    private static final String SENSOR_GYROSCOPE = "gyroscope";
     private static final String SENSOR_LIGHT = "light";
-    private static final String SENSOR_GPS = "gps";
-    private static final String SENSOR_PROXIMITY = "proximity";
-    private static final String SENSOR_BATTERY = "battery";
     private static final String SENSOR_MAGNETIC = "magnetic";
+    private static final String SENSOR_PRESSURE = "pressure";
+    private static final String SENSOR_PROXIMITY = "proximity";
+    private static final String SENSOR_ROTATION = "rotation";
     private static Log log = LogFactory.getLog(AndroidSenseService.class);
 
     //TODO; replace this tenant domain

From 5b24ebab9860e2965b3c54975ec9dbdb1ab9b506 Mon Sep 17 00:00:00 2001
From: NuwanSameera <nuwansameera74@gmail.com>
Date: Mon, 4 Jan 2016 15:50:46 +0530
Subject: [PATCH 05/10] Digital display device type view updates

---
 .../type-view.hbs                             | 70 ++++++++-----------
 1 file changed, 28 insertions(+), 42 deletions(-)

diff --git a/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/type-view.hbs b/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/type-view.hbs
index 593c1326e6..73d0e4527e 100644
--- a/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/type-view.hbs
+++ b/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/type-view.hbs
@@ -34,14 +34,17 @@
     </ul>
     <br>
 
+    <a href="/api-store/apis/info?name={{@uriParams.deviceType}}&version=1.0.0&provider=admin" class="btn-operations"
+       target="_blank"><i class="fw fw-api"></i> View API</i> &nbsp;</a>
     <a href="#" class="download-link btn-operations"><i class="fw fw-download"></i>Download</a>
 
     <div id="download-device-modal-content" class="hide">
         <div class="modal-content">
             <div class="row">
-                <div class="col-md-7 col-centered center-container">
+                <div class="col-md-7  center-container">
                     <h3>Name your device and download the agent from following link.</h3>
                     <br/>
+
                     <form id="downloadForm" method="GET" action="{{@app.context}}/api/devices/sketch/download">
                         <div class="control-group">
                             <div class="controls">
@@ -49,22 +52,21 @@
                                        type="text"
                                        placeholder="Ex. Lobby_DigitalDisplay"
                                        name="deviceName" size="60" required>
-                                <br/>
+                                <br/><br/>
                                 <input type="hidden" class="deviceType" name="deviceType"
                                        value="digital_display"/>
                                 <input type="hidden" class="sketchType" name="sketchType"
                                        value="digital_display"/>
                             </div>
                         </div>
-                        <br/>
-                        <div class="buttons">
-                            <a class="btn-operations" onclick="downloadAgent()">Download
+                        <div class="buttons" style="padding-bottom: 0px">
+                            <a class="btn btn-operations" onclick="downloadAgent()">Download
                                 Now</a>
                             &nbsp;&nbsp;
-                            <a href="#" id="download-device-download-link" class="blue-button">
+                            <a href="#" id="download-device-download-link" class="btn btn-operations">
                                 Copy Link
                             </a>
-
+                            &nbsp;&nbsp;
                         </div>
                     </form>
                 </div>
@@ -72,21 +74,6 @@
         </div>
     </div>
 
-    <div id="download-device-modal-content-links" class="hide">
-        <div class="modal-content">
-            <div class="row">
-                <div class="col-md-7 col-centered center-container">
-                    <h3>Please download the file from following link(Press CTRL+C).</h3>
-                    <br/>
-
-                    <div>
-                        <input id="download-device-url" style="color:#3f3f3f;padding:5px"
-                               type="text" value="" placeholder="Type here" size="60">
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
 
     <div id="device-400-content" class="hide">
         <div class="modal-content">
@@ -244,39 +231,39 @@
 
 <style type="text/css">
     .circle {
-        background: none repeat scroll 0 0 #191919;
-        border-radius: 50px;
-        height: 50px;
-        padding: 10px;
-        width: 50px;
-        color: #fff;
+    background: none repeat scroll 0 0 #191919;
+    border-radius: 50px;
+    height: 50px;
+    padding: 10px;
+    width: 50px;
+    color: #fff;
     }
     .padding-top-double {
-        padding-top: 20px;
+    padding-top: 20px;
     }
     .padding-double {
-        padding: 20px;
+    padding: 20px;
     }
     .grey {
-        color: #333;
+    color: #333;
     }
     hr {
-        display: block;
-        height: 1px;
-        border: 0;
-        border-top: 1px solid #7f7f7f;
-        margin: 1em 0;
-        padding: 0;
-        opacity: 0.2;
+    display: block;
+    height: 1px;
+    border: 0;
+    border-top: 1px solid #7f7f7f;
+    margin: 1em 0;
+    padding: 0;
+    opacity: 0.2;
     }
     .light-grey {
-        color: #7c7c7c;
+    color: #7c7c7c;
     }
     .uppercase {
-        text-transform: uppercase;
+    text-transform: uppercase;
     }
     .grey-bg {
-        background-color: #f6f4f4;
+    background-color: #f6f4f4;
     }
 </style>
 
@@ -284,4 +271,3 @@
     {{js "/js/download.js"}}
     {{js "/js/jquery.validate.js"}}
 {{/zone}}
-

From b89df93c8bfd466a4035cfb27ec573a100e24d8e Mon Sep 17 00:00:00 2001
From: Menaka Madushanka <menaka12350@gmail.com>
Date: Mon, 4 Jan 2016 17:18:38 +0530
Subject: [PATCH 06/10] raspberrypi.json added

---
 .../EventReceiver_temperature.xml             |  8 +++
 .../artifact.xml                              |  4 ++
 .../Eventstore_temperature_1.0.0/artifact.xml |  4 ++
 .../org_wso2_iot_devices_temperature.xml      | 44 ++++++++++++
 .../artifact.xml                              |  5 ++
 ...rg.wso2.iot.devices.temperature_1.0.0.json | 20 ++++++
 .../Temperature_Sensor_Script.xml             | 13 ++++
 .../Sparkscripts_1.0.0/artifact.xml           |  4 ++
 .../Temperature_Sensor/artifacts.xml          | 11 +++
 .../build.xml                                 | 20 ++++++
 .../pom.xml                                   | 68 +++++++++++++++++++
 .../main/resources/configs/raspberrypi.json   | 21 ++++++
 .../src/main/resources/p2.inf                 |  4 +-
 .../pom.xml                                   |  1 +
 14 files changed, 225 insertions(+), 2 deletions(-)
 create mode 100644 features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/Temperature_Sensor/Eventreceiver_temperature_1.0.0/EventReceiver_temperature.xml
 create mode 100644 features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/Temperature_Sensor/Eventreceiver_temperature_1.0.0/artifact.xml
 create mode 100644 features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/Temperature_Sensor/Eventstore_temperature_1.0.0/artifact.xml
 create mode 100644 features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/Temperature_Sensor/Eventstore_temperature_1.0.0/org_wso2_iot_devices_temperature.xml
 create mode 100644 features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/Temperature_Sensor/Eventstream_temperature_1.0.0/artifact.xml
 create mode 100644 features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/Temperature_Sensor/Eventstream_temperature_1.0.0/org.wso2.iot.devices.temperature_1.0.0.json
 create mode 100644 features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/Temperature_Sensor/Sparkscripts_1.0.0/Temperature_Sensor_Script.xml
 create mode 100644 features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/Temperature_Sensor/Sparkscripts_1.0.0/artifact.xml
 create mode 100644 features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/Temperature_Sensor/artifacts.xml
 create mode 100644 features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/build.xml
 create mode 100644 features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/pom.xml
 create mode 100644 features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/configs/raspberrypi.json

diff --git a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/Temperature_Sensor/Eventreceiver_temperature_1.0.0/EventReceiver_temperature.xml b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/Temperature_Sensor/Eventreceiver_temperature_1.0.0/EventReceiver_temperature.xml
new file mode 100644
index 0000000000..6786696c7a
--- /dev/null
+++ b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/Temperature_Sensor/Eventreceiver_temperature_1.0.0/EventReceiver_temperature.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eventReceiver name="EventReceiver_temperature" statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventreceiver">
+    <from eventAdapterType="wso2event">
+        <property name="events.duplicated.in.cluster">false</property>
+    </from>
+    <mapping customMapping="disable" type="wso2event"/>
+    <to streamName="org.wso2.iot.devices.temperature" version="1.0.0"/>
+</eventReceiver>
diff --git a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/Temperature_Sensor/Eventreceiver_temperature_1.0.0/artifact.xml b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/Temperature_Sensor/Eventreceiver_temperature_1.0.0/artifact.xml
new file mode 100644
index 0000000000..b72e1ff7a4
--- /dev/null
+++ b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/Temperature_Sensor/Eventreceiver_temperature_1.0.0/artifact.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<artifact name="Eventreceiver_temperature" version="1.0.0" type="event/receiver" serverRole="DataAnalyticsServer">
+    <file>EventReceiver_temperature.xml</file>
+</artifact>
diff --git a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/Temperature_Sensor/Eventstore_temperature_1.0.0/artifact.xml b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/Temperature_Sensor/Eventstore_temperature_1.0.0/artifact.xml
new file mode 100644
index 0000000000..90b14c1165
--- /dev/null
+++ b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/Temperature_Sensor/Eventstore_temperature_1.0.0/artifact.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<artifact name="Eventstore_temperature" version="1.0.0" type="analytics/eventstore" serverRole="DataAnalyticsServer">
+    <file>org_wso2_iot_devices_temperature.xml</file>
+</artifact>
diff --git a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/Temperature_Sensor/Eventstore_temperature_1.0.0/org_wso2_iot_devices_temperature.xml b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/Temperature_Sensor/Eventstore_temperature_1.0.0/org_wso2_iot_devices_temperature.xml
new file mode 100644
index 0000000000..13a625bde9
--- /dev/null
+++ b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/Temperature_Sensor/Eventstore_temperature_1.0.0/org_wso2_iot_devices_temperature.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<EventStoreConfiguration>
+    <Source>
+        <StreamId>org.wso2.iot.devices.temperature:1.0.0</StreamId>
+    </Source>
+    <RecordStoreName>EVENT_STORE</RecordStoreName>
+    <TableSchema>
+		<ColumnDefinition>
+			<Name>meta_owner</Name>
+			<EnableIndexing>true</EnableIndexing>
+			<IsPrimaryKey>true</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>STRING</Type>
+		</ColumnDefinition>
+		<ColumnDefinition>
+			<Name>meta_deviceType</Name>
+			<EnableIndexing>true</EnableIndexing>
+			<IsPrimaryKey>true</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>STRING</Type>
+		</ColumnDefinition>
+		<ColumnDefinition>
+			<Name>meta_deviceId</Name>
+			<EnableIndexing>true</EnableIndexing>
+			<IsPrimaryKey>true</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>STRING</Type>
+		</ColumnDefinition>
+		<ColumnDefinition>
+			<Name>meta_time</Name>
+			<EnableIndexing>true</EnableIndexing>
+			<IsPrimaryKey>true</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>LONG</Type>
+		</ColumnDefinition>
+		<ColumnDefinition>
+			<Name>temperature</Name>
+			<EnableIndexing>false</EnableIndexing>
+			<IsPrimaryKey>false</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>FLOAT</Type>
+		</ColumnDefinition>
+    </TableSchema>
+</EventStoreConfiguration>
\ No newline at end of file
diff --git a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/Temperature_Sensor/Eventstream_temperature_1.0.0/artifact.xml b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/Temperature_Sensor/Eventstream_temperature_1.0.0/artifact.xml
new file mode 100644
index 0000000000..61e7903b89
--- /dev/null
+++ b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/Temperature_Sensor/Eventstream_temperature_1.0.0/artifact.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<artifact name="Eventstream_temperature" version="1.0.0" type="event/stream" serverRole="DataAnalyticsServer">
+	<file>org.wso2.iot.devices.temperature_1.0.0.json</file>	
+</artifact>
+
diff --git a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/Temperature_Sensor/Eventstream_temperature_1.0.0/org.wso2.iot.devices.temperature_1.0.0.json b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/Temperature_Sensor/Eventstream_temperature_1.0.0/org.wso2.iot.devices.temperature_1.0.0.json
new file mode 100644
index 0000000000..5d94b9821b
--- /dev/null
+++ b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/Temperature_Sensor/Eventstream_temperature_1.0.0/org.wso2.iot.devices.temperature_1.0.0.json
@@ -0,0 +1,20 @@
+{
+  "name": "org.wso2.iot.devices.temperature",
+  "version": "1.0.0",
+  "nickName": "Temperature Data",
+  "description": "Temperature data received from the Device",
+  "metaData": [
+    {"name":"owner","type":"STRING"},     
+    {"name":"deviceType","type":"STRING"},
+    {"name":"deviceId","type":"STRING"},  
+    {"name":"time","type":"LONG"}
+  ],
+  "payloadData": [
+    {
+      "name": "temperature","type": "FLOAT"
+    }
+  ]
+}
+	
+
+				                                    		
diff --git a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/Temperature_Sensor/Sparkscripts_1.0.0/Temperature_Sensor_Script.xml b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/Temperature_Sensor/Sparkscripts_1.0.0/Temperature_Sensor_Script.xml
new file mode 100644
index 0000000000..ee6a7195d6
--- /dev/null
+++ b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/Temperature_Sensor/Sparkscripts_1.0.0/Temperature_Sensor_Script.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Analytics>
+    <Name>IoTServer_Sensor_Script</Name>
+    <Script>
+        CREATE TEMPORARY TABLE DeviceTemperatureData USING CarbonAnalytics OPTIONS(tableName "ORG_WSO2_IOT_DEVICES_TEMPERATURE");
+
+        CREATE TEMPORARY TABLE DeviceTemperatureSummaryData USING CarbonAnalytics OPTIONS (tableName "DEVICE_TEMPERATURE_SUMMARY", schema "temperature FLOAT, deviceType STRING -i, deviceId STRING -i, owner STRING -i, time LONG -i",primaryKeys "deviceType, deviceId, owner, time");
+
+
+        insert overwrite table DeviceTemperatureSummaryData select temperature, meta_deviceType as deviceType, meta_deviceId as deviceId, meta_owner as owner, cast(meta_time/1000 as BIGINT)as time from DeviceTemperatureData group by temperature, meta_deviceType, meta_deviceId, meta_owner, cast(meta_time/1000 as BIGINT);
+    </Script>
+    <CronExpression>0 * * * * ?</CronExpression>
+</Analytics>
diff --git a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/Temperature_Sensor/Sparkscripts_1.0.0/artifact.xml b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/Temperature_Sensor/Sparkscripts_1.0.0/artifact.xml
new file mode 100644
index 0000000000..58c2dcc17f
--- /dev/null
+++ b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/Temperature_Sensor/Sparkscripts_1.0.0/artifact.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<artifact name="Sparkscripts" version="1.0.0" type="analytics/spark" serverRole="DataAnalyticsServer">
+    <file>Temperature_Sensor_Script.xml</file>
+</artifact>
diff --git a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/Temperature_Sensor/artifacts.xml b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/Temperature_Sensor/artifacts.xml
new file mode 100644
index 0000000000..b53507636b
--- /dev/null
+++ b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/Temperature_Sensor/artifacts.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<artifacts>
+    <artifact name="IoTServer_Sensors_CAPP" version="1.0.0" type="carbon/application">        
+
+		<dependency artifact="Eventstream_temperature" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+		<dependency artifact="Eventstore_temperature" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+		<dependency artifact="Eventreceiver_temperature" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+
+		<dependency artifact="Sparkscripts" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+    </artifact>
+</artifacts>
diff --git a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/build.xml b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/build.xml
new file mode 100644
index 0000000000..a34ea833ac
--- /dev/null
+++ b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/build.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="create-sample-sensor-capps" default="zip" basedir=".">
+
+    <property name="project-name" value="${ant.project.name}"/>
+    <property name="target-dir" value="../org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/carbonapps"/>
+
+    <property name="Temperature_Sensor_dir" value="Temperature_Sensor"/>
+
+    <target name="clean">
+        <delete dir="${target-dir}" />
+    </target>
+
+    <target name="zip" depends="clean">
+        <mkdir dir="${target-dir}"/>
+        <zip destfile="${target-dir}/${Temperature_Sensor_dir}.car">
+            <zipfileset dir="${Temperature_Sensor_dir}"/>
+        </zip>
+    </target>
+
+</project>
diff --git a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/pom.xml b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/pom.xml
new file mode 100644
index 0000000000..3d0753265b
--- /dev/null
+++ b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/pom.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+# Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+#
+# 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.
+  -->
+<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/maven-v4_0_0.xsd">
+
+    <parent>
+        <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
+        <artifactId>device-mgt-iot-raspberrypi-feature</artifactId>
+        <version>1.9.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.wso2.carbon.device.mgt.iot.raspberrypi.analytics</artifactId>
+    <name>WSO2 Carbon - IoT Server Raspberry Pi Analytics capp</name>
+    <packaging>pom</packaging>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>2.4.1</version>
+                <executions>
+                    <execution>
+                        <id>auto-clean</id>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.7</version>
+                <executions>
+                    <execution>
+                        <phase>process-resources</phase>
+                        <configuration>
+                            <target>
+                                <ant antfile="build.xml" target="zip"/>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/configs/raspberrypi.json b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/configs/raspberrypi.json
new file mode 100644
index 0000000000..16d56ae001
--- /dev/null
+++ b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/configs/raspberrypi.json
@@ -0,0 +1,21 @@
+{
+  "deviceType": {
+    "label": "RaspberryPi",
+    "category": "iot"
+   },
+
+  "analyticStreams": [
+    {
+      "name": "Temperature",
+      "table": "DEVICE_TEMPERATURE_SUMMARY",
+      "ui_unit": {
+        "name": "cdmf.unit.analytics.line-chart",
+        "data":[
+          {"column": {"name":"TIME", "label":"time", "ui-mapping":"x-axis"}},
+          {"column": {"name":"TEMPERATURE", "label":"Temperature", "ui-mapping":"y-axis"}}
+        ]
+      }
+    }
+  ]
+
+}
\ No newline at end of file
diff --git a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/p2.inf b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/p2.inf
index 7c542593f6..97d22ac40e 100644
--- a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/p2.inf
+++ b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/p2.inf
@@ -1,6 +1,6 @@
 instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../conf/devicetype-conf/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.raspberrypi_${feature.version}/configs/,target:${installFolder}/../../conf/devicetype-conf/,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../conf/device-types/);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.raspberrypi_${feature.version}/configs/,target:${installFolder}/../../conf/device-types/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.raspberrypi_${feature.version}/webapps/,target:${installFolder}/../../deployment/server/webapps/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../resources/sketches/);\
diff --git a/features/device-mgt-iot-raspberrypi-feature/pom.xml b/features/device-mgt-iot-raspberrypi-feature/pom.xml
index 57229cb214..19d2e79bb6 100644
--- a/features/device-mgt-iot-raspberrypi-feature/pom.xml
+++ b/features/device-mgt-iot-raspberrypi-feature/pom.xml
@@ -36,6 +36,7 @@
 
 	<modules>
 		<module>org.wso2.carbon.device.mgt.iot.raspberrypi.feature</module>
+		<module>org.wso2.carbon.device.mgt.iot.raspberrypi.analytics</module>
 	</modules>
 
 </project>

From 21e7362857216f35f209513002c5fca1f5c9619a Mon Sep 17 00:00:00 2001
From: Menaka Madushanka <menaka12350@gmail.com>
Date: Mon, 4 Jan 2016 17:29:27 +0530
Subject: [PATCH 07/10] drone_analyzer.json

---
 .../src/main/resources/configs/drone_analyzer.json          | 6 ++++++
 .../src/main/resources/p2.inf                               | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/configs/drone_analyzer.json

diff --git a/features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/configs/drone_analyzer.json b/features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/configs/drone_analyzer.json
new file mode 100644
index 0000000000..731a4fb80b
--- /dev/null
+++ b/features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/configs/drone_analyzer.json
@@ -0,0 +1,6 @@
+{
+  "deviceType": {
+    "label": "Drone Analyzer",
+    "category": "iot"
+  }
+}
\ No newline at end of file
diff --git a/features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/p2.inf b/features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/p2.inf
index b5b4a4da3f..420a62ee27 100644
--- a/features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/p2.inf
+++ b/features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/p2.inf
@@ -1,6 +1,6 @@
 instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../conf/devicetype-conf/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.droneanalyzer_${feature.version}/configs/,target:${installFolder}/../../conf/devicetype-conf/,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../conf/device-types/);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.droneanalyzer_${feature.version}/configs/,target:${installFolder}/../../conf/device-types/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.droneanalyzer_${feature.version}/webapps/,target:${installFolder}/../../deployment/server/webapps/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../resources/sketches/);\

From 804c2f3be7aea65a107f569a77f43ecbc92a8014 Mon Sep 17 00:00:00 2001
From: Menaka Madushanka <menaka12350@gmail.com>
Date: Mon, 4 Jan 2016 17:41:02 +0530
Subject: [PATCH 08/10] digital_display.json added

---
 .../src/main/resources/configs/digital_display.json        | 7 +++++++
 .../src/main/resources/p2.inf                              | 2 ++
 2 files changed, 9 insertions(+)
 create mode 100644 features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/configs/digital_display.json

diff --git a/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/configs/digital_display.json b/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/configs/digital_display.json
new file mode 100644
index 0000000000..58e14efa12
--- /dev/null
+++ b/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/configs/digital_display.json
@@ -0,0 +1,7 @@
+{
+  "deviceType": {
+    "label": "Digital Display",
+    "category": "iot"
+  }
+}
+
diff --git a/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/p2.inf b/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/p2.inf
index 28eb268339..d248d62951 100644
--- a/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/p2.inf
+++ b/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/p2.inf
@@ -1,4 +1,6 @@
 instructions.configure = \
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../conf/device-types/);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.digitaldisplay_${feature.version}/configs/,target:${installFolder}/../../conf/device-types/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.digitaldisplay_${feature.version}/webapps/,target:${installFolder}/../../deployment/server/webapps/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../resources/sketches/);\

From 42e7b2b8d83be04ce3a5cdd30a2f50637dc61b69 Mon Sep 17 00:00:00 2001
From: NuwanSameera <nuwansameera74@gmail.com>
Date: Mon, 4 Jan 2016 17:47:29 +0530
Subject: [PATCH 09/10] add configs for arduino, android, windows

---
 .../EventReceiver_temperature.xml             |  8 +++
 .../artifact.xml                              |  4 ++
 .../Eventstore_temperature_1.0.0/artifact.xml |  4 ++
 .../org_wso2_iot_devices_temperature.xml      | 44 ++++++++++++
 .../artifact.xml                              |  5 ++
 ...rg.wso2.iot.devices.temperature_1.0.0.json | 20 ++++++
 .../Temperature_Sensor_Script.xml             | 13 ++++
 .../Sparkscripts_1.0.0/artifact.xml           |  4 ++
 .../Temperature_Sensor/artifacts.xml          | 11 +++
 .../build.xml                                 | 20 ++++++
 .../pom.xml                                   | 68 +++++++++++++++++++
 .../src/main/resources/configs/arduino.json   | 18 +++++
 .../src/main/resources/p2.inf                 |  2 +
 .../device-mgt-iot-arduino-feature/pom.xml    |  3 +-
 .../src/main/resources/configs/android.json   |  6 ++
 .../src/main/resources/p2.inf                 |  2 +
 .../src/main/resources/configs/windows.json   |  6 ++
 .../src/main/resources/p2.inf                 |  2 +
 18 files changed, 239 insertions(+), 1 deletion(-)
 create mode 100644 features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/Temperature_Sensor/Eventreceiver_temperature_1.0.0/EventReceiver_temperature.xml
 create mode 100644 features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/Temperature_Sensor/Eventreceiver_temperature_1.0.0/artifact.xml
 create mode 100644 features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/Temperature_Sensor/Eventstore_temperature_1.0.0/artifact.xml
 create mode 100644 features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/Temperature_Sensor/Eventstore_temperature_1.0.0/org_wso2_iot_devices_temperature.xml
 create mode 100644 features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/Temperature_Sensor/Eventstream_temperature_1.0.0/artifact.xml
 create mode 100644 features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/Temperature_Sensor/Eventstream_temperature_1.0.0/org.wso2.iot.devices.temperature_1.0.0.json
 create mode 100644 features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/Temperature_Sensor/Sparkscripts_1.0.0/Temperature_Sensor_Script.xml
 create mode 100644 features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/Temperature_Sensor/Sparkscripts_1.0.0/artifact.xml
 create mode 100644 features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/Temperature_Sensor/artifacts.xml
 create mode 100644 features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/build.xml
 create mode 100644 features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/pom.xml
 create mode 100644 features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/configs/arduino.json
 create mode 100644 features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/configs/android.json
 create mode 100644 features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/configs/windows.json

diff --git a/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/Temperature_Sensor/Eventreceiver_temperature_1.0.0/EventReceiver_temperature.xml b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/Temperature_Sensor/Eventreceiver_temperature_1.0.0/EventReceiver_temperature.xml
new file mode 100644
index 0000000000..6786696c7a
--- /dev/null
+++ b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/Temperature_Sensor/Eventreceiver_temperature_1.0.0/EventReceiver_temperature.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eventReceiver name="EventReceiver_temperature" statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventreceiver">
+    <from eventAdapterType="wso2event">
+        <property name="events.duplicated.in.cluster">false</property>
+    </from>
+    <mapping customMapping="disable" type="wso2event"/>
+    <to streamName="org.wso2.iot.devices.temperature" version="1.0.0"/>
+</eventReceiver>
diff --git a/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/Temperature_Sensor/Eventreceiver_temperature_1.0.0/artifact.xml b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/Temperature_Sensor/Eventreceiver_temperature_1.0.0/artifact.xml
new file mode 100644
index 0000000000..b72e1ff7a4
--- /dev/null
+++ b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/Temperature_Sensor/Eventreceiver_temperature_1.0.0/artifact.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<artifact name="Eventreceiver_temperature" version="1.0.0" type="event/receiver" serverRole="DataAnalyticsServer">
+    <file>EventReceiver_temperature.xml</file>
+</artifact>
diff --git a/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/Temperature_Sensor/Eventstore_temperature_1.0.0/artifact.xml b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/Temperature_Sensor/Eventstore_temperature_1.0.0/artifact.xml
new file mode 100644
index 0000000000..90b14c1165
--- /dev/null
+++ b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/Temperature_Sensor/Eventstore_temperature_1.0.0/artifact.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<artifact name="Eventstore_temperature" version="1.0.0" type="analytics/eventstore" serverRole="DataAnalyticsServer">
+    <file>org_wso2_iot_devices_temperature.xml</file>
+</artifact>
diff --git a/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/Temperature_Sensor/Eventstore_temperature_1.0.0/org_wso2_iot_devices_temperature.xml b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/Temperature_Sensor/Eventstore_temperature_1.0.0/org_wso2_iot_devices_temperature.xml
new file mode 100644
index 0000000000..13a625bde9
--- /dev/null
+++ b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/Temperature_Sensor/Eventstore_temperature_1.0.0/org_wso2_iot_devices_temperature.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<EventStoreConfiguration>
+    <Source>
+        <StreamId>org.wso2.iot.devices.temperature:1.0.0</StreamId>
+    </Source>
+    <RecordStoreName>EVENT_STORE</RecordStoreName>
+    <TableSchema>
+		<ColumnDefinition>
+			<Name>meta_owner</Name>
+			<EnableIndexing>true</EnableIndexing>
+			<IsPrimaryKey>true</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>STRING</Type>
+		</ColumnDefinition>
+		<ColumnDefinition>
+			<Name>meta_deviceType</Name>
+			<EnableIndexing>true</EnableIndexing>
+			<IsPrimaryKey>true</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>STRING</Type>
+		</ColumnDefinition>
+		<ColumnDefinition>
+			<Name>meta_deviceId</Name>
+			<EnableIndexing>true</EnableIndexing>
+			<IsPrimaryKey>true</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>STRING</Type>
+		</ColumnDefinition>
+		<ColumnDefinition>
+			<Name>meta_time</Name>
+			<EnableIndexing>true</EnableIndexing>
+			<IsPrimaryKey>true</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>LONG</Type>
+		</ColumnDefinition>
+		<ColumnDefinition>
+			<Name>temperature</Name>
+			<EnableIndexing>false</EnableIndexing>
+			<IsPrimaryKey>false</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>FLOAT</Type>
+		</ColumnDefinition>
+    </TableSchema>
+</EventStoreConfiguration>
\ No newline at end of file
diff --git a/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/Temperature_Sensor/Eventstream_temperature_1.0.0/artifact.xml b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/Temperature_Sensor/Eventstream_temperature_1.0.0/artifact.xml
new file mode 100644
index 0000000000..61e7903b89
--- /dev/null
+++ b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/Temperature_Sensor/Eventstream_temperature_1.0.0/artifact.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<artifact name="Eventstream_temperature" version="1.0.0" type="event/stream" serverRole="DataAnalyticsServer">
+	<file>org.wso2.iot.devices.temperature_1.0.0.json</file>	
+</artifact>
+
diff --git a/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/Temperature_Sensor/Eventstream_temperature_1.0.0/org.wso2.iot.devices.temperature_1.0.0.json b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/Temperature_Sensor/Eventstream_temperature_1.0.0/org.wso2.iot.devices.temperature_1.0.0.json
new file mode 100644
index 0000000000..5d94b9821b
--- /dev/null
+++ b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/Temperature_Sensor/Eventstream_temperature_1.0.0/org.wso2.iot.devices.temperature_1.0.0.json
@@ -0,0 +1,20 @@
+{
+  "name": "org.wso2.iot.devices.temperature",
+  "version": "1.0.0",
+  "nickName": "Temperature Data",
+  "description": "Temperature data received from the Device",
+  "metaData": [
+    {"name":"owner","type":"STRING"},     
+    {"name":"deviceType","type":"STRING"},
+    {"name":"deviceId","type":"STRING"},  
+    {"name":"time","type":"LONG"}
+  ],
+  "payloadData": [
+    {
+      "name": "temperature","type": "FLOAT"
+    }
+  ]
+}
+	
+
+				                                    		
diff --git a/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/Temperature_Sensor/Sparkscripts_1.0.0/Temperature_Sensor_Script.xml b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/Temperature_Sensor/Sparkscripts_1.0.0/Temperature_Sensor_Script.xml
new file mode 100644
index 0000000000..ee6a7195d6
--- /dev/null
+++ b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/Temperature_Sensor/Sparkscripts_1.0.0/Temperature_Sensor_Script.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Analytics>
+    <Name>IoTServer_Sensor_Script</Name>
+    <Script>
+        CREATE TEMPORARY TABLE DeviceTemperatureData USING CarbonAnalytics OPTIONS(tableName "ORG_WSO2_IOT_DEVICES_TEMPERATURE");
+
+        CREATE TEMPORARY TABLE DeviceTemperatureSummaryData USING CarbonAnalytics OPTIONS (tableName "DEVICE_TEMPERATURE_SUMMARY", schema "temperature FLOAT, deviceType STRING -i, deviceId STRING -i, owner STRING -i, time LONG -i",primaryKeys "deviceType, deviceId, owner, time");
+
+
+        insert overwrite table DeviceTemperatureSummaryData select temperature, meta_deviceType as deviceType, meta_deviceId as deviceId, meta_owner as owner, cast(meta_time/1000 as BIGINT)as time from DeviceTemperatureData group by temperature, meta_deviceType, meta_deviceId, meta_owner, cast(meta_time/1000 as BIGINT);
+    </Script>
+    <CronExpression>0 * * * * ?</CronExpression>
+</Analytics>
diff --git a/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/Temperature_Sensor/Sparkscripts_1.0.0/artifact.xml b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/Temperature_Sensor/Sparkscripts_1.0.0/artifact.xml
new file mode 100644
index 0000000000..58c2dcc17f
--- /dev/null
+++ b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/Temperature_Sensor/Sparkscripts_1.0.0/artifact.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<artifact name="Sparkscripts" version="1.0.0" type="analytics/spark" serverRole="DataAnalyticsServer">
+    <file>Temperature_Sensor_Script.xml</file>
+</artifact>
diff --git a/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/Temperature_Sensor/artifacts.xml b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/Temperature_Sensor/artifacts.xml
new file mode 100644
index 0000000000..b53507636b
--- /dev/null
+++ b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/Temperature_Sensor/artifacts.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<artifacts>
+    <artifact name="IoTServer_Sensors_CAPP" version="1.0.0" type="carbon/application">        
+
+		<dependency artifact="Eventstream_temperature" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+		<dependency artifact="Eventstore_temperature" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+		<dependency artifact="Eventreceiver_temperature" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+
+		<dependency artifact="Sparkscripts" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+    </artifact>
+</artifacts>
diff --git a/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/build.xml b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/build.xml
new file mode 100644
index 0000000000..71411aa34f
--- /dev/null
+++ b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/build.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="create-sample-sensor-capps" default="zip" basedir=".">
+
+    <property name="project-name" value="${ant.project.name}"/>
+    <property name="target-dir" value="../org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/carbonapps"/>
+
+    <property name="Temperature_Sensor_dir" value="Temperature_Sensor"/>
+
+    <target name="clean">
+        <delete dir="${target-dir}" />
+    </target>
+
+    <target name="zip" depends="clean">
+        <mkdir dir="${target-dir}"/>
+        <zip destfile="${target-dir}/${Temperature_Sensor_dir}.car">
+            <zipfileset dir="${Temperature_Sensor_dir}"/>
+        </zip>
+    </target>
+
+</project>
diff --git a/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/pom.xml b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/pom.xml
new file mode 100644
index 0000000000..64a7b148f5
--- /dev/null
+++ b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics/pom.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+# Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+#
+# 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.
+  -->
+<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/maven-v4_0_0.xsd">
+
+    <parent>
+        <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
+        <artifactId>device-mgt-iot-arduino-feature</artifactId>
+        <version>1.9.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.wso2.carbon.device.mgt.iot.arduino.analytics</artifactId>
+    <name>WSO2 Carbon - IoT Server Arduino Analytics capp</name>
+    <packaging>pom</packaging>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>2.4.1</version>
+                <executions>
+                    <execution>
+                        <id>auto-clean</id>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.7</version>
+                <executions>
+                    <execution>
+                        <phase>process-resources</phase>
+                        <configuration>
+                            <target>
+                                <ant antfile="build.xml" target="zip"/>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/configs/arduino.json b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/configs/arduino.json
new file mode 100644
index 0000000000..e18a6a60e1
--- /dev/null
+++ b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/configs/arduino.json
@@ -0,0 +1,18 @@
+{
+  "deviceType": {
+    "label": "Arduino",
+    "category": "iot",
+    "downloadAgentUri": "manager/device/arduino/download",
+  },
+  "analyticStreams": {
+      "name": "Temperature",
+      "table": "DEVICE_TEMPERATURE_SUMMARY",
+      "ui_unit": {
+        "name": "cdmf.unit.analytics.line-chart",
+        "data":[
+          {"column": {"name":"TIME", "label":"time", "ui-mapping":"x-axis"}},
+          {"column": {"name":"ACCELEROMETER", "label":"Accelerometer", "ui-mapping":"y-axis"}}
+        ]
+      }
+    }
+}
\ No newline at end of file
diff --git a/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/p2.inf b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/p2.inf
index 7bdbcad9c9..44f7e5c70e 100644
--- a/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/p2.inf
+++ b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/p2.inf
@@ -1,4 +1,6 @@
 instructions.configure = \
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../conf/device-types/);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.arduino_${feature.version}/configs/,target:${installFolder}/../../conf/device-types/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../conf/devicetype-conf/);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.arduino_${feature.version}/configs/,target:${installFolder}/../../conf/devicetype-conf/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\
diff --git a/features/device-mgt-iot-arduino-feature/pom.xml b/features/device-mgt-iot-arduino-feature/pom.xml
index 2dba8b7603..3fcae4bb6d 100644
--- a/features/device-mgt-iot-arduino-feature/pom.xml
+++ b/features/device-mgt-iot-arduino-feature/pom.xml
@@ -36,6 +36,7 @@
 
 	<modules>
 		<module>org.wso2.carbon.device.mgt.iot.arduino.feature</module>
-	</modules>
+        <module>org.wso2.carbon.device.mgt.iot.arduino.analytics</module>
+    </modules>
 
 </project>
diff --git a/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/configs/android.json b/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/configs/android.json
new file mode 100644
index 0000000000..3601ecb510
--- /dev/null
+++ b/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/configs/android.json
@@ -0,0 +1,6 @@
+{
+  "deviceType": {
+    "label": "Android",
+    "category" : "mobile"
+  }
+}
diff --git a/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/p2.inf b/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/p2.inf
index 0bc0624e24..9469fa7958 100644
--- a/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/p2.inf
+++ b/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/p2.inf
@@ -1,4 +1,6 @@
 instructions.configure = \
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../conf/device-types/);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.android_${feature.version}/configs/,target:${installFolder}/../../conf/device-types/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.android_${feature.version}/webapps/,target:${installFolder}/../../deployment/server/webapps/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.android_${feature.version}/jaggeryapps/,target:${installFolder}/../../deployment/server/jaggeryapps/,overwrite:true);\
diff --git a/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/configs/windows.json b/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/configs/windows.json
new file mode 100644
index 0000000000..33823e6653
--- /dev/null
+++ b/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/configs/windows.json
@@ -0,0 +1,6 @@
+{
+  "deviceType": {
+    "label": "Windows",
+    "category" : "mobile"
+  }
+}
diff --git a/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/p2.inf b/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/p2.inf
index f7de186327..217d8d8fca 100644
--- a/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/p2.inf
+++ b/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/p2.inf
@@ -1,4 +1,6 @@
 instructions.configure = \
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../conf/device-types/);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.windows_${feature.version}/configs/,target:${installFolder}/../../conf/device-types/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/jaggeryapps/,target:${installFolder}/../../deployment/server/jaggeryapps/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/webapps/,target:${installFolder}/../../deployment/server/webapps/,overwrite:true);\

From f074f7e80f60a832b19bdaef89321bffed612e31 Mon Sep 17 00:00:00 2001
From: charithag <charitha.ws@gmail.com>
Date: Mon, 4 Jan 2016 20:18:17 +0530
Subject: [PATCH 10/10] Add configs for analytics

---
 .../main/resources/configs/android_sense.json | 120 ++++++++++++++++++
 .../private/conf/device-type.json             |   6 -
 .../src/main/resources/p2.inf                 |   2 +
 .../src/main/resources/configs/arduino.json   |   4 +-
 .../private/conf/device-type.json             |   8 --
 .../src/main/resources/p2.inf                 |   2 -
 .../private/conf/device-type.json             |   7 -
 .../private/conf/device-type.json             |   8 --
 .../main/resources/configs/raspberrypi.json   |   2 -
 .../private/conf/device-type.json             |   8 --
 .../resources/configs/virtual_firealarm.json  |  21 +++
 .../private/conf/device-type.json             |   8 --
 .../src/main/resources/p2.inf                 |   4 +-
 .../private/conf/device-type.json             |   6 -
 .../src/main/resources/p2.inf                 |   2 +-
 .../private/conf/device-type.json             |   6 -
 .../src/main/resources/p2.inf                 |   2 +-
 17 files changed, 150 insertions(+), 66 deletions(-)
 create mode 100644 features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/configs/android_sense.json
 delete mode 100644 features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/private/conf/device-type.json
 delete mode 100644 features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/private/conf/device-type.json
 delete mode 100644 features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/private/conf/device-type.json
 delete mode 100644 features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone_analyzer.type-view/private/conf/device-type.json
 delete mode 100644 features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/private/conf/device-type.json
 create mode 100644 features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/configs/virtual_firealarm.json
 delete mode 100644 features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/private/conf/device-type.json
 delete mode 100644 features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/conf/device-type.json
 delete mode 100644 features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/private/conf/device-type.json

diff --git a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/configs/android_sense.json b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/configs/android_sense.json
new file mode 100644
index 0000000000..f3ab98a9bd
--- /dev/null
+++ b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/configs/android_sense.json
@@ -0,0 +1,120 @@
+{
+  "deviceType": {
+    "label": "Android Sense",
+    "category": "iot"
+  },
+  "analyticStreams": [
+    {
+      "name": "Accelerometer",
+      "table": "DEVICE_ACCELEROMETER_SUMMARY",
+      "ui_unit": {
+        "name": "cdmf.unit.analytics.line-chart",
+        "data":[
+          {"column": {"name":"TIME", "label":"time", "ui-mapping":"x-axis"}},
+          {"column": {"name":"ACCELEROMETER", "label":"Accelerometer", "ui-mapping":"y-axis"}}
+        ]
+      }
+    },
+    {
+      "name": "Battery",
+      "table": "DEVICE_BATTERY_SUMMARY",
+      "ui_unit": {
+        "name": "cdmf.unit.analytics.line-chart",
+        "data":[
+          {"column": {"name":"TIME", "label":"time", "ui-mapping":"x-axis"}},
+          {"column": {"name":"BATTERY", "label":"Battery Level", "ui-mapping":"y-axis"}}
+        ]
+      }
+    },
+    {
+      "name": "GPS",
+      "table": "DEVICE_GPS_SUMMARY",
+      "ui_unit": {
+        "name": "cdmf.unit.analytics.google-map",
+        "data":[
+          {"column": {"name":"TIME", "label":"time", "ui-mapping":"time"}},
+          {"column": {"name":"LATITUDE", "label":"Latitude", "ui-mapping":"lat"}},
+          {"column": {"name":"LONGITUDE", "label":"Longitude", "ui-mapping":"lat"}}
+        ]
+      }
+    },
+    {
+      "name": "Gravity",
+      "table": "DEVICE_GRAVITY_SUMMARY",
+      "ui_unit": {
+        "name": "cdmf.unit.analytics.line-chart",
+        "data":[
+          {"column": {"name":"TIME", "label":"time", "ui-mapping":"x-axis"}},
+          {"column": {"name":"GRAVITY", "label":"Gravity", "ui-mapping":"y-axis"}}
+        ]
+      }
+    },
+    {
+      "name": "Gyroscope",
+      "table": "DEVICE_GYROSCOPE_SUMMARY",
+      "ui_unit": {
+        "name": "cdmf.unit.analytics.line-chart",
+        "data":[
+          {"column": {"name":"TIME", "label":"time", "ui-mapping":"x-axis"}},
+          {"column": {"name":"GYROSCOPE", "label":"Gyroscope", "ui-mapping":"y-axis"}}
+        ]
+      }
+    },
+    {
+      "name": "Light",
+      "table": "DEVICE_LIGHT_SUMMARY",
+      "ui_unit": {
+        "name": "cdmf.unit.analytics.line-chart",
+        "data":[
+          {"column": {"name":"TIME", "label":"time", "ui-mapping":"x-axis"}},
+          {"column": {"name":"LIGHT", "label":"Light", "ui-mapping":"y-axis"}}
+        ]
+      }
+    },
+    {
+      "name": "Magnetic",
+      "table": "DEVICE_MAGNETIC_SUMMARY",
+      "ui_unit": {
+        "name": "cdmf.unit.analytics.line-chart",
+        "data":[
+          {"column": {"name":"TIME", "label":"time", "ui-mapping":"x-axis"}},
+          {"column": {"name":"MAGNETIC", "label":"Magnetic", "ui-mapping":"y-axis"}}
+        ]
+      }
+    },
+    {
+      "name": "Pressure",
+      "table": "DEVICE_PRESSURE_SUMMARY",
+      "ui_unit": {
+        "name": "cdmf.unit.analytics.line-chart",
+        "data":[
+          {"column": {"name":"TIME", "label":"time", "ui-mapping":"x-axis"}},
+          {"column": {"name":"PRESSURE", "label":"Pressure", "ui-mapping":"y-axis"}}
+        ]
+      }
+    },
+    {
+      "name": "Proximity",
+      "table": "DEVICE_PROXIMITY_SUMMARY",
+      "ui_unit": {
+        "name": "cdmf.unit.analytics.bar-chart",
+        "data":[
+          {"column": {"name":"TIME", "label":"time", "ui-mapping":"x-axis"}},
+          {"column": {"name":"PROXIMITY", "label":"Proximity", "ui-mapping":"y-axis"}}
+        ]
+      }
+    },
+    {
+      "name": "Rotation",
+      "table": "DEVICE_ROTATION_SUMMARY",
+      "ui_unit": "cdmf.unit.analytics.line-chart",
+      "ui_unit": {
+        "name": "cdmf.unit.analytics.line-chart",
+        "data":[
+          {"column": {"name":"TIME", "label":"time", "ui-mapping":"x-axis"}},
+          {"column": {"name":"ROTATION", "label":"Rotation", "ui-mapping":"y-axis"}}
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/private/conf/device-type.json b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/private/conf/device-type.json
deleted file mode 100644
index 105f8cbd08..0000000000
--- a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/private/conf/device-type.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "deviceType": {
-    "label": "Android Sense",
-    "category" : "iot"
-  }
-}
diff --git a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/p2.inf b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/p2.inf
index 81e14433d9..be34d4bd45 100644
--- a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/p2.inf
+++ b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/p2.inf
@@ -1,4 +1,6 @@
 instructions.configure = \
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../conf/device-types/);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm_${feature.version}/configs/,target:${installFolder}/../../conf/device-types/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.androidsense_${feature.version}/webapps/,target:${installFolder}/../../deployment/server/webapps/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/carbonapps/);\
diff --git a/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/configs/arduino.json b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/configs/arduino.json
index e18a6a60e1..08b8166d24 100644
--- a/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/configs/arduino.json
+++ b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/configs/arduino.json
@@ -4,7 +4,8 @@
     "category": "iot",
     "downloadAgentUri": "manager/device/arduino/download",
   },
-  "analyticStreams": {
+  "analyticStreams": [
+    {
       "name": "Temperature",
       "table": "DEVICE_TEMPERATURE_SUMMARY",
       "ui_unit": {
@@ -15,4 +16,5 @@
         ]
       }
     }
+  ]
 }
\ No newline at end of file
diff --git a/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/private/conf/device-type.json b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/private/conf/device-type.json
deleted file mode 100644
index 0de14e63be..0000000000
--- a/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/private/conf/device-type.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "deviceType": {
-    "label": "Arduino",
-    "category": "iot",
-    "downloadAgentUri": "manager/device/arduino/download",
-    "downloadAgentLinkGenUri" : "manager/device/arduino/generate_link"
-  }
-}
\ No newline at end of file
diff --git a/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/p2.inf b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/p2.inf
index 44f7e5c70e..ef0ff6ae94 100644
--- a/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/p2.inf
+++ b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/p2.inf
@@ -1,8 +1,6 @@
 instructions.configure = \
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../conf/device-types/);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.arduino_${feature.version}/configs/,target:${installFolder}/../../conf/device-types/,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../conf/devicetype-conf/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.arduino_${feature.version}/configs/,target:${installFolder}/../../conf/devicetype-conf/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.arduino_${feature.version}/webapps/,target:${installFolder}/../../deployment/server/webapps/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../resources/sketches/);\
diff --git a/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/private/conf/device-type.json b/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/private/conf/device-type.json
deleted file mode 100644
index 58e14efa12..0000000000
--- a/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/private/conf/device-type.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "deviceType": {
-    "label": "Digital Display",
-    "category": "iot"
-  }
-}
-
diff --git a/features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone_analyzer.type-view/private/conf/device-type.json b/features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone_analyzer.type-view/private/conf/device-type.json
deleted file mode 100644
index 31cbfa7cf8..0000000000
--- a/features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone_analyzer.type-view/private/conf/device-type.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "deviceType": {
-    "label": "Drone Analyzer",
-    "category": "iot",
-    "downloadAgentUri": "manager/device/drone_analyzer/download",
-    "downloadAgentLinkGenUri" : "manager/device/drone_analyzer/generate_link"
-  }
-}
\ No newline at end of file
diff --git a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/configs/raspberrypi.json b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/configs/raspberrypi.json
index 16d56ae001..aad069ddc8 100644
--- a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/configs/raspberrypi.json
+++ b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/configs/raspberrypi.json
@@ -3,7 +3,6 @@
     "label": "RaspberryPi",
     "category": "iot"
    },
-
   "analyticStreams": [
     {
       "name": "Temperature",
@@ -17,5 +16,4 @@
       }
     }
   ]
-
 }
\ No newline at end of file
diff --git a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/private/conf/device-type.json b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/private/conf/device-type.json
deleted file mode 100644
index 35f3ecff09..0000000000
--- a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/private/conf/device-type.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "deviceType": {
-    "label": "RaspberryPi",
-    "category": "iot",
-    "downloadAgentUri": "manager/device/raspberrypi/download",
-    "downloadAgentLinkGenUri" : "manager/device/raspberrypi/generate_link"
-  }
-}
\ No newline at end of file
diff --git a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/configs/virtual_firealarm.json b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/configs/virtual_firealarm.json
new file mode 100644
index 0000000000..57e7f0a882
--- /dev/null
+++ b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/configs/virtual_firealarm.json
@@ -0,0 +1,21 @@
+{
+  "deviceType": {
+    "label": "Virtual Firealarm",
+    "category": "iot",
+    "downloadAgentUri": "manager/device/virtual_firealarm/download",
+    "downloadAgentLinkGenUri": "manager/device/virtual_firealarm/generate_link"
+  },
+  "analyticStreams": [
+    {
+      "name": "Temperature",
+      "table": "DEVICE_TEMPERATURE_SUMMARY",
+      "ui_unit": {
+        "name": "cdmf.unit.analytics.line-chart",
+        "data":[
+          {"column": {"name":"TIME", "label":"time", "ui-mapping":"x-axis"}},
+          {"column": {"name":"TEMPERATURE", "label":"Temperature", "ui-mapping":"y-axis"}}
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/private/conf/device-type.json b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/private/conf/device-type.json
deleted file mode 100644
index 10d4fcb31e..0000000000
--- a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/private/conf/device-type.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "deviceType": {
-    "label": "Virtual Firealarm",
-    "category": "iot",
-    "downloadAgentUri": "manager/device/virtual_firealarm/download",
-    "downloadAgentLinkGenUri" : "manager/device/virtual_firealarm/generate_link"
-  }
-}
\ No newline at end of file
diff --git a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/p2.inf b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/p2.inf
index 53bbb56f9f..7711271ef6 100644
--- a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/p2.inf
+++ b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/p2.inf
@@ -1,6 +1,6 @@
 instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../conf/devicetype-conf/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm_${feature.version}/configs/,target:${installFolder}/../../conf/devicetype-conf/,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../conf/device-types/);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm_${feature.version}/configs/,target:${installFolder}/../../conf/device-types/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm_${feature.version}/webapps/,target:${installFolder}/../../deployment/server/webapps/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/carbonapps/);\
diff --git a/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/conf/device-type.json b/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/conf/device-type.json
deleted file mode 100644
index 3601ecb510..0000000000
--- a/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/conf/device-type.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "deviceType": {
-    "label": "Android",
-    "category" : "mobile"
-  }
-}
diff --git a/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/p2.inf b/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/p2.inf
index 9469fa7958..e229616385 100644
--- a/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/p2.inf
+++ b/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/p2.inf
@@ -1,6 +1,6 @@
 instructions.configure = \
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../conf/device-types/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.android_${feature.version}/configs/,target:${installFolder}/../../conf/device-types/,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.android_${feature.version}/configs/,target:${installFolder}/../../conf/device-types/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.android_${feature.version}/webapps/,target:${installFolder}/../../deployment/server/webapps/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.android_${feature.version}/jaggeryapps/,target:${installFolder}/../../deployment/server/jaggeryapps/,overwrite:true);\
diff --git a/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/private/conf/device-type.json b/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/private/conf/device-type.json
deleted file mode 100644
index 33823e6653..0000000000
--- a/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/private/conf/device-type.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "deviceType": {
-    "label": "Windows",
-    "category" : "mobile"
-  }
-}
diff --git a/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/p2.inf b/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/p2.inf
index 217d8d8fca..09f27767d5 100644
--- a/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/p2.inf
+++ b/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/p2.inf
@@ -1,6 +1,6 @@
 instructions.configure = \
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../conf/device-types/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.windows_${feature.version}/configs/,target:${installFolder}/../../conf/device-types/,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/configs/,target:${installFolder}/../../conf/device-types/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/jaggeryapps/,target:${installFolder}/../../deployment/server/jaggeryapps/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/webapps/,target:${installFolder}/../../deployment/server/webapps/,overwrite:true);\