diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 8b4d6540..580abf65 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -35,10 +35,6 @@
WSO2 IoT Server - Distribution
WSO2 IoT Server Distribution
-
- src/statistics/carbonapps
-
-
com.h2database.wso2
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index f00540d0..8bb9fb44 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -342,7 +342,7 @@
- src/statistics/carbonapps/target
+ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/carbonapps
${pom.artifactId}-${pom.version}/repository/deployment/server/carbonapps
diff --git a/modules/distribution/src/statistics/bamtoolbox/IOT_Sensor_Analytics.tbox b/modules/distribution/src/statistics/bamtoolbox/IOT_Sensor_Analytics.tbox
deleted file mode 100644
index 326f121e..00000000
Binary files a/modules/distribution/src/statistics/bamtoolbox/IOT_Sensor_Analytics.tbox and /dev/null differ
diff --git a/modules/distribution/src/statistics/carbonapps/Accelerometer/Eventreceiver_accelerometer_1.0.0/EventReceiver_accelerometer.xml b/modules/distribution/src/statistics/carbonapps/Accelerometer/Eventreceiver_accelerometer_1.0.0/EventReceiver_accelerometer.xml
deleted file mode 100644
index 2e43c8c1..00000000
--- a/modules/distribution/src/statistics/carbonapps/Accelerometer/Eventreceiver_accelerometer_1.0.0/EventReceiver_accelerometer.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
- false
-
-
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/Accelerometer/Eventreceiver_accelerometer_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Accelerometer/Eventreceiver_accelerometer_1.0.0/artifact.xml
deleted file mode 100644
index 0875edb2..00000000
--- a/modules/distribution/src/statistics/carbonapps/Accelerometer/Eventreceiver_accelerometer_1.0.0/artifact.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- EventReceiver_accelerometer.xml
-
diff --git a/modules/distribution/src/statistics/carbonapps/Accelerometer/Eventstore_accelerometer_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Accelerometer/Eventstore_accelerometer_1.0.0/artifact.xml
deleted file mode 100644
index 9e6f1e84..00000000
--- a/modules/distribution/src/statistics/carbonapps/Accelerometer/Eventstore_accelerometer_1.0.0/artifact.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- org_wso2_iot_devices_accelerometer.xml
-
diff --git a/modules/distribution/src/statistics/carbonapps/Accelerometer/Eventstore_accelerometer_1.0.0/org_wso2_iot_devices_accelerometer.xml b/modules/distribution/src/statistics/carbonapps/Accelerometer/Eventstore_accelerometer_1.0.0/org_wso2_iot_devices_accelerometer.xml
deleted file mode 100644
index 3312516e..00000000
--- a/modules/distribution/src/statistics/carbonapps/Accelerometer/Eventstore_accelerometer_1.0.0/org_wso2_iot_devices_accelerometer.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
- EVENT_STORE
-
-
- meta_owner
- true
- true
- false
- STRING
-
-
- meta_deviceType
- true
- true
- false
- STRING
-
-
- meta_deviceId
- true
- true
- false
- STRING
-
-
- meta_time
- true
- true
- false
- LONG
-
-
- accelerometer
- false
- false
- false
- FLOAT
-
-
-
\ No newline at end of file
diff --git a/modules/distribution/src/statistics/carbonapps/Accelerometer/Eventstream_accelerometer_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Accelerometer/Eventstream_accelerometer_1.0.0/artifact.xml
deleted file mode 100644
index 94cfa5d3..00000000
--- a/modules/distribution/src/statistics/carbonapps/Accelerometer/Eventstream_accelerometer_1.0.0/artifact.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- org.wso2.iot.devices.accelerometer_1.0.0.json
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/Accelerometer/Eventstream_accelerometer_1.0.0/org.wso2.iot.devices.accelerometer_1.0.0.json b/modules/distribution/src/statistics/carbonapps/Accelerometer/Eventstream_accelerometer_1.0.0/org.wso2.iot.devices.accelerometer_1.0.0.json
deleted file mode 100644
index db6af8ee..00000000
--- a/modules/distribution/src/statistics/carbonapps/Accelerometer/Eventstream_accelerometer_1.0.0/org.wso2.iot.devices.accelerometer_1.0.0.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "name": "org.wso2.iot.devices.accelerometer",
- "version": "1.0.0",
- "nickName": "accelerometer Data",
- "description": "accelerometer data received from the Device",
- "metaData": [
- {"name":"owner","type":"STRING"},
- {"name":"deviceType","type":"STRING"},
- {"name":"deviceId","type":"STRING"},
- {"name":"time","type":"LONG"}
- ],
- "payloadData": [
- {
- "name": "accelerometer","type": "FLOAT"
- }
- ]
-}
-
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/Accelerometer/Sparkscripts_1.0.0/Accelerometer_Sensor_Script.xml b/modules/distribution/src/statistics/carbonapps/Accelerometer/Sparkscripts_1.0.0/Accelerometer_Sensor_Script.xml
deleted file mode 100644
index 80cf89b5..00000000
--- a/modules/distribution/src/statistics/carbonapps/Accelerometer/Sparkscripts_1.0.0/Accelerometer_Sensor_Script.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- Accelerometer_Sensor_Script
-
- 0 * * * * ?
-
diff --git a/modules/distribution/src/statistics/carbonapps/Accelerometer/Sparkscripts_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Accelerometer/Sparkscripts_1.0.0/artifact.xml
deleted file mode 100644
index 9c88d819..00000000
--- a/modules/distribution/src/statistics/carbonapps/Accelerometer/Sparkscripts_1.0.0/artifact.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- Accelerometer_Sensor_Script.xml
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/Accelerometer/artifacts.xml b/modules/distribution/src/statistics/carbonapps/Accelerometer/artifacts.xml
deleted file mode 100644
index 88a8d5f5..00000000
--- a/modules/distribution/src/statistics/carbonapps/Accelerometer/artifacts.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/Battery/Eventreceiver_battery_1.0.0/EventReceiver_battery.xml b/modules/distribution/src/statistics/carbonapps/Battery/Eventreceiver_battery_1.0.0/EventReceiver_battery.xml
deleted file mode 100644
index 640da303..00000000
--- a/modules/distribution/src/statistics/carbonapps/Battery/Eventreceiver_battery_1.0.0/EventReceiver_battery.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
- false
-
-
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/Battery/Eventreceiver_battery_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Battery/Eventreceiver_battery_1.0.0/artifact.xml
deleted file mode 100644
index 00f6cbca..00000000
--- a/modules/distribution/src/statistics/carbonapps/Battery/Eventreceiver_battery_1.0.0/artifact.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- EventReceiver_battery.xml
-
diff --git a/modules/distribution/src/statistics/carbonapps/Battery/Eventstore_battery_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Battery/Eventstore_battery_1.0.0/artifact.xml
deleted file mode 100644
index 1ab97be0..00000000
--- a/modules/distribution/src/statistics/carbonapps/Battery/Eventstore_battery_1.0.0/artifact.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- org_wso2_iot_devices_battery.xml
-
diff --git a/modules/distribution/src/statistics/carbonapps/Battery/Eventstore_battery_1.0.0/org_wso2_iot_devices_battery.xml b/modules/distribution/src/statistics/carbonapps/Battery/Eventstore_battery_1.0.0/org_wso2_iot_devices_battery.xml
deleted file mode 100644
index 6f40ebb5..00000000
--- a/modules/distribution/src/statistics/carbonapps/Battery/Eventstore_battery_1.0.0/org_wso2_iot_devices_battery.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
- EVENT_STORE
-
-
- meta_owner
- true
- true
- false
- STRING
-
-
- meta_deviceType
- true
- true
- false
- STRING
-
-
- meta_deviceId
- true
- true
- false
- STRING
-
-
- meta_time
- true
- true
- false
- LONG
-
-
- battery
- false
- false
- false
- FLOAT
-
-
-
\ No newline at end of file
diff --git a/modules/distribution/src/statistics/carbonapps/Battery/Eventstream_battery_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Battery/Eventstream_battery_1.0.0/artifact.xml
deleted file mode 100644
index f3451427..00000000
--- a/modules/distribution/src/statistics/carbonapps/Battery/Eventstream_battery_1.0.0/artifact.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- org.wso2.iot.devices.battery_1.0.0.json
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/Battery/Eventstream_battery_1.0.0/org.wso2.iot.devices.battery_1.0.0.json b/modules/distribution/src/statistics/carbonapps/Battery/Eventstream_battery_1.0.0/org.wso2.iot.devices.battery_1.0.0.json
deleted file mode 100644
index c0a2106f..00000000
--- a/modules/distribution/src/statistics/carbonapps/Battery/Eventstream_battery_1.0.0/org.wso2.iot.devices.battery_1.0.0.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "name": "org.wso2.iot.devices.battery",
- "version": "1.0.0",
- "nickName": "battery Data",
- "description": "battery data received from the Device",
- "metaData": [
- {"name":"owner","type":"STRING"},
- {"name":"deviceType","type":"STRING"},
- {"name":"deviceId","type":"STRING"},
- {"name":"time","type":"LONG"}
- ],
- "payloadData": [
- {
- "name": "battery","type": "FLOAT"
- }
- ]
-}
-
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/Battery/Sparkscripts_1.0.0/Battery_Sensor_Script.xml b/modules/distribution/src/statistics/carbonapps/Battery/Sparkscripts_1.0.0/Battery_Sensor_Script.xml
deleted file mode 100644
index 005ab010..00000000
--- a/modules/distribution/src/statistics/carbonapps/Battery/Sparkscripts_1.0.0/Battery_Sensor_Script.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- Battery_Sensor_Script
-
- 0 * * * * ?
-
diff --git a/modules/distribution/src/statistics/carbonapps/Battery/Sparkscripts_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Battery/Sparkscripts_1.0.0/artifact.xml
deleted file mode 100644
index 1a1ad956..00000000
--- a/modules/distribution/src/statistics/carbonapps/Battery/Sparkscripts_1.0.0/artifact.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- Battery_Sensor_Script.xml
-
diff --git a/modules/distribution/src/statistics/carbonapps/Battery/artifacts.xml b/modules/distribution/src/statistics/carbonapps/Battery/artifacts.xml
deleted file mode 100644
index b5514bd6..00000000
--- a/modules/distribution/src/statistics/carbonapps/Battery/artifacts.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/GPS/Eventreceiver_gps_1.0.0/EventReceiver_gps.xml b/modules/distribution/src/statistics/carbonapps/GPS/Eventreceiver_gps_1.0.0/EventReceiver_gps.xml
deleted file mode 100644
index acda8f1a..00000000
--- a/modules/distribution/src/statistics/carbonapps/GPS/Eventreceiver_gps_1.0.0/EventReceiver_gps.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
- false
-
-
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/GPS/Eventreceiver_gps_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/GPS/Eventreceiver_gps_1.0.0/artifact.xml
deleted file mode 100644
index da4b5802..00000000
--- a/modules/distribution/src/statistics/carbonapps/GPS/Eventreceiver_gps_1.0.0/artifact.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- EventReceiver_gps.xml
-
diff --git a/modules/distribution/src/statistics/carbonapps/GPS/Eventstore_gps_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/GPS/Eventstore_gps_1.0.0/artifact.xml
deleted file mode 100644
index 04fe1f05..00000000
--- a/modules/distribution/src/statistics/carbonapps/GPS/Eventstore_gps_1.0.0/artifact.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- org_wso2_iot_devices_gps.xml
-
diff --git a/modules/distribution/src/statistics/carbonapps/GPS/Eventstore_gps_1.0.0/org_wso2_iot_devices_gps.xml b/modules/distribution/src/statistics/carbonapps/GPS/Eventstore_gps_1.0.0/org_wso2_iot_devices_gps.xml
deleted file mode 100644
index 98de2ba9..00000000
--- a/modules/distribution/src/statistics/carbonapps/GPS/Eventstore_gps_1.0.0/org_wso2_iot_devices_gps.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
- EVENT_STORE
-
-
- meta_owner
- true
- true
- false
- STRING
-
-
- meta_deviceType
- true
- true
- false
- STRING
-
-
- meta_deviceId
- true
- true
- false
- STRING
-
-
- meta_time
- true
- true
- false
- LONG
-
-
- latitude
- false
- false
- false
- FLOAT
-
-
- longitude
- false
- false
- false
- FLOAT
-
-
-
\ No newline at end of file
diff --git a/modules/distribution/src/statistics/carbonapps/GPS/Eventstream_gps_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/GPS/Eventstream_gps_1.0.0/artifact.xml
deleted file mode 100644
index 5d0432ee..00000000
--- a/modules/distribution/src/statistics/carbonapps/GPS/Eventstream_gps_1.0.0/artifact.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- org.wso2.iot.devices.gps_1.0.0.json
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/GPS/Eventstream_gps_1.0.0/org.wso2.iot.devices.gps_1.0.0.json b/modules/distribution/src/statistics/carbonapps/GPS/Eventstream_gps_1.0.0/org.wso2.iot.devices.gps_1.0.0.json
deleted file mode 100644
index 04d2b106..00000000
--- a/modules/distribution/src/statistics/carbonapps/GPS/Eventstream_gps_1.0.0/org.wso2.iot.devices.gps_1.0.0.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "name": "org.wso2.iot.devices.gps",
- "version": "1.0.0",
- "nickName": "GPS Data",
- "description": "GPS data received from the Device",
- "metaData": [
- {"name":"owner","type":"STRING"},
- {"name":"deviceType","type":"STRING"},
- {"name":"deviceId","type":"STRING"},
- {"name":"time","type":"LONG"}
- ],
- "payloadData": [
- {
- "name": "latitude","type": "FLOAT"
- },
- {
- "name": "longitude","type": "FLOAT"
- }
- ]
-}
-
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/GPS/Sparkscripts_1.0.0/GPS_Sensor_Script.xml b/modules/distribution/src/statistics/carbonapps/GPS/Sparkscripts_1.0.0/GPS_Sensor_Script.xml
deleted file mode 100644
index 8d67f805..00000000
--- a/modules/distribution/src/statistics/carbonapps/GPS/Sparkscripts_1.0.0/GPS_Sensor_Script.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- IoTServer_Sensor_Script
-
- 0 * * * * ?
-
diff --git a/modules/distribution/src/statistics/carbonapps/GPS/Sparkscripts_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/GPS/Sparkscripts_1.0.0/artifact.xml
deleted file mode 100644
index 19a4f36d..00000000
--- a/modules/distribution/src/statistics/carbonapps/GPS/Sparkscripts_1.0.0/artifact.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- GPS_Sensor_Script.xml
-
diff --git a/modules/distribution/src/statistics/carbonapps/GPS/artifacts.xml b/modules/distribution/src/statistics/carbonapps/GPS/artifacts.xml
deleted file mode 100644
index 8bf3d37c..00000000
--- a/modules/distribution/src/statistics/carbonapps/GPS/artifacts.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/Gravity/Eventreceiver_gravaity_1.0.0/EventReceiver_gravity.xml b/modules/distribution/src/statistics/carbonapps/Gravity/Eventreceiver_gravaity_1.0.0/EventReceiver_gravity.xml
deleted file mode 100644
index 86efcbfb..00000000
--- a/modules/distribution/src/statistics/carbonapps/Gravity/Eventreceiver_gravaity_1.0.0/EventReceiver_gravity.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
- false
-
-
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/Gravity/Eventreceiver_gravaity_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Gravity/Eventreceiver_gravaity_1.0.0/artifact.xml
deleted file mode 100644
index e150a5c6..00000000
--- a/modules/distribution/src/statistics/carbonapps/Gravity/Eventreceiver_gravaity_1.0.0/artifact.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- EventReceiver_gravity.xml
-
diff --git a/modules/distribution/src/statistics/carbonapps/Gravity/Eventstore_gravity_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Gravity/Eventstore_gravity_1.0.0/artifact.xml
deleted file mode 100644
index d54e89a9..00000000
--- a/modules/distribution/src/statistics/carbonapps/Gravity/Eventstore_gravity_1.0.0/artifact.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- org_wso2_iot_devices_gravity.xml
-
diff --git a/modules/distribution/src/statistics/carbonapps/Gravity/Eventstore_gravity_1.0.0/org_wso2_iot_devices_gravity.xml b/modules/distribution/src/statistics/carbonapps/Gravity/Eventstore_gravity_1.0.0/org_wso2_iot_devices_gravity.xml
deleted file mode 100644
index 3a575434..00000000
--- a/modules/distribution/src/statistics/carbonapps/Gravity/Eventstore_gravity_1.0.0/org_wso2_iot_devices_gravity.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
- EVENT_STORE
-
-
- meta_owner
- true
- true
- false
- STRING
-
-
- meta_deviceType
- true
- true
- false
- STRING
-
-
- meta_deviceId
- true
- true
- false
- STRING
-
-
- meta_time
- true
- true
- false
- LONG
-
-
- gravity
- false
- false
- false
- FLOAT
-
-
-
\ No newline at end of file
diff --git a/modules/distribution/src/statistics/carbonapps/Gravity/Eventstream_gravity_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Gravity/Eventstream_gravity_1.0.0/artifact.xml
deleted file mode 100644
index 2953fd5b..00000000
--- a/modules/distribution/src/statistics/carbonapps/Gravity/Eventstream_gravity_1.0.0/artifact.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- org.wso2.iot.devices.gravity_1.0.0.json
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/Gravity/Eventstream_gravity_1.0.0/org.wso2.iot.devices.gravity_1.0.0.json b/modules/distribution/src/statistics/carbonapps/Gravity/Eventstream_gravity_1.0.0/org.wso2.iot.devices.gravity_1.0.0.json
deleted file mode 100644
index f18bd87b..00000000
--- a/modules/distribution/src/statistics/carbonapps/Gravity/Eventstream_gravity_1.0.0/org.wso2.iot.devices.gravity_1.0.0.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "name": "org.wso2.iot.devices.gravity",
- "version": "1.0.0",
- "nickName": "Gravity Data",
- "description": "Gravity data received from the Device",
- "metaData": [
- {"name":"owner","type":"STRING"},
- {"name":"deviceType","type":"STRING"},
- {"name":"deviceId","type":"STRING"},
- {"name":"time","type":"LONG"}
- ],
- "payloadData": [
- {
- "name": "gravity","type": "FLOAT"
- }
- ]
-}
-
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/Gravity/Sparkscripts_1.0.0/Gravity_Sensor_Script.xml b/modules/distribution/src/statistics/carbonapps/Gravity/Sparkscripts_1.0.0/Gravity_Sensor_Script.xml
deleted file mode 100644
index 34bcb8d0..00000000
--- a/modules/distribution/src/statistics/carbonapps/Gravity/Sparkscripts_1.0.0/Gravity_Sensor_Script.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- IoTServer_Sensor_Script
-
- 0 * * * * ?
-
diff --git a/modules/distribution/src/statistics/carbonapps/Gravity/Sparkscripts_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Gravity/Sparkscripts_1.0.0/artifact.xml
deleted file mode 100644
index 0d5f122e..00000000
--- a/modules/distribution/src/statistics/carbonapps/Gravity/Sparkscripts_1.0.0/artifact.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- Gravity_Sensor_Script.xml
-
diff --git a/modules/distribution/src/statistics/carbonapps/Gravity/artifacts.xml b/modules/distribution/src/statistics/carbonapps/Gravity/artifacts.xml
deleted file mode 100644
index 1a9e815e..00000000
--- a/modules/distribution/src/statistics/carbonapps/Gravity/artifacts.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/Gyroscope/Eventreceiver_gyroscope_1.0.0/EventReceiver_gyroscope.xml b/modules/distribution/src/statistics/carbonapps/Gyroscope/Eventreceiver_gyroscope_1.0.0/EventReceiver_gyroscope.xml
deleted file mode 100644
index f5aa74ea..00000000
--- a/modules/distribution/src/statistics/carbonapps/Gyroscope/Eventreceiver_gyroscope_1.0.0/EventReceiver_gyroscope.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
- false
-
-
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/Gyroscope/Eventreceiver_gyroscope_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Gyroscope/Eventreceiver_gyroscope_1.0.0/artifact.xml
deleted file mode 100644
index 4d4a7b91..00000000
--- a/modules/distribution/src/statistics/carbonapps/Gyroscope/Eventreceiver_gyroscope_1.0.0/artifact.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- EventReceiver_gyroscope.xml
-
diff --git a/modules/distribution/src/statistics/carbonapps/Gyroscope/Eventstore_gyroscope_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Gyroscope/Eventstore_gyroscope_1.0.0/artifact.xml
deleted file mode 100644
index 73fbde21..00000000
--- a/modules/distribution/src/statistics/carbonapps/Gyroscope/Eventstore_gyroscope_1.0.0/artifact.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- org_wso2_iot_devices_gyroscope.xml
-
diff --git a/modules/distribution/src/statistics/carbonapps/Gyroscope/Eventstore_gyroscope_1.0.0/org_wso2_iot_devices_gyroscope.xml b/modules/distribution/src/statistics/carbonapps/Gyroscope/Eventstore_gyroscope_1.0.0/org_wso2_iot_devices_gyroscope.xml
deleted file mode 100644
index 603711c1..00000000
--- a/modules/distribution/src/statistics/carbonapps/Gyroscope/Eventstore_gyroscope_1.0.0/org_wso2_iot_devices_gyroscope.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
- EVENT_STORE
-
-
- meta_owner
- true
- true
- false
- STRING
-
-
- meta_deviceType
- true
- true
- false
- STRING
-
-
- meta_deviceId
- true
- true
- false
- STRING
-
-
- meta_time
- true
- true
- false
- LONG
-
-
- gyroscope
- false
- false
- false
- FLOAT
-
-
-
\ No newline at end of file
diff --git a/modules/distribution/src/statistics/carbonapps/Gyroscope/Eventstream_gyroscope_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Gyroscope/Eventstream_gyroscope_1.0.0/artifact.xml
deleted file mode 100644
index e09e166e..00000000
--- a/modules/distribution/src/statistics/carbonapps/Gyroscope/Eventstream_gyroscope_1.0.0/artifact.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- org.wso2.iot.devices.gyroscope_1.0.0.json
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/Gyroscope/Eventstream_gyroscope_1.0.0/org.wso2.iot.devices.gyroscope_1.0.0.json b/modules/distribution/src/statistics/carbonapps/Gyroscope/Eventstream_gyroscope_1.0.0/org.wso2.iot.devices.gyroscope_1.0.0.json
deleted file mode 100644
index 0583da29..00000000
--- a/modules/distribution/src/statistics/carbonapps/Gyroscope/Eventstream_gyroscope_1.0.0/org.wso2.iot.devices.gyroscope_1.0.0.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "name": "org.wso2.iot.devices.gyroscope",
- "version": "1.0.0",
- "nickName": "Gyroscope Data",
- "description": "Gyroscope data received from the Device",
- "metaData": [
- {"name":"owner","type":"STRING"},
- {"name":"deviceType","type":"STRING"},
- {"name":"deviceId","type":"STRING"},
- {"name":"time","type":"LONG"}
- ],
- "payloadData": [
- {
- "name": "gyroscope","type": "FLOAT"
- }
- ]
-}
-
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/Gyroscope/Sparkscripts_1.0.0/Gyroscope_Sensor_Script.xml b/modules/distribution/src/statistics/carbonapps/Gyroscope/Sparkscripts_1.0.0/Gyroscope_Sensor_Script.xml
deleted file mode 100644
index f26032cf..00000000
--- a/modules/distribution/src/statistics/carbonapps/Gyroscope/Sparkscripts_1.0.0/Gyroscope_Sensor_Script.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- IoTServer_Sensor_Script
-
- 0 * * * * ?
-
diff --git a/modules/distribution/src/statistics/carbonapps/Gyroscope/Sparkscripts_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Gyroscope/Sparkscripts_1.0.0/artifact.xml
deleted file mode 100644
index 3fcf3d50..00000000
--- a/modules/distribution/src/statistics/carbonapps/Gyroscope/Sparkscripts_1.0.0/artifact.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- Gyroscope_Sensor_Script.xml
-
diff --git a/modules/distribution/src/statistics/carbonapps/Gyroscope/artifacts.xml b/modules/distribution/src/statistics/carbonapps/Gyroscope/artifacts.xml
deleted file mode 100644
index 6a3ea818..00000000
--- a/modules/distribution/src/statistics/carbonapps/Gyroscope/artifacts.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/Light/Eventreceiver_light_1.0.0/EventReceiver_light.xml b/modules/distribution/src/statistics/carbonapps/Light/Eventreceiver_light_1.0.0/EventReceiver_light.xml
deleted file mode 100644
index ef4ec04d..00000000
--- a/modules/distribution/src/statistics/carbonapps/Light/Eventreceiver_light_1.0.0/EventReceiver_light.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
- false
-
-
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/Light/Eventreceiver_light_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Light/Eventreceiver_light_1.0.0/artifact.xml
deleted file mode 100644
index a7d13f8d..00000000
--- a/modules/distribution/src/statistics/carbonapps/Light/Eventreceiver_light_1.0.0/artifact.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- EventReceiver_light.xml
-
diff --git a/modules/distribution/src/statistics/carbonapps/Light/Eventstore_light_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Light/Eventstore_light_1.0.0/artifact.xml
deleted file mode 100644
index b424b32d..00000000
--- a/modules/distribution/src/statistics/carbonapps/Light/Eventstore_light_1.0.0/artifact.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- org_wso2_iot_devices_light.xml
-
diff --git a/modules/distribution/src/statistics/carbonapps/Light/Eventstore_light_1.0.0/org_wso2_iot_devices_light.xml b/modules/distribution/src/statistics/carbonapps/Light/Eventstore_light_1.0.0/org_wso2_iot_devices_light.xml
deleted file mode 100644
index 4ccd871b..00000000
--- a/modules/distribution/src/statistics/carbonapps/Light/Eventstore_light_1.0.0/org_wso2_iot_devices_light.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
- EVENT_STORE
-
-
- meta_owner
- true
- true
- false
- STRING
-
-
- meta_deviceType
- true
- true
- false
- STRING
-
-
- meta_deviceId
- true
- true
- false
- STRING
-
-
- meta_time
- true
- true
- false
- LONG
-
-
- light
- false
- false
- false
- FLOAT
-
-
-
\ No newline at end of file
diff --git a/modules/distribution/src/statistics/carbonapps/Light/Eventstream_light_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Light/Eventstream_light_1.0.0/artifact.xml
deleted file mode 100644
index 39d09aff..00000000
--- a/modules/distribution/src/statistics/carbonapps/Light/Eventstream_light_1.0.0/artifact.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- org.wso2.iot.devices.light_1.0.0.json
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/Light/Eventstream_light_1.0.0/org.wso2.iot.devices.light_1.0.0.json b/modules/distribution/src/statistics/carbonapps/Light/Eventstream_light_1.0.0/org.wso2.iot.devices.light_1.0.0.json
deleted file mode 100644
index 253f0b0c..00000000
--- a/modules/distribution/src/statistics/carbonapps/Light/Eventstream_light_1.0.0/org.wso2.iot.devices.light_1.0.0.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "name": "org.wso2.iot.devices.light",
- "version": "1.0.0",
- "nickName": "light Data",
- "description": "light data received from the Device",
- "metaData": [
- {"name":"owner","type":"STRING"},
- {"name":"deviceType","type":"STRING"},
- {"name":"deviceId","type":"STRING"},
- {"name":"time","type":"LONG"}
- ],
- "payloadData": [
- {
- "name": "light","type": "FLOAT"
- }
- ]
-}
-
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/Light/Sparkscripts_1.0.0/Light_Sensor_Script.xml b/modules/distribution/src/statistics/carbonapps/Light/Sparkscripts_1.0.0/Light_Sensor_Script.xml
deleted file mode 100644
index 930fd26e..00000000
--- a/modules/distribution/src/statistics/carbonapps/Light/Sparkscripts_1.0.0/Light_Sensor_Script.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- Light_Sensor_Script
-
- 0 * * * * ?
-
diff --git a/modules/distribution/src/statistics/carbonapps/Light/Sparkscripts_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Light/Sparkscripts_1.0.0/artifact.xml
deleted file mode 100644
index 30953886..00000000
--- a/modules/distribution/src/statistics/carbonapps/Light/Sparkscripts_1.0.0/artifact.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- Light_Sensor_Script.xml
-
diff --git a/modules/distribution/src/statistics/carbonapps/Light/artifacts.xml b/modules/distribution/src/statistics/carbonapps/Light/artifacts.xml
deleted file mode 100644
index 79bc08b5..00000000
--- a/modules/distribution/src/statistics/carbonapps/Light/artifacts.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/Magnetic/Eventreceiver_magnetic_1.0.0/EventReceiver_magnetic.xml b/modules/distribution/src/statistics/carbonapps/Magnetic/Eventreceiver_magnetic_1.0.0/EventReceiver_magnetic.xml
deleted file mode 100644
index 22e8e22f..00000000
--- a/modules/distribution/src/statistics/carbonapps/Magnetic/Eventreceiver_magnetic_1.0.0/EventReceiver_magnetic.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
- false
-
-
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/Magnetic/Eventreceiver_magnetic_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Magnetic/Eventreceiver_magnetic_1.0.0/artifact.xml
deleted file mode 100644
index 2d595f4f..00000000
--- a/modules/distribution/src/statistics/carbonapps/Magnetic/Eventreceiver_magnetic_1.0.0/artifact.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- EventReceiver_magnetic.xml
-
diff --git a/modules/distribution/src/statistics/carbonapps/Magnetic/Eventstore_magnetic_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Magnetic/Eventstore_magnetic_1.0.0/artifact.xml
deleted file mode 100644
index d84e3fea..00000000
--- a/modules/distribution/src/statistics/carbonapps/Magnetic/Eventstore_magnetic_1.0.0/artifact.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- org_wso2_iot_devices_magnetic.xml
-
diff --git a/modules/distribution/src/statistics/carbonapps/Magnetic/Eventstore_magnetic_1.0.0/org_wso2_iot_devices_magnetic.xml b/modules/distribution/src/statistics/carbonapps/Magnetic/Eventstore_magnetic_1.0.0/org_wso2_iot_devices_magnetic.xml
deleted file mode 100644
index eefb1fb0..00000000
--- a/modules/distribution/src/statistics/carbonapps/Magnetic/Eventstore_magnetic_1.0.0/org_wso2_iot_devices_magnetic.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
- EVENT_STORE
-
-
- meta_owner
- true
- true
- false
- STRING
-
-
- meta_deviceType
- true
- true
- false
- STRING
-
-
- meta_deviceId
- true
- true
- false
- STRING
-
-
- meta_time
- true
- true
- false
- LONG
-
-
- magnetic
- false
- false
- false
- FLOAT
-
-
-
\ No newline at end of file
diff --git a/modules/distribution/src/statistics/carbonapps/Magnetic/Eventstream_magnetic_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Magnetic/Eventstream_magnetic_1.0.0/artifact.xml
deleted file mode 100644
index 2d071139..00000000
--- a/modules/distribution/src/statistics/carbonapps/Magnetic/Eventstream_magnetic_1.0.0/artifact.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- org.wso2.iot.devices.magnetic_1.0.0.json
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/Magnetic/Eventstream_magnetic_1.0.0/org.wso2.iot.devices.magnetic_1.0.0.json b/modules/distribution/src/statistics/carbonapps/Magnetic/Eventstream_magnetic_1.0.0/org.wso2.iot.devices.magnetic_1.0.0.json
deleted file mode 100644
index 5cbe22ba..00000000
--- a/modules/distribution/src/statistics/carbonapps/Magnetic/Eventstream_magnetic_1.0.0/org.wso2.iot.devices.magnetic_1.0.0.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "name": "org.wso2.iot.devices.magnetic",
- "version": "1.0.0",
- "nickName": "magnetic Data",
- "description": "magnetic data received from the Device",
- "metaData": [
- {"name":"owner","type":"STRING"},
- {"name":"deviceType","type":"STRING"},
- {"name":"deviceId","type":"STRING"},
- {"name":"time","type":"LONG"}
- ],
- "payloadData": [
- {
- "name": "magnetic","type": "FLOAT"
- }
- ]
-}
-
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/Magnetic/Sparkscripts_1.0.0/Magnetic_Sensor_Script.xml b/modules/distribution/src/statistics/carbonapps/Magnetic/Sparkscripts_1.0.0/Magnetic_Sensor_Script.xml
deleted file mode 100644
index 7df6931e..00000000
--- a/modules/distribution/src/statistics/carbonapps/Magnetic/Sparkscripts_1.0.0/Magnetic_Sensor_Script.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- IoTServer_Sensor_Script
-
- 0 * * * * ?
-
diff --git a/modules/distribution/src/statistics/carbonapps/Magnetic/Sparkscripts_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Magnetic/Sparkscripts_1.0.0/artifact.xml
deleted file mode 100644
index 81a49e1f..00000000
--- a/modules/distribution/src/statistics/carbonapps/Magnetic/Sparkscripts_1.0.0/artifact.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- Magnetic_Sensor_Script.xml
-
diff --git a/modules/distribution/src/statistics/carbonapps/Magnetic/artifacts.xml b/modules/distribution/src/statistics/carbonapps/Magnetic/artifacts.xml
deleted file mode 100644
index 8c013b5d..00000000
--- a/modules/distribution/src/statistics/carbonapps/Magnetic/artifacts.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/Pressure/Eventreceiver_pressure_1.0.0/EventReceiver_pressure.xml b/modules/distribution/src/statistics/carbonapps/Pressure/Eventreceiver_pressure_1.0.0/EventReceiver_pressure.xml
deleted file mode 100644
index 76ac8619..00000000
--- a/modules/distribution/src/statistics/carbonapps/Pressure/Eventreceiver_pressure_1.0.0/EventReceiver_pressure.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
- false
-
-
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/Pressure/Eventreceiver_pressure_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Pressure/Eventreceiver_pressure_1.0.0/artifact.xml
deleted file mode 100644
index c611037c..00000000
--- a/modules/distribution/src/statistics/carbonapps/Pressure/Eventreceiver_pressure_1.0.0/artifact.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- EventReceiver_pressure.xml
-
diff --git a/modules/distribution/src/statistics/carbonapps/Pressure/Eventstore_pressure_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Pressure/Eventstore_pressure_1.0.0/artifact.xml
deleted file mode 100644
index dfae64f1..00000000
--- a/modules/distribution/src/statistics/carbonapps/Pressure/Eventstore_pressure_1.0.0/artifact.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- org_wso2_iot_devices_pressure.xml
-
diff --git a/modules/distribution/src/statistics/carbonapps/Pressure/Eventstore_pressure_1.0.0/org_wso2_iot_devices_pressure.xml b/modules/distribution/src/statistics/carbonapps/Pressure/Eventstore_pressure_1.0.0/org_wso2_iot_devices_pressure.xml
deleted file mode 100644
index 2533da29..00000000
--- a/modules/distribution/src/statistics/carbonapps/Pressure/Eventstore_pressure_1.0.0/org_wso2_iot_devices_pressure.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
- EVENT_STORE
-
-
- meta_owner
- true
- true
- false
- STRING
-
-
- meta_deviceType
- true
- true
- false
- STRING
-
-
- meta_deviceId
- true
- true
- false
- STRING
-
-
- meta_time
- true
- true
- false
- LONG
-
-
- pressure
- false
- false
- false
- FLOAT
-
-
-
\ No newline at end of file
diff --git a/modules/distribution/src/statistics/carbonapps/Pressure/Eventstream_pressure_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Pressure/Eventstream_pressure_1.0.0/artifact.xml
deleted file mode 100644
index 2a2f8868..00000000
--- a/modules/distribution/src/statistics/carbonapps/Pressure/Eventstream_pressure_1.0.0/artifact.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- org.wso2.iot.devices.pressure_1.0.0.json
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/Pressure/Eventstream_pressure_1.0.0/org.wso2.iot.devices.pressure_1.0.0.json b/modules/distribution/src/statistics/carbonapps/Pressure/Eventstream_pressure_1.0.0/org.wso2.iot.devices.pressure_1.0.0.json
deleted file mode 100644
index f58059d2..00000000
--- a/modules/distribution/src/statistics/carbonapps/Pressure/Eventstream_pressure_1.0.0/org.wso2.iot.devices.pressure_1.0.0.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "name": "org.wso2.iot.devices.pressure",
- "version": "1.0.0",
- "nickName": "Pressure Data",
- "description": "Pressure data received from the Device",
- "metaData": [
- {"name":"owner","type":"STRING"},
- {"name":"deviceType","type":"STRING"},
- {"name":"deviceId","type":"STRING"},
- {"name":"time","type":"LONG"}
- ],
- "payloadData": [
- {
- "name": "pressure","type": "FLOAT"
- }
- ]
-}
-
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/Pressure/Sparkscripts_1.0.0/Pressure_Sensor_Script.xml b/modules/distribution/src/statistics/carbonapps/Pressure/Sparkscripts_1.0.0/Pressure_Sensor_Script.xml
deleted file mode 100644
index d6c0e353..00000000
--- a/modules/distribution/src/statistics/carbonapps/Pressure/Sparkscripts_1.0.0/Pressure_Sensor_Script.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- IoTServer_Sensor_Script
-
- 0 * * * * ?
-
diff --git a/modules/distribution/src/statistics/carbonapps/Pressure/Sparkscripts_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Pressure/Sparkscripts_1.0.0/artifact.xml
deleted file mode 100644
index 046bc619..00000000
--- a/modules/distribution/src/statistics/carbonapps/Pressure/Sparkscripts_1.0.0/artifact.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- Pressure_Sensor_Script.xml
-
diff --git a/modules/distribution/src/statistics/carbonapps/Pressure/artifacts.xml b/modules/distribution/src/statistics/carbonapps/Pressure/artifacts.xml
deleted file mode 100644
index 249b33da..00000000
--- a/modules/distribution/src/statistics/carbonapps/Pressure/artifacts.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/Proximity/Eventreceiver_proximity_1.0.0/EventReceiver_proximity.xml b/modules/distribution/src/statistics/carbonapps/Proximity/Eventreceiver_proximity_1.0.0/EventReceiver_proximity.xml
deleted file mode 100644
index d57d2e0a..00000000
--- a/modules/distribution/src/statistics/carbonapps/Proximity/Eventreceiver_proximity_1.0.0/EventReceiver_proximity.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
- false
-
-
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/Proximity/Eventreceiver_proximity_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Proximity/Eventreceiver_proximity_1.0.0/artifact.xml
deleted file mode 100644
index 1e3fbccb..00000000
--- a/modules/distribution/src/statistics/carbonapps/Proximity/Eventreceiver_proximity_1.0.0/artifact.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- EventReceiver_proximity.xml
-
diff --git a/modules/distribution/src/statistics/carbonapps/Proximity/Eventstore_proximity_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Proximity/Eventstore_proximity_1.0.0/artifact.xml
deleted file mode 100644
index bdcffa5b..00000000
--- a/modules/distribution/src/statistics/carbonapps/Proximity/Eventstore_proximity_1.0.0/artifact.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- org_wso2_iot_devices_proximity.xml
-
diff --git a/modules/distribution/src/statistics/carbonapps/Proximity/Eventstore_proximity_1.0.0/org_wso2_iot_devices_proximity.xml b/modules/distribution/src/statistics/carbonapps/Proximity/Eventstore_proximity_1.0.0/org_wso2_iot_devices_proximity.xml
deleted file mode 100644
index f0958f01..00000000
--- a/modules/distribution/src/statistics/carbonapps/Proximity/Eventstore_proximity_1.0.0/org_wso2_iot_devices_proximity.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
- EVENT_STORE
-
-
- meta_owner
- true
- true
- false
- STRING
-
-
- meta_deviceType
- true
- true
- false
- STRING
-
-
- meta_deviceId
- true
- true
- false
- STRING
-
-
- meta_time
- true
- true
- false
- LONG
-
-
- proximity
- false
- false
- false
- FLOAT
-
-
-
\ No newline at end of file
diff --git a/modules/distribution/src/statistics/carbonapps/Proximity/Eventstream_proximity_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Proximity/Eventstream_proximity_1.0.0/artifact.xml
deleted file mode 100644
index bec60673..00000000
--- a/modules/distribution/src/statistics/carbonapps/Proximity/Eventstream_proximity_1.0.0/artifact.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- org.wso2.iot.devices.proximity_1.0.0.json
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/Proximity/Eventstream_proximity_1.0.0/org.wso2.iot.devices.proximity_1.0.0.json b/modules/distribution/src/statistics/carbonapps/Proximity/Eventstream_proximity_1.0.0/org.wso2.iot.devices.proximity_1.0.0.json
deleted file mode 100644
index 88fb9008..00000000
--- a/modules/distribution/src/statistics/carbonapps/Proximity/Eventstream_proximity_1.0.0/org.wso2.iot.devices.proximity_1.0.0.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "name": "org.wso2.iot.devices.proximity",
- "version": "1.0.0",
- "nickName": "Proximity Data",
- "description": "Proximity data received from the Device",
- "metaData": [
- {"name":"owner","type":"STRING"},
- {"name":"deviceType","type":"STRING"},
- {"name":"deviceId","type":"STRING"},
- {"name":"time","type":"LONG"}
- ],
- "payloadData": [
- {
- "name": "proximity","type": "FLOAT"
- }
- ]
-}
-
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/Proximity/Sparkscripts_1.0.0/Proximity_Sensor_Script.xml b/modules/distribution/src/statistics/carbonapps/Proximity/Sparkscripts_1.0.0/Proximity_Sensor_Script.xml
deleted file mode 100644
index 889cfca6..00000000
--- a/modules/distribution/src/statistics/carbonapps/Proximity/Sparkscripts_1.0.0/Proximity_Sensor_Script.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- IoTServer_Sensor_Script
-
- 0 * * * * ?
-
diff --git a/modules/distribution/src/statistics/carbonapps/Proximity/Sparkscripts_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Proximity/Sparkscripts_1.0.0/artifact.xml
deleted file mode 100644
index c3bc1d61..00000000
--- a/modules/distribution/src/statistics/carbonapps/Proximity/Sparkscripts_1.0.0/artifact.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- Proximity_Sensor_Script.xml
-
diff --git a/modules/distribution/src/statistics/carbonapps/Proximity/artifacts.xml b/modules/distribution/src/statistics/carbonapps/Proximity/artifacts.xml
deleted file mode 100644
index d682d5b6..00000000
--- a/modules/distribution/src/statistics/carbonapps/Proximity/artifacts.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/distribution/src/statistics/carbonapps/Rotation/Eventreceiver_rotation_1.0.0/EventReceiver_rotation.xml b/modules/distribution/src/statistics/carbonapps/Rotation/Eventreceiver_rotation_1.0.0/EventReceiver_rotation.xml
deleted file mode 100644
index df0dfb57..00000000
--- a/modules/distribution/src/statistics/carbonapps/Rotation/Eventreceiver_rotation_1.0.0/EventReceiver_rotation.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
- false
-
-
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/Rotation/Eventreceiver_rotation_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Rotation/Eventreceiver_rotation_1.0.0/artifact.xml
deleted file mode 100644
index 3395400e..00000000
--- a/modules/distribution/src/statistics/carbonapps/Rotation/Eventreceiver_rotation_1.0.0/artifact.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- EventReceiver_rotation.xml
-
diff --git a/modules/distribution/src/statistics/carbonapps/Rotation/Eventstore_rotation_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Rotation/Eventstore_rotation_1.0.0/artifact.xml
deleted file mode 100644
index 6a75eba8..00000000
--- a/modules/distribution/src/statistics/carbonapps/Rotation/Eventstore_rotation_1.0.0/artifact.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- org_wso2_iot_devices_rotation.xml
-
diff --git a/modules/distribution/src/statistics/carbonapps/Rotation/Eventstore_rotation_1.0.0/org_wso2_iot_devices_rotation.xml b/modules/distribution/src/statistics/carbonapps/Rotation/Eventstore_rotation_1.0.0/org_wso2_iot_devices_rotation.xml
deleted file mode 100644
index 8e6863f5..00000000
--- a/modules/distribution/src/statistics/carbonapps/Rotation/Eventstore_rotation_1.0.0/org_wso2_iot_devices_rotation.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
- EVENT_STORE
-
-
- meta_owner
- true
- true
- false
- STRING
-
-
- meta_deviceType
- true
- true
- false
- STRING
-
-
- meta_deviceId
- true
- true
- false
- STRING
-
-
- meta_time
- true
- true
- false
- LONG
-
-
- rotation
- false
- false
- false
- FLOAT
-
-
-
\ No newline at end of file
diff --git a/modules/distribution/src/statistics/carbonapps/Rotation/Eventstream_rotation_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Rotation/Eventstream_rotation_1.0.0/artifact.xml
deleted file mode 100644
index 21982655..00000000
--- a/modules/distribution/src/statistics/carbonapps/Rotation/Eventstream_rotation_1.0.0/artifact.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- org.wso2.iot.devices.rotation_1.0.0.json
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/Rotation/Eventstream_rotation_1.0.0/org.wso2.iot.devices.rotation_1.0.0.json b/modules/distribution/src/statistics/carbonapps/Rotation/Eventstream_rotation_1.0.0/org.wso2.iot.devices.rotation_1.0.0.json
deleted file mode 100644
index 03881bcf..00000000
--- a/modules/distribution/src/statistics/carbonapps/Rotation/Eventstream_rotation_1.0.0/org.wso2.iot.devices.rotation_1.0.0.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "name": "org.wso2.iot.devices.rotation",
- "version": "1.0.0",
- "nickName": "Rotation Data",
- "description": "Rotation data received from the Device",
- "metaData": [
- {"name":"owner","type":"STRING"},
- {"name":"deviceType","type":"STRING"},
- {"name":"deviceId","type":"STRING"},
- {"name":"time","type":"LONG"}
- ],
- "payloadData": [
- {
- "name": "rotation","type": "FLOAT"
- }
- ]
-}
-
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/Rotation/Sparkscripts_1.0.0/Rotation_Sensor_Script.xml b/modules/distribution/src/statistics/carbonapps/Rotation/Sparkscripts_1.0.0/Rotation_Sensor_Script.xml
deleted file mode 100644
index ed2730eb..00000000
--- a/modules/distribution/src/statistics/carbonapps/Rotation/Sparkscripts_1.0.0/Rotation_Sensor_Script.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- IoTServer_Sensor_Script
-
- 0 * * * * ?
-
diff --git a/modules/distribution/src/statistics/carbonapps/Rotation/Sparkscripts_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Rotation/Sparkscripts_1.0.0/artifact.xml
deleted file mode 100644
index 59ec9383..00000000
--- a/modules/distribution/src/statistics/carbonapps/Rotation/Sparkscripts_1.0.0/artifact.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- Rotation_Sensor_Script.xml
-
diff --git a/modules/distribution/src/statistics/carbonapps/Rotation/artifacts.xml b/modules/distribution/src/statistics/carbonapps/Rotation/artifacts.xml
deleted file mode 100644
index 4a2b6e95..00000000
--- a/modules/distribution/src/statistics/carbonapps/Rotation/artifacts.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventreceiver_temperature_1.0.0/EventReceiver_temperature.xml b/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventreceiver_temperature_1.0.0/EventReceiver_temperature.xml
deleted file mode 100644
index 6786696c..00000000
--- a/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventreceiver_temperature_1.0.0/EventReceiver_temperature.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
- false
-
-
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventreceiver_temperature_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventreceiver_temperature_1.0.0/artifact.xml
deleted file mode 100644
index b72e1ff7..00000000
--- a/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventreceiver_temperature_1.0.0/artifact.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- EventReceiver_temperature.xml
-
diff --git a/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventstore_temperature_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventstore_temperature_1.0.0/artifact.xml
deleted file mode 100644
index 90b14c11..00000000
--- a/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventstore_temperature_1.0.0/artifact.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- org_wso2_iot_devices_temperature.xml
-
diff --git a/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventstore_temperature_1.0.0/org_wso2_iot_devices_temperature.xml b/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventstore_temperature_1.0.0/org_wso2_iot_devices_temperature.xml
deleted file mode 100644
index 13a625bd..00000000
--- a/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventstore_temperature_1.0.0/org_wso2_iot_devices_temperature.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
- EVENT_STORE
-
-
- meta_owner
- true
- true
- false
- STRING
-
-
- meta_deviceType
- true
- true
- false
- STRING
-
-
- meta_deviceId
- true
- true
- false
- STRING
-
-
- meta_time
- true
- true
- false
- LONG
-
-
- temperature
- false
- false
- false
- FLOAT
-
-
-
\ No newline at end of file
diff --git a/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventstream_temperature_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventstream_temperature_1.0.0/artifact.xml
deleted file mode 100644
index 61e7903b..00000000
--- a/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventstream_temperature_1.0.0/artifact.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- org.wso2.iot.devices.temperature_1.0.0.json
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventstream_temperature_1.0.0/org.wso2.iot.devices.temperature_1.0.0.json b/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventstream_temperature_1.0.0/org.wso2.iot.devices.temperature_1.0.0.json
deleted file mode 100644
index 5d94b982..00000000
--- a/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Eventstream_temperature_1.0.0/org.wso2.iot.devices.temperature_1.0.0.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "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/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Sparkscripts_1.0.0/Temperature_Sensor_Script.xml b/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Sparkscripts_1.0.0/Temperature_Sensor_Script.xml
deleted file mode 100644
index ee6a7195..00000000
--- a/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Sparkscripts_1.0.0/Temperature_Sensor_Script.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- IoTServer_Sensor_Script
-
- 0 * * * * ?
-
diff --git a/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Sparkscripts_1.0.0/artifact.xml b/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Sparkscripts_1.0.0/artifact.xml
deleted file mode 100644
index 58c2dcc1..00000000
--- a/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/Sparkscripts_1.0.0/artifact.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- Temperature_Sensor_Script.xml
-
diff --git a/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/artifacts.xml b/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/artifacts.xml
deleted file mode 100644
index b5350763..00000000
--- a/modules/distribution/src/statistics/carbonapps/Temperature_Sensor/artifacts.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/build.xml b/modules/distribution/src/statistics/carbonapps/build.xml
deleted file mode 100644
index b3d87e62..00000000
--- a/modules/distribution/src/statistics/carbonapps/build.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/modules/distribution/src/statistics/carbonapps/pom.xml b/modules/distribution/src/statistics/carbonapps/pom.xml
deleted file mode 100644
index 56205789..00000000
--- a/modules/distribution/src/statistics/carbonapps/pom.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
-
-
-
- org.wso2.iot
- wso2iot-parent
- 1.0.0-SNAPSHOT
- ../../../../../pom.xml
-
-
- 4.0.0
- iot-sample-capps
- WSO2 iot server sample capp
- pom
-
-
-
-
- maven-clean-plugin
- 2.4.1
-
-
- auto-clean
- initialize
-
- clean
-
-
-
-
-
- maven-antrun-plugin
- 1.7
-
-
- process-resources
-
-
-
-
-
-
- run
-
-
-
-
-
-
-
-
\ No newline at end of file