From a905f22651b806c74ce61e89f202b519c929f345 Mon Sep 17 00:00:00 2001 From: Hasunie Date: Wed, 11 Jan 2017 09:03:03 +0530 Subject: [PATCH 1/2] fixing Windows gatway issues --- .../device/mgt/mobile/windows/api/common/PluginConstants.java | 2 +- .../mobile/windows/api/services/DeviceManagementService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/common/PluginConstants.java b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/common/PluginConstants.java index b44bee037..27a7b479e 100644 --- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/common/PluginConstants.java +++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/common/PluginConstants.java @@ -68,7 +68,7 @@ public final class PluginConstants { public static final String CXF_REQUEST_URI = "org.apache.cxf.request.uri"; //Web services media types - public static final String SYNCML_MEDIA_TYPE = "application/vnd.syncml.dm+xml;charset=utf-8"; + public static final String SYNCML_MEDIA_TYPE = "application/vnd.syncml.dm+xml"; /** * Discovery service related other constants diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementService.java b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementService.java index 7a08827df..06ff00717 100644 --- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementService.java +++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementService.java @@ -46,7 +46,7 @@ import javax.ws.rs.core.Response; @Extension(properties = { @ExtensionProperty(name = "name", value = "Windows 10 Device management"), @ExtensionProperty(name = "context", - value = "/api/device-mgt/windows/v1.0/management"), + value = "/api/device-mgt/windows/v1.0/management/devicemgt"), }) } ), From 32d99bcab6d798cd6031efed4de6b8dec3e52a70 Mon Sep 17 00:00:00 2001 From: Hasunie Date: Wed, 11 Jan 2017 14:13:08 +0530 Subject: [PATCH 2/2] fixing jira IOTS-378 --- .../public/js/load-map.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/js/load-map.js b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/js/load-map.js index 895f75b94..c09ab8ddb 100755 --- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/js/load-map.js +++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/js/load-map.js @@ -45,7 +45,7 @@ $(document).ready(function () { var url = $(this).prop("href"); var hash = url.substring(url.indexOf("#") + 1); - if (hash == "device_location") { + if (hash == "device_location_tab") { if (!map) { loadLeafletMap(); }