From 26bc2d5716fde9d09c90eae0c798e2ddc59aee8c Mon Sep 17 00:00:00 2001
From: lasantha <tcdlpds@gmail.com>
Date: Thu, 22 Jun 2017 10:58:05 +0530
Subject: [PATCH] Renamed device details and SMS stream names

---
 .../Android-SMS-ExecutionPlan.siddhiql                        | 4 ++--
 .../android_device_details_event_sink/artifact.xml            | 2 +-
 .../androidsense/android_device_details_streams/artifact.xml  | 2 +-
 .../androidsense/android_sms_script/AndroidSmsScript.xml      | 4 ++--
 .../androidsense/android_sms_stats_event_sink/artifact.xml    | 2 +-
 .../androidsense/android_sms_stats_streams/artifact.xml       | 2 +-
 .../carbonapps/androidsense/android_sms_streams/artifact.xml  | 2 +-
 7 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_sms_executionplan/Android-SMS-ExecutionPlan.siddhiql b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_sms_executionplan/Android-SMS-ExecutionPlan.siddhiql
index 1e44cf5582..39163fe412 100755
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_sms_executionplan/Android-SMS-ExecutionPlan.siddhiql
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_sms_executionplan/Android-SMS-ExecutionPlan.siddhiql
@@ -2,10 +2,10 @@
 
 @Plan:description('Process received and sent SMS details')
 
-@Import('org.wso2.iot.android.sms:1.0.0')
+@Import('iot.per.device.stream.android.sms:1.0.0')
 define stream SmsStream (meta_owner string, meta_deviceId string, meta_timestamp long, number string, type string, body string);
 
-@Export('org.wso2.iot.android.sms.stats:1.0.0')
+@Export('iot.per.device.stream.android.sms.stats:1.0.0')
 define stream SmsStatsStream (meta_owner string, meta_deviceId string, meta_timestamp long, number string, type string, year int, month int, day int, hour int, minute int);
 
 partition with (meta_deviceId of SmsStream)
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_details_event_sink/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_details_event_sink/artifact.xml
index 921342a028..e1b9330bfe 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_details_event_sink/artifact.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_details_event_sink/artifact.xml
@@ -18,6 +18,6 @@
   -->
 
 <artifact name= "android_device_details_event_sink" version="1.0.0" type="analytics/eventstore" serverRole="DataAnalyticsServer">
-	<file>org_wso2_iot_android_device_details.xml</file>
+	<file>iot_per_device_stream_android_device_details.xml</file>
 </artifact>
 
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_details_streams/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_details_streams/artifact.xml
index 884c45f882..a2bc62bdc1 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_details_streams/artifact.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_details_streams/artifact.xml
@@ -18,6 +18,6 @@
   -->
 
 <artifact name= "android_device_details_streams" version="1.0.0" type="event/stream" serverRole="DataAnalyticsServer">
-	<file>org.wso2.iot.android.device.details_1.0.0.json</file>
+	<file>iot.per.device.stream.android.device.details_1.0.0.json</file>
 </artifact>
 
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_script/AndroidSmsScript.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_script/AndroidSmsScript.xml
index e283370887..4e6c582869 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_script/AndroidSmsScript.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_script/AndroidSmsScript.xml
@@ -2,7 +2,7 @@
 <Analytics>
     <Editable>true</Editable>
     <Name>AndroidSmsScript</Name>
-    <Script>        CREATE TEMPORARY TABLE AndroidSmsData USING CarbonAnalytics OPTIONS(tableName "ORG_WSO2_IOT_ANDROID_SMS_STATS", incrementalParams "ORG_WSO2_IOT_ANDROID_SMS_STATS, DAY");
+    <Script>        CREATE TEMPORARY TABLE AndroidSmsData USING CarbonAnalytics OPTIONS(tableName "IOT_PER_DEVICE_STREAM_ANDROID_SMS_STATS", incrementalParams "IOT_PER_DEVICE_STREAM_ANDROID_SMS_STATS, DAY");
     
         CREATE TEMPORARY TABLE Android_Sms_Stat_Per_Day USING CarbonAnalytics
         OPTIONS (tableName "Android_Sms_Stat_Per_Day",
@@ -15,7 +15,7 @@
         FROM AndroidSmsData
         GROUP BY year, month, day, meta_deviceId, meta_owner, type ORDER BY timestamp DESC;
                      
-        INCREMENTAL_TABLE_COMMIT ORG_WSO2_IOT_ANDROID_SMS_STATS;
+        INCREMENTAL_TABLE_COMMIT IOT_PER_DEVICE_STREAM_ANDROID_SMS_STATS;
     </Script>
     <CronExpression>0 0/5 * * * ?</CronExpression>
 </Analytics>
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_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_sms_stats_event_sink/artifact.xml
index 40ee4c17c4..cdc4b3901b 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_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_sms_stats_event_sink/artifact.xml
@@ -18,6 +18,6 @@
   -->
 
 <artifact name= "android_sms_stats_event_sink" version="1.0.0" type="analytics/eventstore" serverRole="DataAnalyticsServer">
-	<file>org_wso2_iot_android_sms_stats.xml</file>
+	<file>iot_per_device_stream_android_sms_stats.xml</file>
 </artifact>
 
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_stats_streams/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_stats_streams/artifact.xml
index c2f3c0789c..0502b47f97 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_stats_streams/artifact.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_stats_streams/artifact.xml
@@ -18,6 +18,6 @@
   -->
 
 <artifact name= "android_sms_stats_streams" version="1.0.0" type="event/stream" serverRole="DataAnalyticsServer">
-	<file>org.wso2.iot.android.sms.stats_1.0.0.json</file>
+	<file>iot.per.device.stream.android.sms.stats_1.0.0.json</file>
 </artifact>
 
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_streams/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_streams/artifact.xml
index b8c27c416d..e7fc6f81f1 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_streams/artifact.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_streams/artifact.xml
@@ -18,6 +18,6 @@
   -->
 
 <artifact name= "android_sms_streams" version="1.0.0" type="event/stream" serverRole="DataAnalyticsServer">
-	<file>org.wso2.iot.android.sms_1.0.0.json</file>
+	<file>iot.per.device.stream.android.sms_1.0.0.json</file>
 </artifact>