From d0183deb2ad2dffa861dff45284b51fe8e210252 Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Fri, 13 May 2016 02:54:21 +0530
Subject: [PATCH] few changes in event recievers and remove type and method
 from feature

---
 .../EventReceiver_ConnectedCup.xml                  | 13 ++++++-------
 .../resources/carbonapps/ConnectedCup/artifacts.xml |  2 +-
 .../api/ConnectedCupControllerService.java          |  3 +--
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/ConnectedCup/EventReceiver_ConnectedCup_1.0.0/EventReceiver_ConnectedCup.xml b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/ConnectedCup/EventReceiver_ConnectedCup_1.0.0/EventReceiver_ConnectedCup.xml
index 94c1c435..6dbe5218 100644
--- a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/ConnectedCup/EventReceiver_ConnectedCup_1.0.0/EventReceiver_ConnectedCup.xml
+++ b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/ConnectedCup/EventReceiver_ConnectedCup_1.0.0/EventReceiver_ConnectedCup.xml
@@ -17,17 +17,16 @@
   ~ under the License.
   -->
 
-<eventReceiver name="EventReceiver_ConnectedCup" statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventreceiver">
+<eventReceiver name="connectedcup_reciever" statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventreceiver">
     <from eventAdapterType="oauth-mqtt">
-        <property name="topic">wso2/carbon.super/connectedcup/#</property>
+        <property name="topic">carbon.super/connectedcup/#</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://localhost:9443/dynamic-client-web/register</property>
-        <property name="url">tcp://localhost:1883</property>
+        <property name="contentValidation">org.wso2.carbon.device.mgt.iot.input.adapter.mqtt.util.MQTTContentValidator</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>
     </from>
     <mapping customMapping="disable" type="json"/>
     <to streamName="org.wso2.iot.connectedcup" version="1.0.0"/>
-</eventReceiver>
-
+</eventReceiver>
\ No newline at end of file
diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/ConnectedCup/artifacts.xml b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/ConnectedCup/artifacts.xml
index 86306d71..a4c1a87e 100644
--- a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/ConnectedCup/artifacts.xml
+++ b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/ConnectedCup/artifacts.xml
@@ -20,7 +20,7 @@
 <artifacts>
     <artifact name="ConnectedCup_CAPP" version="1.0.0" type="carbon/application">
 		<dependency artifact="EventStream_ConnectedCup" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
-		<dependency artifact="EventReceiver_ConnectedCup" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+		<dependency artifact="connectedcup_reciever" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
         <dependency artifact="EventPublisher_ConnectedCup" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
         <dependency artifact="EventExecution_ConnectedCup" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
     </artifact>
diff --git a/modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupControllerService.java b/modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupControllerService.java
index f89a405e..a41d44e2 100644
--- a/modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupControllerService.java
+++ b/modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupControllerService.java
@@ -39,8 +39,7 @@ public interface ConnectedCupControllerService {
 
     @Path("device/ordercoffee")
     @POST
-    @Feature(code = "ordercoffee", name = "Order Coffee", type = "control",
-            description = "Order coffee cup")
+    @Feature(code = "ordercoffee", name = "Order Coffee", description = "Order coffee cup")
     Response orderCoffee(@QueryParam("deviceId") String deviceId);
 
     /**