{{#defineZone "device-details-header"}}
-
- {{#if device.viewModel.model}}
- {{device.viewModel.vendor}} {{device.viewModel.model}}
+ {{#if device.model}}
+ {{device.vendor}} {{device.model}}
{{/if}}
- Ownership - {{device.viewModel.ownership}}
+ Ownership - {{device.ownership}}
Device is
{{#equal device.status "ACTIVE"}}Active{{/equal}}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/view.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/view.js
index 3f2d34dc87..60c8e50f2e 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/view.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/view.js
@@ -35,10 +35,6 @@ function onRequest(context) {
if (filteredDeviceData["type"]) {
viewModel["deviceType"] = filteredDeviceData["type"];
viewModel["type"] = filteredDeviceData["type"];
- viewModel.isNotWindows = true;
- if (viewModel["deviceType"] == "windows") {
- viewModel.isNotWindows = false;
- }
}
if (filteredDeviceData["deviceIdentifier"]) {
viewModel["deviceIdentifier"] = filteredDeviceData["deviceIdentifier"];
@@ -65,138 +61,6 @@ function onRequest(context) {
viewModel["ownership"] = filteredDeviceData["enrolmentInfo"]["ownership"];
}
}
- if (filteredDeviceData["initialDeviceInfo"]) {
- viewModel["deviceInfoAvailable"] = true;
- if (filteredDeviceData["initialDeviceInfo"]["IMEI"]) {
- viewModel["imei"] = filteredDeviceData["initialDeviceInfo"]["IMEI"];
- }
- if (!filteredDeviceData["latestDeviceInfo"]) {
- if (filteredDeviceData["initialDeviceInfo"]["OS_BUILD_DATE"]) {
- if (filteredDeviceData["initialDeviceInfo"]["OS_BUILD_DATE"] != "0") {
- viewModel["osBuildDate"] = new Date(filteredDeviceData["initialDeviceInfo"]["OS_BUILD_DATE"] * 1000);
- }
- }
- if (filteredDeviceData["initialDeviceInfo"]["LATITUDE"] && filteredDeviceData["initialDeviceInfo"]["LONGITUDE"]) {
- viewModel["location"] = {};
- viewModel["location"]["latitude"] = filteredDeviceData["initialDeviceInfo"]["LATITUDE"];
- viewModel["location"]["longitude"] = filteredDeviceData["initialDeviceInfo"]["LONGITUDE"];
- }
- if (filteredDeviceData["initialDeviceInfo"]["VENDOR"] && filteredDeviceData["initialDeviceInfo"]["DEVICE_MODEL"]) {
- viewModel["vendor"] = filteredDeviceData["initialDeviceInfo"]["VENDOR"];
- viewModel["model"] = filteredDeviceData["initialDeviceInfo"]["DEVICE_MODEL"];
- }
- if (filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]) {
- if (deviceType == "android") {
- viewModel["BatteryLevel"] = {};
- viewModel["BatteryLevel"]["value"] = filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["BATTERY_LEVEL"];
-
- viewModel["internalMemory"] = {};
- viewModel["internalMemory"]["total"] = Math.
- round(filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["INTERNAL_TOTAL_MEMORY"] * 100) / 100;
- if (filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["INTERNAL_TOTAL_MEMORY"] != 0) {
- viewModel["internalMemory"]["usage"] = Math.
- round((filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["INTERNAL_TOTAL_MEMORY"] -
- filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["INTERNAL_AVAILABLE_MEMORY"])
- / filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["INTERNAL_TOTAL_MEMORY"] * 10000) / 100;
- } else {
- viewModel["internalMemory"]["usage"] = 0;
- }
-
- viewModel["externalMemory"] = {};
- viewModel["externalMemory"]["total"] = Math.
- round(filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["EXTERNAL_TOTAL_MEMORY"] * 100) / 100;
- if (filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["EXTERNAL_TOTAL_MEMORY"] != 0) {
- viewModel["externalMemory"]["usage"] = Math.
- round((filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["EXTERNAL_TOTAL_MEMORY"] -
- filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["EXTERNAL_AVAILABLE_MEMORY"])
- / filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["EXTERNAL_TOTAL_MEMORY"] * 10000) / 100;
- } else {
- viewModel["externalMemory"]["usage"] = 0;
- }
- } else if (deviceType == "ios") {
- viewModel["BatteryLevel"] = {};
- viewModel["BatteryLevel"]["value"] = filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["BatteryLevel"];
-
- viewModel["internalMemory"] = {};
- viewModel["internalMemory"]["total"] = Math.
- round(filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["DeviceCapacity"] * 100) / 100;
- if (filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["DeviceCapacity"] != 0) {
- viewModel["internalMemory"]["usage"] = Math.
- round((filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["DeviceCapacity"] -
- filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["AvailableDeviceCapacity"])
- / filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["DeviceCapacity"] * 10000) / 100;
- } else {
- viewModel["internalMemory"]["usage"] = 0;
- }
- }
- }
- }
- }
- if (filteredDeviceData["latestDeviceInfo"]) {
- viewModel["deviceInfoAvailable"] = true;
- if (filteredDeviceData["latestDeviceInfo"]["osBuildDate"]) {
- if (filteredDeviceData["latestDeviceInfo"]["osBuildDate"] != "0") {
- viewModel["osBuildDate"] = new Date(filteredDeviceData["latestDeviceInfo"]["osBuildDate"] * 1000);
- }
- }
- if (filteredDeviceData["latestDeviceInfo"]["location"]["latitude"] &&
- filteredDeviceData["latestDeviceInfo"]["location"]["longitude"]) {
- viewModel["location"] = {};
- viewModel["location"]["latitude"] = filteredDeviceData["latestDeviceInfo"]["location"]["latitude"];
- viewModel["location"]["longitude"] = filteredDeviceData["latestDeviceInfo"]["location"]["longitude"];
- }
- if (filteredDeviceData["latestDeviceInfo"]["vendor"] && filteredDeviceData["latestDeviceInfo"]["deviceModel"]) {
- viewModel["vendor"] = filteredDeviceData["latestDeviceInfo"]["vendor"];
- viewModel["model"] = filteredDeviceData["latestDeviceInfo"]["deviceModel"];
- }
- if (filteredDeviceData["latestDeviceInfo"]["updatedTime"]) {
- viewModel["lastUpdatedTime"] = filteredDeviceData["latestDeviceInfo"]["updatedTime"].
- substr(0, filteredDeviceData["latestDeviceInfo"]["updatedTime"].indexOf("+"));
- }
- viewModel["BatteryLevel"] = {};
- viewModel["BatteryLevel"]["value"] = filteredDeviceData["latestDeviceInfo"]["batteryLevel"];
-
- viewModel["cpuUsage"] = {};
- viewModel["cpuUsage"]["value"] = filteredDeviceData["latestDeviceInfo"]["cpuUsage"];
-
- viewModel["ramUsage"] = {};
- if (filteredDeviceData["latestDeviceInfo"]["totalRAMMemory"] != 0) {
- viewModel["ramUsage"]["value"] = Math.
- round((filteredDeviceData["latestDeviceInfo"]["totalRAMMemory"] -
- filteredDeviceData["latestDeviceInfo"]["availableRAMMemory"])
- / filteredDeviceData["latestDeviceInfo"]["totalRAMMemory"] * 10000) / 100;
- } else {
- viewModel["ramUsage"]["value"] = 0;
- }
-
- viewModel["internalMemory"] = {};
- viewModel["internalMemory"]["total"] = Math.
- round(filteredDeviceData["latestDeviceInfo"]["internalTotalMemory"] * 100) / 100;
- if (filteredDeviceData["latestDeviceInfo"]["internalTotalMemory"] != 0) {
- viewModel["internalMemory"]["usage"] = Math.
- round((filteredDeviceData["latestDeviceInfo"]["internalTotalMemory"] -
- filteredDeviceData["latestDeviceInfo"]["internalAvailableMemory"])
- / filteredDeviceData["latestDeviceInfo"]["internalTotalMemory"] * 10000) / 100;
- } else {
- viewModel["internalMemory"]["usage"] = 0;
- }
-
- viewModel["externalMemory"] = {};
- viewModel["externalMemory"]["total"] = Math.
- round(filteredDeviceData["latestDeviceInfo"]["externalTotalMemory"] * 100) / 100;
- if (filteredDeviceData["latestDeviceInfo"]["externalTotalMemory"] != 0) {
- viewModel["externalMemory"]["usage"] = Math.
- round((filteredDeviceData["latestDeviceInfo"]["externalTotalMemory"] -
- filteredDeviceData["latestDeviceInfo"]["externalAvailableMemory"])
- / filteredDeviceData["latestDeviceInfo"]["externalTotalMemory"] * 10000) / 100;
- } else {
- viewModel["externalMemory"]["usage"] = 0;
- }
- }
- if (!filteredDeviceData["initialDeviceInfo"] && !filteredDeviceData["latestDeviceInfo"]) {
- viewModel["deviceInfoAvailable"] = false;
- }
-
deviceViewData["device"] = viewModel;
} else if (response["status"] == "unauthorized") {
deviceViewData["deviceFound"] = true;
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs
index 4fe6e70fd3..0c22014c8e 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs
@@ -64,6 +64,12 @@
+ {{#if geoServicesEnabled}}
+
+ Alerts Stream
+ Spatial Stream
+
+ {{/if}}
Information
+ {{#if geoServicesEnabled}}
Speed km/h
Heading
+ {{/if}}
@@ -688,11 +696,11 @@
var geoLocationLink = $(".initGeoLocationLink");
if (geoLocationLink) {
geoLocationLink.on('click', function () {
- initializeGeoLocation()
+ initializeGeoLocation({{geoServicesEnabled}});
});
- {{#if showGeoFencingTools}}
+ geoPublicUri = $("#geo-charts").data("geo-public-uri");
+ {{#if geoServicesEnabled}}
var geoToolsMenu = $('#location-action-bar');
- geoPublicUri = $("#geo-charts").data("geo-public-uri");
var realtTime = createGeoToolListItem('javascript:enableRealTime()',
'Return to Real Time View', 'fw fw-undo', geoToolsMenu);
realtTime.css("display", "none");
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.js
index a01115ce1d..f35db76fee 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.js
@@ -52,6 +52,6 @@ function onRequest(context) {
} else {
viewModel.lastLocation = stringify({});
}
- viewModel.showGeoFencingTools = true;
+ viewModel.geoServicesEnabled = devicemgtProps.serverConfig.geoLocationConfiguration.isEnabled;
return viewModel;
}
\ No newline at end of file
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/app.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/app.js
index ad02afb114..dcc9a8c95a 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/app.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/app.js
@@ -40,38 +40,11 @@ function initialLoad() {
setTimeout(initialLoad, 500); // give everything some time to render
} else {
initializeMap();
- // getTileServers();
- // loadWms();
processAfterInitializationMap();
- //Access gps and make zoom to server location as map center
- //navigator.geolocation.getCurrentPosition(success, error);
$("#loading").hide();
}
}
-//function success(position) {
-// var browserLatitude = position.coords.latitude;
-// var browserLongitude = position.coords.longitude;
-// map.setView([browserLatitude, browserLongitude]);
-// map.setZoom(14);
-// $.UIkit.notify({
-// message: "Map view set to browser's location",
-// status: 'info',
-// timeout: ApplicationOptions.constance.NOTIFY_INFO_TIMEOUT,
-// pos: 'top-center'
-// });
-//}
-//
-//function error() {
-// $.UIkit.notify({
-// message: "Unable to find browser location!",
-// status: 'warning',
-// timeout: ApplicationOptions.constance.NOTIFY_WARNING_TIMEOUT,
-// pos: 'top-center'
-// });
-//}
-
-
function initializeMap() {
if (typeof(map) !== 'undefined') {
map.remove();
@@ -83,7 +56,7 @@ function initializeMap() {
map = L.map("map", {
zoom: 14,
center: [6.927078, 79.861243],
- layers: [defaultOSM, defaultTFL],
+ layers: [defaultOSM],
zoomControl: true,
attributionControl: false,
maxZoom: 20,
@@ -147,28 +120,20 @@ function processAfterInitializationMap() {
div.innerHTML = "
Attribution";
return div;
};
- // map.addControl(attributionControl);
map.addControl(L.control.fullscreen({position: 'bottomright'}));
geoAlertsBar = L.control.geoAlerts({position: 'topright'});
map.addControl(geoAlertsBar);
- //L.control.fullscreen({
- // position: 'bottomright'
- //}).addTo(map);
- // L.control.zoom({
- // position: "bottomright"
- // }).addTo(map);
groupedOverlays = {
"Web Map Service layers": {}
};
layerControl = L.control.groupedLayers(baseLayers, groupedOverlays, {
- collapsed: true
+ collapsed: true,
+ position: 'bottomleft'
}).addTo(map);
- //L.control.layers(baseLayers).addTo(map);
- //map.addLayer(defaultTFL);
}
/* Highlight search box text on click */
@@ -308,35 +273,43 @@ var getProviderData = function (timeFrom, timeTo) {
deviceId = deviceDetails.data("deviceid");
deviceType = deviceDetails.data("type");
- var serviceUrl = '/api/device-mgt/v1.0/geo-services/stats/' + deviceType + '/' + deviceId + '?from=' + timeFrom + '&to=' + timeTo;
- invokerUtil.get(serviceUrl,
- function (data) {
- tableData = JSON.parse(data);
- if (tableData.length === 0) {
- var geoCharts = $("#geo-charts");
- var location = geoCharts.data("device-location");
- location.heading = 0;
- location.id = deviceId;
- location.values = {};
- location.values.id = deviceId;
- location.values.information = "Last seen " + timeSince(new Date(location.updatedTime));
- location.values.notify = false;
- location.values.speed = 0;
- location.values.state = "NORMAL";
- location.values.longitude = location.longitude;
- location.values.latitude = location.latitude;
- location.timestamp = location.updatedTime;
- location.values.timeStamp = location.updatedTime;
- location.values.type = deviceType;
- location._version = "1.0.0";
- tableData.push(location);
- }
- }, function (message) {
- console.log(message);
- });
+ if (geoFencingEnabled) {
+ var serviceUrl = '/api/device-mgt/v1.0/geo-services/stats/' + deviceType + '/' + deviceId + '?from=' + timeFrom + '&to=' + timeTo;
+ invokerUtil.get(serviceUrl,
+ function (data) {
+ tableData = JSON.parse(data);
+ if (tableData.length === 0) {
+ showCurrentLocation(tableData);
+ }
+ }, function (message) {
+ showCurrentLocation(tableData);
+ });
+ } else {
+ showCurrentLocation(tableData);
+ }
return tableData;
};
+function showCurrentLocation(tableData){
+ var geoCharts = $("#geo-charts");
+ var location = geoCharts.data("device-location");
+ location.heading = 0;
+ location.id = deviceId;
+ location.values = {};
+ location.values.id = deviceId;
+ location.values.information = "Last seen " + timeSince(new Date(location.updatedTime));
+ location.values.notify = false;
+ location.values.speed = 0;
+ location.values.state = "NORMAL";
+ location.values.longitude = location.longitude;
+ location.values.latitude = location.latitude;
+ location.timestamp = location.updatedTime;
+ location.values.timeStamp = location.updatedTime;
+ location.values.type = deviceType;
+ location._version = "1.0.0";
+ tableData.push(location);
+}
+
function timeSince(date) {
if (!date) {
@@ -399,12 +372,10 @@ function enableRealTime() {
isBatchModeOn = false;
}
-function InitSpatialObject() {
+var geoFencingEnabled = true;
+function InitSpatialObject(geoFencingIsEnabled) {
+ geoFencingEnabled = geoFencingIsEnabled;
var spatialObject = drawSpatialObject();
- setTimeout(function () {
- map.setView(spatialObject.marker.getLatLng(), spatialObject.marker.zoomLevel, {animate: true});
- }, 1000
- );
map.addControl(L.control.focus({position: 'bottomright', marker: spatialObject.marker, zoomLevel: zoomLevel}));
}
@@ -455,13 +426,19 @@ function drawSpatialObject() {
return true;
}
- map.setView(spatialObject.marker.getLatLng(), zoomLevel, {animate: true}); // TODO: check the map._layersMaxZoom and set the zoom level accordingly
+ if (geoFencingEnabled) {
+ var alertsFromDate = new Date();
+ alertsFromDate.setHours(alertsFromDate.getHours() - 24); //last 24 hours
+ getAlertsHistory(deviceType, deviceId, alertsFromDate.valueOf(), toDate.valueOf());
+ }
+
+ setTimeout(function () {
+ map.invalidateSize();
+ map.setView(spatialObject.marker.getLatLng(), spatialObject.marker.zoomLevel, {animate: true});
+ spatialObject.marker.openPopup();
+ spatialObject.drawPath();
+ }, 500);
- var alertsFromDate = new Date();
- alertsFromDate.setHours(alertsFromDate.getHours() - 24); //last 24 hours
- getAlertsHistory(deviceType, deviceId, alertsFromDate.valueOf(), toDate.valueOf());
- spatialObject.marker.openPopup();
- spatialObject.drawPath();
if (speedGraphControl) {
setTimeout(function () {
createChart();
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_remote.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_remote.js
index 90e338c5d6..e7c9df3f16 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_remote.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_remote.js
@@ -65,17 +65,7 @@ var defaultOSM = L.tileLayer("https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png
maxZoom: 19
});
-//var defaultTFL = L.tileLayer('https://{s}.google.com/vt/lyrs=m&x={x}&y={y}&z={z}',{
-// maxZoom: 19,
-// subdomains:['mt0','mt1','mt2','mt3']
-//});
-var defaultTFL = L.tileLayer("", {
- maxZoom: 19,
- attribution: '| London Traffic and London Buses data Powered by TfL Open Data'
-});
-
var baseLayers = {
- //"Google Maps": defaultTFL,
"Open Street Maps": defaultOSM
};
@@ -564,7 +554,6 @@ function getAlertsHistory(deviceType, deviceId, timeFrom, timeTo) {
}
});
}, function (message) {
- console.log(message);
});
}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/websocket.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/websocket.js
index f8fb392397..3ef846e148 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/websocket.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/websocket.js
@@ -20,7 +20,7 @@ var debugObject; // assign object and debug from browser console, this is for de
var showPathFlag = false; // Flag to hold the status of draw objects path
var currentSpatialObjects = {};
var selectedSpatialObject; // This is set when user search for an object from the search box
-var websocket;
+var spatialWebsocket;
var onAlertWebsocket;
var onTrafficStreamWebsocket;
var currentPredictions = {};
@@ -506,36 +506,11 @@ function LocalStorageArray(id) {
};
}
-var webSocketOnTrafficStreamOpen = function () {
- onTrafficStreamWebsocket.set_opened();
- noty({text: 'You Are Connected to Traffic Stream !!', type: 'success'});
-};
-
-var webSocketOnTrafficStreamMessage = function processMessage(message) {
- var json = $.parseJSON(message.data);
- if (json.messageType == "Traffic") {
- processTrafficMessage(json);
- } else {
- console.log("Message type not supported.");
- }
-};
-
-var webSocketOnTrafficStreamClose = function (e) {
- if (onTrafficStreamWebsocket.get_opened()) {
- noty({text: 'Connection lost with Traffic Stream Stream !!', type: 'error'});
- }
- waitForSocketConnection(onTrafficStreamWebsocket, initializeOnTrafficStreamWebSocket);
-};
-
-var webSocketOnTrafficStreamError = function (e) {
- if (!onTrafficStreamWebsocket.get_opened()) return;
- noty({text: 'Something went wrong when trying to connect to
' + trafficStreamWebSocketURL + '', type: 'error'});
-};
-
+var initLoading = true;
var webSocketOnAlertOpen = function () {
onAlertWebsocket.set_opened();
- noty({text: 'You Are Connected to Alert Stream !!', type: 'success'});
+ $('#ws-alert-stream').removeClass('text-muted text-danger text-success').addClass('text-success');
};
var webSocketOnAlertMessage = function processMessage(message) {
@@ -551,7 +526,7 @@ var webSocketOnAlertMessage = function processMessage(message) {
var webSocketOnAlertClose = function (e) {
if (onAlertWebsocket.get_opened()) {
- noty({text: 'Connection lost with Alert Stream !!', type: 'error'});
+ $('#ws-alert-stream').removeClass('text-muted text-danger text-success').addClass('text-danger');
}
waitForSocketConnection(onAlertWebsocket, initializeOnAlertWebSocket);
};
@@ -561,18 +536,15 @@ var webSocketOnAlertError = function (e) {
noty({text: 'Something went wrong when trying to connect to ' + alertWebSocketURL + '', type: 'error'});
};
-var initLoading = true;
-var webSocketOnOpen = function () {
- websocket.set_opened();
+var webSocketSpatialOnOpen = function () {
+ spatialWebsocket.set_opened();
if (initLoading) {
- initialLoad();
- InitSpatialObject();
initLoading = false;
}
- noty({text: 'You Are Connected to Spatial Stream !!', type: 'success'});
+ $('#ws-spatial-stream').removeClass('text-muted text-danger text-success').addClass('text-success');
};
-var webSocketOnMessage = function (message) {
+var webSocketSpatialOnMessage = function (message) {
if (!isBatchModeOn) {
var json = $.parseJSON(message.data);
if (json.messageType == "Point") {
@@ -585,15 +557,15 @@ var webSocketOnMessage = function (message) {
}
};
-var webSocketOnClose = function (e) {
- if (websocket.get_opened()) {
- noty({text: 'Connection lost with server!!', type: 'error'});
+var webSocketSpatialOnClose = function (e) {
+ if (spatialWebsocket.get_opened()) {
+ $('#ws-spatial-stream').removeClass('text-muted text-danger text-success').addClass('text-danger');
}
- waitForSocketConnection(websocket, initializeWebSocket);
+ waitForSocketConnection(spatialWebsocket, initializeSpatialStreamWebSocket);
};
-var webSocketOnError = function (err) {
- if (!websocket.get_opened()) return;
+var webSocketSpatialOnError = function (err) {
+ if (!spatialWebsocket.get_opened()) return;
noty({text: 'Something went wrong when trying to connect to ' + webSocketURL + '', type: 'error'});
};
@@ -622,13 +594,13 @@ function waitForSocketConnection(socket, callback) {
}
-function initializeWebSocket() {
- if(websocket) websocket.close();
- websocket = new WebSocket(webSocketURL);
- websocket.onopen = webSocketOnOpen;
- websocket.onmessage = webSocketOnMessage;
- websocket.onclose = webSocketOnClose;
- websocket.onerror = webSocketOnError;
+function initializeSpatialStreamWebSocket() {
+ if(spatialWebsocket) spatialWebsocket.close();
+ spatialWebsocket = new WebSocket(webSocketURL);
+ spatialWebsocket.onopen = webSocketSpatialOnOpen;
+ spatialWebsocket.onmessage = webSocketSpatialOnMessage;
+ spatialWebsocket.onclose = webSocketSpatialOnClose;
+ spatialWebsocket.onerror = webSocketSpatialOnError;
}
function initializeOnAlertWebSocket() {
@@ -640,7 +612,7 @@ function initializeOnAlertWebSocket() {
onAlertWebsocket.onopen = webSocketOnAlertOpen;
}
-function initializeGeoLocation() {
+function initializeGeoLocation(geoFencingEnabled) {
var deviceDetails = $(".device-id");
deviceId = deviceDetails.data("deviceid");
deviceType = deviceDetails.data("type");
@@ -657,11 +629,17 @@ function initializeGeoLocation() {
alertWebSocketURL = wsEndPoint + userDomain + "/org.wso2.geo.AlertsNotifications/1.0.0?"
+ "deviceId=" + deviceId + "&deviceType=" + deviceType + "&websocketToken=" + wsToken;
$("#proximity_alert").hide();
- initializeWebSocket();
- initializeOnAlertWebSocket();
- window.onbeforeunload = function () {
- websocket.close();
- onAlertWebsocket.close();
+
+ initialLoad();
+ InitSpatialObject(geoFencingEnabled);
+
+ if (geoFencingEnabled) {
+ initializeSpatialStreamWebSocket();
+ initializeOnAlertWebSocket();
+ window.onbeforeunload = function () {
+ spatialWebsocket.close();
+ onAlertWebsocket.close();
+ }
}
} else {
noty({text: 'Invalid Access! No device information provided to track!', type: 'error'});
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.url.printer/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.url.printer/pom.xml
index 6e606f450b..2f496d83ef 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.url.printer/pom.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.url.printer/pom.xml
@@ -23,7 +23,7 @@
device-mgt
org.wso2.carbon.devicemgt
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../pom.xml
diff --git a/components/device-mgt/pom.xml b/components/device-mgt/pom.xml
index 869842c5aa..88684f9337 100644
--- a/components/device-mgt/pom.xml
+++ b/components/device-mgt/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.devicemgt
carbon-devicemgt
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../../pom.xml
diff --git a/components/email-sender/org.wso2.carbon.email.sender.core/pom.xml b/components/email-sender/org.wso2.carbon.email.sender.core/pom.xml
index c9bce89e6a..5a9f95a2be 100644
--- a/components/email-sender/org.wso2.carbon.email.sender.core/pom.xml
+++ b/components/email-sender/org.wso2.carbon.email.sender.core/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.devicemgt
email-sender
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../pom.xml
diff --git a/components/email-sender/pom.xml b/components/email-sender/pom.xml
index 50d748e54a..677fba51af 100644
--- a/components/email-sender/pom.xml
+++ b/components/email-sender/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.devicemgt
carbon-devicemgt
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../../pom.xml
diff --git a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml b/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml
index 73b710ffdd..c25a1118bb 100644
--- a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml
+++ b/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml
@@ -22,13 +22,13 @@
org.wso2.carbon.devicemgt
identity-extensions
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.device.mgt.oauth.extensions
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
bundle
WSO2 Carbon - OAuth Extensions
http://wso2.org
diff --git a/components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml b/components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml
index a42a3eef56..d8c9074ae6 100644
--- a/components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml
+++ b/components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml
@@ -21,7 +21,7 @@
identity-extensions
org.wso2.carbon.devicemgt
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
4.0.0
diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/pom.xml b/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/pom.xml
index 47d9ad5d59..1a8417826a 100644
--- a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/pom.xml
+++ b/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.devicemgt
identity-extensions
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../pom.xml
diff --git a/components/identity-extensions/pom.xml b/components/identity-extensions/pom.xml
index f2cbb6cfaf..1705b13019 100644
--- a/components/identity-extensions/pom.xml
+++ b/components/identity-extensions/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.devicemgt
carbon-devicemgt
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../../pom.xml
diff --git a/components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml b/components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml
index b74c0856d7..4a39ad844e 100644
--- a/components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml
+++ b/components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
policy-mgt
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.devicemgt
org.wso2.carbon.complex.policy.decision.point
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
bundle
WSO2 Carbon - Policy Decision Point
WSO2 Carbon - Policy Decision Point
diff --git a/components/policy-mgt/org.wso2.carbon.policy.decision.point/pom.xml b/components/policy-mgt/org.wso2.carbon.policy.decision.point/pom.xml
index 5dcd68fba1..6473f31b39 100644
--- a/components/policy-mgt/org.wso2.carbon.policy.decision.point/pom.xml
+++ b/components/policy-mgt/org.wso2.carbon.policy.decision.point/pom.xml
@@ -3,14 +3,14 @@
org.wso2.carbon.devicemgt
policy-mgt
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.devicemgt
org.wso2.carbon.policy.decision.point
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
bundle
WSO2 Carbon - Policy Decision Point
WSO2 Carbon - Policy Decision Point
diff --git a/components/policy-mgt/org.wso2.carbon.policy.information.point/pom.xml b/components/policy-mgt/org.wso2.carbon.policy.information.point/pom.xml
index aab6fcd9d4..42cf989bfc 100644
--- a/components/policy-mgt/org.wso2.carbon.policy.information.point/pom.xml
+++ b/components/policy-mgt/org.wso2.carbon.policy.information.point/pom.xml
@@ -3,7 +3,7 @@
org.wso2.carbon.devicemgt
policy-mgt
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../pom.xml
@@ -11,7 +11,7 @@
4.0.0
org.wso2.carbon.devicemgt
org.wso2.carbon.policy.information.point
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
bundle
WSO2 Carbon - Policy Information Point
WSO2 Carbon - Policy Information Point
diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml b/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml
index 6e958960b6..3132fcc215 100644
--- a/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml
+++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
policy-mgt
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.devicemgt
org.wso2.carbon.policy.mgt.common
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
bundle
WSO2 Carbon - Policy Management Common
WSO2 Carbon - Policy Management Common
diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml
index 60a2fb0bfc..ffc9fdee39 100644
--- a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml
+++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
policy-mgt
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.devicemgt
org.wso2.carbon.policy.mgt.core
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
bundle
WSO2 Carbon - Policy Management Core
WSO2 Carbon - Policy Management Core
diff --git a/components/policy-mgt/pom.xml b/components/policy-mgt/pom.xml
index 0f826711cf..7812f5ee1b 100644
--- a/components/policy-mgt/pom.xml
+++ b/components/policy-mgt/pom.xml
@@ -23,13 +23,13 @@
org.wso2.carbon.devicemgt
carbon-devicemgt
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../../pom.xml
4.0.0
policy-mgt
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
pom
WSO2 Carbon - Policy Management Component
http://wso2.org
diff --git a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml
index 1401faf2b6..9d7a925a03 100644
--- a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml
+++ b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml
@@ -21,14 +21,14 @@
org.wso2.carbon.devicemgt
webapp-authenticator-framework
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.devicemgt
org.wso2.carbon.webapp.authenticator.framework
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
bundle
WSO2 Carbon - Web Application Authenticator Framework Bundle
WSO2 Carbon - Web Application Authenticator Framework Bundle
diff --git a/components/webapp-authenticator-framework/pom.xml b/components/webapp-authenticator-framework/pom.xml
index 13e4672eb5..01f7d80b6e 100644
--- a/components/webapp-authenticator-framework/pom.xml
+++ b/components/webapp-authenticator-framework/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
carbon-devicemgt
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../../pom.xml
4.0.0
org.wso2.carbon.devicemgt
webapp-authenticator-framework
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
pom
WSO2 Carbon - Webapp Authenticator Framework
http://wso2.org
diff --git a/features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/pom.xml b/features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/pom.xml
index 7a0e1c369d..deb3172579 100644
--- a/features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/pom.xml
+++ b/features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/pom.xml
@@ -21,14 +21,14 @@
org.wso2.carbon.devicemgt
apimgt-extensions-feature
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.apimgt.application.extension.feature
pom
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
WSO2 Carbon - API Management Application Extension Feature
http://wso2.org
This feature contains an implementation of a api application registration, which takes care of subscription
diff --git a/features/apimgt-extensions/org.wso2.carbon.apimgt.handler.server.feature/pom.xml b/features/apimgt-extensions/org.wso2.carbon.apimgt.handler.server.feature/pom.xml
index 50574c6331..77c4aab268 100644
--- a/features/apimgt-extensions/org.wso2.carbon.apimgt.handler.server.feature/pom.xml
+++ b/features/apimgt-extensions/org.wso2.carbon.apimgt.handler.server.feature/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
apimgt-extensions-feature
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.apimgt.handler.server.feature
pom
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
WSO2 Carbon - Device Management - APIM handler Server Feature
http://wso2.org
This feature contains the handler for the api authentications
diff --git a/features/apimgt-extensions/org.wso2.carbon.apimgt.integration.client.feature/pom.xml b/features/apimgt-extensions/org.wso2.carbon.apimgt.integration.client.feature/pom.xml
index 68dcb25065..c7b4edead9 100644
--- a/features/apimgt-extensions/org.wso2.carbon.apimgt.integration.client.feature/pom.xml
+++ b/features/apimgt-extensions/org.wso2.carbon.apimgt.integration.client.feature/pom.xml
@@ -21,13 +21,13 @@
org.wso2.carbon.devicemgt
apimgt-extensions-feature
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.apimgt.integration.client.feature
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
pom
WSO2 Carbon - APIM Integration Client Feature
http://wso2.org
diff --git a/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml b/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml
index 478ab80e15..9987e9c70e 100644
--- a/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml
+++ b/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml
@@ -21,14 +21,14 @@
org.wso2.carbon.devicemgt
apimgt-extensions-feature
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.apimgt.webapp.publisher.feature
pom
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
WSO2 Carbon - API Management Webapp Publisher Feature
http://wso2.org
This feature contains an implementation of a Tomcat lifecycle listener, which takes care of publishing
diff --git a/features/apimgt-extensions/pom.xml b/features/apimgt-extensions/pom.xml
index c2c1ddeafa..333f2ff068 100644
--- a/features/apimgt-extensions/pom.xml
+++ b/features/apimgt-extensions/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
carbon-devicemgt
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../../pom.xml
4.0.0
org.wso2.carbon.devicemgt
apimgt-extensions-feature
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
pom
WSO2 Carbon - API Management Extensions Feature
http://wso2.org
diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml
index dbc6db7220..e4b5ebe75e 100644
--- a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml
+++ b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.devicemgt
certificate-mgt-feature
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../pom.xml
diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/pom.xml b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/pom.xml
index 9b84adf979..a3b957d66e 100644
--- a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/pom.xml
+++ b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.devicemgt
certificate-mgt-feature
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../pom.xml
diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml
index 49676f2683..577f3bba41 100644
--- a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml
+++ b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
certificate-mgt-feature
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.certificate.mgt.server.feature
pom
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
WSO2 Carbon - Certificate Management Server Feature
http://wso2.org
This feature contains the core bundles required for back-end Certificate Management functionality
diff --git a/features/certificate-mgt/pom.xml b/features/certificate-mgt/pom.xml
index 2399940b34..3ef2fba7fb 100644
--- a/features/certificate-mgt/pom.xml
+++ b/features/certificate-mgt/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
carbon-devicemgt
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../../pom.xml
4.0.0
org.wso2.carbon.devicemgt
certificate-mgt-feature
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
pom
WSO2 Carbon - Certificate Management Feature
http://wso2.org
diff --git a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature/pom.xml b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature/pom.xml
index deedb7ab89..1e90a8a0a8 100644
--- a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature/pom.xml
+++ b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
device-mgt-extensions-feature
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature
pom
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
WSO2 Carbon - Device Type Deployer Feature
http://wso2.org
WSO2 Carbon - Device Type Deployer Feature
diff --git a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml
index d278fdce19..96c6c3a794 100644
--- a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml
+++ b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
device-mgt-extensions-feature
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature
pom
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
WSO2 Carbon - FCM Based Push Notification Provider Feature
http://wso2.org
WSO2 Carbon - MQTT Based Push Notification Provider Feature
diff --git a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature/pom.xml b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature/pom.xml
index 53168b2f10..a9a4d3082a 100644
--- a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature/pom.xml
+++ b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
device-mgt-extensions-feature
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature
pom
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
WSO2 Carbon - MQTT Based Push Notification Provider Feature
http://wso2.org
WSO2 Carbon - MQTT Based Push Notification Provider Feature
diff --git a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml
index 67b75a0c29..2c30758822 100644
--- a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml
+++ b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
device-mgt-extensions-feature
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature
pom
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
WSO2 Carbon - MQTT Based Push Notification Provider Feature
http://wso2.org
WSO2 Carbon - MQTT Based Push Notification Provider Feature
diff --git a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml
index 0d1a12ffea..20bbeff5ad 100644
--- a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml
+++ b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
device-mgt-extensions-feature
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature
pom
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
WSO2 Carbon - XMPP Based Push Notification Provider Feature
http://wso2.org
WSO2 Carbon - XMPP Based Push Notification Provider Feature
diff --git a/features/device-mgt-extensions/pom.xml b/features/device-mgt-extensions/pom.xml
index ff211c694a..6d6987f4b8 100644
--- a/features/device-mgt-extensions/pom.xml
+++ b/features/device-mgt-extensions/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.devicemgt
carbon-devicemgt
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../../pom.xml
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard.feature/pom.xml
index c1471fe23d..e727569a91 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard.feature/pom.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard.feature/pom.xml
@@ -3,13 +3,13 @@
org.wso2.carbon.devicemgt
device-mgt-feature
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.device.mgt.analytics.dashboard.feature
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
pom
WSO2 Carbon - Device Management Dashboard Analytics Feature
WSO2 Carbon - Device Management Dashboard Analytics Feature
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher.feature/pom.xml
index 98d080bd93..93bfc90919 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher.feature/pom.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher.feature/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
device-mgt-feature
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.device.mgt.analytics.data.publisher.feature
pom
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
WSO2 Carbon - Device Management Server Feature
http://wso2.org
This feature contains bundles related to device analytics data publisher
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml
index a48d9cd60b..ffd4d1a361 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.devicemgt
device-mgt-feature
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../pom.xml
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml
index 2cb5357944..70ea9a952c 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml
@@ -4,14 +4,14 @@
org.wso2.carbon.devicemgt
device-mgt-feature
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.device.mgt.extensions.feature
pom
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
WSO2 Carbon - Device Management Extensions Feature
http://wso2.org
This feature contains common extensions used by key device management functionalities
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml
index ce94986b78..0b49118504 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.devicemgt
device-mgt-feature
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../pom.xml
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
index c5c218e043..ac7510bd1a 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
device-mgt-feature
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.device.mgt.server.feature
pom
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
WSO2 Carbon - Device Management Server Feature
http://wso2.org
This feature contains the core bundles required for Back-end Device Management functionality
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml
index 87a33c7dc2..0f0312f977 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml
@@ -79,6 +79,7 @@
600
+ false
false
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/pom.xml
index 176b3ac33e..466bc459a3 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/pom.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.devicemgt
device-mgt-feature
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../pom.xml
diff --git a/features/device-mgt/pom.xml b/features/device-mgt/pom.xml
index 56b1d2ef57..985ca86e06 100644
--- a/features/device-mgt/pom.xml
+++ b/features/device-mgt/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.devicemgt
carbon-devicemgt
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../../pom.xml
diff --git a/features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml b/features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml
index bf31933295..e0205c526d 100644
--- a/features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml
+++ b/features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
email-sender-feature
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.email.sender.feature
pom
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
WSO2 Carbon - Email Sender Feature
http://wso2.org
This feature contains the core bundles required for email sender related functionality
diff --git a/features/email-sender/pom.xml b/features/email-sender/pom.xml
index 425e5367cc..d2897b27ed 100644
--- a/features/email-sender/pom.xml
+++ b/features/email-sender/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
carbon-devicemgt
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../../pom.xml
4.0.0
org.wso2.carbon.devicemgt
email-sender-feature
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
pom
WSO2 Carbon - Email Sender Feature
http://wso2.org
diff --git a/features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml b/features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml
index a6e35d8edf..5f1630cc24 100644
--- a/features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml
+++ b/features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml
@@ -23,14 +23,14 @@
org.wso2.carbon.devicemgt
jwt-client-feature
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.identity.jwt.client.extension.feature
pom
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
WSO2 Carbon - JWT Client Feature
http://wso2.org
This feature contains jwt client implementation from which we can get a access token using the jwt
diff --git a/features/jwt-client/pom.xml b/features/jwt-client/pom.xml
index 81f12aeb97..e59b27e378 100644
--- a/features/jwt-client/pom.xml
+++ b/features/jwt-client/pom.xml
@@ -23,13 +23,13 @@
org.wso2.carbon.devicemgt
carbon-devicemgt
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../../pom.xml
4.0.0
jwt-client-feature
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
pom
WSO2 Carbon - JWT Client Extension Feature
http://wso2.org
diff --git a/features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml b/features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml
index 08dfc5045b..6ea3a2870b 100644
--- a/features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml
+++ b/features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml
@@ -23,14 +23,14 @@
org.wso2.carbon.devicemgt
oauth-extensions-feature
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.device.mgt.oauth.extensions.feature
pom
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
WSO2 Carbon - Device Mgt OAuth Extensions Feature
http://wso2.org
This feature contains devicemgt related OAuth extensions
diff --git a/features/oauth-extensions/pom.xml b/features/oauth-extensions/pom.xml
index 31dd0c8966..8bcf345feb 100644
--- a/features/oauth-extensions/pom.xml
+++ b/features/oauth-extensions/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
carbon-devicemgt
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../../pom.xml
4.0.0
org.wso2.carbon.devicemgt
oauth-extensions-feature
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
pom
WSO2 Carbon - Device Management OAuth Extensions Feature
http://wso2.org
diff --git a/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml b/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml
index 9d4b1e2bb8..3a7f087259 100644
--- a/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml
+++ b/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml
@@ -23,14 +23,14 @@
org.wso2.carbon.devicemgt
policy-mgt-feature
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.policy.mgt.server.feature
pom
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
WSO2 Carbon - Policy Management Server Feature
http://wso2.org
This feature contains the core bundles required for Back-end Device Management functionality
diff --git a/features/policy-mgt/pom.xml b/features/policy-mgt/pom.xml
index 4ba250bb76..6a6ee81620 100644
--- a/features/policy-mgt/pom.xml
+++ b/features/policy-mgt/pom.xml
@@ -23,14 +23,14 @@
org.wso2.carbon.devicemgt
carbon-devicemgt
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../../pom.xml
4.0.0
org.wso2.carbon.devicemgt
policy-mgt-feature
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
pom
WSO2 Carbon - Policy Management Feature
http://wso2.org
diff --git a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml b/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml
index 1a23116c60..6c0eec6695 100644
--- a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml
+++ b/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
webapp-authenticator-framework-feature
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.webapp.authenticator.framework.server.feature
pom
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
WSO2 Carbon - Webapp Authenticator Framework Server Feature
http://wso2.org
This feature contains the core bundles required for Back-end Device Management functionality
diff --git a/features/webapp-authenticator-framework/pom.xml b/features/webapp-authenticator-framework/pom.xml
index c9ba0057af..d1b7a9e958 100644
--- a/features/webapp-authenticator-framework/pom.xml
+++ b/features/webapp-authenticator-framework/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
carbon-devicemgt
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
../../pom.xml
4.0.0
org.wso2.carbon.devicemgt
webapp-authenticator-framework-feature
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
pom
WSO2 Carbon - Webapp Authenticator Framework Feature
http://wso2.org
diff --git a/pom.xml b/pom.xml
index 5d093900fb..b00f927a11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
org.wso2.carbon.devicemgt
carbon-devicemgt
pom
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
WSO2 Carbon - Device Management - Parent
http://wso2.org
WSO2 Connected Device Manager Components
@@ -1840,7 +1840,7 @@
1.2.11.wso2v10
- 3.0.24-SNAPSHOT
+ 3.0.28-SNAPSHOT
4.4.8