From cb939d64162d58295573daa121674f7a36a6090f Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Wed, 4 May 2016 01:18:38 +0530
Subject: [PATCH 1/2] added template for host

---
 .../EventReceiver_AndroidSense.xml                            | 4 ++--
 .../EventReceiver_http_temperature.xml                        | 2 +-
 .../EventReceiver_mqtt_temperature.xml                        | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/Android_Sense/EventReceiver_AndroidSense_1.0.0/EventReceiver_AndroidSense.xml b/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/Android_Sense/EventReceiver_AndroidSense_1.0.0/EventReceiver_AndroidSense.xml
index ab4c8385a..1fa0ea8e8 100644
--- a/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/Android_Sense/EventReceiver_AndroidSense_1.0.0/EventReceiver_AndroidSense.xml
+++ b/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/Android_Sense/EventReceiver_AndroidSense_1.0.0/EventReceiver_AndroidSense.xml
@@ -23,8 +23,8 @@
         <property name="username">admin</property>
         <property name="contentValidationParams">device_id_json_path:event.metaData.deviceId,device_id_topic_hierarchy_index:3</property>
         <property name="contentValidation">default</property>
-        <property name="dcrUrl">https://localhost:9443/dynamic-client-web/register</property>
-        <property name="url">tcp://localhost:1883</property>
+        <property name="dcrUrl">https://${server.host}:${mgt.transport.https.port}/dynamic-client-web/register</property>
+        <property name="url">tcp://${mqtt.broker.host}:${mqtt.broker.port}</property>
         <property name="cleanSession">true</property>
     </from>
     <mapping customMapping="disable" type="json"/>
diff --git a/components/iot-plugins/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/Temperature/Eventreceiver_http_temperature_1.0.0/EventReceiver_http_temperature.xml b/components/iot-plugins/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/Temperature/Eventreceiver_http_temperature_1.0.0/EventReceiver_http_temperature.xml
index f88e6cd22..896c90dc5 100644
--- a/components/iot-plugins/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/Temperature/Eventreceiver_http_temperature_1.0.0/EventReceiver_http_temperature.xml
+++ b/components/iot-plugins/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/Temperature/Eventreceiver_http_temperature_1.0.0/EventReceiver_http_temperature.xml
@@ -24,7 +24,7 @@
     <property name="contentValidation">default</property>
     <property name="transports">all</property>
     <property name="maximumTotalHttpConnection">100</property>
-    <property name="tokenValidationEndpointUrl">https://localhost:9443/services/OAuth2TokenValidationService</property>
+    <property name="tokenValidationEndpointUrl">https://${server.host}:${mgt.transport.https.port}/services/OAuth2TokenValidationService</property>
     <property name="password">admin</property>
 </from>
 <mapping customMapping="disable" type="json"/>
diff --git a/components/iot-plugins/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/Temperature/Eventreceiver_mqtt_temperature_1.0.0/EventReceiver_mqtt_temperature.xml b/components/iot-plugins/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/Temperature/Eventreceiver_mqtt_temperature_1.0.0/EventReceiver_mqtt_temperature.xml
index 1166733c4..46964370e 100644
--- a/components/iot-plugins/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/Temperature/Eventreceiver_mqtt_temperature_1.0.0/EventReceiver_mqtt_temperature.xml
+++ b/components/iot-plugins/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/Temperature/Eventreceiver_mqtt_temperature_1.0.0/EventReceiver_mqtt_temperature.xml
@@ -23,8 +23,8 @@
     <property name="username">admin</property>
     <property name="contentValidationParams">device_id_json_path:event.metaData.deviceId,device_id_topic_hierarchy_index:3</property>
     <property name="contentValidation">default</property>
-    <property name="dcrUrl">https://localhost:9443/dynamic-client-web/register</property>
-    <property name="url">tcp://localhost:1883</property>
+    <property name="dcrUrl">https://${server.host}:${mgt.transport.https.port}/dynamic-client-web/register</property>
+    <property name="url">tcp://${mqtt.broker.host}:${mqtt.broker.port}</property>
     <property name="cleanSession">true</property>
 </from>
 <mapping customMapping="disable" type="json"/>

From 514c2074956519befd4470bff79d55cefa0a3d69 Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Wed, 4 May 2016 03:01:06 +0530
Subject: [PATCH 2/2] changes on temperate event receiver

---
 .../EventReceiver_mqtt_temperature.xml                         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/iot-plugins/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/Temperature/Eventreceiver_mqtt_temperature_1.0.0/EventReceiver_mqtt_temperature.xml b/components/iot-plugins/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/Temperature/Eventreceiver_mqtt_temperature_1.0.0/EventReceiver_mqtt_temperature.xml
index 8bb64c057..9c93e8d49 100644
--- a/components/iot-plugins/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/Temperature/Eventreceiver_mqtt_temperature_1.0.0/EventReceiver_mqtt_temperature.xml
+++ b/components/iot-plugins/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/Temperature/Eventreceiver_mqtt_temperature_1.0.0/EventReceiver_mqtt_temperature.xml
@@ -19,11 +19,12 @@
 
 <eventReceiver name="temperature-mqtt" statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventreceiver">
 <from eventAdapterType="oauth-mqtt">
-    <property name="topic">wso2/carbon.super/+/+/temperature</property>
+    <property name="topic">wso2/carbon.super/raspberrypi/+/temperature</property>
     <property name="username">admin</property>
     <property name="contentValidationParams">device_id_json_path:event.metaData.deviceId,device_id_topic_hierarchy_index:3</property>
     <property name="contentValidation">default</property>
     <property name="dcrUrl">https://${server.host}:${mgt.transport.https.port}/dynamic-client-web/register</property>
+    <property name="clientId">temperatureMqttClient</property>
     <property name="url">tcp://${mqtt.broker.host}:${mqtt.broker.port}</property>
     <property name="cleanSession">true</property>
 </from>