Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins

components/analytics/iot-analytics/org.wso2.carbon.device.mgt.cdmf.analytics/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>iot-analytics</artifactId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>iot-analytics</artifactId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/analytics/iot-analytics/org.wso2.carbon.iot.device.statistics.dashboard/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>iot-analytics</artifactId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>iot-analytics</artifactId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/analytics/iot-analytics/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>analytics</artifactId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/analytics/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>carbon-device-mgt-plugins-parent</artifactId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>androidsense-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.api/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>androidsense-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>androidsense-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.platform.configuration/configuration.hbs

@@ -18,7 +18,7 @@
 <div class="panel panel-default">
     <div id="general-config-heading" class="panel-heading" role="tab">
         <h2 class="sub-title panel-title">
-            Android Sense Endpoint Configuration
+            Android Sense Configuration
         </h2>
     </div>
     <div id="android_sense-config-body" class="panel-collapse panel-body"
@@ -27,22 +27,32 @@
              class="alert alert-danger hidden" role="alert">
             <i class="icon fw fw-error"></i><span></span>
         </div>
-        <div class="wr-input-control">
+        <div class="wr-input-control wr-btn-grp">
-            <label class="wr-input-label" for="email-config-host">
+            <button id="save-general-btn" class="wr-btn" onclick="artifactUpload();">
-                Mqtt Endpoint
+                Deploy Analytics Artifacts
-                                            <span class="helper" title="SMTP Server Host">
+            </button>
-                                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+
+        </div>
+    </div>
+</div>
+
+<div id="androidsense-statistic-response-template" style="display: none">
+    <div class="content">
+        <div class="row">
+            <div class="col-lg-5 col-md-6 col-centered">
+                <h3>
+                    <span class="fw-stack">
+                        <i class="fw fw-circle-outline fw-stack-2x"></i>
+                        <i id="status-icon" class="fw fw-error fw-stack-1x"></i>
                     </span>
                     <br>
-            </label>
+                </h3>
-            <input id="mqtt-endpoint" type="text" class="form-control"
+                <h4>
-                   placeholder="[ Required Field ]">
+                    <span id="title"></span>
                     <br>
+                </h4>
+                <span id="description"></span>
             </div>
-        <div class="wr-input-control wr-btn-grp">
-            <button id="save-general-btn" class="wr-btn" onclick="addConfiguration();">
-                        Save
-            </button>
         </div>
     </div>
 </div>

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.platform.configuration/public/js/platform-configuration.js

@@ -95,3 +95,30 @@ var addConfiguration = function () {
         }
     );
 };
+
+var artifactUpload = function () {
+	var contentType = "application/json";
+	var backendEndBasePath = "/api/device-mgt/v1.0";
+	var urix = backendEndBasePath + "/admin/devicetype/deploy/android_sense";
+	var defaultStatusClasses = "fw fw-stack-1x";
+	var content = $("#androidsense-statistic-response-template").find(".content");
+	var title = content.find("#title");
+	var statusIcon = content.find("#status-icon");
+	var data = {}
+	invokerUtil.post(urix, data, function (data) {
+		title.html("Deploying statistic artifacts. Please wait...");
+		statusIcon.attr("class", defaultStatusClasses + " fw-check");
+		$(modalPopupContent).html(content.html());
+		showPopup();
+		setTimeout(function () {
+			hidePopup();
+			location.reload(true);
+		}, 5000);
+
+	}, function (jqXHR) {
+		title.html("Failed to deploy artifacts, Please contact administrator.");
+		statusIcon.attr("class", defaultStatusClasses + " fw-error");
+		$(modalPopupContent).html(content.html());
+		showPopup();
+	}, contentType);
+};

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/public/js/download.js

@@ -73,30 +73,3 @@ function attachEvents() {
     }
 }
 
-function artifactUpload() {
-	var contentType = "application/json";
-
-	var urix = backendEndBasePath + "/admin/devicetype/deploy/android_sense";
-	var defaultStatusClasses = "fw fw-stack-1x";
-	var content = $("#androidsense-statistic-response-template").find(".content");
-	var title = content.find("#title");
-	var statusIcon = content.find("#status-icon");
-	var data = {}
-	invokerUtil.post(urix, data, function (data) {
-		title.html("Deploying statistic artifacts. Please wait...");
-		statusIcon.attr("class", defaultStatusClasses + " fw-check");
-		$(modalPopupContent).html(content.html());
-		showPopup();
-		setTimeout(function () {
-			hidePopup();
-			location.reload(true);
-		}, 5000);
-
-	}, function (jqXHR) {
-		title.html("Failed to deploy artifacts, Please contact administrator.");
-		statusIcon.attr("class", defaultStatusClasses + " fw-error");
-		$(modalPopupContent).html(content.html());
-		showPopup();
-	}, contentType);
-}
-

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/type-view.hbs

@@ -41,9 +41,6 @@
     <a href="#" class="download-link btn-operations"><i class="fw fw-mobile fw-inverse fw-lg add-margin-1x"></i> Enroll Device</a>
     <a href="{{hostName}}{{@unit.publicUri}}/asset/androidsense.apk" class="btn-operations"><i class="fw fw-download fw-inverse fw-lg add-margin-1x"></i> Download APK</a>
     <a href="javascript:toggleEmailInvite()" class="btn-operations"><i class="fw fw-mail fw-inverse fw-lg add-margin-1x"></i> Invite by Email</a>
-    {{#if permissions.IS_ADMIN}}
-        <a href="javascript:artifactUpload()" class="btn-operations"><i class="fw fw-upload fw-inverse fw-lg add-margin-1x"></i> Deploy Analytics Artifacts</a>
-    {{/if}}
     <p class="doc-link">Click <a href="https://docs.wso2.com/display/IoTS300/Android+Sense"
                                  target="_blank">[ here ]</a> for latest instructions and
         troubleshooting.</p>

components/device-types/androidsense-plugin/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>device-types</artifactId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.analytics/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>arduino-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.api/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>arduino-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.api/src/main/webapp/WEB-INF/web.xml

@@ -20,7 +20,10 @@
         <param-name>doAuthentication</param-name>
         <param-value>true</param-value>
     </context-param>
-
+	<context-param>
+		<param-name>isSharedWithAllTenants</param-name>
+		<param-value>true</param-value>
+	</context-param>
     <!--publish to apim-->
     <context-param>
         <param-name>managed-api-enabled</param-name>

components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>arduino-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.platform.configuration/configuration.hbs

@@ -27,33 +27,32 @@
              class="alert alert-danger hidden" role="alert">
             <i class="icon fw fw-error"></i><span></span>
         </div>
-        <div class="wr-input-control">
-            <label class="wr-input-label" for="email-config-host">
-                Http Server IP
-                <span class="helper" title="SMTP Server Host">
-                                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
-                                            </span>
-                <br>
-            </label>
-            <input id="http-endpoint" type="text" class="form-control"
-                   placeholder="[ Required Field ]">
-            <br>
 
-            <label class="wr-input-label" for="email-config-host">
+        <div class="wr-input-control wr-btn-grp">
-                Http Server Port
+            <button id="save-general-btn" class="wr-btn" onclick="artifactUpload();">
-                <span class="helper" title="SMTP Server Host">
+                Deploy Analytics Artifacts
-                                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+            </button>
+        </div>
+    </div>
+</div>
+
+<div id="arduino-statistic-response-template" style="display: none">
+    <div class="content">
+        <div class="row">
+            <div class="col-lg-5 col-md-6 col-centered">
+                <h3>
+                    <span class="fw-stack">
+                        <i class="fw fw-circle-outline fw-stack-2x"></i>
+                        <i id="status-icon" class="fw fw-error fw-stack-1x"></i>
                     </span>
                     <br>
-            </label>
+                </h3>
-            <input id="https-endpoint" type="text" class="form-control"
+                <h4>
-                   placeholder="[ Required Field ]">
+                    <span id="title"></span>
                     <br>
+                </h4>
+                <span id="description"></span>
             </div>
-        <div class="wr-input-control wr-btn-grp">
-            <button id="save-general-btn" class="wr-btn" onclick="addConfiguration();">
-                Save
-            </button>
         </div>
     </div>
 </div>

components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.platform.configuration/public/js/platform-configuration.js

@@ -103,3 +103,30 @@ var addConfiguration = function () {
         }
     );
 };
+
+var artifactUpload = function () {
+	var contentType = "application/json";
+	var backendEndBasePath = "/api/device-mgt/v1.0";
+	var urix = backendEndBasePath + "/admin/devicetype/deploy/arduino";
+	var defaultStatusClasses = "fw fw-stack-1x";
+	var content = $("#arduino-statistic-response-template").find(".content");
+	var title = content.find("#title");
+	var statusIcon = content.find("#status-icon");
+	var data = {}
+	invokerUtil.post(urix, data, function (data) {
+		title.html("Deploying statistic artifacts. Please wait...");
+		statusIcon.attr("class", defaultStatusClasses + " fw-check");
+		$(modalPopupContent).html(content.html());
+		showPopup();
+		setTimeout(function () {
+			hidePopup();
+			location.reload(true);
+		}, 5000);
+
+	}, function (jqXHR) {
+		title.html("Failed to deploy artifacts, Please contact administrator.");
+		statusIcon.attr("class", defaultStatusClasses + " fw-error");
+		$(modalPopupContent).html(content.html());
+		showPopup();
+	}, contentType);
+};

components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.realtime.analytics-view/analytics-view.js

@@ -31,12 +31,23 @@ function onRequest(context) {
     if (encodedClientKeys) {
         var tokenUtil = require("/app/modules/oauth/token-handler-utils.js")["utils"];
         var resp = tokenUtil.decode(encodedClientKeys).split(":");
-        var tokenPair = jwtClient.getAccessToken(resp[0], resp[1], context.user.username, "default", {});
+
+		if (user.domain == "carbon.super") {
+			var tokenPair = jwtClient.getAccessToken(resp[0], resp[1], context.user.username , "default", {});
 			if (tokenPair) {
 				token = tokenPair.accessToken;
 			}
 			websocketEndpoint = websocketEndpoint + "/secured-websocket/org.wso2.iot.devices.temperature/1.0.0?"
 				+ "deviceId=" + device.deviceIdentifier + "&deviceType=" + device.type + "&websocketToken=" + token;
+		} else {
+			var tokenPair = jwtClient.getAccessToken(resp[0], resp[1], context.user.username + "@" + user.domain
+				, "default", {});
+			if (tokenPair) {
+				token = tokenPair.accessToken;
+			}
+			websocketEndpoint = websocketEndpoint + "/secured-websocket/t/" + user.domain + "/org.wso2.iot.devices.temperature/1.0.0?"
+				+ "deviceId=" + device.deviceIdentifier + "&deviceType=" + device.type + "&websocketToken=" + token;
+		}
     }
     return {"device": device, "websocketEndpoint": websocketEndpoint};
 }

components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/public/js/download.js

@@ -184,30 +184,3 @@ function doAction(data) {
         });
     }
 }
-
-function artifactUpload() {
-    var contentType = "application/json";
-
-    var urix = backendEndBasePath + "/admin/devicetype/deploy/arduino";
-    var defaultStatusClasses = "fw fw-stack-1x";
-    var content = $("#arduino-statistic-response-template").find(".content");
-    var title = content.find("#title");
-    var statusIcon = content.find("#status-icon");
-    var data = {}
-    invokerUtil.post(urix, data, function (data) {
-        title.html("Deploying statistic artifacts. Please wait...");
-        statusIcon.attr("class", defaultStatusClasses + " fw-check");
-        $(modalPopupContent).html(content.html());
-        showPopup();
-        setTimeout(function () {
-            hidePopup();
-            location.reload(true);
-        }, 5000);
-
-    }, function (jqXHR) {
-        title.html("Failed to deploy artifacts, Please contact administrator.");
-        statusIcon.attr("class", defaultStatusClasses + " fw-error");
-        $(modalPopupContent).html(content.html());
-        showPopup();
-    }, contentType);
-}

components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/type-view.hbs

@@ -66,11 +66,6 @@
     <a href="#" class="download-link btn-operations">
         <i class="fw fw-download add-margin-1x"></i>Download Sketch
     </a>
-    {{#if permissions.IS_ADMIN}}
-        <a href="javascript:artifactUpload()" class="btn-operations"><i
-                class="fw fw-upload fw-inverse fw-lg add-margin-1x"></i> Deploy Analytics Artifacts</a>
-    {{/if}}
-
     <p class="doc-link">Click <a href="https://docs.wso2.com/display/IoTS300/Arduino"
                                  target="_blank">here</a> for latest instructions and
         troubleshooting.</p>

components/device-types/arduino-plugin/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>device-types</artifactId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>carbon-device-mgt-plugins-parent</artifactId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>raspberrypi-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/artifacts.xml

@@ -19,8 +19,6 @@
 
 <artifacts>
     <artifact name="raspberrypi" version="1.0.0" type="carbon/application">
-        <dependency artifact="raspberrypi_stream" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
-        <dependency artifact="raspberrypi_receiver" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
         <dependency artifact="raspberrypi_execution" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
     </artifact>
 </artifacts>

components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/raspberrypi_receiver/artifact.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~
-  ~ WSO2 Inc. licenses this file to you under the Apache License,
-  ~ Version 2.0 (the "License"); you may not use this file except
-  ~ in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied. See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<artifact name="raspberrypi_receiver" version="1.0.0" type="event/receiver" serverRole="DataAnalyticsServer">
-    <file>raspberrypi_receiver.xml</file>
-</artifact>

components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.api/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<artifactId>raspberrypi-plugin</artifactId>
 		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-		<version>3.0.34-SNAPSHOT</version>
+		<version>3.0.35-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>raspberrypi-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.platform.configuration/configuration.hbs

@@ -27,43 +27,32 @@
              class="alert alert-danger hidden" role="alert">
             <i class="icon fw fw-error"></i><span></span>
         </div>
-        <div class="wr-input-control">
-            <label class="wr-input-label" for="email-config-host">
-                Http Endpoint
-                                            <span class="helper" title="SMTP Server Host">
-                                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
-                                            </span>
-                <br>
-            </label>
-            <input id="http-endpoint" type="text" class="form-control"
-                   placeholder="[ Required Field ]">
-            <br>
-
-            <label class="wr-input-label" for="email-config-host">
-                Https Endpoint
-                                            <span class="helper" title="SMTP Server Host">
-                                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
-                                            </span>
-                <br>
-            </label>
-            <input id="https-endpoint" type="text" class="form-control"
-                   placeholder="[ Required Field ]">
-            <br>
-            <label class="wr-input-label" for="email-config-host">
-                Mqtt Endpoint
-                                            <span class="helper" title="SMTP Server Host">
-                                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
-                                            </span>
-                <br>
-            </label>
-            <input id="mqtt-endpoint" type="text" class="form-control"
-                   placeholder="[ Required Field ]">
-            <br>
-        </div>
         <div class="wr-input-control wr-btn-grp">
-            <button id="save-general-btn" class="wr-btn" onclick="addConfiguration();">
+            <button id="save-general-btn" class="wr-btn" onclick="artifactUpload();">
-                        Save
+                Deploy Analytics Artifacts
             </button>
+
+        </div>
+    </div>
+</div>
+
+<div id="raspberrypi-statistic-response-template" style="display: none">
+    <div class="content">
+        <div class="row">
+            <div class="col-lg-5 col-md-6 col-centered">
+                <h3>
+                    <span class="fw-stack">
+                        <i class="fw fw-circle-outline fw-stack-2x"></i>
+                        <i id="status-icon" class="fw fw-error fw-stack-1x"></i>
+                    </span>
+                    <br>
+                </h3>
+                <h4>
+                    <span id="title"></span>
+                    <br>
+                </h4>
+                <span id="description"></span>
+            </div>
         </div>
     </div>
 </div>

components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.platform.configuration/configuration.js

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-function onRequest(context) {
+function onRequest(context){
     var viewModel = {};
 	var userModule = require("/app/modules/business-controllers/user.js")["userModule"];
 	viewModel["permissions"] = userModule.getUIPermissions();

components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.platform.configuration/public/js/platform-configuration.js

@@ -113,3 +113,30 @@ var addConfiguration = function () {
         }
     );
 };
+
+var artifactUpload = function () {
+	var contentType = "application/json";
+	var backendEndBasePath = "/api/device-mgt/v1.0";
+	var urix = backendEndBasePath + "/admin/devicetype/deploy/raspberrypi";
+	var defaultStatusClasses = "fw fw-stack-1x";
+	var content = $("#raspberrypi-statistic-response-template").find(".content");
+	var title = content.find("#title");
+	var statusIcon = content.find("#status-icon");
+	var data = {}
+	invokerUtil.post(urix, data, function (data) {
+		title.html("Deploying statistic artifacts. Please wait...");
+		statusIcon.attr("class", defaultStatusClasses + " fw-check");
+		$(modalPopupContent).html(content.html());
+		showPopup();
+		setTimeout(function () {
+			hidePopup();
+			location.reload(true);
+		}, 5000);
+
+	}, function (jqXHR) {
+		title.html("Failed to deploy artifacts, Please contact administrator.");
+		statusIcon.attr("class", defaultStatusClasses + " fw-error");
+		$(modalPopupContent).html(content.html());
+		showPopup();
+	}, contentType);
+};

components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.realtime.analytics-view/analytics-view.js

@@ -28,15 +28,32 @@ function onRequest(context) {
     var jwtClient = jwtService.getJWTClient();
     var encodedClientKeys = session.get(constants["ENCODED_TENANT_BASED_WEB_SOCKET_CLIENT_CREDENTIALS"]);
     var token = "";
+	var user = session.get(constants.USER_SESSION_KEY);
+	if (!user) {
+		log.error("User object was not found in the session");
+		throw constants.ERRORS.USER_NOT_FOUND;
+	}
     if (encodedClientKeys) {
         var tokenUtil = require("/app/modules/oauth/token-handler-utils.js")["utils"];
         var resp = tokenUtil.decode(encodedClientKeys).split(":");
-        var tokenPair = jwtClient.getAccessToken(resp[0], resp[1], context.user.username,"default", {});
+
+		if (user.domain == "carbon.super") {
+			var tokenPair = jwtClient.getAccessToken(resp[0], resp[1], context.user.username , "default", {});
 			if (tokenPair) {
 				token = tokenPair.accessToken;
 			}
 			websocketEndpoint = websocketEndpoint + "/secured-websocket/org.wso2.iot.devices.temperature/1.0.0?"
 				+ "deviceId=" + device.deviceIdentifier + "&deviceType=" + device.type + "&websocketToken=" + token;
+		} else {
+			var tokenPair = jwtClient.getAccessToken(resp[0], resp[1], context.user.username + "@" + user.domain
+				, "default", {});
+			if (tokenPair) {
+				token = tokenPair.accessToken;
+			}
+			websocketEndpoint = websocketEndpoint + "/secured-websocket/t/" + user.domain + "/org.wso2.iot.devices.temperature/1.0.0?"
+				+ "deviceId=" + device.deviceIdentifier + "&deviceType=" + device.type + "&websocketToken=" + token;
+		}
+
     }
     return {"device": device, "websocketEndpoint": websocketEndpoint};
 }

components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/public/js/download.js

@@ -183,30 +183,3 @@ function doAction(data) {
         });
     }
 }
-
-function artifactUpload() {
-	var contentType = "application/json";
-
-	var urix = backendEndBasePath + "/admin/devicetype/deploy/raspberrypi";
-	var defaultStatusClasses = "fw fw-stack-1x";
-	var content = $("#raspberrypi-statistic-response-template").find(".content");
-	var title = content.find("#title");
-	var statusIcon = content.find("#status-icon");
-	var data = {}
-	invokerUtil.post(urix, data, function (data) {
-		title.html("Deploying statistic artifacts. Please wait...");
-		statusIcon.attr("class", defaultStatusClasses + " fw-check");
-		$(modalPopupContent).html(content.html());
-		showPopup();
-		setTimeout(function () {
-			hidePopup();
-			location.reload(true);
-		}, 5000);
-
-	}, function (jqXHR) {
-		title.html("Failed to deploy artifacts, Please contact administrator.");
-		statusIcon.attr("class", defaultStatusClasses + " fw-error");
-		$(modalPopupContent).html(content.html());
-		showPopup();
-	}, contentType);
-}

components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/type-view.hbs

@@ -61,9 +61,6 @@
     <a href="#" class="download-link btn-operations">
         <i class="fw fw-download add-margin-1x"></i>Download Agent
     </a>
-    {{#if permissions.IS_ADMIN}}
-        <a href="javascript:artifactUpload()" class="btn-operations"><i class="fw fw-upload fw-inverse fw-lg add-margin-1x"></i> Deploy Analytics Artifacts</a>
-    {{/if}}
 
     <p class="doc-link">Click <a href="https://docs.wso2.com/display/IoTS300/Raspberry+Pi"
                                  target="_blank">here</a> for latest instructions and

components/device-types/raspberrypi-plugin/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>device-types</artifactId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.advanced.impl/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<artifactId>virtual-fire-alarm-plugin</artifactId>
 		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-		<version>3.0.34-SNAPSHOT</version>
+		<version>3.0.35-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<artifactId>virtual-fire-alarm-plugin</artifactId>
 		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-		<version>3.0.34-SNAPSHOT</version>
+		<version>3.0.35-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>virtual-fire-alarm-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics/src/main/resources/carbonapps/virtualfirealarm/artifacts.xml

@@ -19,8 +19,6 @@
 
 <artifacts>
     <artifact name="virtualfirealarm" version="1.0.0" type="carbon/application">
-        <dependency artifact="virtualfirealarm_stream" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
-        <dependency artifact="virtualfirealarm_receiver" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
         <dependency artifact="virtualfirealarm_execution" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
     </artifact>
 </artifacts>

components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics/src/main/resources/carbonapps/virtualfirealarm/virtualfirealarm_receiver/artifact.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~
-  ~ WSO2 Inc. licenses this file to you under the Apache License,
-  ~ Version 2.0 (the "License"); you may not use this file except
-  ~ in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied. See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<artifact name="virtualfirealarm_receiver" version="1.0.0" type="event/receiver" serverRole="DataAnalyticsServer">
-    <file>virtualfirealarm_receiver.xml</file>
-</artifact>

components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics/src/main/resources/carbonapps/virtualfirealarm/virtualfirealarm_stream/artifact.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~
-  ~ WSO2 Inc. licenses this file to you under the Apache License,
-  ~ Version 2.0 (the "License"); you may not use this file except
-  ~ in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied. See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<artifact name= "virtualfirealarm_stream" version="1.0.0" type="event/stream" serverRole="DataAnalyticsServer">
-	<file>org.wso2.iot.virtualfirealarm_1.0.0.json</file>
-</artifact>
-

components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<artifactId>virtual-fire-alarm-plugin</artifactId>
 		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-		<version>3.0.34-SNAPSHOT</version>
+		<version>3.0.35-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/webapp/WEB-INF/web.xml

@@ -20,6 +20,10 @@
         <param-name>doAuthentication</param-name>
         <param-value>true</param-value>
     </context-param>
+	<context-param>
+		<param-name>isSharedWithAllTenants</param-name>
+		<param-value>true</param-value>
+	</context-param>
 
     <!--publish to apim-->
     <context-param>

components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>virtual-fire-alarm-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.platform.configuration/configuration.hbs

@@ -19,7 +19,7 @@
 <div class="panel panel-default">
     <div id="general-config-heading" class="panel-heading" role="tab">
         <h2 class="sub-title panel-title">
-            Virtual Firealarm Endpoint Configuration
+            Virtual Firealarm Configuration
         </h2>
     </div>
     <div id="virtual-alarm-config-body" class="panel-collapse panel-body"
@@ -28,43 +28,32 @@
              class="alert alert-danger hidden" role="alert">
             <i class="icon fw fw-error"></i><span></span>
         </div>
-        <div class="wr-input-control">
-            <label class="wr-input-label" for="email-config-host">
-                Http Endpoint
-                                            <span class="helper" title="SMTP Server Host">
-                                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
-                                            </span>
-                <br>
-            </label>
-            <input id="http-endpoint" type="text" class="form-control"
-                   placeholder="[ Required Field ]">
-            <br>
-
-            <label class="wr-input-label" for="email-config-host">
-                Https Endpoint
-                                            <span class="helper" title="SMTP Server Host">
-                                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
-                                            </span>
-                <br>
-            </label>
-            <input id="https-endpoint" type="text" class="form-control"
-                   placeholder="[ Required Field ]">
-            <br>
-            <label class="wr-input-label" for="email-config-host">
-                Mqtt Endpoint
-                                            <span class="helper" title="SMTP Server Host">
-                                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
-                                            </span>
-                <br>
-            </label>
-            <input id="mqtt-endpoint" type="text" class="form-control"
-                   placeholder="[ Required Field ]">
-            <br>
-        </div>
         <div class="wr-input-control wr-btn-grp">
-            <button id="save-general-btn-virtualfirealarm" class="wr-btn" onclick="addConfiguration();">
+            <button id="save-general-btn" class="wr-btn" onclick="artifactUpload();">
-                        Save
+                Deploy Analytics Artifacts
             </button>
+
+        </div>
+    </div>
+</div>
+
+<div id="virtual-firealarm-statistic-response-template" style="display: none">
+    <div class="content">
+        <div class="row">
+            <div class="col-lg-5 col-md-6 col-centered">
+                <h3>
+                    <span class="fw-stack">
+                        <i class="fw fw-circle-outline fw-stack-2x"></i>
+                        <i id="status-icon" class="fw fw-error fw-stack-1x"></i>
+                    </span>
+                    <br>
+                </h3>
+                <h4>
+                    <span id="title"></span>
+                    <br>
+                </h4>
+                <span id="description"></span>
+            </div>
         </div>
     </div>
 </div>

components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.platform.configuration/configuration.js

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+function onRequest(context){
+    var viewModel = {};
+	var userModule = require("/app/modules/business-controllers/user.js")["userModule"];
+	viewModel["permissions"] = userModule.getUIPermissions();
+    return viewModel;
+}

components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.platform.configuration/public/js/platform-configuration.js

@@ -103,3 +103,30 @@ var addConfiguration = function () {
         }
     );
 };
+
+var artifactUpload = function () {
+	var contentType = "application/json";
+	var backendEndBasePath = "/api/device-mgt/v1.0";
+	var urix = backendEndBasePath + "/admin/devicetype/deploy/virtual_firealarm";
+	var defaultStatusClasses = "fw fw-stack-1x";
+	var content = $("#virtual-firealarm-statistic-response-template").find(".content");
+	var title = content.find("#title");
+	var statusIcon = content.find("#status-icon");
+	var data = {}
+	invokerUtil.post(urix, data, function (data) {
+		title.html("Deploying statistic artifacts. Please wait...");
+		statusIcon.attr("class", defaultStatusClasses + " fw-check");
+		$(modalPopupContent).html(content.html());
+		showPopup();
+		setTimeout(function () {
+			hidePopup();
+			location.reload(true);
+		}, 5000);
+
+	}, function (jqXHR) {
+		title.html("Failed to deploy artifacts, Please contact administrator.");
+		statusIcon.attr("class", defaultStatusClasses + " fw-error");
+		$(modalPopupContent).html(content.html());
+		showPopup();
+	}, contentType);
+};

components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.realtime.analytics-view/analytics-view.js

@@ -28,15 +28,31 @@ function onRequest(context) {
     var jwtClient = jwtService.getJWTClient();
     var encodedClientKeys = session.get(constants["ENCODED_TENANT_BASED_WEB_SOCKET_CLIENT_CREDENTIALS"]);
     var token = "";
+	var user = session.get(constants.USER_SESSION_KEY);
+	if (!user) {
+		log.error("User object was not found in the session");
+		throw constants.ERRORS.USER_NOT_FOUND;
+	}
+
     if (encodedClientKeys) {
 		var tokenUtil = require("/app/modules/oauth/token-handler-utils.js")["utils"];
 		var resp = tokenUtil.decode(encodedClientKeys).split(":");
-        var tokenPair = jwtClient.getAccessToken(resp[0], resp[1], context.user.username,"default", {});
+		if (user.domain == "carbon.super") {
+			var tokenPair = jwtClient.getAccessToken(resp[0], resp[1], context.user.username , "default", {});
 			if (tokenPair) {
 				token = tokenPair.accessToken;
 			}
 			websocketEndpoint = websocketEndpoint + "/secured-websocket/org.wso2.iot.devices.temperature/1.0.0?"
 				+ "deviceId=" + device.deviceIdentifier + "&deviceType=" + device.type + "&websocketToken=" + token;
+		} else {
+			var tokenPair = jwtClient.getAccessToken(resp[0], resp[1], context.user.username + "@" + user.domain
+				, "default", {});
+			if (tokenPair) {
+				token = tokenPair.accessToken;
+			}
+			websocketEndpoint = websocketEndpoint + "/secured-websocket/t/" + user.domain + "/org.wso2.iot.devices.temperature/1.0.0?"
+				+ "deviceId=" + device.deviceIdentifier + "&deviceType=" + device.type + "&websocketToken=" + token;
+		}
     }
     return {"device": device, "websocketEndpoint": websocketEndpoint};
 }

components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/public/js/download.js

@@ -135,30 +135,3 @@ function doAction(data) {
         });
     }
 }
-
-function artifactUpload() {
-	var contentType = "application/json";
-
-	var urix = backendEndBasePath + "/admin/devicetype/deploy/virtual_firealarm";
-	var defaultStatusClasses = "fw fw-stack-1x";
-	var content = $("#virtualfirealarm-statistic-response-template").find(".content");
-	var title = content.find("#title");
-	var statusIcon = content.find("#status-icon");
-	var data = {}
-	invokerUtil.post(urix, data, function (data) {
-		title.html("Deploying statistic artifacts. Please wait...");
-		statusIcon.attr("class", defaultStatusClasses + " fw-check");
-		$(modalPopupContent).html(content.html());
-		showPopup();
-		setTimeout(function () {
-			hidePopup();
-			location.reload(true);
-		}, 5000);
-
-	}, function (jqXHR) {
-		title.html("Failed to deploy artifacts, Please contact administrator.");
-		statusIcon.attr("class", defaultStatusClasses + " fw-error");
-		$(modalPopupContent).html(content.html());
-		showPopup();
-	}, contentType);
-}

components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/type-view.hbs

@@ -54,9 +54,6 @@
     </a>
     <a href="#" class="download-link btn-operations">
         <i class="fw fw-download"></i>Download Agent</a>
-    {{#if permissions.IS_ADMIN}}
-        <a href="javascript:artifactUpload()" class="btn-operations"><i class="fw fw-upload fw-inverse fw-lg add-margin-1x"></i> Deploy Analytics Artifacts</a>
-    {{/if}}
 
     <p class="doc-link">Click <a href="https://docs.wso2.com/display/IoTS300/Virtual+Firealarm"
                                   target="_blank">[ here ]</a> for latest instructions and

components/device-types/virtual-fire-alarm-plugin/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>device-types</artifactId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.osgiconnector/pom.xml

@@ -18,7 +18,7 @@
      <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>appm-connector</artifactId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.restconnector/pom.xml

@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>appm-connector</artifactId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/extensions/appm-connector/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>extensions</artifactId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.extension/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>cdmf-transport-adapters</artifactId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.http/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>cdmf-transport-adapters</artifactId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.http/src/main/java/org/wso2/carbon/device/mgt/input/adapter/http/HTTPMessageServlet.java

@@ -69,9 +69,14 @@ public class HTTPMessageServlet extends HttpServlet {
 		this.tenantId = tenantId;
 		this.exposedTransports = eventAdapterConfiguration.getProperties().get(
 				HTTPEventAdapterConstants.EXPOSED_TRANSPORTS);
+        String globalContentValidator = globalProperties.get(HTTPEventAdapterConstants.
+                                                                     ADAPTER_CONF_CONTENT_VALIDATOR_TYPE);
 
 		String contentValidatorType = eventAdapterConfiguration.getProperties().get(
 				HTTPEventAdapterConstants.ADAPTER_CONF_CONTENT_VALIDATOR_TYPE);
+        if (globalContentValidator != null && !globalContentValidator.isEmpty() ) {
+            contentValidatorType = globalContentValidator;
+        }
 		if (contentValidatorType == null || HTTPEventAdapterConstants.DEFAULT.equals(contentValidatorType)) {
 			contentValidator = InputAdapterServiceDataHolder.getInputAdapterExtensionService()
                     .getDefaultContentValidator();

components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>cdmf-transport-adapters</artifactId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/input/adapter/mqtt/MQTTEventAdapter.java

@@ -93,6 +93,10 @@ public class MQTTEventAdapter implements InputEventAdapter {
     public void disconnect() {
         //when mqtt and this feature  both together then this method becomes a blocking method, Therefore
         // have used a thread to skip it.
+        if (!PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain()
+                .equals(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME)) {
+            return;
+        }
         try {
             Thread thread = new Thread(new Runnable() {
                 public void run() {

components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/input/adapter/mqtt/MQTTEventAdapterFactory.java

@@ -120,7 +120,7 @@ public class MQTTEventAdapterFactory extends InputEventAdapterFactory {
         // set clientId
         Property clientId = new Property(MQTTEventAdapterConstants.ADAPTER_CONF_CLIENTID);
         clientId.setDisplayName(resourceBundle.getString(MQTTEventAdapterConstants.ADAPTER_CONF_CLIENTID));
-        clientId.setRequired(false);
+        clientId.setRequired(true);
         clientId.setHint(resourceBundle.getString(MQTTEventAdapterConstants.ADAPTER_CONF_CLIENTID_HINT));
         propertyList.add(clientId);
 

components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/input/adapter/mqtt/util/MQTTAdapterListener.java

@@ -24,6 +24,7 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpPost;
+import org.apache.http.conn.HttpHostConnectException;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.message.BasicHeader;
@@ -131,7 +132,7 @@ public class MQTTAdapterListener implements MqttCallback, Runnable {
         }
     }
 
-    public void startListener() throws MqttException {
+    public boolean startListener() throws MqttException {
         if (this.mqttBrokerConnectionConfiguration.getUsername() != null &&
                 this.mqttBrokerConnectionConfiguration.getDcrUrl() != null) {
             String username = this.mqttBrokerConnectionConfiguration.getUsername();
@@ -182,17 +183,34 @@ public class MQTTAdapterListener implements MqttCallback, Runnable {
                             log.error(msg, e);
                         }
                     }
+                } catch (HttpHostConnectException e) {
+                    log.error("Keymanager is unreachable, Waiting....");
+                    return false;
                 } catch (MalformedURLException e) {
                     log.error("Invalid dcrUrl : " + dcrUrlString);
+                    return false;
                 } catch (JWTClientException | UserStoreException e) {
                     log.error("Failed to create an oauth token with jwt grant type.", e);
+                    return false;
                 } catch (NoSuchAlgorithmException | KeyManagementException | KeyStoreException | IOException e) {
                     log.error("Failed to create a http connection.", e);
+                    return false;
                 }
             }
         }
+        try {
             mqttClient.connect(connectionOptions);
+        } catch (MqttException e) {
+            log.warn("Broker is unreachable, Waiting.....");
+            return false;
+        }
+        try {
             mqttClient.subscribe(topic);
+        } catch (MqttException e) {
+            log.error("Failed to subscribe to topic: " + topic + ", Retrying.....");
+            return false;
+        }
+        return true;
 
     }
 
@@ -267,10 +285,14 @@ public class MQTTAdapterListener implements MqttCallback, Runnable {
         while (!connectionSucceeded) {
             try {
                 connectionDuration = connectionDuration * MQTTEventAdapterConstants.RECONNECTION_PROGRESS_FACTOR;
+                if (connectionDuration > MQTTEventAdapterConstants.MAXIMUM_RECONNECTION_DURATION) {
+                    connectionDuration = MQTTEventAdapterConstants.MAXIMUM_RECONNECTION_DURATION;
+                }
                 Thread.sleep(connectionDuration);
-                startListener();
+                if (startListener()) {
                     connectionSucceeded = true;
                     log.info("MQTT Connection successful");
+                }
             } catch (InterruptedException e) {
                 log.error("Interruption occurred while waiting for reconnection", e);
             } catch (MqttException e) {

components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/input/adapter/mqtt/util/MQTTBrokerConnectionConfiguration.java

@@ -105,10 +105,18 @@ public class MQTTBrokerConnectionConfiguration {
         this.brokerUrl = PropertyUtils.replaceMqttProperty(url);
         this.dcrUrl = PropertyUtils
                 .replaceMqttProperty(globalProperties.get(MQTTEventAdapterConstants.ADAPTER_CONF_DCR_URL));
+        this.contentValidatorType = globalProperties.get(MQTTEventAdapterConstants.ADAPTER_CONF_CONTENT_VALIDATOR_TYPE);
+        if (contentValidatorType == null || contentValidatorType.isEmpty()) {
             this.contentValidatorType = eventAdapterConfiguration.getProperties()
                     .get(MQTTEventAdapterConstants.ADAPTER_CONF_CONTENT_VALIDATOR_TYPE);
+        }
+        String cleanSession = globalProperties.get(MQTTEventAdapterConstants.ADAPTER_CONF_CLEAN_SESSION);
+        if (cleanSession == null || cleanSession.isEmpty()) {
             this.cleanSession = Boolean.parseBoolean(eventAdapterConfiguration.getProperties()
                                                              .get(MQTTEventAdapterConstants.ADAPTER_CONF_CLEAN_SESSION));
+        } else {
+            this.cleanSession = Boolean.parseBoolean(cleanSession);
+        }
         //If global properties are available those will be assigned else constant values will be assigned
         if (globalProperties.get(MQTTEventAdapterConstants.ADAPTER_CONF_KEEP_ALIVE) != null) {
             keepAlive = Integer.parseInt((globalProperties.get(MQTTEventAdapterConstants.ADAPTER_CONF_KEEP_ALIVE)));

components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/input/adapter/mqtt/util/MQTTEventAdapterConstants.java

@@ -50,6 +50,7 @@ public class MQTTEventAdapterConstants {
 
     public static final int INITIAL_RECONNECTION_DURATION = 4000;
     public static final int RECONNECTION_PROGRESS_FACTOR = 2;
+    public static final int MAXIMUM_RECONNECTION_DURATION = 60000;
 
     public static final String EMPTY_STRING = "";
     public static final String GRANT_TYPE_PARAM_NAME = "grant_type";

components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.xmpp/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>cdmf-transport-adapters</artifactId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.mqtt/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>cdmf-transport-adapters</artifactId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/output/adapter/mqtt/MQTTEventAdapter.java

@@ -44,10 +44,10 @@ public class MQTTEventAdapter implements OutputEventAdapter {
     private Map<String, String> globalProperties;
     private MQTTAdapterPublisher mqttAdapterPublisher;
     private int connectionKeepAliveInterval;
-    private String qos;
     private static ThreadPoolExecutor threadPoolExecutor;
     private static final Log log = LogFactory.getLog(MQTTEventAdapter.class);
     private int tenantId;
+    private MQTTBrokerConnectionConfiguration mqttBrokerConnectionConfiguration;
 
     public MQTTEventAdapter(OutputEventAdapterConfiguration eventAdapterConfiguration,
                             Map<String, String> globalProperties) {
@@ -117,11 +117,11 @@ public class MQTTEventAdapter implements OutputEventAdapter {
 
     @Override
     public void connect() {
-        MQTTBrokerConnectionConfiguration mqttBrokerConnectionConfiguration =
+        mqttBrokerConnectionConfiguration =
                 new MQTTBrokerConnectionConfiguration(eventAdapterConfiguration, globalProperties);
         String clientId = eventAdapterConfiguration.getStaticProperties().get(
                 MQTTEventAdapterConstants.ADAPTER_CONF_CLIENTID);
-        qos = eventAdapterConfiguration.getStaticProperties().get(MQTTEventAdapterConstants.ADAPTER_MESSAGE_QOS);
+
         mqttAdapterPublisher = new MQTTAdapterPublisher(mqttBrokerConnectionConfiguration, clientId, tenantId);
     }
 
@@ -179,11 +179,7 @@ public class MQTTEventAdapter implements OutputEventAdapter {
                         }
                     }
                 }
-                if (qos == null || qos.trim().isEmpty()) {
+                mqttAdapterPublisher.publish(mqttBrokerConnectionConfiguration.getQos(), message.toString(), topic);
-                    mqttAdapterPublisher.publish(message.toString(), topic);
-                } else {
-                    mqttAdapterPublisher.publish(Integer.parseInt(qos), message.toString(), topic);
-                }
             } catch (Throwable t) {
                 EventAdapterUtil.logAndDrop(eventAdapterConfiguration.getName(), message, null, t, log, tenantId);
             }

components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/output/adapter/mqtt/MQTTEventAdapterFactory.java

@@ -90,9 +90,9 @@ public class MQTTEventAdapterFactory extends OutputEventAdapterFactory {
         // set Quality of Service
         Property qos = new Property(MQTTEventAdapterConstants.ADAPTER_MESSAGE_QOS);
         qos.setDisplayName(resourceBundle.getString(MQTTEventAdapterConstants.ADAPTER_MESSAGE_QOS));
-        qos.setRequired(true);
+        qos.setRequired(false);
         qos.setOptions(new String[]{"0", "1", "2"});
-        qos.setDefaultValue("1");
+        qos.setDefaultValue("2");
 
         staticPropertyList.add(brokerUrl);
         staticPropertyList.add(userName);

components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/output/adapter/mqtt/util/MQTTBrokerConnectionConfiguration.java

@@ -34,6 +34,7 @@ public class MQTTBrokerConnectionConfiguration {
     private boolean cleanSession = true;
     private int keepAlive;
     private boolean globalCredentailSet;
+    private int qos;
 
     public String getTokenUrl() {
         return tokenUrl;
@@ -75,6 +76,9 @@ public class MQTTBrokerConnectionConfiguration {
         return globalCredentailSet;
     }
 
+    public int getQos() {
+        return qos;
+    }
     public MQTTBrokerConnectionConfiguration(OutputEventAdapterConfiguration eventAdapterConfiguration,
                                              Map<String, String> globalProperties) {
         adapterName = eventAdapterConfiguration.getName();
@@ -98,14 +102,28 @@ public class MQTTBrokerConnectionConfiguration {
         if (scopes == null) {
             this.scopes = MQTTEventAdapterConstants.EMPTY_STRING;
         }
+        String cleanSession = globalProperties.get(MQTTEventAdapterConstants.ADAPTER_CONF_CLEAN_SESSION);
+        if (cleanSession == null || cleanSession.isEmpty()) {
             this.cleanSession = Boolean.parseBoolean(eventAdapterConfiguration.getStaticProperties()
                                                              .get(MQTTEventAdapterConstants.ADAPTER_CONF_CLEAN_SESSION));
+        } else {
+            this.cleanSession = Boolean.parseBoolean(cleanSession);
+        }
         //If global properties are available those will be assigned else constant values will be assigned
         if (globalProperties.get(MQTTEventAdapterConstants.ADAPTER_CONF_KEEP_ALIVE) != null) {
             keepAlive = Integer.parseInt((globalProperties.get(MQTTEventAdapterConstants.ADAPTER_CONF_KEEP_ALIVE)));
         } else {
             keepAlive = MQTTEventAdapterConstants.ADAPTER_CONF_DEFAULT_KEEP_ALIVE;
         }
+        String qosVal = globalProperties.get(MQTTEventAdapterConstants.ADAPTER_MESSAGE_QOS);
+        if (qosVal != null && !qosVal.isEmpty()) {
+            this.qos = Integer.parseInt(qosVal);
+        } else {
+            qosVal = eventAdapterConfiguration.getStaticProperties().get(MQTTEventAdapterConstants.ADAPTER_MESSAGE_QOS);
+            this.qos = Integer.parseInt(qosVal);
+        }
+
+
     }
 
 }

components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>cdmf-transport-adapters</artifactId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>cdmf-transport-adapters</artifactId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket/src/main/java/org/wso2/carbon/device/mgt/output/adapter/websocket/authorization/DeviceAuthorizer.java

@@ -63,23 +63,14 @@ public class DeviceAuthorizer implements Authorizer {
     private static DeviceAccessAuthorizationAdminService deviceAccessAuthorizationAdminService;
     private static final String CDMF_SERVER_BASE_CONTEXT = "/api/device-mgt/v1.0";
     private static final String DEVICE_MGT_SERVER_URL = "deviceMgtServerUrl";
-    private static final String STAT_PERMISSION = "statsPermission";
     private static final String DEVICE_ID = "deviceId";
     private static final String DEVICE_TYPE = "deviceType";
     private static Log log = LogFactory.getLog(DeviceAuthorizer.class);
-    private static List<String> statPermissions;
-
     public DeviceAuthorizer() {
     }
 
     @Override
     public void init(Map<String, String> globalProperties) {
-        statPermissions = getPermissions(globalProperties);
-        if (statPermissions != null && !statPermissions.isEmpty()) {
-            for (String permission : statPermissions) {
-                PermissionUtil.putPermission(permission);
-            }
-        }
         try {
             deviceAccessAuthorizationAdminService = Feign.builder().client(getSSLClient()).logger(new Slf4jLogger())
                     .logLevel(Logger.Level.FULL).requestInterceptor(new OAuthRequestInterceptor(globalProperties))
@@ -102,9 +93,6 @@ public class DeviceAuthorizer implements Authorizer {
 
             AuthorizationRequest authorizationRequest = new AuthorizationRequest();
             authorizationRequest.setTenantDomain(authenticationInfo.getTenantDomain());
-            if (statPermissions != null && !statPermissions.isEmpty()) {
-                authorizationRequest.setPermissions(statPermissions);
-            }
             authorizationRequest.setUsername(authenticationInfo.getUsername());
             DeviceIdentifier deviceIdentifier = new DeviceIdentifier();
             deviceIdentifier.setId(deviceId);
@@ -137,14 +125,6 @@ public class DeviceAuthorizer implements Authorizer {
         return deviceMgtServerUrl;
     }
 
-    private List<String> getPermissions(Map<String, String> properties) {
-        String stats =  properties.get(STAT_PERMISSION);
-        if (stats != null && !stats.isEmpty()) {
-            return Arrays.asList(stats.replace("\n", "").split(" "));
-        }
-        return null;
-    }
-
     private static Client getSSLClient() {
         return new Client.Default(getTrustedSSLSocketFactory(), new HostnameVerifier() {
             @Override

components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket/src/main/java/org/wso2/carbon/device/mgt/output/adapter/websocket/authorization/PermissionUtil.java

@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * you may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.wso2.carbon.device.mgt.output.adapter.websocket.authorization;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.base.MultitenantConstants;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.internal.WebsocketEventAdaptorServiceDataHolder;
-import org.wso2.carbon.registry.api.Resource;
-import org.wso2.carbon.registry.core.Registry;
-import org.wso2.carbon.registry.core.exceptions.RegistryException;
-
-import java.util.StringTokenizer;
-
-/**
- * Utility class which holds necessary utility methods required for persisting permissions in
- * registry.
- */
-public class PermissionUtil {
-
-    public static final String PERMISSION_PROPERTY_NAME = "name";
-    private static Log log = LogFactory.getLog(DeviceAuthorizer.class);
-
-    public static void putPermission(String permission) {
-        try {
-            StringTokenizer tokenizer = new StringTokenizer(permission, "/");
-            String lastToken = "", currentToken, tempPath;
-            while (tokenizer.hasMoreTokens()) {
-                currentToken = tokenizer.nextToken();
-                tempPath = lastToken + "/" + currentToken;
-                if (!checkResourceExists(tempPath)) {
-                    createRegistryCollection(tempPath, currentToken);
-
-                }
-                lastToken = tempPath;
-            }
-        } catch (org.wso2.carbon.registry.api.RegistryException e) {
-            log.error("Failed to creation permission in registry" + permission, e);
-        }
-    }
-
-    public static void createRegistryCollection(String path, String resourceName)
-            throws org.wso2.carbon.registry.api.RegistryException {
-        Resource resource = getGovernanceRegistry().newCollection();
-        resource.addProperty(PERMISSION_PROPERTY_NAME, resourceName);
-        getGovernanceRegistry().beginTransaction();
-        getGovernanceRegistry().put(path, resource);
-        getGovernanceRegistry().commitTransaction();
-    }
-
-    public static boolean checkResourceExists(String path)
-            throws RegistryException {
-        return getGovernanceRegistry().resourceExists(path);
-    }
-
-    public static Registry getGovernanceRegistry() throws RegistryException {
-        return WebsocketEventAdaptorServiceDataHolder.getRegistryService()
-                    .getGovernanceSystemRegistry(MultitenantConstants.SUPER_TENANT_ID);
-    }
-
-}

components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket/src/main/java/org/wso2/carbon/device/mgt/output/adapter/websocket/authorization/client/dto/DeviceAccessAuthorizationAdminService.java

@@ -28,7 +28,7 @@ import javax.ws.rs.core.MediaType;
 
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
-@Path("/admin/authorization")
+@Path("/admin/authorization/stat")
 /**
  * This interface provided the definition of the device - user access verification service.
  */

components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.xmpp/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>cdmf-transport-adapters</artifactId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/extensions/cdmf-transport-adapters/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>extensions</artifactId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>mb-extensions</artifactId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/mqtt/authorization/DeviceAccessBasedMQTTAuthorizer.java

@@ -77,12 +77,14 @@ public class DeviceAccessBasedMQTTAuthorizer implements IAuthorizer {
     private static final String CACHE_MANAGER_NAME = "mqttAuthorizationCacheManager";
     private static final String CACHE_NAME = "mqttAuthorizationCache";
     private static DeviceAccessAuthorizationAdminService deviceAccessAuthorizationAdminService;
-
+    private static OAuthRequestInterceptor oAuthRequestInterceptor;
+    private static final String GATEWAY_ERROR_CODE = "<am:code>404</am:code>";
 
     public DeviceAccessBasedMQTTAuthorizer() {
+        oAuthRequestInterceptor = new OAuthRequestInterceptor();
         this.MQTTAuthorizationConfiguration = AuthorizationConfigurationManager.getInstance();
         deviceAccessAuthorizationAdminService = Feign.builder().client(getSSLClient()).logger(new Slf4jLogger())
-                .logLevel(Logger.Level.FULL).requestInterceptor(new OAuthRequestInterceptor())
+                .logLevel(Logger.Level.FULL).requestInterceptor(oAuthRequestInterceptor)
                 .contract(new JAXRSContract()).encoder(new GsonEncoder()).decoder(new GsonDecoder())
                 .target(DeviceAccessAuthorizationAdminService.class,
                         MQTTAuthorizationConfiguration.getDeviceMgtServerUrl() + CDMF_SERVER_BASE_CONTEXT);
@@ -121,7 +123,12 @@ public class DeviceAccessBasedMQTTAuthorizer implements IAuthorizer {
                     }
                     return false;
                 } catch (FeignException e) {
+                    oAuthRequestInterceptor.resetApiApplicationKey();
+                    if (e.getMessage().contains(GATEWAY_ERROR_CODE)) {
+                        log.error("Failed to connect to the device authorization service.");
+                    } else {
                         log.error(e.getMessage(), e);
+                    }
                     return false;
                 }
             }
@@ -164,6 +171,12 @@ public class DeviceAccessBasedMQTTAuthorizer implements IAuthorizer {
                     }
                 }
             } catch (FeignException e) {
+                oAuthRequestInterceptor.resetApiApplicationKey();
+                if (e.getMessage().contains(GATEWAY_ERROR_CODE)) {
+                    log.error("Failed to connect to the device authorization service.");
+                } else {
+                    log.error(e.getMessage(), e);
+                }
                 log.error(e.getMessage(), e);
             }
         } finally {

components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/mqtt/authorization/client/OAuthRequestInterceptor.java

@@ -123,6 +123,10 @@ public class OAuthRequestInterceptor implements RequestInterceptor {
         template.header("Authorization", headerValue);
     }
 
+    public void resetApiApplicationKey() {
+        apiApplicationKey = null;
+    }
+
     private static Client getSSLClient() {
         return new Client.Default(getTrustedSSLSocketFactory(), new HostnameVerifier() {
             @Override

components/extensions/mb-extensions/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>extensions</artifactId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/extensions/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>carbon-device-mgt-plugins-parent</artifactId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/extensions/siddhi-extensions/org.wso2.extension.siddhi.execution.json/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>siddhi-extensions</artifactId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -77,7 +77,7 @@
                             org.wso2.extension.siddhi.execution.json.*
                         </Export-Package>
                         <Import-Package>
-                            org.json,
+                            org.json;version="${orbit.version.json.range}",
                             org.wso2.siddhi.core.*,
                             org.wso2.siddhi.query.api.*,
                         </Import-Package>

components/extensions/siddhi-extensions/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>extensions</artifactId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.analytics/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>android-plugin</artifactId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>android-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/DeviceManagementServiceImpl.java

@@ -193,8 +193,8 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
                 notification.setOperationId(operation.getId());
                 notification.setStatus(org.wso2.carbon.device.mgt.common.notification.mgt.Notification.
                         Status.NEW.toString());
-                notification.setDescription(operation.getCode() + " operation did fail to execute on device " +
+                notification.setDescription(operation.getCode() + " operation failed to execute on device " +
-                        deviceName + " with identifier " + deviceId);
+                        deviceName + " (ID: " + deviceId + ")");
                 AndroidAPIUtils.getNotificationManagementService().addNotification(id, notification);
             }
             if (log.isDebugEnabled()) {

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/pom.xml

@@ -23,13 +23,13 @@
     <parent>
         <artifactId>android-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.mobile.android.ui</artifactId>
-    <version>3.0.34-SNAPSHOT</version>
+    <version>3.0.35-SNAPSHOT</version>
     <name>WSO2 Carbon - Mobile Android UI</name>
     <packaging>pom</packaging>
 

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/js/type-view.js

@@ -385,30 +385,3 @@ $(document).ready(function () {
         );
     });
 });
-
-function artifactUpload() {
-	var contentType = "application/json";
-
-	var urix = backendEndBasePath + "/admin/devicetype/deploy/android";
-	var defaultStatusClasses = "fw fw-stack-1x";
-	var content = $("#android-statistic-response-template").find(".content");
-	var title = content.find("#title");
-	var statusIcon = content.find("#status-icon");
-	var data = {}
-	invokerUtil.post(urix, data, function (data) {
-		title.html("Deploying statistic artifacts. Please wait...");
-		statusIcon.attr("class", defaultStatusClasses + " fw-check");
-		$(modalPopupContent).html(content.html());
-		showPopup();
-		setTimeout(function () {
-			hidePopup();
-			location.reload(true);
-		}, 5000);
-
-	}, function (jqXHR) {
-		title.html("Failed to deploy artifacts, Please contact administrator.");
-		statusIcon.attr("class", defaultStatusClasses + " fw-error");
-		$(modalPopupContent).html(content.html());
-		showPopup();
-	}, contentType);
-}

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.hbs

@@ -43,10 +43,6 @@
                     <a href="{{host}}/android-web-agent/public/mdm.page.enrollments.android.download-agent/asset/android-agent.apk"
                        class="btn-operations remove-margin download_agent">
                         <i class="fw fw-download fw-inverse fw-lg add-margin-1x"></i> Download APK</a>
-                    {{#if permissions.IS_ADMIN}}
-                        <a href="javascript:artifactUpload()" class="btn-operations">
-                            <i class="fw fw-upload fw-inverse fw-lg add-margin-1x"></i> Deploy Geo Dashboard</a>
-                    {{/if}}
                 </div>
             {{/if}}
         {{/if}}

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.js

@@ -19,8 +19,6 @@
 function onRequest(context) {
     var viewModel = {};
     var devicemgtProps = require("/app/modules/conf-reader/main.js")["conf"];
-	var userModule = require("/app/modules/business-controllers/user.js")["userModule"];
-	viewModel["permissions"] = userModule.getUIPermissions();
     var isCloud = devicemgtProps["isCloud"];
     viewModel["isVirtual"] = request.getParameter("type") == 'virtual';
     viewModel["isCloud"] = isCloud;

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>android-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/mobile-plugins/android-plugin/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>mobile-plugins</artifactId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/mobile-plugins/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>carbon-device-mgt-plugins-parent</artifactId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>windows-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/pom.xml

@@ -23,13 +23,13 @@
     <parent>
         <artifactId>windows-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.mobile.windows.ui</artifactId>
-    <version>3.0.34-SNAPSHOT</version>
+    <version>3.0.35-SNAPSHOT</version>
     <name>WSO2 Carbon - Mobile Windows UI</name>
     <packaging>pom</packaging>
 

components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>windows-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/mobile-plugins/windows-plugin/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>mobile-plugins</artifactId>
-        <version>3.0.34-SNAPSHOT</version>
+        <version>3.0.35-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>