changes to take in both https and http server endpoints

modules/samples/virtual_firealarm/sketch/deviceConfig.properties

@@ -18,8 +18,9 @@
 #[Device-Configurations]
 owner=${DEVICE_OWNER}
 deviceId=${DEVICE_ID}
-server-ep=${SERVER_EP}
-service-ep=${SERVICE_EP}
+controller-context=/virtual_firealarm/controller
+https-ep=${HTTPS_EP}
+http-ep=${HTTP_EP}
 apim-ep=${APIM_EP}
 mqtt-ep=${MQTT_EP}
 xmpp-ep=${XMPP_EP}

modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/virtual/firealarm/service/impl/VirtualFireAlarmService.java

@@ -368,15 +368,6 @@ public class VirtualFireAlarmService {
 		newXmppAccount.setAccountName(owner + "_" + deviceId);
 		newXmppAccount.setUsername(deviceId);
 		newXmppAccount.setPassword(accessToken);
-
-		String xmppEndPoint = XmppConfig.getInstance().getXmppControlQueue().getServerURL();
-
-		int indexOfChar = xmppEndPoint.lastIndexOf('/');
-
-		if (indexOfChar != -1) {
-			xmppEndPoint = xmppEndPoint.substring((indexOfChar + 1), xmppEndPoint.length());
-		}
-
 		newXmppAccount.setEmail(deviceId + "@wso2.com");
 
 		XmppServerClient xmppServerClient = new XmppServerClient();