From 9585d316632312cbd6e09228c5795e113bebec9e Mon Sep 17 00:00:00 2001 From: lasantha Date: Thu, 22 Jun 2017 10:07:53 +0530 Subject: [PATCH] refactored accelerometer artifacts --- ...droid-Accelerometer-ExecutionPlan.siddhiql | 4 +- .../artifact.xml | 2 +- ...g_wso2_iot_android_accelerometer_stats.xml | 90 ------------------- .../artifact.xml | 2 +- ...iot.android.accelerometer.stats_1.0.0.json | 50 ----------- .../artifact.xml | 2 +- ....wso2.iot.android.accelerometer_1.0.0.json | 30 ------- 7 files changed, 5 insertions(+), 175 deletions(-) delete mode 100755 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_stats_event_sink/org_wso2_iot_android_accelerometer_stats.xml delete mode 100755 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_stats_streams/org.wso2.iot.android.accelerometer.stats_1.0.0.json delete mode 100755 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_streams/org.wso2.iot.android.accelerometer_1.0.0.json diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_executionplan/Android-Accelerometer-ExecutionPlan.siddhiql b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_executionplan/Android-Accelerometer-ExecutionPlan.siddhiql index e89e73f86..89301c04e 100755 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_executionplan/Android-Accelerometer-ExecutionPlan.siddhiql +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_executionplan/Android-Accelerometer-ExecutionPlan.siddhiql @@ -2,11 +2,11 @@ @Plan:description('Process accelerometer changes.') -@Import('org.wso2.iot.android.accelerometer:1.0.0') +@Import('iot.per.device.stream.android.accelerometer:1.0.0') define stream AccelerometerStream (meta_owner string, meta_deviceId string, meta_timestamp long, axis string, value float); -@Export('org.wso2.iot.android.accelerometer.stats:1.0.0') +@Export('iot.per.device.stream.android.accelerometer.stats:1.0.0') define stream AccelerometerStatsStream (meta_owner string, meta_deviceId string, meta_timestamp long, axis string, value float, year int, month int, day int, hour int, minute int); partition with (meta_deviceId of AccelerometerStream) diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_stats_event_sink/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_stats_event_sink/artifact.xml index ada735d4c..9eb26b391 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_stats_event_sink/artifact.xml +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_stats_event_sink/artifact.xml @@ -18,6 +18,6 @@ --> - org_wso2_iot_android_accelerometer_stats.xml + iot_per_device_stream_android_accelerometer_stats.xml diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_stats_event_sink/org_wso2_iot_android_accelerometer_stats.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_stats_event_sink/org_wso2_iot_android_accelerometer_stats.xml deleted file mode 100755 index 663853bfd..000000000 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_stats_event_sink/org_wso2_iot_android_accelerometer_stats.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - meta_owner - false - false - false - false - STRING - - - meta_deviceId - false - false - false - false - STRING - - - meta_timestamp - false - false - false - false - LONG - - - axis - false - false - false - false - STRING - - - value - false - false - false - false - FLOAT - - - year - false - false - false - false - INTEGER - - - month - false - false - false - false - INTEGER - - - day - false - false - false - false - INTEGER - - - hour - false - false - false - false - INTEGER - - - minute - false - false - false - false - INTEGER - - - - org.wso2.iot.android.accelerometer.stats:1.0.0 - - false - EVENT_STORE - \ No newline at end of file diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_stats_streams/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_stats_streams/artifact.xml index 2f5ff7deb..f3379fe5b 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_stats_streams/artifact.xml +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_stats_streams/artifact.xml @@ -18,6 +18,6 @@ --> - org.wso2.iot.android.accelerometer.stats_1.0.0.json + iot.per.device.stream.android.accelerometer.stats_1.0.0.json diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_stats_streams/org.wso2.iot.android.accelerometer.stats_1.0.0.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_stats_streams/org.wso2.iot.android.accelerometer.stats_1.0.0.json deleted file mode 100755 index e1e1567f1..000000000 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_stats_streams/org.wso2.iot.android.accelerometer.stats_1.0.0.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "name": "org.wso2.iot.android.accelerometer.stats", - "version": "1.0.0", - "nickName": "", - "description": "", - "metaData": [ - { - "name": "owner", - "type": "STRING" - }, - { - "name": "deviceId", - "type": "STRING" - }, - { - "name": "timestamp", - "type": "LONG" - } - ], - "payloadData": [ - { - "name": "axis", - "type": "STRING" - }, - { - "name": "value", - "type": "FLOAT" - }, - { - "name": "year", - "type": "INT" - }, - { - "name": "month", - "type": "INT" - }, - { - "name": "day", - "type": "INT" - }, - { - "name": "hour", - "type": "INT" - }, - { - "name": "minute", - "type": "INT" - } - ] -} \ No newline at end of file diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_streams/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_streams/artifact.xml index b2a12cc76..43194caa4 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_streams/artifact.xml +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_streams/artifact.xml @@ -18,6 +18,6 @@ --> - org.wso2.iot.android.accelerometer_1.0.0.json + iot.per.device.stream.android.accelerometer_1.0.0.json diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_streams/org.wso2.iot.android.accelerometer_1.0.0.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_streams/org.wso2.iot.android.accelerometer_1.0.0.json deleted file mode 100755 index 69d9f8db0..000000000 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_streams/org.wso2.iot.android.accelerometer_1.0.0.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "org.wso2.iot.android.accelerometer", - "version": "1.0.0", - "nickName": "", - "description": "", - "metaData": [ - { - "name": "owner", - "type": "STRING" - }, - { - "name": "deviceId", - "type": "STRING" - }, - { - "name": "timestamp", - "type": "LONG" - } - ], - "payloadData": [ - { - "name": "axis", - "type": "STRING" - }, - { - "name": "value", - "type": "FLOAT" - } - ] -} \ No newline at end of file