Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server

modules/samples/connectedcup/component/controller/src/main/java/org/coffeeking/controller/service/transport/ConnectedCupMQTTConnector.java

@@ -42,9 +42,8 @@ public class ConnectedCupMQTTConnector extends MQTTTransportHandler {
     private static String serverName = DeviceManagementConfigurationManager.getInstance().
             getDeviceManagementServerInfo().getName();
 
-    private static String subscribeTopic = "wso2" + File.separator + "+" + File.separator +
+    private static String subscribeTopic = "wso2/+/" + ConnectedCupConstants.DEVICE_TYPE + "/+/"
-                                           ConnectedCupConstants.DEVICE_TYPE + File.separator + "+" + File.separator
+            + "connected_publisher";
-                                           + "connected_publisher";
 
     private static String iotServerSubscriber = UUID.randomUUID().toString().substring(0, 5);