few changes in event recievers and remove type and method from feature

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>
-

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>

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);
 
     /**