From f4aad41a347b8be9df4a9c372b3ae11156b5360c Mon Sep 17 00:00:00 2001 From: lasantha Date: Thu, 22 Jun 2017 10:18:27 +0530 Subject: [PATCH] refactored Android activity artifacts --- .../android_activity_script/AndroidActivityScript.xml | 4 ++-- .../android_activity_stats_event_sink/artifact.xml | 2 +- .../androidsense/android_activity_stats_streams/artifact.xml | 2 +- .../androidsense/android_activity_streams/artifact.xml | 2 +- .../Android-Activity-ExecutionPlan.siddhiql | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_script/AndroidActivityScript.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_script/AndroidActivityScript.xml index b20721054..cb58d51c7 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_script/AndroidActivityScript.xml +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_script/AndroidActivityScript.xml @@ -2,7 +2,7 @@ true AndroidActivityScript - 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_activity_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_activity_stats_event_sink/artifact.xml index 99a20223a..3a5fed805 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_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_activity_stats_event_sink/artifact.xml @@ -18,6 +18,6 @@ --> - org_wso2_iot_android_activity_stats.xml + iot_per_device_stream_android_activity_stats.xml diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_stats_streams/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_stats_streams/artifact.xml index afa78e413..c5331928d 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_stats_streams/artifact.xml +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_stats_streams/artifact.xml @@ -18,6 +18,6 @@ --> - org.wso2.iot.android.activity.stats_1.0.0.json + iot.per.device.stream.android.activity.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_activity_streams/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_streams/artifact.xml index 8b473dd5d..dc2ba5697 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_streams/artifact.xml +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_streams/artifact.xml @@ -18,6 +18,6 @@ --> - org.wso2.iot.android.activity_1.0.0.json + iot.per.device.stream.android.activity_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_android_activity_executionplan/Android-Activity-ExecutionPlan.siddhiql b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_activity_executionplan/Android-Activity-ExecutionPlan.siddhiql index ab3edacbd..d11da88ec 100755 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_activity_executionplan/Android-Activity-ExecutionPlan.siddhiql +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_activity_executionplan/Android-Activity-ExecutionPlan.siddhiql @@ -2,10 +2,10 @@ @Plan:description('Identify the start and end of each activities') -@Import('org.wso2.iot.android.activity:1.0.0') +@Import('iot.per.device.stream.android.activity:1.0.0') define stream ActivitySream (meta_owner string, meta_deviceId string, meta_timestamp long, action string); -@Export('org.wso2.iot.android.activity.stats:1.0.0') +@Export('iot.per.device.stream.android.activity.stats:1.0.0') define stream ActivityStatsStream (meta_owner string, meta_deviceId string, meta_timestamp long, action string, duration long, year int, month int, day int, hour int, minute int); partition with (meta_deviceId of ActivitySream)