Merge pull request #615 from wso2/cloud-3.1.0

Cloud related fixes

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

@@ -26,7 +26,7 @@
     <property name="Arduino_dir" value="Arduino"/>
 
     <target name="clean">
-        <delete dir="${target-dir}" />
+        <delete dir="${target-dir}"/>
     </target>
 
     <target name="zip" depends="clean">

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

@@ -16,7 +16,8 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <artifactId>arduino-plugin</artifactId>
@@ -40,7 +41,7 @@
                         <phase>process-resources</phase>
                         <configuration>
                             <target>
-                                <ant antfile="build.xml" target="zip" />
+                                <ant antfile="build.xml" target="zip"/>
                             </target>
                         </configuration>
                         <goals>

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

@@ -17,8 +17,8 @@
   -->
 
 <assembly
-        xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
         xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
     <id>src</id>
     <formats>

components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.analytics/src/main/resources/carbonapps/Arduino/arduino_execution/artifact.xml

@@ -18,6 +18,6 @@
   -->
 
 <artifact name="arduino_execution" version="1.0.0" type="event/execution-plan" serverRole="DataAnalyticsServer">
-	<file>arduino_execution.siddhiql</file>
+    <file>arduino_execution.siddhiql</file>
 </artifact>
 

components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.analytics/src/main/resources/carbonapps/Arduino/arduino_receiver/arduino_receiver.xml

@@ -16,7 +16,8 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-<eventReceiver name="arduino_receiver" statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventreceiver">
+<eventReceiver name="arduino_receiver" statistics="disable" trace="disable"
+               xmlns="http://wso2.org/carbon/eventreceiver">
     <from eventAdapterType="oauth-http">
         <property name="contentValidator">iot-http</property>
     </from>

components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.analytics/src/main/resources/carbonapps/Arduino/arduino_stream/artifact.xml

@@ -17,7 +17,7 @@
   ~ under the License.
   -->
 
-<artifact name= "arduino_stream" version="1.0.0" type="event/stream" serverRole="DataAnalyticsServer">
+<artifact name="arduino_stream" version="1.0.0" type="event/stream" serverRole="DataAnalyticsServer">
-	<file>org.wso2.iot.arduino_1.0.0.json</file>
+    <file>org.wso2.iot.arduino_1.0.0.json</file>
 </artifact>
 

components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.analytics/src/main/resources/carbonapps/Arduino/arduino_stream/org.wso2.iot.arduino_1.0.0.json

@@ -4,12 +4,19 @@
   "nickName": "Arduino",
   "description": "Temperature data received from the Arduino",
   "metaData": [
-    {"name":"owner","type":"STRING"},
+    {
-    {"name":"deviceId","type":"STRING"}
+      "name": "owner",
+      "type": "STRING"
+    },
+    {
+      "name": "deviceId",
+      "type": "STRING"
+    }
   ],
   "payloadData": [
     {
-      "name": "temperature","type": "FLOAT"
+      "name": "temperature",
+      "type": "FLOAT"
     }
   ]
 }

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

@@ -17,7 +17,8 @@
   ~ under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>arduino-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
@@ -144,7 +145,7 @@
         <dependency>
             <groupId>org.wso2.carbon.devicemgt</groupId>
             <artifactId>org.wso2.carbon.apimgt.annotations</artifactId>
-			<scope>provided</scope>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 

components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.api/src/main/java/org/wso2/carbon/device/mgt/iot/arduino/service/impl/ArduinoService.java

@@ -19,7 +19,6 @@
 package org.wso2.carbon.device.mgt.iot.arduino.service.impl;
 
 import io.swagger.annotations.*;
-
 import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.apimgt.annotations.api.Scopes;
 import org.wso2.carbon.device.mgt.iot.arduino.service.impl.constants.ArduinoConstants;
@@ -110,7 +109,7 @@ public interface ArduinoService {
             }
     )
     Response getArduinoTemperatureStats(@PathParam("deviceId") String deviceId, @QueryParam("from") long from,
-                                               @QueryParam("to") long to);
+                                        @QueryParam("to") long to);
 
     /**
      * download device agent

components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.api/src/main/java/org/wso2/carbon/device/mgt/iot/arduino/service/impl/ArduinoServiceImpl.java

@@ -148,7 +148,7 @@ public class ArduinoServiceImpl implements ArduinoService {
                                                @QueryParam("to") long to) {
         try {
             if (!APIUtil.getDeviceAccessAuthorizationService().isUserAuthorized(new DeviceIdentifier(deviceId,
-                   ArduinoConstants.DEVICE_TYPE), DeviceGroupConstants.Permissions.DEFAULT_STATS_MONITOR_PERMISSIONS)) {
+                    ArduinoConstants.DEVICE_TYPE), DeviceGroupConstants.Permissions.DEFAULT_STATS_MONITOR_PERMISSIONS)) {
                 return Response.status(Response.Status.UNAUTHORIZED.getStatusCode()).build();
             }
             String fromDate = String.valueOf(from);
@@ -207,7 +207,7 @@ public class ArduinoServiceImpl implements ArduinoService {
 
     private ZipArchive createDownloadFile(String owner, String deviceName)
             throws DeviceManagementException, JWTClientException, APIManagerException,
-                   UserStoreException {
+            UserStoreException {
         if (owner == null) {
             throw new IllegalArgumentException("Error on createDownloadFile() Owner is null!");
         }
@@ -220,7 +220,8 @@ public class ArduinoServiceImpl implements ArduinoService {
         }
         String applicationUsername = PrivilegedCarbonContext.getThreadLocalCarbonContext().getUserRealm()
                 .getRealmConfiguration().getAdminUserName() + "@" + PrivilegedCarbonContext
-                .getThreadLocalCarbonContext().getTenantDomain();;
+                .getThreadLocalCarbonContext().getTenantDomain();
+        ;
         if (apiApplicationKey == null) {
             APIManagementProviderService apiManagementProviderService = APIUtil.getAPIManagementProviderService();
             String[] tags = {ArduinoConstants.DEVICE_TYPE};
@@ -231,14 +232,14 @@ public class ArduinoServiceImpl implements ArduinoService {
         JWTClient jwtClient = APIUtil.getJWTClientManagerService().getJWTClient();
         String scopes = " device_" + deviceId + " perm:arduino:enroll";
         AccessTokenInfo accessTokenInfo = jwtClient.getAccessToken(apiApplicationKey.getConsumerKey(),
-                                                                   apiApplicationKey.getConsumerSecret(), owner, scopes);
+                apiApplicationKey.getConsumerSecret(), owner, scopes);
         //create token
         String accessToken = accessTokenInfo.getAccessToken();
         String refreshToken = accessTokenInfo.getRefreshToken();
         //Register the device with CDMF
         ZipUtil ziputil = new ZipUtil();
         return ziputil.createZipFile(owner, APIUtil.getTenantDomainOftheUser(),
-                                                   ArduinoConstants.DEVICE_TYPE, deviceId, deviceName, accessToken, refreshToken);
+                ArduinoConstants.DEVICE_TYPE, deviceId, deviceName, accessToken, refreshToken);
     }
 
     private static String shortUUID() {

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

@@ -26,16 +26,16 @@
     it will result 403 error at the runtime.
 -->
 <PermissionConfiguration>
-	<APIVersion></APIVersion>
+    <APIVersion></APIVersion>
-	<!-- Device related APIs -->
+    <!-- Device related APIs -->
 
-	<Permission>
+    <Permission>
-		<name>control bulb</name>
+        <name>control bulb</name>
-		<path>/device-mgt/user/operations</path>
+        <path>/device-mgt/user/operations</path>
-		<url>/device/*/bulb</url>
+        <url>/device/*/bulb</url>
-		<method>POST</method>
+        <method>POST</method>
-		<scope>arduino_user</scope>
+        <scope>arduino_user</scope>
-	</Permission>
+    </Permission>
     <Permission>
         <name>get controls</name>
         <path>/device-mgt/user/operations</path>

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

@@ -16,9 +16,9 @@
   ~ limitations under the License.
   -->
 
-<beans xmlns="http://www.springframework.org/schema/beans"
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+       xmlns="http://www.springframework.org/schema/beans"
        xsi:schemaLocation="
          http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
          http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
@@ -30,7 +30,7 @@
             </bean>
         </jaxrs:serviceBeans>
         <jaxrs:providers>
-            <bean class="org.codehaus.jackson.jaxrs.JacksonJsonProvider" />
+            <bean class="org.codehaus.jackson.jaxrs.JacksonJsonProvider"/>
         </jaxrs:providers>
     </jaxrs:server>
 

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

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<web-app version="2.5"
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         version="2.5"
          xmlns="http://java.sun.com/xml/ns/javaee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
          metadata-complete="true">
-	<display-name>Arduino</display-name>
+    <display-name>Arduino</display-name>
-	<description>Arduino</description>
+    <description>Arduino</description>
 
     <servlet>
         <servlet-name>CXFServlet</servlet-name>
@@ -28,7 +28,8 @@
     </context-param>
 
     <listener>
-        <listener-class>org.wso2.carbon.device.mgt.iot.arduino.service.impl.listener.ArduinoPermissionUpdateListener</listener-class>
+        <listener-class>org.wso2.carbon.device.mgt.iot.arduino.service.impl.listener.ArduinoPermissionUpdateListener
+        </listener-class>
     </listener>
 
 </web-app>

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

@@ -18,7 +18,8 @@
   ~ under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <artifactId>arduino-plugin</artifactId>

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

@@ -17,8 +17,8 @@
   -->
 
 <assembly
-        xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
         xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
     <id>src</id>
     <formats>

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.analytics-view/analytics-view.js

@@ -26,7 +26,7 @@ function onRequest(context) {
     if (devices) {
         return {
             "devices": stringify(devices),
-            "backendApiUri":  "/arduino/device/stats/"
+            "backendApiUri": "/arduino/device/stats/"
         };
     } else if (deviceType != null && deviceType != undefined && deviceId != null && deviceId != undefined) {
         var deviceModule = require("/app/modules/business-controllers/device.js")["deviceModule"];

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.analytics-view/public/js/arduino.js

@@ -48,25 +48,25 @@ function drawGraph_arduino(from, to) {
     if (devices) {
         for (var i = 0; i < devices.length; i++) {
             graphConfig['series'].push(
-                    {
-                        'color': palette.color(),
-                        'data': [{
-                            x: parseInt(new Date().getTime() / 1000),
-                            y: 0
-                        }],
-                        'name': devices[i].name
-                    });
-        }
-    } else {
-        graphConfig['series'].push(
                 {
                     'color': palette.color(),
                     'data': [{
                         x: parseInt(new Date().getTime() / 1000),
                         y: 0
                     }],
-                    'name': $("#arduino-details").data("devicename")
+                    'name': devices[i].name
                 });
+        }
+    } else {
+        graphConfig['series'].push(
+            {
+                'color': palette.color(),
+                'data': [{
+                    x: parseInt(new Date().getTime() / 1000),
+                    y: 0
+                }],
+                'name': $("#arduino-details").data("devicename")
+            });
     }
 
     var graph = new Rickshaw.Graph(graphConfig);
@@ -103,9 +103,9 @@ function drawGraph_arduino(from, to) {
         graph: graph,
         formatter: function (series, x, y) {
             var date = '<span class="date">' +
-                       moment((x + tzOffset) * 1000).format('Do MMM YYYY h:mm:ss a') + '</span>';
+                moment((x + tzOffset) * 1000).format('Do MMM YYYY h:mm:ss a') + '</span>';
             var swatch = '<span class="detail_swatch" style="background-color: ' +
-                         series.color + '"></span>';
+                series.color + '"></span>';
             return swatch + series.name + ": " + parseInt(y) + '<br>' + date;
         }
     });
@@ -145,7 +145,7 @@ function drawGraph_arduino(from, to) {
             return;
         }
         var backendApiUrl = $("#arduino-div-chart").data("backend-api-url") + devices[deviceIndex].deviceIdentifier
-                            + "?from=" + from + "&to=" + to;
+            + "?from=" + from + "&to=" + to;
         var successCallback = function (data) {
             if (data) {
                 drawLineGraph(JSON.parse(data));
@@ -167,10 +167,10 @@ function drawGraph_arduino(from, to) {
         var chartData = [];
         for (var i = 0; i < data.length; i++) {
             chartData.push(
-                    {
+                {
-                        x: parseInt(data[i].values.time) - tzOffset,
+                    x: parseInt(data[i].values.time) - tzOffset,
-                        y: parseInt(data[i].values.temperature)
+                    y: parseInt(data[i].values.temperature)
-                    }
+                }
             );
         }
 

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.device-view/device-view.hbs

@@ -33,14 +33,14 @@
     </div>
     <div class="add-margin-top-4x">
         {{unit "cdmf.unit.device.operation-bar" device=device autoCompleteParams=autoCompleteParams
-        encodedFeaturePayloads=encodedFeaturePayloads}}
+               encodedFeaturePayloads=encodedFeaturePayloads}}
     </div>
 {{/zone}}
 
 {{#zone "device-view-tabs"}}
     <li class="active"><a class="list-group-item" href="#device_statistics" role="tab"
                           data-toggle="tab" aria-controls="device_statistics">Device
-                                                                              Statistics</a>
+        Statistics</a>
     </li>
     <li><a class="list-group-item" href="#event_log" role="tab" data-toggle="tab"
            aria-controls="event_log">Operations Log</a></li>

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.device-view/device-view.js

@@ -22,20 +22,20 @@ function onRequest(context) {
     var deviceId = request.getParameter("id");
     var devicemgtProps = require("/app/modules/conf-reader/main.js")["conf"];
     var autoCompleteParams = [
-        {"name" : "deviceId", "value" : deviceId}
+        {"name": "deviceId", "value": deviceId}
     ];
 
     if (deviceType != null && deviceType != undefined && deviceId != null && deviceId != undefined) {
         var deviceModule = require("/app/modules/business-controllers/device.js")["deviceModule"];
         var device = deviceModule.viewDevice(deviceType, deviceId);
         if (device && device.status != "error") {
-            var anchor = { "device" : { "id" : device.content.deviceIdentifier, "type" : device.content.type}};
+            var anchor = {"device": {"id": device.content.deviceIdentifier, "type": device.content.type}};
             return {
                 "device": device.content,
-                "autoCompleteParams" : autoCompleteParams,
+                "autoCompleteParams": autoCompleteParams,
                 "encodedFeaturePayloads": "",
-                "portalUrl" : devicemgtProps['portalURL'],
+                "portalUrl": devicemgtProps['portalURL'],
-                "anchor" : JSON.stringify(anchor)
+                "anchor": JSON.stringify(anchor)
             };
         } else {
             response.sendError(404, "Device Id " + deviceId + " of type " + deviceType + " cannot be found!");

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.device-view/device-view.json

@@ -1,3 +1,3 @@
 {
-    "version": "1.0.0"
+  "version": "1.0.0"
 }

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

@@ -30,7 +30,7 @@
         <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="helper" title="SMTP Server Host">
                                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                             </span>
                 <br>
@@ -41,7 +41,7 @@
 
             <label class="wr-input-label" for="email-config-host">
                 Http Server Port
-                                            <span class="helper" title="SMTP Server Host">
+                <span class="helper" title="SMTP Server Host">
                                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                             </span>
                 <br>
@@ -52,7 +52,7 @@
         </div>
         <div class="wr-input-control wr-btn-grp">
             <button id="save-general-btn" class="wr-btn" onclick="addConfiguration();">
-                        Save
+                Save
             </button>
         </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/configuration.json

@@ -1,3 +1,3 @@
 {
-	"version" : "1.0.0"
+  "version": "1.0.0"
 }

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,7 +31,7 @@ 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", {});
+        var tokenPair = jwtClient.getAccessToken(resp[0], resp[1], context.user.username, "default", {});
         if (tokenPair) {
             token = tokenPair.accessToken;
         }

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/public/js/device-stats.js

@@ -25,9 +25,9 @@ $(window).load(function () {
     var tNow = new Date().getTime() / 1000;
     for (var i = 0; i < 30; i++) {
         chartData.push({
-                           x: tNow - (30 - i) * 15,
+            x: tNow - (30 - i) * 15,
-                           y: parseFloat(0)
+            y: parseFloat(0)
-                       });
+        });
     }
 
     graph = new Rickshaw.Graph({
@@ -90,9 +90,9 @@ function connect(target) {
         ws.onmessage = function (event) {
             var dataPoint = JSON.parse(event.data);
             chartData.push({
-                               x: parseInt(dataPoint[0]) / 1000,
+                x: parseInt(dataPoint[0]) / 1000,
-                               y: parseFloat(dataPoint[5])
+                y: parseFloat(dataPoint[5])
-                           });
+            });
             chartData.shift();
             graph.update();
         };

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/private/config.json

@@ -4,7 +4,7 @@
     "category": "iot",
     "downloadAgentUri": "arduino/device/download",
     "category": "iot",
-    "scopes" : [
+    "scopes": [
       "perm:arduino:enroll"
     ]
   }

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/css/styles.css

@@ -21,15 +21,19 @@
     width: 50px;
     color: #fff;
 }
+
 .padding-top-double {
     padding-top: 20px;
 }
+
 .padding-double {
     padding: 20px;
 }
+
 .grey {
     color: #333;
 }
+
 hr {
     display: block;
     height: 1px;
@@ -39,20 +43,25 @@ hr {
     padding: 0;
     opacity: 0.2;
 }
+
 .light-grey {
     color: #7c7c7c;
 }
+
 .uppercase {
     text-transform: uppercase;
 }
+
 .grey-bg {
     background-color: #f6f4f4;
 }
-.doc-link{
+
+.doc-link {
     background: none;
     color: #000;
     padding: 10px 0px;
 }
+
 .doc-link a {
     color: #006eff;
 }

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

@@ -110,15 +110,15 @@ function attachEvents() {
                         doAction(data);
                     }
                 );
-            }else if(deviceName){
+            } else if (deviceName) {
                 $('.controls').append('<label for="deviceName" generated="true" class="error" ' +
-                                      'style="display: inline-block;">Please enter at least 4 ' +
+                    'style="display: inline-block;">Please enter at least 4 ' +
-                                      'characters.</label>');
+                    'characters.</label>');
                 $('.control-group').removeClass('success').addClass('error');
             } else {
                 $('.controls').append('<label for="deviceName" generated="true" class="error" ' +
-                                      'style="display: inline-block;">This field is required.' +
+                    'style="display: inline-block;">This field is required.' +
-                                      '</label>');
+                    '</label>');
                 $('.control-group').removeClass('success').addClass('error');
             }
         });
@@ -146,7 +146,7 @@ function downloadAgent() {
         setTimeout(function () {
             hidePopup();
         }, 1000);
-    }else {
+    } else {
         $("#invalid-username-error-msg span").text("Invalid device name");
         $("#invalid-username-error-msg").removeClass("hidden");
     }
@@ -186,28 +186,28 @@ function doAction(data) {
 }
 
 function artifactUpload() {
-	var contentType = "application/json";
+    var contentType = "application/json";
 
-	var urix = backendEndBasePath + "/admin/devicetype/deploy/arduino";
+    var urix = backendEndBasePath + "/admin/devicetype/deploy/arduino";
-	var defaultStatusClasses = "fw fw-stack-1x";
+    var defaultStatusClasses = "fw fw-stack-1x";
-	var content = $("#arduino-statistic-response-template").find(".content");
+    var content = $("#arduino-statistic-response-template").find(".content");
-	var title = content.find("#title");
+    var title = content.find("#title");
-	var statusIcon = content.find("#status-icon");
+    var statusIcon = content.find("#status-icon");
-	var data = {}
+    var data = {}
-	invokerUtil.post(urix, data, function (data) {
+    invokerUtil.post(urix, data, function (data) {
-		title.html("Deploying statistic artifacts. Please wait...");
+        title.html("Deploying statistic artifacts. Please wait...");
-		statusIcon.attr("class", defaultStatusClasses + " fw-check");
+        statusIcon.attr("class", defaultStatusClasses + " fw-check");
-		$(modalPopupContent).html(content.html());
+        $(modalPopupContent).html(content.html());
-		showPopup();
+        showPopup();
-		setTimeout(function () {
+        setTimeout(function () {
-			hidePopup();
+            hidePopup();
-			location.reload(true);
+            location.reload(true);
-		}, 5000);
+        }, 5000);
 
-	}, function (jqXHR) {
+    }, function (jqXHR) {
-		title.html("Failed to deploy artifacts, Please contact administrator.");
+        title.html("Failed to deploy artifacts, Please contact administrator.");
-		statusIcon.attr("class", defaultStatusClasses + " fw-error");
+        statusIcon.attr("class", defaultStatusClasses + " fw-error");
-		$(modalPopupContent).html(content.html());
+        $(modalPopupContent).html(content.html());
-		showPopup();
+        showPopup();
-	}, contentType);
+    }, 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

@@ -32,31 +32,31 @@
     <h3 class="uppercase">What it Does</h3>
     <hr>
     <p class="grey margin-top">Connect Arduino UNO board to WSO2 IoT Server and visualize sensor
-                               data.</p>
+        data.</p>
     <br>
     <h3 class="uppercase">What You Need</h3>
     <hr>
     <ul class="list-unstyled">
         <li class="padding-top-double">
             <span class="badge">ITEM 01</span>
-               Arduino UNO Board.
+            Arduino UNO Board.
         </li>
         <li>
             <span class="badge">ITEM 02</span>
-               Adafruit Wifi Shield for Arduino.
+            Adafruit Wifi Shield for Arduino.
         </li>
         <li>
             <span class="badge">ITEM 03</span>
-               LED bulb connected to Pin 13.
+            LED bulb connected to Pin 13.
             <i>(If not available, will use the one on the board.)</i>
         </li>
         <li>
             <span class="badge">ITEM 04</span>
-               Resister( e.g 330 ohms )
+            Resister( e.g 330 ohms )
         </li>
         <li>
             <span class="badge">STEP 05</span>
-               Proceed to [Prepare] section.
+            Proceed to [Prepare] section.
     </ul>
     <br>
     <a href="/api-store/apis/info?name={{@uriParams.deviceType}}&version=1.0.0&provider=admin"
@@ -67,7 +67,8 @@
         <i class="fw fw-download add-margin-1x"></i>Download Sketch
     </a>
     {{#if displayStatus}}
-        <a href="javascript:artifactUpload()" class="btn-operations"><i class="fw fw-upload fw-inverse fw-lg add-margin-1x"></i> Deploy Analytics Artifacts</a>
+        <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"
@@ -201,11 +202,11 @@
     <ul class="list-unstyled">
         <li class="padding-top-double">
             <span class="badge">01</span>
-               Wifi-Shield mounted onto the Arduino-UNO board
+            Wifi-Shield mounted onto the Arduino-UNO board
         </li>
         <li class="padding-top-double">
             <span class="badge">02</span>
-               Connect LED bulb to arduino as follows
+            Connect LED bulb to arduino as follows
             <br/><br/>
             <a href="{{@unit.publicUri}}/images/schematicsGuide.png" target="_blank">
                 <img src="{{@unit.publicUri}}/images/schematicsGuide.png" class="img-responsive">
@@ -215,20 +216,20 @@
 
         <li class="padding-top-double">
             <span class="badge">03</span>
-               Download Arduino-Sketch from [Download Sketch] link above.
+            Download Arduino-Sketch from [Download Sketch] link above.
         </li>
         <li class="padding-top-double">
             <span class="badge">04</span>
-               Unzip the downloaded Arduino Agent
+            Unzip the downloaded Arduino Agent
         </li>
         <li class="padding-top-double">
             <span class="badge">05</span>
-               Create a folder called "ArduinoBoardSketch" and move all source files
+            Create a folder called "ArduinoBoardSketch" and move all source files
             inside
         </li>
         <li class="padding-top-double">
             <span class="badge">06</span>
-               Open ArduinoBoardSketch.h and provide appropriate values for
+            Open ArduinoBoardSketch.h and provide appropriate values for
             <i>[WLAN_SSID]</i>,
             <i>[WLAN_PASS]</i>,
             <i>[SERVICE_PORT]</i>,
@@ -238,7 +239,7 @@
         </li>
         <li class="padding-top-double">
             <span class="badge">07</span>
-               Burn the sketch onto your Arduino board and let the program run.
+            Burn the sketch onto your Arduino board and let the program run.
         </li>
         <li class="padding-top-double">
 
@@ -246,14 +247,14 @@
                 <i class="fw fw-circle-outline fw-stack-2x"></i>
                 <i class="fw fw-right-arrow fw-stack-1x"></i>
             </span>
-               Arduino will publish it's internal temperature to WSO2-IoT-Server
+            Arduino will publish it's internal temperature to WSO2-IoT-Server
             <br/><br/>
 
             <span class="fw-stack margin-right">
                 <i class="fw fw-circle-outline fw-stack-2x"></i>
                 <i class="fw fw-right-arrow fw-stack-1x"></i>
             </span>
-               LED on <i>PIN 13</i> can be controlled from Device Management page.
+            LED on <i>PIN 13</i> can be controlled from Device Management page.
         </li>
     </ul>
     <br>
@@ -267,17 +268,17 @@
             <ul class="list-unstyled">
                 <li class="padding-top-double">
                     <span class="badge">01</span>
-                       You can view all your connected devices at
+                    You can view all your connected devices at
                     <a href="{{@app.context}}/devices">[Device Management]</a> page.
                 </li>
                 <li class="padding-top-double">
                     <span class="badge">02</span>
-                       Select one of connected devices and check for available control
+                    Select one of connected devices and check for available control
                     operations and monitor Real-Time data.
                 </li>
                 <li class="padding-top-double">
                     <span class="badge">03</span>
-                       You can also view analytics of the data published to IoT-Server by
+                    You can also view analytics of the data published to IoT-Server by
                     navigating to Device Analytics page.
                 </li>
             </ul>

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

@@ -16,22 +16,22 @@
  * under the License.
  */
 
-function onRequest(context){
+function onRequest(context) {
     var viewModel = {};
     var devicemgtProps = require("/app/modules/conf-reader/main.js")["conf"];
-	var serviceInvokers = require("/app/modules/oauth/token-protected-service-invokers.js")["invokers"];
+    var serviceInvokers = require("/app/modules/oauth/token-protected-service-invokers.js")["invokers"];
-	var url = devicemgtProps["httpsURL"] + "/api/device-mgt/v1.0/admin/devicetype/deploy/arduino/status";
+    var url = devicemgtProps["httpsURL"] + "/api/device-mgt/v1.0/admin/devicetype/deploy/arduino/status";
-	serviceInvokers.XMLHttp.get(
+    serviceInvokers.XMLHttp.get(
-		url, function (responsePayload) {
+        url, function (responsePayload) {
-			var responseContent = responsePayload.status;
+            var responseContent = responsePayload.status;
-			new Log().error(responseContent);
+            new Log().error(responseContent);
-			if ("204" == responsePayload.status) {
+            if ("204" == responsePayload.status) {
-				viewModel["displayStatus"] = "Display";
+                viewModel["displayStatus"] = "Display";
-			}
+            }
-		},
+        },
-		function (responsePayload) {
+        function (responsePayload) {
-			//do nothing.
+            //do nothing.
-		}
+        }
-	);
+    );
     return viewModel;
 }

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

@@ -1,3 +1,3 @@
 {
-    "version": "1.0.0"
+  "version": "1.0.0"
 }

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

@@ -17,7 +17,8 @@
 ~ under the License.
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>

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

@@ -27,9 +27,16 @@
             to save it to your computer.</p>
         <p class="doc-link">For further instructions and troubleshooting please visit the following <a href="https://docs.wso2.com/display/IoTS300/Android"
                                      target="_blank">link</a>.</p>-->
-        <p class="doc-link text-center">Need help? Read <a
+        {{#if isCloud}}
-                href="https://docs.wso2.com/display/DeviceCloud/Enrolling+an+Android+Device" target="_blank">WSO2 Device
+            <p class="doc-link text-center">Need help? Read <a
-            Cloud documentation.</a></p>
+                    href="https://docs.wso2.com/display/IoTS300/Android" target="_blank">WSO2 Device
+                Cloud documentation.</a></p>
+        {{else}}
+            <p class="doc-link text-center">Need help? Read <a
+                    href="https://docs.wso2.com/display/DeviceCloud/Enrolling+an+Android+Device" target="_blank">WSO2
+                IoT Server documentation.</a></p>
+        {{/if}}
+
     </div>
 </div>
 
@@ -40,21 +47,16 @@
     </div>
 </div>
 
-<div class="row grey-bg">
+{{#if isCloud}}
-    {{#if isCloud}}
+    <div class="row grey-bg">
-    <div class="col-xs-12 col-sm-6 col-md-6 col-lg-6 add-padding-top-2x add-padding-bottom-2x">
-    {{else}}
-    <div class="col-xs-12 col-sm-6 col-md-3 col-lg-3 add-padding-top-2x add-padding-bottom-2x">
-    {{/if}}
 
-
+        <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 col-md-offset-1 col-lg-offset-1 add-padding-top-2x add-padding-bottom-2x">
-    <h5><strong>Step 1</strong></h5>
+            <h5><strong>Step 1</strong></h5>
-    <p>Let's start by installing the Android agent on your device. Open the downloaded file, and tap <b>INSTALL</b>.</p>
+            <p>Let's start by installing the Android agent on your device. Open the downloaded file, and tap
-    <img src="{{@unit.publicUri}}/images/install_agent.png" class="img-responsive">
+                <b>INSTALL</b>.</p>
-</div>
+            <img src="{{@unit.publicUri}}/images/install_agent.png" class="img-responsive">
-
+        </div>
-    {{#if isCloud}}
+        <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 col-md-offset-2 col-lg-offset-2 add-padding-top-2x add-padding-bottom-2x">
-        <div class="col-xs-12 col-sm-6 col-md-6 col-lg-6 add-padding-top-2x add-padding-bottom-2x">
             <h5><strong>Step 2</strong></h5>
             <p>Enter your:
             <p>
@@ -65,7 +67,14 @@
             </ul>
             <img src="{{@unit.publicUri}}/images/login.png" class="img-responsive">
         </div>
-    {{else}}
+{{else}}
+    <div class="row grey-bg">
+        <div class="col-xs-12 col-sm-6 col-md-3 col-lg-3 add-padding-top-2x add-padding-bottom-2x">
+            <h5><strong>Step 1</strong></h5>
+            <p>Let's start by installing the Android agent on your device. Open the downloaded file, and tap
+                <b>INSTALL</b>.</p>
+            <img src="{{@unit.publicUri}}/images/install_agent.png" class="img-responsive">
+        </div>
 
         <div class="col-xs-12 col-sm-6 col-md-3 col-lg-3 add-padding-top-2x add-padding-bottom-2x">
             <h5><strong>Step 2</strong></h5>
@@ -88,7 +97,7 @@
             </ul>
             <img src="{{@unit.publicUri}}/images/install_agent.png" class="img-responsive">
         </div>
-    {{/if}}
+{{/if}}
 
 </div>
 
@@ -151,10 +160,10 @@
 
     <br/>
 
-    {{#zone "topCss"}}
+{{#zone "topCss"}}
-        {{css "css/styles.css"}}
+    {{css "css/styles.css"}}
-    {{/zone}}
+{{/zone}}
 
-    {{#zone "bottomJs"}}
+{{#zone "bottomJs"}}
-        {{js "js/type-view.js"}}
+    {{js "js/type-view.js"}}
-    {{/zone}}
+{{/zone}}