Merge branch 'cloud-3.1.0' into cloud-3.1.0

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

@@ -56,7 +56,7 @@ import javax.ws.rs.core.Response;
                 }
         ),
         tags = {
-                @Tag(name = "android_sense", description = "")
+                @Tag(name = "android_sense,device_management", description = "")
         }
 )
 @Scopes(

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

@@ -40,7 +40,7 @@ import javax.ws.rs.core.Response;
                 }
         ),
         tags = {
-                @Tag(name = "arduino", description = "")
+                @Tag(name = "arduino,device_management", description = "")
         }
 )
 @Scopes(

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

@@ -39,7 +39,7 @@ import javax.ws.rs.core.Response;
                 }
         ),
         tags = {
-                @Tag(name = "raspberrypi", description = "")
+                @Tag(name = "raspberrypi,device_management", description = "")
         }
 )
 @Scopes(

components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java

@@ -45,7 +45,7 @@ import javax.ws.rs.core.Response;
                 }
         ),
         tags = {
-                @Tag(name = "virtual_firealarm", description = "")
+                @Tag(name = "virtual_firealarm,device_management", description = "")
         }
 )
 @Scopes(

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

@@ -58,7 +58,7 @@ import java.util.List;
                 }
         ),
         tags = {
-                @Tag(name = "android", description = "")
+                @Tag(name = "android,device_management", description = "")
         }
 )
 @Path("/admin/devices")

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

@@ -56,7 +56,7 @@ import java.util.List;
                 }
         ),
         tags = {
-                @Tag(name = "android", description = "")
+                @Tag(name = "android,device_management", description = "")
         }
 )
 @Api(value = "Android Device Management",

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

@@ -55,7 +55,7 @@ import javax.ws.rs.core.Response;
                 }
         ),
         tags = {
-                @Tag(name = "android", description = "")
+                @Tag(name = "android,device_management", description = "")
         }
 )
 @Api(value = "Android Configuration Management", description = "This API carries all the resource used to mange the Android platform configurations.")

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

@@ -53,7 +53,7 @@ import javax.ws.rs.core.Response;
                 }
         ),
         tags = {
-                @Tag(name = "android", description = "")
+                @Tag(name = "android,device_management", description = "")
         }
 )
 @Api(value = "Event Receiver", description = "Event publishing/retrieving related APIs. To enable event publishing/retrieving you need to" +

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

@@ -336,16 +336,18 @@
                             <div id="device-location"
                                  data-lat="{{device.location.latitude}}"
                                  data-long="{{device.location.longitude}}"
-                                 data-locations = "{{device.locationHistory}}">
+                                 data-locations="{{device.locationHistory}}">
                             </div>
                             <br/>
-                            <a class="padding-left" target="_blank"
-                               href="{{portalUrl}}/portal/dashboards/geo-dashboard/?GLOBAL-STATE={{anchor}}">
+                            {{#unless isCloud}}
+                                <a class="padding-left" target="_blank"
+                                   href="{{portalUrl}}/portal/dashboards/geo-dashboard/?GLOBAL-STATE={{anchor}}">
                                 <span class="fw-stack">
                                     <i class="fw fw-circle-outline fw-stack-2x"></i>
                                     <i class="fw fw-map-location fw-stack-1x"></i>
-                                </span>  Add Geo Fencing
-                            </a>
+                                </span> Add Geo Fencing
+                                </a>
+                            {{/unless}}
                         {{else}}
                             <div id="map-error" class="message message-warning">
                                 <h4 class="remove-margin">

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

@@ -213,6 +213,7 @@ function onRequest(context) {
     deviceViewData["autoCompleteParams"] = autoCompleteParams;
 
     deviceViewData["portalUrl"] = devicemgtProps['portalURL'];
+    deviceViewData["isCloud"] = devicemgtProps['isCloud'];
     deviceViewData["anchor"] = encodeURI(JSON.stringify({ "device" : { "id" : deviceId, "type" : deviceType}}));
     return deviceViewData;
 }

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

@@ -19,7 +19,7 @@
 var map;
 
 function loadLeafletMap() {
-   
+
     var deviceLocationID = "#device-location",
         locations = $(deviceLocationID).data("locations"),
         location_lat = $(deviceLocationID).data("lat"),
@@ -28,7 +28,7 @@ function loadLeafletMap() {
         zoomLevel = 13,
         tileSet = "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
         attribution = "&copy; <a href='https://openstreetmap.org/copyright'>OpenStreetMap</a> contributors";
-    if (locations) {
+    if (locations && locations.locations.length > 0) {
 
         var locationSets = locations.locations;
         map = L.map(container).setView([locationSets[0].lat, locationSets[0].lng], zoomLevel);

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

@@ -95,9 +95,6 @@
     </div>
 </div>
 
-
-
-
 <div class="col-xs-12 col-sm-12 col-md-8 col-lg-12 padding-double grey-bg">
     <h3 class="uppercase">Prepare</h3><hr>
     <ul class="list-unstyled">

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

@@ -34,6 +34,7 @@ function onRequest(context){
 	//		//do nothing.
 	//	}
 	//);
+    viewModel["isCloud"] = devicemgtProps["isCloud"];
     viewModel["hostName"] = devicemgtProps["httpsURL"];
     viewModel["enrollmentURL"] = devicemgtProps["generalConfig"]["host"] + devicemgtProps["androidEnrollmentDir"];
     return viewModel;

components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/ConfigurationMgtService.java

@@ -62,7 +62,7 @@ import javax.ws.rs.core.Response;
                 }
         ),
         tags = {
-                @Tag(name = "windows", description = "")
+                @Tag(name = "windows,device_management", description = "")
         }
 )
 @Api(value = "Windows Configuration Management",

components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementAdminService.java

@@ -55,7 +55,7 @@ import java.util.List;
                 }
         ),
         tags = {
-                @Tag(name = "windows", description = "")
+                @Tag(name = "windows,device_management", description = "")
         }
 )
 @Api(value = "Windows Device Management Administrative Service",

components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/authbst/BSTProvider.java

@@ -51,7 +51,7 @@ import javax.ws.rs.core.Response;
                 }
         ),
         tags = {
-                @Tag(name = "windows", description = "")
+                @Tag(name = "windows,device_management", description = "")
         }
 )
 @Api(value = "Windows Binary Security Token Service",