+
+
+ Installed Applications
-
-
-
+
+
+
-
- Loading Applications
- List...
-
-
-
-
-
- No applications found.
-
-
Please try refreshing in a while.
-
+
+ Loading Applications
+ List...
+
+
+
+
+
+ No applications found.
+
+
Please try refreshing in a while.
-
-
-
- Operations Log
+
+
+
+
-
-
+
+
+
-
- Loading Operations Log...
-
-
-
-
-
- There are no operations, performed yet on this device.
-
-
+
+ Loading Operations Log...
+
+
+
+
+
+ There are no operations, performed yet on this device.
+
-
-
-
- | Operation Code |
- Status |
- Request created at |
-
-
-
-
-
+
+
+
+ | Operation Code |
+ Status |
+ Request created at |
+
+
+
+
+
- {{/defineZone}}
-
+
- {{else}}
-
- Permission Denied
-
-
- You are not authorized to view specified device in the system.
- {{/if}}
+ {{/zone}}
+
{{else}}
- Device not found
+ Permission Denied
- You have tried to access either a removed or non-existing device.
+ You are not authorized to view specified device in the system.
{{/if}}
-{{/zone}}
+{{else}}
+
+ Device not found
+
+
+ You have tried to access either a removed or non-existing device.
+{{/if}}
+
{{#zone "bottomJs"}}
{{#if isAuthorized}}
{{js "js/device-detail.js"}}
diff --git a/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 b/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
index 073670b6c..e12577afd 100644
--- a/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
+++ b/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
@@ -34,7 +34,7 @@ function onRequest(context) {
// creating deviceView information model from filtered device data
var viewModel = {};
if (filteredDeviceData["type"]) {
- viewModel["deviceType"] = filteredDeviceData["type"];
+ viewModel["type"] = filteredDeviceData["type"];
viewModel.isNotWindows = true;
if (viewModel["deviceType"] == "windows") {
viewModel.isNotWindows = false;
diff --git a/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/img/device_icons/TemperatureController.png b/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/img/device_icons/TemperatureController.png
new file mode 100755
index 000000000..e16b48d8e
Binary files /dev/null and b/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/img/device_icons/TemperatureController.png differ
diff --git a/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/img/device_icons/android.png b/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/img/device_icons/android.png
new file mode 100755
index 000000000..7fee78a64
Binary files /dev/null and b/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/img/device_icons/android.png differ
diff --git a/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/img/device_icons/ios.png b/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/img/device_icons/ios.png
new file mode 100755
index 000000000..4b09796f8
Binary files /dev/null and b/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/img/device_icons/ios.png differ
diff --git a/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/img/graph.png b/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/img/graph.png
new file mode 100755
index 000000000..dd819ef4f
Binary files /dev/null and b/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/img/graph.png differ
diff --git a/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/device-detail.js b/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/device-detail.js
old mode 100644
new mode 100755
index 20cf3c165..a90864968
--- a/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/device-detail.js
+++ b/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/device-detail.js
@@ -1,64 +1,136 @@
/*
- * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * 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
+ * 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
+ * "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.
*/
+var InitiateViewOption = null;
+
(function () {
var deviceId = $(".device-id");
var deviceIdentifier = deviceId.data("deviceid");
var deviceType = deviceId.data("type");
var payload = [deviceIdentifier];
var operationTable;
+ var serviceUrl;
+
if (deviceType == "ios") {
serviceUrl = "/ios/operation/deviceinfo";
} else if (deviceType == "android") {
//var serviceUrl = "/mdm-android-agent/operation/device-info";
serviceUrl = "/api/device-mgt/android/v1.0/admin/devices/info";
}
+
if (serviceUrl) {
- invokerUtil.post(serviceUrl, payload,
- function (message) {
- console.log(message);
- }, function (message) {
- console.log(message);
+ invokerUtil.post(
+ serviceUrl,
+ payload,
+ // success-callback
+ function () {
+ $(".panel-body").show();
+ },
+ // error-callback
+ function () {
+ var defaultInnerHTML =
+ "
Device data may not have been updated. Please refresh to try again.
";
+ $(".panel-body").append(defaultInnerHTML);
+ }
+ );
+ }
+
+
+ $(".media.tab-responsive [data-toggle=tab]").on("shown.bs.tab", function (e) {
+ var activeTabPane = $(e.target).attr("href");
+ var activeListGroupItem = $(".media .list-group-item.active");
+
+ $(activeTabPane).removeClass("visible-xs-block");
+ $(activeTabPane).siblings().not(".arrow-left").addClass("visible-xs-block");
+ positionArrow(activeListGroupItem);
+ });
+
+ $(".media.tab-responsive .tab-content").on("shown.bs.collapse", function (e) {
+ var thisParent = $(e.target).parent();
+ var activeTabPaneCaret = thisParent.find('.caret-updown');
+ var activeTabPaneCaretSiblings = thisParent.siblings().find('.caret-updown');
+
+ activeTabPaneCaret.removeClass("fw-up").addClass("fw-down");
+ activeTabPaneCaretSiblings.removeClass("fw-down").addClass("fw-up");
+ });
+
+
+ $('.media.tab-responsive a[data-toggle="collapse"]').on('click',function(){
+ var clickedPanel = $(this).attr('href');
+
+ if($(clickedPanel).hasClass('in')){
+ $(clickedPanel).collapse('hide');
+ }else{
+ $(clickedPanel).collapse('show');
+ }
+ });
+
+
+ function positionArrow(selectedTab) {
+ var selectedTabHeight = $(selectedTab).innerHeight();
+ var arrowPosition = 0;
+ var totalHeight = 0;
+ var arrow = $(".media .panel-group.tab-content .arrow-left");
+ var parentHeight = $(arrow).parent().innerHeight();
+
+
+ if($(selectedTab).prev().length){
+ $(selectedTab).prevAll().each(function() {
+ totalHeight += $(this).innerHeight();
});
+ arrowPosition = totalHeight + (selectedTabHeight / 2);
+ }else{
+ arrowPosition = selectedTabHeight / 2;
+ }
+
+ if(arrowPosition >= parentHeight){
+ parentHeight = arrowPosition + 50;
+ $(arrow).siblings(".panel.active").height(parentHeight);
+ }else{
+ $(arrow).parent().removeAttr("style");
+ }
+
+ $(arrow).css("top", arrowPosition - 10);
}
- $(document).ready(function () {
- $(".panel-body").removeClass("hidden");
- $("#loading-content").remove();
- loadOperationsLog();
+ $(document).ready(function() {
+ $(".device-detail-body").removeClass("hidden");
+ $("#loading-content").remove();
+ console.log("##### something went wrong here!" + deviceType)
+ loadOperationBar(deviceType);
+ loadOperationsLog(false);
loadApplicationsList();
loadPolicyCompliance();
$("#refresh-policy").click(function () {
- $('#policy-spinner').removeClass('hidden');
+ $("#policy-spinner").removeClass("hidden");
loadPolicyCompliance();
});
$("#refresh-apps").click(function () {
- $('#apps-spinner').removeClass('hidden');
+ $("#apps-spinner").removeClass("hidden");
loadApplicationsList();
});
$("#refresh-operations").click(function () {
- $('#operations-spinner').removeClass('hidden');
+ $("#operations-spinner").removeClass("hidden");
loadOperationsLog(true);
});
- loadOperationBar(deviceType);
});
function loadOperationsLog(update) {
@@ -68,103 +140,77 @@
operationTable.ajax.reload(false);
return;
}
- operationTable = $(operationsLogTable)
- .datatables_extended({
- serverSide: true,
- processing: false,
- searching: false,
- ordering: false,
- pageLength: 10,
- order: [],
- ajax: {
- url: context + "/api/operation/paginate",
- data: {
- deviceId: deviceIdentifier,
- deviceType: deviceType
- },
- dataSrc: function (json) {
- $("#operations-spinner").addClass(
- "hidden");
- $("#operations-log-container").empty();
- return json.data;
- }
- },
- columnDefs: [
- {targets: 0, data: "code"},
- {
- targets: 1,
- data: "status",
- render: function (status) {
- var html;
- switch (status) {
- case "COMPLETED" :
- html =
- " Completed";
- break;
- case "PENDING" :
- html =
- " Pending";
- break;
- case "ERROR" :
- html =
- " Error";
- break;
- case "IN_PROGRESS" :
- html =
- " In Progress";
- break;
- case "REPEATED" :
- html =
- " Repeated";
- break;
- }
- return html;
- }
- },
- {
- targets: 2,
- data: "createdTimeStamp",
- render: function (date) {
- var value = String(date);
- return value.slice(0, 16);
- }
- }
- ],
- "createdRow": function (row, data) {
- $(row).attr("data-type", "selectable");
- $(row).attr("data-id", data["id"]);
- $.each($("td", row),
- function (colIndex) {
- switch (colIndex) {
- case 1:
- $(this).attr(
- "data-grid-label",
- "Code");
- $(this).attr(
- "data-display",
- data["code"]);
- break;
- case 2:
- $(this).attr(
- "data-grid-label",
- "Status");
- $(this).attr(
- "data-display",
- data["status"]);
- break;
- case 3:
- $(this).attr(
- "data-grid-label",
- "Created Timestamp");
- $(this).attr(
- "data-display",
- data["createdTimeStamp"]);
- break;
- }
- }
- );
- }
- });
+ operationTable = $(operationsLogTable).datatables_extended({
+ serverSide: true,
+ processing: false,
+ searching: false,
+ ordering: false,
+ pageLength : 10,
+ order: [],
+ ajax: {
+ url: "/emm/api/operation/paginate",
+ data: {deviceId : deviceIdentifier, deviceType: deviceType},
+ dataSrc: function (json) {
+ $("#operations-spinner").addClass("hidden");
+ $("#operations-log-container").empty();
+ return json.data;
+ }
+ },
+ columnDefs: [
+ {targets: 0, data: "code" },
+ {targets: 1, data: "status", render:
+ function (status) {
+ var html;
+ switch (status) {
+ case "COMPLETED" :
+ html = " Completed";
+ break;
+ case "PENDING" :
+ html = " Pending";
+ break;
+ case "ERROR" :
+ html = " Error";
+ break;
+ case "IN_PROGRESS" :
+ html = " In Progress";
+ break;
+ case "REPEATED" :
+ html = " Repeated";
+ break;
+ }
+ return html;
+ }
+ },
+ {targets: 2, data: "createdTimeStamp", render:
+ function (date) {
+ var value = String(date);
+ return value.slice(0, 16);
+ }
+ }
+ ],
+ "createdRow": function(row, data) {
+ $(row).attr("data-type", "selectable");
+ $(row).attr("data-id", data["id"]);
+ $.each($("td", row),
+ function(colIndex) {
+ switch(colIndex) {
+ case 1:
+ $(this).attr("data-grid-label", "Code");
+ $(this).attr("data-display", data["code"]);
+ break;
+ case 2:
+ $(this).attr("data-grid-label", "Status");
+ $(this).attr("data-display", data["status"]);
+ break;
+ case 3:
+ $(this).attr("data-grid-label", "Created Timestamp");
+ $(this).attr("data-display", data["createdTimeStamp"]);
+ break;
+ }
+ }
+ );
+ }
+ });
}
function loadApplicationsList() {
@@ -195,17 +241,17 @@
$("#applications-list-container").html(content);
} else {
$("#applications-list-container").
- html("
No applications found.
" +
- "
Please try refreshing the list in a while.
");
+ html("
No applications found.
" +
+ "
Please try refreshing the list in a while.
");
}
}
},
// error-callback
function () {
$("#applications-list-container").
- html("
Loading application list " +
- "was not successful. please try refreshing the list in a while.
");
- });
+ html("
Loading application list " +
+ "was not successful. please try refreshing the list in a while.
");
+ });
});
}
@@ -257,16 +303,16 @@
}
} else {
$("#policy-list-container").
- html("
This device " +
- "has no policy applied.
");
+ html("
This device " +
+ "has no policy applied.
");
}
}
},
// error-callback
function () {
$("#policy-list-container").
- html("
Loading policy compliance related data " +
- "was not successful. please try refreshing data in a while.
");
+ html("
Loading policy compliance related data " +
+ "was not successful. please try refreshing data in a while.
");
}
);
}
@@ -275,11 +321,12 @@
// error-callback
function () {
$("#policy-list-container").
- html("
Loading policy compliance related data " +
- "was not successful. please try refreshing data in a while.
");
+ html("
Loading policy compliance related data " +
+ "was not successful. please try refreshing data in a while.
");
}
);
}
);
}
+
}());
diff --git a/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 b/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
old mode 100644
new mode 100755
index a2a322f8c..895f75b94
--- a/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
+++ b/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
@@ -1,56 +1,54 @@
/*
- * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * 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
+ * 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
+ * "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.
*/
-$(document).ready(function () {
- if (document.getElementById('device-location')) {
- loadMap();
+var map;
+
+function loadLeafletMap() {
+ var deviceLocationID = "#device-location",
+ lat = $(deviceLocationID).data("lat"),
+ long = $(deviceLocationID).data("long"),
+ container = "device-location",
+ zoomLevel = 13,
+ tileSet = "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
+ attribution = "©
OpenStreetMap contributors";
+
+ if (lat && long) {
+ map = L.map(container).setView([lat, long], zoomLevel);
+ L.tileLayer(tileSet, {attribution: attribution}).addTo(map);
+ L.marker([lat, long]).addTo(map).bindPopup("Device is here...").openPopup();
+
+ $("#map-error").hide();
+ $("#device-location").show();
+ } else {
+ $("#device-location").hide();
+ $("#map-error").show();
}
-});
-
-function loadMap() {
- var map;
-
- function initialize() {
- var mapOptions = {
- zoom: 18
- };
- var lat = $("#device-location").data("lat");
- var long = $("#device-location").data("long");
-
- if (lat != null && lat != undefined && lat != "" && long != null && long != undefined && long != "") {
- $("#map-error").hide();
- $("#device-location").show();
- map = new google.maps.Map(document.getElementById('device-location'),
- mapOptions);
-
- var pos = new google.maps.LatLng(lat, long);
- var marker = new google.maps.Marker({
- position: pos,
- map: map
- });
+}
- map.setCenter(pos);
- } else {
- $("#device-location").hide();
- $("#map-error").show();
+$(document).ready(function () {
+ $("a[data-toggle='tab']").on("shown.bs.tab", function() {
+ var url = $(this).prop("href");
+ var hash = url.substring(url.indexOf("#") + 1);
+
+ if (hash == "device_location") {
+ if (!map) {
+ loadLeafletMap();
+ }
}
-
- }
-
- google.maps.event.addDomListener(window, 'load', initialize);
-}
\ No newline at end of file
+ });
+});
\ No newline at end of file
diff --git a/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/templates/applications-list.hbs b/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/templates/applications-list.hbs
new file mode 100755
index 000000000..3b55136af
--- /dev/null
+++ b/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/templates/applications-list.hbs
@@ -0,0 +1,31 @@
+
\ No newline at end of file
diff --git a/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/templates/operations-log.hbs b/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/templates/operations-log.hbs
new file mode 100755
index 000000000..cc5db5117
--- /dev/null
+++ b/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/templates/operations-log.hbs
@@ -0,0 +1,24 @@
+
+
+
+ | Operation Code |
+ Status |
+ Request created at |
+
+
+
+ {{#each operations}}
+
+ | {{code}} |
+
+ {{#equal status "COMPLETED"}} Completed{{/equal}}
+ {{#equal status "PENDING"}} Pending{{/equal}}
+ {{#equal status "ERROR"}} Error{{/equal}}
+ {{#equal status "IN_PROGRESS"}} In Progress{{/equal}}
+ |
+ {{createdTimeStamp}} |
+
+ {{/each}}
+
+
+
\ No newline at end of file
diff --git a/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/templates/policy-compliance.hbs b/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/templates/policy-compliance.hbs
new file mode 100755
index 000000000..d20ca7a9c
--- /dev/null
+++ b/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/templates/policy-compliance.hbs
@@ -0,0 +1,79 @@
+
+
+
+
+
+ {{#equal deviceType "android"}}
+
+ {{/equal}}
+ {{#equal deviceType "ios"}}
+
+ {{/equal}}
+ {{#equal deviceType "windows"}}
+
+ {{/equal}}
+
+
+ {{policy.policyName}}
+ {{deviceType}}
+
+
+
+
+
+
+ Ownership Type : {{policy.ownershipType}}
+
+
+
+
+ Compliance Type : {{policy.compliance}}
+
+
+
+
+ Compliance :
+ {{#equal compliance "COMPLIANT"}}
+ Compliant
+ {{/equal}}
+ {{#equal compliance "NON-COMPLIANT"}}
+ Not Compliant
+ {{/equal}}
+
+
+
+
+
+
+
+
+
+
+ | Feature |
+ Compliance |
+
+
+
+ {{#each complianceFeatures}}
+
+ | {{featureCode}} |
+
+ {{#equal compliance true}} Compliant{{/equal}}
+ {{#equal compliance false}} Not Compliant{{/equal}}
+ |
+
+ {{/each}}
+
+
+
\ No newline at end of file
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/pom.xml b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/pom.xml
index e5cf085ee..3d32a40ce 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/pom.xml
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/pom.xml
@@ -22,7 +22,7 @@
android-plugin
org.wso2.carbon.devicemgt-plugins
- 2.2.6-SNAPSHOT
+ 3.0.0-SNAPSHOT
../pom.xml
diff --git a/components/mobile-plugins/android-plugin/pom.xml b/components/mobile-plugins/android-plugin/pom.xml
index 3735f8eab..6a31d5610 100644
--- a/components/mobile-plugins/android-plugin/pom.xml
+++ b/components/mobile-plugins/android-plugin/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.devicemgt-plugins
mobile-plugins
- 2.2.6-SNAPSHOT
+ 3.0.0-SNAPSHOT
../pom.xml
diff --git a/components/mobile-plugins/pom.xml b/components/mobile-plugins/pom.xml
index e5c7b41af..ede324fea 100644
--- a/components/mobile-plugins/pom.xml
+++ b/components/mobile-plugins/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.devicemgt-plugins
carbon-device-mgt-plugins-parent
- 2.2.6-SNAPSHOT
+ 3.0.0-SNAPSHOT
../../pom.xml
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml
index 544a5df8a..6533eaab0 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml
@@ -21,7 +21,7 @@
windows-plugin
org.wso2.carbon.devicemgt-plugins
- 2.2.6-SNAPSHOT
+ 3.0.0-SNAPSHOT
../pom.xml
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/pom.xml b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/pom.xml
index d3053aaca..441939d79 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/pom.xml
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/pom.xml
@@ -23,13 +23,13 @@
windows-plugin
org.wso2.carbon.devicemgt-plugins
- 2.2.6-SNAPSHOT
+ 3.0.0-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.device.mgt.mobile.windows.ui
-
2.2.6-SNAPSHOT
+
3.0.0-SNAPSHOT
WSO2 Carbon - Mobile Windows UI
pom
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/pom.xml b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/pom.xml
index 959caf0be..b7a0960d2 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/pom.xml
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/pom.xml
@@ -22,7 +22,7 @@
windows-plugin
org.wso2.carbon.devicemgt-plugins
- 2.2.6-SNAPSHOT
+ 3.0.0-SNAPSHOT
../pom.xml
diff --git a/components/mobile-plugins/windows-plugin/pom.xml b/components/mobile-plugins/windows-plugin/pom.xml
index 260ea5f4f..586239ecd 100644
--- a/components/mobile-plugins/windows-plugin/pom.xml
+++ b/components/mobile-plugins/windows-plugin/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.devicemgt-plugins
mobile-plugins
- 2.2.6-SNAPSHOT
+ 3.0.0-SNAPSHOT
../pom.xml
diff --git a/features/analytics-feature/org.wso2.carbon.device.mgt.iot.analytics.feature/pom.xml b/features/analytics-feature/org.wso2.carbon.device.mgt.iot.analytics.feature/pom.xml
index ceacb5903..d8f75cbad 100644
--- a/features/analytics-feature/org.wso2.carbon.device.mgt.iot.analytics.feature/pom.xml
+++ b/features/analytics-feature/org.wso2.carbon.device.mgt.iot.analytics.feature/pom.xml
@@ -23,13 +23,13 @@
org.wso2.carbon.devicemgt-plugins
analytics-feature
- 2.2.6-SNAPSHOT
+ 3.0.0-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.device.mgt.iot.analytics.feature
-
2.2.6-SNAPSHOT
+
3.0.0-SNAPSHOT
pom
WSO2 Carbon - IoT Server Analytics Feature
http://wso2.org
diff --git a/features/analytics-feature/pom.xml b/features/analytics-feature/pom.xml
index 5362d66a1..e50200f9d 100644
--- a/features/analytics-feature/pom.xml
+++ b/features/analytics-feature/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.devicemgt-plugins
carbon-device-mgt-plugins-parent
- 2.2.6-SNAPSHOT
+ 3.0.0-SNAPSHOT
../../pom.xml
diff --git a/features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/pom.xml b/features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/pom.xml
index 8516d1574..b93cd1801 100644
--- a/features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/pom.xml
+++ b/features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/pom.xml
@@ -23,13 +23,13 @@
org.wso2.carbon.devicemgt-plugins
androidsense-plugin-feature
- 2.2.6-SNAPSHOT
+ 3.0.0-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.device.mgt.iot.androidsense.feature
-
2.2.6-SNAPSHOT
+
3.0.0-SNAPSHOT
pom
WSO2 Carbon - IoT Server Android Sense Feature
http://wso2.org
diff --git a/features/device-types-feature/androidsense-plugin-feature/pom.xml b/features/device-types-feature/androidsense-plugin-feature/pom.xml
index 29e9152d2..b86b9e9b3 100644
--- a/features/device-types-feature/androidsense-plugin-feature/pom.xml
+++ b/features/device-types-feature/androidsense-plugin-feature/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.devicemgt-plugins
device-types-feature
- 2.2.6-SNAPSHOT
+ 3.0.0-SNAPSHOT
../pom.xml
diff --git a/features/device-types-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/pom.xml b/features/device-types-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/pom.xml
index 9a1bb1615..4f3dc994d 100644
--- a/features/device-types-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/pom.xml
+++ b/features/device-types-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/pom.xml
@@ -23,7 +23,7 @@
org.wso2.carbon.devicemgt-plugins
arduino-plugin-feature
- 2.2.6-SNAPSHOT
+ 3.0.0-SNAPSHOT
../pom.xml
diff --git a/features/device-types-feature/arduino-plugin-feature/pom.xml b/features/device-types-feature/arduino-plugin-feature/pom.xml
index 6a632b890..54f17257c 100644
--- a/features/device-types-feature/arduino-plugin-feature/pom.xml
+++ b/features/device-types-feature/arduino-plugin-feature/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.devicemgt-plugins
device-types-feature
- 2.2.6-SNAPSHOT
+ 3.0.0-SNAPSHOT
../pom.xml
diff --git a/features/device-types-feature/pom.xml b/features/device-types-feature/pom.xml
index 4319c54dd..ed93c38c8 100644
--- a/features/device-types-feature/pom.xml
+++ b/features/device-types-feature/pom.xml
@@ -22,13 +22,13 @@
org.wso2.carbon.devicemgt-plugins
carbon-device-mgt-plugins-parent
- 2.2.6-SNAPSHOT
+ 3.0.0-SNAPSHOT
../../pom.xml
4.0.0
device-types-feature
-
2.2.6-SNAPSHOT
+
3.0.0-SNAPSHOT
pom
WSO2 Carbon - Device Management IoT Plugins Feature
http://wso2.org
diff --git a/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/pom.xml b/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/pom.xml
index 149cddd06..3906f6702 100644
--- a/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/pom.xml
+++ b/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/pom.xml
@@ -23,7 +23,7 @@
org.wso2.carbon.devicemgt-plugins
raspberrypi-plugin-feature
- 2.2.6-SNAPSHOT
+ 3.0.0-SNAPSHOT
../pom.xml
diff --git a/features/device-types-feature/raspberrypi-plugin-feature/pom.xml b/features/device-types-feature/raspberrypi-plugin-feature/pom.xml
index 9f314bbf0..785165f37 100644
--- a/features/device-types-feature/raspberrypi-plugin-feature/pom.xml
+++ b/features/device-types-feature/raspberrypi-plugin-feature/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.devicemgt-plugins
device-types-feature
- 2.2.6-SNAPSHOT
+ 3.0.0-SNAPSHOT
../pom.xml
diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/pom.xml b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/pom.xml
index 244280034..61f0eaefc 100644
--- a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/pom.xml
+++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/pom.xml
@@ -23,7 +23,7 @@
org.wso2.carbon.devicemgt-plugins
virtual-fire-alarm-plugin-feature
- 2.2.6-SNAPSHOT
+ 3.0.0-SNAPSHOT
../pom.xml
diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml b/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml
index 75287d1a8..20e1e12a0 100644
--- a/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml
+++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.devicemgt-plugins
device-types-feature
- 2.2.6-SNAPSHOT
+ 3.0.0-SNAPSHOT
../pom.xml
diff --git a/features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml b/features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml
index d3118d5f2..f7e1e7e98 100644
--- a/features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml
+++ b/features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml
@@ -23,7 +23,7 @@
org.wso2.carbon.devicemgt-plugins
extensions-feature
- 2.2.6-SNAPSHOT
+ 3.0.0-SNAPSHOT
../pom.xml
diff --git a/features/extensions-feature/org.wso2.carbon.appmgt.mdm.osgiconnector.feature/pom.xml b/features/extensions-feature/org.wso2.carbon.appmgt.mdm.osgiconnector.feature/pom.xml
index 2e1aa54bb..bbeddcc50 100644
--- a/features/extensions-feature/org.wso2.carbon.appmgt.mdm.osgiconnector.feature/pom.xml
+++ b/features/extensions-feature/org.wso2.carbon.appmgt.mdm.osgiconnector.feature/pom.xml
@@ -20,13 +20,13 @@
org.wso2.carbon.devicemgt-plugins
extensions-feature
- 2.2.6-SNAPSHOT
+ 3.0.0-SNAPSHOT
../pom.xml
org.wso2.carbon.appmgt.mdm.osgiconnector.feature
pom
-
2.2.6-SNAPSHOT
+
3.0.0-SNAPSHOT
WSO2 Carbon - App management MDM OSGI Connector
http://wso2.org
This feature contains the core bundles required for APP management OSGI MDM connection
@@ -36,7 +36,7 @@
org.wso2.carbon.devicemgt-plugins
org.wso2.carbon.appmgt.mdm.osgiconnector
- 2.2.6-SNAPSHOT
+ 3.0.0-SNAPSHOT
org.apache.ws.commons.axiom
diff --git a/features/extensions-feature/org.wso2.carbon.device.mgt.adapter.feature/pom.xml b/features/extensions-feature/org.wso2.carbon.device.mgt.adapter.feature/pom.xml
index 3633335a8..cb503edb4 100644
--- a/features/extensions-feature/org.wso2.carbon.device.mgt.adapter.feature/pom.xml
+++ b/features/extensions-feature/org.wso2.carbon.device.mgt.adapter.feature/pom.xml
@@ -23,14 +23,14 @@
org.wso2.carbon.devicemgt-plugins
extensions-feature
- 2.2.6-SNAPSHOT
+ 3.0.0-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.device.mgt.adapter.feature
pom
- 2.2.6-SNAPSHOT
+ 3.0.0-SNAPSHOT
WSO2 Carbon - Device Management Adapters Feature
http://wso2.org
This feature contains the adapter bundles required for IoT Server
diff --git a/features/extensions-feature/pom.xml b/features/extensions-feature/pom.xml
index 8b3e4aed4..9d8dfb436 100644
--- a/features/extensions-feature/pom.xml
+++ b/features/extensions-feature/pom.xml
@@ -22,13 +22,13 @@
org.wso2.carbon.devicemgt-plugins
carbon-device-mgt-plugins-parent
- 2.2.6-SNAPSHOT
+ 3.0.0-SNAPSHOT
../../pom.xml
4.0.0
extensions-feature
- 2.2.6-SNAPSHOT
+ 3.0.0-SNAPSHOT
pom
WSO2 Carbon - Device Management Extensions
http://wso2.org
diff --git a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/pom.xml b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/pom.xml
index 06c6c0200..d359552c3 100644
--- a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/pom.xml
+++ b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt-plugins
android-plugin-feature
- 2.2.6-SNAPSHOT
+ 3.0.0-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.device.mgt.mobile.android.feature
pom
- 2.2.6-SNAPSHOT
+ 3.0.0-SNAPSHOT
WSO2 Carbon - Android Device Management Feature
http://wso2.org
This feature contains the core bundles required for Android Device Management
diff --git a/features/mobile-plugins-feature/android-plugin-feature/pom.xml b/features/mobile-plugins-feature/android-plugin-feature/pom.xml
index 0bcf194b0..59ce2fc7e 100644
--- a/features/mobile-plugins-feature/android-plugin-feature/pom.xml
+++ b/features/mobile-plugins-feature/android-plugin-feature/pom.xml
@@ -22,13 +22,13 @@
org.wso2.carbon.devicemgt-plugins
mobile-plugins-feature
- 2.2.6-SNAPSHOT
+ 3.0.0-SNAPSHOT
../pom.xml
4.0.0
android-plugin-feature
- 2.2.6-SNAPSHOT
+ 3.0.0-SNAPSHOT
pom
WSO2 Carbon - Device Management Android Plugin Feature
http://wso2.org
diff --git a/features/mobile-plugins-feature/pom.xml b/features/mobile-plugins-feature/pom.xml
index 2529a4abb..9607994c2 100644
--- a/features/mobile-plugins-feature/pom.xml
+++ b/features/mobile-plugins-feature/pom.xml
@@ -22,13 +22,13 @@
org.wso2.carbon.devicemgt-plugins
carbon-device-mgt-plugins-parent
- 2.2.6-SNAPSHOT
+ 3.0.0-SNAPSHOT
../../pom.xml
4.0.0
mobile-plugins-feature
- 2.2.6-SNAPSHOT
+ 3.0.0-SNAPSHOT
pom
WSO2 Carbon - Device Management EMM Plugins Feature
http://wso2.org
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/pom.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/pom.xml
index 35aa46167..5a9b83ff0 100644
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/pom.xml
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt-plugins
windows-plugin-feature
- 2.2.6-SNAPSHOT
+ 3.0.0-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.device.mgt.mobile.windows.feature
pom
- 2.2.6-SNAPSHOT
+ 3.0.0-SNAPSHOT
WSO2 Carbon - Windows Device Management Feature
http://wso2.org
This feature contains the core bundles required for Windows Device Management
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/pom.xml b/features/mobile-plugins-feature/windows-plugin-feature/pom.xml
index c0253fbf2..5eca7c7ac 100644
--- a/features/mobile-plugins-feature/windows-plugin-feature/pom.xml
+++ b/features/mobile-plugins-feature/windows-plugin-feature/pom.xml
@@ -22,13 +22,13 @@
org.wso2.carbon.devicemgt-plugins
mobile-plugins-feature
- 2.2.6-SNAPSHOT
+ 3.0.0-SNAPSHOT
../pom.xml
4.0.0
windows-plugin-feature
- 2.2.6-SNAPSHOT
+ 3.0.0-SNAPSHOT
pom
WSO2 Carbon - Device Management Windows Plugin Feature
http://wso2.org
diff --git a/pom.xml b/pom.xml
index 27724bdbb..481a951d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
org.wso2.carbon.devicemgt-plugins
carbon-device-mgt-plugins-parent
pom
- 2.2.6-SNAPSHOT
+ 3.0.0-SNAPSHOT
WSO2 Carbon - Device Management Plugins Parent
http://wso2.org
WSO2 Carbon - Device Management Plugins Parent
@@ -1198,7 +1198,7 @@
1.1.1
- 1.2.7-SNAPSHOT
+ 2.0.0-SNAPSHOT
[1.1.1, 2.0.0)
@@ -1206,7 +1206,7 @@
1.2.5
- 2.2.6-SNAPSHOT
+ 3.0.0-SNAPSHOT
4.4.8