From b64e47a26a1843e883996899bcccc7b1f092f683 Mon Sep 17 00:00:00 2001 From: lasantha Date: Thu, 22 Jun 2017 10:41:26 +0530 Subject: [PATCH] Refactored Android battery artifacts --- .../Android-Battery-ExecutionPlan.siddhiql | 8 ++++---- .../android_battery_script/AndroidBatteryScript.xml | 4 ++-- .../android_battery_stats_event_sink/artifact.xml | 2 +- .../android_battery_stats_streams/artifact.xml | 2 +- .../androidsense/android_battery_streams/artifact.xml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_battery_execution_plan/Android-Battery-ExecutionPlan.siddhiql b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_battery_execution_plan/Android-Battery-ExecutionPlan.siddhiql index 68ed7fd49..f09eb33bc 100755 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_battery_execution_plan/Android-Battery-ExecutionPlan.siddhiql +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_battery_execution_plan/Android-Battery-ExecutionPlan.siddhiql @@ -3,13 +3,13 @@ @Plan:description('Find the battery status of the android device.') -@Import('org.wso2.iot.android.battery:1.0.0') -define stream BatteryStream (meta_owner string, meta_deviceId string, meta_timestamp long, level int, state string, status string, temperature int); +@Import('iot.per.device.stream.android.battery:1.0.0') +define stream BatteryStream (meta_owner string, meta_deviceId string, meta_timestamp long, level int, state string, status int, temperature int); -@Export('org.wso2.iot.android.battery.stats:1.0.0') +@Export('iot.per.device.stream.android.battery.stats:1.0.0') define stream BatteryStatsStream (meta_owner string, meta_deviceId string, meta_timestamp long, level int, state -string, status string, temperature int, year int, month int, day int, hour int, minute int); +string, status int, temperature int, year int, month int, day int, hour int, minute int); partition with (meta_deviceId of BatteryStream) begin diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_script/AndroidBatteryScript.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_script/AndroidBatteryScript.xml index 73b354fd6..525d31c23 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_script/AndroidBatteryScript.xml +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_script/AndroidBatteryScript.xml @@ -3,7 +3,7 @@ true AndroidBatteryScript 0 0/5 * * * ? diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_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_battery_stats_event_sink/artifact.xml index 41994b061..7d9cf504b 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_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_battery_stats_event_sink/artifact.xml @@ -19,6 +19,6 @@ - org_wso2_iot_android_battery_stats.xml + iot_per_device_stream_android_battery_stats.xml diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_stats_streams/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_stats_streams/artifact.xml index 56cda93fd..c37c7c374 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_stats_streams/artifact.xml +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_stats_streams/artifact.xml @@ -18,6 +18,6 @@ --> - org.wso2.iot.android.battery.stats_1.0.0.json + iot.per.device.stream.android.battery.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_battery_streams/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_streams/artifact.xml index 3719bc850..7739d2cd1 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_streams/artifact.xml +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_streams/artifact.xml @@ -18,6 +18,6 @@ --> - org.wso2.iot.android.battery_1.0.0.json + iot.per.device.stream.android.battery_1.0.0.json