From 04566ec250cb26ec2ff88075a9021ae254f379ac Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Thu, 12 May 2016 21:59:35 +0530
Subject: [PATCH] updated event receivers

---
 .../EventReceiver_AndroidSense.xml            |  3 ++-
 .../EventReceiver_http_temperature.xml        | 25 ++++++++++---------
 .../EventReceiver_mqtt_temperature.xml        |  3 ++-
 3 files changed, 17 insertions(+), 14 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 a72ab6ca2..499c7cbf3 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
@@ -22,7 +22,8 @@
         <property name="topic">carbon.super/android_sense/+/data</property>
         <property name="username">admin</property>
         <property name="contentValidationParams">device_id_json_path:event.metaData.deviceId,device_id_topic_hierarchy_index:2</property>
-        <property name="contentValidation">default</property>
+        <property name="contentValidation">org.wso2.carbon.device.mgt.iot.input.adapter.mqtt.util.MQTTContentValidator</property>
+        <property name="contentTransformer">default</property>
         <property name="dcrUrl">https://localhost:${carbon.https.port}/dynamic-client-web/register</property>
         <property name="url">tcp://${mqtt.broker.host}:${mqtt.broker.port}</property>
         <property name="cleanSession">true</property>
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 c134fa361..c1c2dd7f1 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
@@ -17,16 +17,17 @@
   ~ under the License.
   -->
 <eventReceiver name="temperature-http" statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventreceiver">
-<from eventAdapterType="oauth-http">
-    <property name="maximumHttpConnectionPerHost">2</property>
-    <property name="username">admin</property>
-    <property name="contentValidationParams">device_id_json_path:event.metaData.deviceId</property>
-    <property name="contentValidation">default</property>
-    <property name="transports">all</property>
-    <property name="maximumTotalHttpConnection">100</property>
-    <property name="tokenValidationEndpointUrl">https://localhost:${carbon.https.port}/services/OAuth2TokenValidationService</property>
-    <property name="password">admin</property>
-</from>
-<mapping customMapping="disable" type="json"/>
-<to streamName="org.wso2.iot.devices.temperature" version="1.0.0"/>
+    <from eventAdapterType="oauth-http">
+        <property name="maximumHttpConnectionPerHost">2</property>
+        <property name="username">admin</property>
+        <property name="contentValidationParams">device_id_json_path:event.metaData.deviceId</property>
+        <property name="contentValidation">org.wso2.carbon.device.mgt.iot.input.adapter.http.util.HTTPContentValidator</property>
+        <property name="contentTransformer">default</property>
+        <property name="transports">all</property>
+        <property name="maximumTotalHttpConnection">100</property>
+        <property name="tokenValidationEndpointUrl">https://localhost:${carbon.https.port}/services/OAuth2TokenValidationService</property>
+        <property name="password">admin</property>
+    </from>
+    <mapping customMapping="disable" type="json"/>
+    <to streamName="org.wso2.iot.devices.temperature" version="1.0.0"/>
 </eventReceiver>
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 e49b93544..f1114ecc3 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
@@ -22,7 +22,8 @@
     <property name="topic">carbon.super/+/+/temperature</property>
     <property name="username">admin</property>
     <property name="contentValidationParams">device_id_json_path:event.metaData.deviceId,device_id_topic_hierarchy_index:2</property>
-    <property name="contentValidation">default</property>
+    <property name="contentValidation">org.wso2.carbon.device.mgt.iot.input.adapter.mqtt.util.MQTTContentValidator</property>
+    <property name="contentTransformer">default</property>
     <property name="dcrUrl">https://localhost:${carbon.https.port}/dynamic-client-web/register</property>
     <property name="clientId">temperatureMqttClient</property>
     <property name="url">tcp://${mqtt.broker.host}:${mqtt.broker.port}</property>