From a905f22651b806c74ce61e89f202b519c929f345 Mon Sep 17 00:00:00 2001 From: Hasunie Date: Wed, 11 Jan 2017 09:03:03 +0530 Subject: [PATCH 01/20] 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 b44bee0374..27a7b479eb 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 7a08827df3..06ff007171 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 fc3d15887e444d9169191d6dd9d79d68aaa27653 Mon Sep 17 00:00:00 2001 From: Imesh Chandrasiri Date: Wed, 11 Jan 2017 11:20:21 +0530 Subject: [PATCH 02/20] Updating font wso2 to version 1.2.1 --- .../device-view.hbs | 2 +- .../analytics-view.hbs | 2 +- .../type-view.hbs | 6 +- .../device-view.hbs | 2 +- .../analytics-view.hbs | 2 +- .../type-view.hbs | 4 +- .../device-view.hbs | 2 +- .../analytics-view.hbs | 2 +- .../type-view.hbs | 4 +- .../device-view.hbs | 2 +- .../analytics-view.hbs | 2 +- .../type-view.hbs | 2 +- .../device-view.hbs | 2 +- .../public/templates/policy-compliance.hbs | 2 +- .../operation-bar.hbs | 4 +- .../public/templates/android-policy-edit.hbs | 8 +- .../public/templates/android-policy-view.hbs | 12 +- .../templates/android-policy-operations.hbs | 8 +- .../right.hbs | 2 +- .../lib/font-wso2_1.2/css/font-wso2.css | 1478 +++++++---- .../lib/font-wso2_1.2/css/font-wso2.min.css | 15 + .../lib/font-wso2_1.2/fonts/font-wso2.eot | Bin 81188 -> 62120 bytes .../lib/font-wso2_1.2/fonts/font-wso2.svg | 2227 +++++++++++++++-- .../lib/font-wso2_1.2/fonts/font-wso2.ttf | Bin 81016 -> 61944 bytes .../lib/font-wso2_1.2/fonts/font-wso2.woff | Bin 81092 -> 123392 bytes .../lib/font-wso2_1.2/fonts/font-wso2.woff2 | Bin 0 -> 33168 bytes .../public/templates/policy-compliance.hbs | 2 +- .../operation-bar.hbs | 4 +- .../templates/hidden-operations-android.hbs | 12 +- .../templates/hidden-operations-ios.hbs | 6 +- .../public/templates/operations.hbs | 10 +- .../public/templates/windows-policy-edit.hbs | 4 +- .../public/templates/windows-policy-view.hbs | 4 +- .../templates/windows-policy-operations.hbs | 4 +- .../right.hbs | 2 +- .../lib/font-wso2_1.2/css/font-wso2.css | 1478 +++++++---- .../lib/font-wso2_1.2/css/font-wso2.min.css | 15 + .../lib/font-wso2_1.2/fonts/font-wso2.eot | Bin 81188 -> 62120 bytes .../lib/font-wso2_1.2/fonts/font-wso2.svg | 2227 +++++++++++++++-- .../lib/font-wso2_1.2/fonts/font-wso2.ttf | Bin 81016 -> 61944 bytes .../lib/font-wso2_1.2/fonts/font-wso2.woff | Bin 81092 -> 123392 bytes .../lib/font-wso2_1.2/fonts/font-wso2.woff2 | Bin 0 -> 33168 bytes 42 files changed, 5971 insertions(+), 1587 deletions(-) create mode 100644 components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/font-wso2_1.2/css/font-wso2.min.css create mode 100644 components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/font-wso2_1.2/fonts/font-wso2.woff2 create mode 100644 components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/font-wso2_1.2/css/font-wso2.min.css create mode 100644 components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/font-wso2_1.2/fonts/font-wso2.woff2 diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs index 952d78878e..e23f3c0c1c 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs @@ -86,7 +86,7 @@ href="{{portalUrl}}/portal/dashboards/geo-dashboard/?GLOBAL-STATE={{anchor}}"> - + View Device Location diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.realtime.analytics-view/analytics-view.hbs b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.realtime.analytics-view/analytics-view.hbs index 02f753c9f7..8c7a7383a6 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.realtime.analytics-view/analytics-view.hbs +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.realtime.analytics-view/analytics-view.hbs @@ -23,7 +23,7 @@ - + View Device Analytics diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/type-view.hbs b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/type-view.hbs index 7d4e1c9b7b..1b9254a00f 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/type-view.hbs +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/type-view.hbs @@ -204,7 +204,7 @@