From 429266d9d2677995e4152a7c4c9db9e077e38f08 Mon Sep 17 00:00:00 2001
From: Hasunie <hasunie@wso2.com>
Date: Fri, 13 Jan 2017 09:07:33 +0530
Subject: [PATCH 01/10] adding windows synaps configs

---
 .../windows/api/common/PluginConstants.java   |   1 +
 .../api/services/DeviceManagementService.java |   4 +-
 .../discovery/impl/DiscoveryServiceImpl.java  |   6 +-
 .../enrollment/EnrollmentService.java         |   4 +-
 .../admin--Windows_10_Device_management.xml   |  56 ++++++
 ...n--Windows_10_Device_management_v1.0.0.xml |  52 ++++++
 .../admin--Windows_10_Enrollment_Service.xml  |  56 ++++++
 ...--Windows_10_Enrollment_Service_v1.0.0.xml |  44 +++++
 ...-Windows_8.1_Device_Management_Service.xml |  54 ++++++
 ...s_8.1_Device_Management_Service_v1.0.0.xml |  42 +++++
 .../admin--Windows_8.1_Enrollment_Service.xml |  54 ++++++
 ...-Windows_8.1_Enrollment_Service_v1.0.0.xml |  42 +++++
 ...-Windows_Binary_Security_Token_Service.xml |  54 ++++++
 ...s_Binary_Security_Token_Service_v1.0.0.xml |  42 +++++
 ...dmin--Windows_Configuration_Management.xml |  54 ++++++
 ...indows_Configuration_Management_v1.0.0.xml |  64 +++++++
 ...vice_Management_Administrative_Service.xml |  54 ++++++
 ...nagement_Administrative_Service_v1.0.0.xml | 174 ++++++++++++++++++
 .../apis/admin--Windows_Discovery_Service.xml |  56 ++++++
 ...dmin--Windows_Discovery_Service_v1.0.0.xml |  44 +++++
 ...min--Windows_Enrollment_policy_Service.xml |  56 ++++++
 ...ndows_Enrollment_policy_Service_v1.0.0.xml |  44 +++++
 .../main/resources/devicetypes/windows.xml    |   7 +
 .../src/main/resources/p2.inf                 |  13 +-
 24 files changed, 1068 insertions(+), 9 deletions(-)
 create mode 100644 features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Device_management.xml
 create mode 100644 features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Device_management_v1.0.0.xml
 create mode 100644 features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Enrollment_Service.xml
 create mode 100644 features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Enrollment_Service_v1.0.0.xml
 create mode 100644 features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_8.1_Device_Management_Service.xml
 create mode 100644 features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_8.1_Device_Management_Service_v1.0.0.xml
 create mode 100644 features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_8.1_Enrollment_Service.xml
 create mode 100644 features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_8.1_Enrollment_Service_v1.0.0.xml
 create mode 100644 features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Binary_Security_Token_Service.xml
 create mode 100644 features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Binary_Security_Token_Service_v1.0.0.xml
 create mode 100644 features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Configuration_Management.xml
 create mode 100644 features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Configuration_Management_v1.0.0.xml
 create mode 100644 features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Device_Management_Administrative_Service.xml
 create mode 100644 features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Device_Management_Administrative_Service_v1.0.0.xml
 create mode 100644 features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Discovery_Service.xml
 create mode 100644 features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Discovery_Service_v1.0.0.xml
 create mode 100644 features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Enrollment_policy_Service.xml
 create mode 100644 features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Enrollment_policy_Service_v1.0.0.xml

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 27a7b479e..bebdafe00 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
@@ -342,6 +342,7 @@ public final class PluginConstants {
         }
         public static final String REQUESTED_WIN10_VERSION = "3.0";
         public static final String REQUESTED_WIN81_VERSION = "2.0";
+        public static final String OS_VERSION = "10";
     }
 
     /**
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 06ff00717..081158f30 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
@@ -54,8 +54,8 @@ import javax.ws.rs.core.Response;
                 @Tag(name = "windows", description = "")
         }
 )
-@Api(value = "Windows 10 Device management",
-        description = "This carries all the resources related to Windows 10 management session message flow.")
+//@Api(value = "Windows 10 Device management",
+//        description = "This carries all the resources related to Windows 10 management session message flow.")
 @Path("/devicemgt")
 public interface DeviceManagementService {
     @Path("/pending-operations")
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/discovery/impl/DiscoveryServiceImpl.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/discovery/impl/DiscoveryServiceImpl.java
index 08e69af07..da50c09c9 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/discovery/impl/DiscoveryServiceImpl.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/discovery/impl/DiscoveryServiceImpl.java
@@ -68,9 +68,11 @@ public class DiscoveryServiceImpl implements DiscoveryService {
         String emailId = discoveryRequest.getEmailId();
         String[] userDomains = emailId.split(DELIMITER);
         String domain = userDomains[DOMAIN_SEGMENT];
+        String osVersion = discoveryRequest.getOsEdition();
+        String[] osVersions = osVersion .split(".");
+        String os = osVersions[0];
         DiscoveryResponse discoveryResponse;
-        if (PluginConstants.WindowsVersionProperties.REQUESTED_WIN10_VERSION.equals(discoveryRequest.getVersion()) &&
-                FEDERATED.equals(getAuthPolicy())) {
+        if (PluginConstants.WindowsVersionProperties.OS_VERSION.equals(os) && FEDERATED.equals(getAuthPolicy())) {
             discoveryResponse = new DiscoveryResponse();
 
             discoveryResponse.setAuthPolicy(FEDERATED);
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/enrollment/EnrollmentService.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/enrollment/EnrollmentService.java
index 42af80541..2d2586c86 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/enrollment/EnrollmentService.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/enrollment/EnrollmentService.java
@@ -51,8 +51,8 @@ import java.io.UnsupportedEncodingException;
                 @Tag(name = "windows", description = "")
         }
 )
-@Api(value = "Windows 10 Enrollment Service",
-        description = "This carries all the resources related to Windows enrollment.")
+//@Api(value = "Windows 10 Enrollment Service",
+//        description = "This carries all the resources related to Windows enrollment.")
 
 @WebService(targetNamespace = PluginConstants.DEVICE_ENROLLMENT_SERVICE_TARGET_NAMESPACE, name = "enrollment")
 @BindingType(value = SOAPBinding.SOAP12HTTP_BINDING)
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Device_management.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Device_management.xml
new file mode 100644
index 000000000..84586a896
--- /dev/null
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Device_management.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows 10 Device management" context="/api/device-mgt/windows/v1.0/management/devicemgt">
+    <resource methods="HEAD DELETE POST GET OPTIONS PATCH PUT" url-mapping="/*" faultSequence="fault">
+        <inSequence>
+            <property name="isDefault" expression="$trp:WSO2_AM_API_DEFAULT_VERSION"/>
+            <filter source="$ctx:isDefault" regex="true">
+                <then>
+                    <log level="custom">
+                        <property name="STATUS" value="Faulty invoking through default API.Dropping message to avoid recursion.."/>
+                    </log>
+                    <payloadFactory media-type="xml">
+                        <format>
+                            <am:fault xmlns:am="http://wso2.org/apimanager">
+                                <am:code>500</am:code>
+                                <am:type>Status report</am:type>
+                                <am:message>Internal Server Error</am:message>
+                                <am:description>Faulty invoking through default API</am:description>
+                            </am:fault>
+                        </format>
+                        <args/>
+                    </payloadFactory>
+                    <property name="HTTP_SC" value="500" scope="axis2"/>
+                    <property name="RESPONSE" value="true"/>
+                    <header name="To" action="remove"/>
+                    <property name="NO_ENTITY_BODY" scope="axis2" action="remove"/>
+                    <property name="ContentType" scope="axis2" action="remove"/>
+                    <property name="Authorization" scope="transport" action="remove"/>
+                    <property name="Host" scope="transport" action="remove"/>
+                    <property name="Accept" scope="transport" action="remove"/>
+                    <send/>
+                </then>
+                <else>
+                    <header name="WSO2_AM_API_DEFAULT_VERSION" scope="transport" value="true"/>
+                    <property name="uri.var.portnum" expression="get-property('http.nio.port')"/>
+                    <send>
+                        <endpoint>
+                            <http uri-template="http://localhost:{uri.var.portnum}/api/device-mgt/windows/v1.0/management/devicemgt/1.0.0">
+                                <timeout>
+                                    <duration>60000</duration>
+                                    <responseAction>fault</responseAction>
+                                </timeout>
+                            </http>
+                        </endpoint>
+                    </send>
+                </else>
+            </filter>
+        </inSequence>
+        <outSequence>
+            <property name="FORCE_HTTP_CONTENT_LENGTH" scope="axis2" value="true"/>
+            <property name="COPY_CONTENT_LENGTH_FROM_INCOMING" value="true" scope="axis2"/>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.SynapsePropertiesHandler"/>
+    </handlers>
+</api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Device_management_v1.0.0.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Device_management_v1.0.0.xml
new file mode 100644
index 000000000..2081ae6ef
--- /dev/null
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Device_management_v1.0.0.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows 10 Device management" context="/api/device-mgt/windows/v1.0/management/devicemgt/1.0.0" version="1.0.0" version-type="context">
+    <resource methods="POST" url-mapping="/pending-operations" faultSequence="fault">
+        <inSequence>
+            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
+                <then>
+<!--
+		<property name="ContentType" value="application/xml" scope="axis2"/>
+		<property name="messageType" value="application/xml" scope="axis2"/>
+		 <property name="DISABLE_CHUNKING" value="true" scope="axis2" />
+-->
+
+                    <send>
+                        <endpoint name="admin--Windows 10 Device management_APIproductionEndpoint_0">
+                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/management/devicemgt"/>
+                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/management/devicemgt"/>
+                        </endpoint>
+                    </send>
+                </then>
+                <else>
+                    <sequence key="_sandbox_key_error_"/>
+                </else>
+            </filter>
+        </inSequence>
+        <outSequence>
+            <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
+<!--
+	    <property name="ContentType" value="application/vnd.syncml.dm+xml" scope="axis2"/>
+	    <property name="messageType" value="application/vnd.syncml.dm+xml" scope="axis2"/>
+-->
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.APIMgtLatencyStatsHandler"/>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
+            <property name="apiImplementationType" value="ENDPOINT"/>
+        </handler>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.APIAuthenticationHandler"/>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.throttling.APIThrottleHandler">
+            <property name="policyKey" value="gov:/apimgt/applicationdata/tiers.xml"/>
+            <property name="policyKeyApplication" value="gov:/apimgt/applicationdata/app-tiers.xml"/>
+            <property name="id" value="A"/>
+            <property name="policyKeyResource" value="gov:/apimgt/applicationdata/res-tiers.xml"/>
+        </handler>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtUsageHandler"/>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtGoogleAnalyticsTrackingHandler">
+            <property name="configKey" value="gov:/apimgt/statistics/ga-config.xml"/>
+        </handler>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerExtensionHandler"/>
+    </handlers>
+</api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Enrollment_Service.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Enrollment_Service.xml
new file mode 100644
index 000000000..e901919e3
--- /dev/null
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Enrollment_Service.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows 10 Enrollment Service" context="/api/device-mgt/windows/v1.0/deviceenrolment/enrollment">
+    <resource methods="HEAD DELETE POST GET OPTIONS PATCH PUT" url-mapping="/*" faultSequence="fault">
+        <inSequence>
+            <property name="isDefault" expression="$trp:WSO2_AM_API_DEFAULT_VERSION"/>
+            <filter source="$ctx:isDefault" regex="true">
+                <then>
+                    <log level="custom">
+                        <property name="STATUS" value="Faulty invoking through default API.Dropping message to avoid recursion.."/>
+                    </log>
+                    <payloadFactory media-type="xml">
+                        <format>
+                            <am:fault xmlns:am="http://wso2.org/apimanager">
+                                <am:code>500</am:code>
+                                <am:type>Status report</am:type>
+                                <am:message>Internal Server Error</am:message>
+                                <am:description>Faulty invoking through default API</am:description>
+                            </am:fault>
+                        </format>
+                        <args/>
+                    </payloadFactory>
+                    <property name="HTTP_SC" value="500" scope="axis2"/>
+                    <property name="RESPONSE" value="true"/>
+                    <header name="To" action="remove"/>
+                    <property name="NO_ENTITY_BODY" scope="axis2" action="remove"/>
+                    <property name="ContentType" scope="axis2" action="remove"/>
+                    <property name="Authorization" scope="transport" action="remove"/>
+                    <property name="Host" scope="transport" action="remove"/>
+                    <property name="Accept" scope="transport" action="remove"/>
+                    <send/>
+                </then>
+                <else>
+                    <header name="WSO2_AM_API_DEFAULT_VERSION" scope="transport" value="true"/>
+                    <property name="uri.var.portnum" expression="get-property('http.nio.port')"/>
+                    <send>
+                        <endpoint>
+                            <http uri-template="http://localhost:{uri.var.portnum}/api/device-mgt/windows/v1.0/deviceenrolment/enrollment/1.0.0">
+                                <timeout>
+                                    <duration>60000</duration>
+                                    <responseAction>fault</responseAction>
+                                </timeout>
+                            </http>
+                        </endpoint>
+                    </send>
+                </else>
+            </filter>
+        </inSequence>
+        <outSequence>
+            <property name="FORCE_HTTP_CONTENT_LENGTH" scope="axis2" value="true"/>
+            <property name="COPY_CONTENT_LENGTH_FROM_INCOMING" value="true" scope="axis2"/>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.SynapsePropertiesHandler"/>
+    </handlers>
+</api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Enrollment_Service_v1.0.0.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Enrollment_Service_v1.0.0.xml
new file mode 100644
index 000000000..ced6d1129
--- /dev/null
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Enrollment_Service_v1.0.0.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows 10 Enrollment Service" context="/api/device-mgt/windows/v1.0/deviceenrolment/enrollment/1.0.0" version="1.0.0" version-type="context">
+    <resource methods="POST" url-mapping="/*" faultSequence="fault">
+        <inSequence>
+            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
+                <then>
+                    <send>
+                        <endpoint name="admin--Windows 10 Enrollment Service_APIproductionEndpoint_0">
+                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/deviceenrolment/enrollment"/>
+                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/deviceenrolment/enrollment"/>
+                        </endpoint>
+                    </send>
+                </then>
+                <else>
+                    <sequence key="_sandbox_key_error_"/>
+                </else>
+            </filter>
+        </inSequence>
+        <outSequence>
+            <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
+            <property name="FORCE_HTTP_CONTENT_LENGTH" scope="axis2" value="true"/>
+    <property name="COPY_CONTENT_LENGTH_FROM_INCOMING" value="true" scope="axis2"/>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.APIMgtLatencyStatsHandler"/>
+        <!--handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
+            <property name="apiImplementationType" value="ENDPOINT"/>
+        </handler-->
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.APIAuthenticationHandler"/>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.throttling.APIThrottleHandler">
+            <property name="policyKey" value="gov:/apimgt/applicationdata/tiers.xml"/>
+            <property name="policyKeyApplication" value="gov:/apimgt/applicationdata/app-tiers.xml"/>
+            <property name="id" value="A"/>
+            <property name="policyKeyResource" value="gov:/apimgt/applicationdata/res-tiers.xml"/>
+        </handler>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtUsageHandler"/>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtGoogleAnalyticsTrackingHandler">
+            <property name="configKey" value="gov:/apimgt/statistics/ga-config.xml"/>
+        </handler>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerExtensionHandler"/>
+    </handlers>
+</api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_8.1_Device_Management_Service.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_8.1_Device_Management_Service.xml
new file mode 100644
index 000000000..e8756d3bd
--- /dev/null
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_8.1_Device_Management_Service.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows 8.1 Device Management Service" context="/api/device-mgt/windows/v1.0/syncml">
+    <resource methods="HEAD DELETE POST GET OPTIONS PATCH PUT" url-mapping="/*" faultSequence="fault">
+        <inSequence>
+            <property name="isDefault" expression="$trp:WSO2_AM_API_DEFAULT_VERSION"/>
+            <filter source="$ctx:isDefault" regex="true">
+                <then>
+                    <log level="custom">
+                        <property name="STATUS" value="Faulty invoking through default API.Dropping message to avoid recursion.."/>
+                    </log>
+                    <payloadFactory media-type="xml">
+                        <format>
+                            <am:fault xmlns:am="http://wso2.org/apimanager">
+                                <am:code>500</am:code>
+                                <am:type>Status report</am:type>
+                                <am:message>Internal Server Error</am:message>
+                                <am:description>Faulty invoking through default API</am:description>
+                            </am:fault>
+                        </format>
+                        <args/>
+                    </payloadFactory>
+                    <property name="HTTP_SC" value="500" scope="axis2"/>
+                    <property name="RESPONSE" value="true"/>
+                    <header name="To" action="remove"/>
+                    <property name="NO_ENTITY_BODY" scope="axis2" action="remove"/>
+                    <property name="ContentType" scope="axis2" action="remove"/>
+                    <property name="Authorization" scope="transport" action="remove"/>
+                    <property name="Host" scope="transport" action="remove"/>
+                    <property name="Accept" scope="transport" action="remove"/>
+                    <send/>
+                </then>
+                <else>
+                    <header name="WSO2_AM_API_DEFAULT_VERSION" scope="transport" value="true"/>
+                    <property name="uri.var.portnum" expression="get-property('http.nio.port')"/>
+                    <send>
+                        <endpoint>
+                            <http uri-template="http://localhost:{uri.var.portnum}/api/device-mgt/windows/v1.0/syncml/1.0.0">
+                                <timeout>
+                                    <duration>60000</duration>
+                                    <responseAction>fault</responseAction>
+                                </timeout>
+                            </http>
+                        </endpoint>
+                    </send>
+                </else>
+            </filter>
+        </inSequence>
+        <outSequence>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.SynapsePropertiesHandler"/>
+    </handlers>
+</api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_8.1_Device_Management_Service_v1.0.0.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_8.1_Device_Management_Service_v1.0.0.xml
new file mode 100644
index 000000000..771f35509
--- /dev/null
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_8.1_Device_Management_Service_v1.0.0.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows 8.1 Device Management Service" context="/api/device-mgt/windows/v1.0/syncml/1.0.0" version="1.0.0" version-type="context">
+    <resource methods="POST" url-mapping="/request" faultSequence="fault">
+        <inSequence>
+            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
+                <then>
+                    <send>
+                        <endpoint name="admin--Windows 8.1 Device Management Service_APIproductionEndpoint_0">
+                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/syncml"/>
+                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/syncml"/>
+                        </endpoint>
+                    </send>
+                </then>
+                <else>
+                    <sequence key="_sandbox_key_error_"/>
+                </else>
+            </filter>
+        </inSequence>
+        <outSequence>
+            <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.APIMgtLatencyStatsHandler"/>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
+            <property name="apiImplementationType" value="ENDPOINT"/>
+        </handler>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.APIAuthenticationHandler"/>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.throttling.APIThrottleHandler">
+            <property name="policyKey" value="gov:/apimgt/applicationdata/tiers.xml"/>
+            <property name="policyKeyApplication" value="gov:/apimgt/applicationdata/app-tiers.xml"/>
+            <property name="id" value="A"/>
+            <property name="policyKeyResource" value="gov:/apimgt/applicationdata/res-tiers.xml"/>
+        </handler>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtUsageHandler"/>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtGoogleAnalyticsTrackingHandler">
+            <property name="configKey" value="gov:/apimgt/statistics/ga-config.xml"/>
+        </handler>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerExtensionHandler"/>
+    </handlers>
+</api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_8.1_Enrollment_Service.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_8.1_Enrollment_Service.xml
new file mode 100644
index 000000000..57c18f375
--- /dev/null
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_8.1_Enrollment_Service.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows 8.1 Enrollment Service" context="/api/device-mgt/windows/v1.0/deviceenrolment/wstep">
+    <resource methods="HEAD DELETE POST GET OPTIONS PATCH PUT" url-mapping="/*" faultSequence="fault">
+        <inSequence>
+            <property name="isDefault" expression="$trp:WSO2_AM_API_DEFAULT_VERSION"/>
+            <filter source="$ctx:isDefault" regex="true">
+                <then>
+                    <log level="custom">
+                        <property name="STATUS" value="Faulty invoking through default API.Dropping message to avoid recursion.."/>
+                    </log>
+                    <payloadFactory media-type="xml">
+                        <format>
+                            <am:fault xmlns:am="http://wso2.org/apimanager">
+                                <am:code>500</am:code>
+                                <am:type>Status report</am:type>
+                                <am:message>Internal Server Error</am:message>
+                                <am:description>Faulty invoking through default API</am:description>
+                            </am:fault>
+                        </format>
+                        <args/>
+                    </payloadFactory>
+                    <property name="HTTP_SC" value="500" scope="axis2"/>
+                    <property name="RESPONSE" value="true"/>
+                    <header name="To" action="remove"/>
+                    <property name="NO_ENTITY_BODY" scope="axis2" action="remove"/>
+                    <property name="ContentType" scope="axis2" action="remove"/>
+                    <property name="Authorization" scope="transport" action="remove"/>
+                    <property name="Host" scope="transport" action="remove"/>
+                    <property name="Accept" scope="transport" action="remove"/>
+                    <send/>
+                </then>
+                <else>
+                    <header name="WSO2_AM_API_DEFAULT_VERSION" scope="transport" value="true"/>
+                    <property name="uri.var.portnum" expression="get-property('http.nio.port')"/>
+                    <send>
+                        <endpoint>
+                            <http uri-template="http://localhost:{uri.var.portnum}/api/device-mgt/windows/v1.0/deviceenrolment/wstep/1.0.0">
+                                <timeout>
+                                    <duration>60000</duration>
+                                    <responseAction>fault</responseAction>
+                                </timeout>
+                            </http>
+                        </endpoint>
+                    </send>
+                </else>
+            </filter>
+        </inSequence>
+        <outSequence>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.SynapsePropertiesHandler"/>
+    </handlers>
+</api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_8.1_Enrollment_Service_v1.0.0.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_8.1_Enrollment_Service_v1.0.0.xml
new file mode 100644
index 000000000..2be45de64
--- /dev/null
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_8.1_Enrollment_Service_v1.0.0.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows 8.1 Enrollment Service" context="/api/device-mgt/windows/v1.0/deviceenrolment/wstep/1.0.0" version="1.0.0" version-type="context">
+    <resource methods="POST" url-mapping="/*" faultSequence="fault">
+        <inSequence>
+            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
+                <then>
+                    <send>
+                        <endpoint name="admin--Windows 8.1 Enrollment Service_APIproductionEndpoint_0">
+                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/deviceenrolment/wstep"/>
+                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/deviceenrolment/wstep"/>
+                        </endpoint>
+                    </send>
+                </then>
+                <else>
+                    <sequence key="_sandbox_key_error_"/>
+                </else>
+            </filter>
+        </inSequence>
+        <outSequence>
+            <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.APIMgtLatencyStatsHandler"/>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
+            <property name="apiImplementationType" value="ENDPOINT"/>
+        </handler>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.APIAuthenticationHandler"/>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.throttling.APIThrottleHandler">
+            <property name="policyKey" value="gov:/apimgt/applicationdata/tiers.xml"/>
+            <property name="policyKeyApplication" value="gov:/apimgt/applicationdata/app-tiers.xml"/>
+            <property name="id" value="A"/>
+            <property name="policyKeyResource" value="gov:/apimgt/applicationdata/res-tiers.xml"/>
+        </handler>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtUsageHandler"/>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtGoogleAnalyticsTrackingHandler">
+            <property name="configKey" value="gov:/apimgt/statistics/ga-config.xml"/>
+        </handler>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerExtensionHandler"/>
+    </handlers>
+</api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Binary_Security_Token_Service.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Binary_Security_Token_Service.xml
new file mode 100644
index 000000000..640df9ea0
--- /dev/null
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Binary_Security_Token_Service.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows Binary Security Token Service" context="/api/device-mgt/windows/v1.0/federated">
+    <resource methods="HEAD DELETE POST GET OPTIONS PATCH PUT" url-mapping="/*" faultSequence="fault">
+        <inSequence>
+            <property name="isDefault" expression="$trp:WSO2_AM_API_DEFAULT_VERSION"/>
+            <filter source="$ctx:isDefault" regex="true">
+                <then>
+                    <log level="custom">
+                        <property name="STATUS" value="Faulty invoking through default API.Dropping message to avoid recursion.."/>
+                    </log>
+                    <payloadFactory media-type="xml">
+                        <format>
+                            <am:fault xmlns:am="http://wso2.org/apimanager">
+                                <am:code>500</am:code>
+                                <am:type>Status report</am:type>
+                                <am:message>Internal Server Error</am:message>
+                                <am:description>Faulty invoking through default API</am:description>
+                            </am:fault>
+                        </format>
+                        <args/>
+                    </payloadFactory>
+                    <property name="HTTP_SC" value="500" scope="axis2"/>
+                    <property name="RESPONSE" value="true"/>
+                    <header name="To" action="remove"/>
+                    <property name="NO_ENTITY_BODY" scope="axis2" action="remove"/>
+                    <property name="ContentType" scope="axis2" action="remove"/>
+                    <property name="Authorization" scope="transport" action="remove"/>
+                    <property name="Host" scope="transport" action="remove"/>
+                    <property name="Accept" scope="transport" action="remove"/>
+                    <send/>
+                </then>
+                <else>
+                    <header name="WSO2_AM_API_DEFAULT_VERSION" scope="transport" value="true"/>
+                    <property name="uri.var.portnum" expression="get-property('http.nio.port')"/>
+                    <send>
+                        <endpoint>
+                            <http uri-template="http://localhost:{uri.var.portnum}/api/device-mgt/windows/v1.0/federated/1.0.0">
+                                <timeout>
+                                    <duration>60000</duration>
+                                    <responseAction>fault</responseAction>
+                                </timeout>
+                            </http>
+                        </endpoint>
+                    </send>
+                </else>
+            </filter>
+        </inSequence>
+        <outSequence>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.SynapsePropertiesHandler"/>
+    </handlers>
+</api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Binary_Security_Token_Service_v1.0.0.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Binary_Security_Token_Service_v1.0.0.xml
new file mode 100644
index 000000000..830055ddf
--- /dev/null
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Binary_Security_Token_Service_v1.0.0.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows Binary Security Token Service" context="/api/device-mgt/windows/v1.0/federated/1.0.0" version="1.0.0" version-type="context">
+    <resource methods="POST" url-mapping="/authentication" faultSequence="fault">
+        <inSequence>
+            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
+                <then>
+                    <send>
+                        <endpoint name="admin--Windows Binary Security Token Service_APIproductionEndpoint_0">
+                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/federated"/>
+                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/federated"/>
+                        </endpoint>
+                    </send>
+                </then>
+                <else>
+                    <sequence key="_sandbox_key_error_"/>
+                </else>
+            </filter>
+        </inSequence>
+        <outSequence>
+            <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.APIMgtLatencyStatsHandler"/>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
+            <property name="apiImplementationType" value="ENDPOINT"/>
+        </handler>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.APIAuthenticationHandler"/>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.throttling.APIThrottleHandler">
+            <property name="policyKey" value="gov:/apimgt/applicationdata/tiers.xml"/>
+            <property name="policyKeyApplication" value="gov:/apimgt/applicationdata/app-tiers.xml"/>
+            <property name="id" value="A"/>
+            <property name="policyKeyResource" value="gov:/apimgt/applicationdata/res-tiers.xml"/>
+        </handler>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtUsageHandler"/>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtGoogleAnalyticsTrackingHandler">
+            <property name="configKey" value="gov:/apimgt/statistics/ga-config.xml"/>
+        </handler>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerExtensionHandler"/>
+    </handlers>
+</api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Configuration_Management.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Configuration_Management.xml
new file mode 100644
index 000000000..ecabcf446
--- /dev/null
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Configuration_Management.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows Configuration Management" context="/api/device-mgt/windows/v1.0/configuration">
+    <resource methods="HEAD DELETE POST GET OPTIONS PATCH PUT" url-mapping="/*" faultSequence="fault">
+        <inSequence>
+            <property name="isDefault" expression="$trp:WSO2_AM_API_DEFAULT_VERSION"/>
+            <filter source="$ctx:isDefault" regex="true">
+                <then>
+                    <log level="custom">
+                        <property name="STATUS" value="Faulty invoking through default API.Dropping message to avoid recursion.."/>
+                    </log>
+                    <payloadFactory media-type="xml">
+                        <format>
+                            <am:fault xmlns:am="http://wso2.org/apimanager">
+                                <am:code>500</am:code>
+                                <am:type>Status report</am:type>
+                                <am:message>Internal Server Error</am:message>
+                                <am:description>Faulty invoking through default API</am:description>
+                            </am:fault>
+                        </format>
+                        <args/>
+                    </payloadFactory>
+                    <property name="HTTP_SC" value="500" scope="axis2"/>
+                    <property name="RESPONSE" value="true"/>
+                    <header name="To" action="remove"/>
+                    <property name="NO_ENTITY_BODY" scope="axis2" action="remove"/>
+                    <property name="ContentType" scope="axis2" action="remove"/>
+                    <property name="Authorization" scope="transport" action="remove"/>
+                    <property name="Host" scope="transport" action="remove"/>
+                    <property name="Accept" scope="transport" action="remove"/>
+                    <send/>
+                </then>
+                <else>
+                    <header name="WSO2_AM_API_DEFAULT_VERSION" scope="transport" value="true"/>
+                    <property name="uri.var.portnum" expression="get-property('http.nio.port')"/>
+                    <send>
+                        <endpoint>
+                            <http uri-template="http://localhost:{uri.var.portnum}/api/device-mgt/windows/v1.0/configuration/1.0.0">
+                                <timeout>
+                                    <duration>60000</duration>
+                                    <responseAction>fault</responseAction>
+                                </timeout>
+                            </http>
+                        </endpoint>
+                    </send>
+                </else>
+            </filter>
+        </inSequence>
+        <outSequence>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.SynapsePropertiesHandler"/>
+    </handlers>
+</api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Configuration_Management_v1.0.0.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Configuration_Management_v1.0.0.xml
new file mode 100644
index 000000000..2f5edcf76
--- /dev/null
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Configuration_Management_v1.0.0.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows Configuration Management" context="/api/device-mgt/windows/v1.0/configuration/1.0.0" version="1.0.0" version-type="context">
+    <resource methods="PUT GET" url-mapping="/*" faultSequence="fault">
+        <inSequence>
+            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
+                <then>
+                    <send>
+                        <endpoint name="admin--Windows Configuration Management_APIproductionEndpoint_0">
+                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/configuration"/>
+                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/configuration"/>
+                        </endpoint>
+                    </send>
+                </then>
+                <else>
+                    <sequence key="_sandbox_key_error_"/>
+                </else>
+            </filter>
+        </inSequence>
+        <outSequence>
+            <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
+            <send/>
+        </outSequence>
+    </resource>
+    <resource methods="GET" url-mapping="/license" faultSequence="fault">
+        <inSequence>
+            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
+                <then>
+                    <send>
+                        <endpoint name="admin--Windows Configuration Management_APIproductionEndpoint_1">
+                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/configuration"/>
+                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/configuration"/>
+                        </endpoint>
+                    </send>
+                </then>
+                <else>
+                    <sequence key="_sandbox_key_error_"/>
+                </else>
+            </filter>
+        </inSequence>
+        <outSequence>
+            <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.APIMgtLatencyStatsHandler"/>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
+            <property name="apiImplementationType" value="ENDPOINT"/>
+        </handler>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.APIAuthenticationHandler"/>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.throttling.APIThrottleHandler">
+            <property name="policyKey" value="gov:/apimgt/applicationdata/tiers.xml"/>
+            <property name="policyKeyApplication" value="gov:/apimgt/applicationdata/app-tiers.xml"/>
+            <property name="id" value="A"/>
+            <property name="policyKeyResource" value="gov:/apimgt/applicationdata/res-tiers.xml"/>
+        </handler>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtUsageHandler"/>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtGoogleAnalyticsTrackingHandler">
+            <property name="configKey" value="gov:/apimgt/statistics/ga-config.xml"/>
+        </handler>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerExtensionHandler"/>
+    </handlers>
+</api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Device_Management_Administrative_Service.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Device_Management_Administrative_Service.xml
new file mode 100644
index 000000000..93a2834aa
--- /dev/null
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Device_Management_Administrative_Service.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows Device Management Administrative Service" context="/api/device-mgt/windows/v1.0/admin/devices">
+    <resource methods="HEAD DELETE POST GET OPTIONS PATCH PUT" url-mapping="/*" faultSequence="fault">
+        <inSequence>
+            <property name="isDefault" expression="$trp:WSO2_AM_API_DEFAULT_VERSION"/>
+            <filter source="$ctx:isDefault" regex="true">
+                <then>
+                    <log level="custom">
+                        <property name="STATUS" value="Faulty invoking through default API.Dropping message to avoid recursion.."/>
+                    </log>
+                    <payloadFactory media-type="xml">
+                        <format>
+                            <am:fault xmlns:am="http://wso2.org/apimanager">
+                                <am:code>500</am:code>
+                                <am:type>Status report</am:type>
+                                <am:message>Internal Server Error</am:message>
+                                <am:description>Faulty invoking through default API</am:description>
+                            </am:fault>
+                        </format>
+                        <args/>
+                    </payloadFactory>
+                    <property name="HTTP_SC" value="500" scope="axis2"/>
+                    <property name="RESPONSE" value="true"/>
+                    <header name="To" action="remove"/>
+                    <property name="NO_ENTITY_BODY" scope="axis2" action="remove"/>
+                    <property name="ContentType" scope="axis2" action="remove"/>
+                    <property name="Authorization" scope="transport" action="remove"/>
+                    <property name="Host" scope="transport" action="remove"/>
+                    <property name="Accept" scope="transport" action="remove"/>
+                    <send/>
+                </then>
+                <else>
+                    <header name="WSO2_AM_API_DEFAULT_VERSION" scope="transport" value="true"/>
+                    <property name="uri.var.portnum" expression="get-property('http.nio.port')"/>
+                    <send>
+                        <endpoint>
+                            <http uri-template="http://localhost:{uri.var.portnum}/api/device-mgt/windows/v1.0/admin/devices/1.0.0">
+                                <timeout>
+                                    <duration>60000</duration>
+                                    <responseAction>fault</responseAction>
+                                </timeout>
+                            </http>
+                        </endpoint>
+                    </send>
+                </else>
+            </filter>
+        </inSequence>
+        <outSequence>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.SynapsePropertiesHandler"/>
+    </handlers>
+</api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Device_Management_Administrative_Service_v1.0.0.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Device_Management_Administrative_Service_v1.0.0.xml
new file mode 100644
index 000000000..73e001e5c
--- /dev/null
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Device_Management_Administrative_Service_v1.0.0.xml
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows Device Management Administrative Service" context="/api/device-mgt/windows/v1.0/admin/devices/1.0.0" version="1.0.0" version-type="context">
+    <resource methods="POST" url-mapping="/lock-devices" faultSequence="fault">
+        <inSequence>
+            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
+                <then>
+                    <send>
+                        <endpoint name="admin--Windows Device Management Administrative Service_APIproductionEndpoint_0">
+                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
+                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
+                        </endpoint>
+                    </send>
+                </then>
+                <else>
+                    <sequence key="_sandbox_key_error_"/>
+                </else>
+            </filter>
+        </inSequence>
+        <outSequence>
+            <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
+            <send/>
+        </outSequence>
+    </resource>
+    <resource methods="POST" url-mapping="/location" faultSequence="fault">
+        <inSequence>
+            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
+                <then>
+                    <send>
+                        <endpoint name="admin--Windows Device Management Administrative Service_APIproductionEndpoint_1">
+                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
+                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
+                        </endpoint>
+                    </send>
+                </then>
+                <else>
+                    <sequence key="_sandbox_key_error_"/>
+                </else>
+            </filter>
+        </inSequence>
+        <outSequence>
+            <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
+            <send/>
+        </outSequence>
+    </resource>
+    <resource methods="POST" url-mapping="/reboot" faultSequence="fault">
+        <inSequence>
+            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
+                <then>
+                    <send>
+                        <endpoint name="admin--Windows Device Management Administrative Service_APIproductionEndpoint_2">
+                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
+                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
+                        </endpoint>
+                    </send>
+                </then>
+                <else>
+                    <sequence key="_sandbox_key_error_"/>
+                </else>
+            </filter>
+        </inSequence>
+        <outSequence>
+            <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
+            <send/>
+        </outSequence>
+    </resource>
+    <resource methods="POST" url-mapping="/wipe-devices" faultSequence="fault">
+        <inSequence>
+            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
+                <then>
+                    <send>
+                        <endpoint name="admin--Windows Device Management Administrative Service_APIproductionEndpoint_3">
+                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
+                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
+                        </endpoint>
+                    </send>
+                </then>
+                <else>
+                    <sequence key="_sandbox_key_error_"/>
+                </else>
+            </filter>
+        </inSequence>
+        <outSequence>
+            <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
+            <send/>
+        </outSequence>
+    </resource>
+    <resource methods="POST" url-mapping="/ring-devices" faultSequence="fault">
+        <inSequence>
+            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
+                <then>
+                    <send>
+                        <endpoint name="admin--Windows Device Management Administrative Service_APIproductionEndpoint_4">
+                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
+                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
+                        </endpoint>
+                    </send>
+                </then>
+                <else>
+                    <sequence key="_sandbox_key_error_"/>
+                </else>
+            </filter>
+        </inSequence>
+        <outSequence>
+            <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
+            <send/>
+        </outSequence>
+    </resource>
+    <resource methods="POST" url-mapping="/disenroll-devices" faultSequence="fault">
+        <inSequence>
+            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
+                <then>
+                    <send>
+                        <endpoint name="admin--Windows Device Management Administrative Service_APIproductionEndpoint_5">
+                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
+                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
+                        </endpoint>
+                    </send>
+                </then>
+                <else>
+                    <sequence key="_sandbox_key_error_"/>
+                </else>
+            </filter>
+        </inSequence>
+        <outSequence>
+            <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
+            <send/>
+        </outSequence>
+    </resource>
+    <resource methods="POST" url-mapping="/lock-reset-devices" faultSequence="fault">
+        <inSequence>
+            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
+                <then>
+                    <send>
+                        <endpoint name="admin--Windows Device Management Administrative Service_APIproductionEndpoint_6">
+                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
+                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
+                        </endpoint>
+                    </send>
+                </then>
+                <else>
+                    <sequence key="_sandbox_key_error_"/>
+                </else>
+            </filter>
+        </inSequence>
+        <outSequence>
+            <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.APIMgtLatencyStatsHandler"/>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
+            <property name="apiImplementationType" value="ENDPOINT"/>
+        </handler>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.APIAuthenticationHandler"/>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.throttling.APIThrottleHandler">
+            <property name="policyKey" value="gov:/apimgt/applicationdata/tiers.xml"/>
+            <property name="policyKeyApplication" value="gov:/apimgt/applicationdata/app-tiers.xml"/>
+            <property name="id" value="A"/>
+            <property name="policyKeyResource" value="gov:/apimgt/applicationdata/res-tiers.xml"/>
+        </handler>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtUsageHandler"/>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtGoogleAnalyticsTrackingHandler">
+            <property name="configKey" value="gov:/apimgt/statistics/ga-config.xml"/>
+        </handler>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerExtensionHandler"/>
+    </handlers>
+</api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Discovery_Service.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Discovery_Service.xml
new file mode 100644
index 000000000..63b9966e2
--- /dev/null
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Discovery_Service.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows Discovery Service" context="/api/device-mgt/windows/v1.0/discovery/post">
+    <resource methods="HEAD DELETE POST GET OPTIONS PATCH PUT" url-mapping="/*" faultSequence="fault">
+        <inSequence>
+            <property name="isDefault" expression="$trp:WSO2_AM_API_DEFAULT_VERSION"/>
+            <filter source="$ctx:isDefault" regex="true">
+                <then>
+                    <log level="custom">
+                        <property name="STATUS" value="Faulty invoking through default API.Dropping message to avoid recursion.."/>
+                    </log>
+                    <payloadFactory media-type="xml">
+                        <format>
+                            <am:fault xmlns:am="http://wso2.org/apimanager">
+                                <am:code>500</am:code>
+                                <am:type>Status report</am:type>
+                                <am:message>Internal Server Error</am:message>
+                                <am:description>Faulty invoking through default API</am:description>
+                            </am:fault>
+                        </format>
+                        <args/>
+                    </payloadFactory>
+                    <property name="HTTP_SC" value="500" scope="axis2"/>
+                    <property name="RESPONSE" value="true"/>
+                    <header name="To" action="remove"/>
+                    <property name="NO_ENTITY_BODY" scope="axis2" action="remove"/>
+                    <property name="ContentType" scope="axis2" action="remove"/>
+                    <property name="Authorization" scope="transport" action="remove"/>
+                    <property name="Host" scope="transport" action="remove"/>
+                    <property name="Accept" scope="transport" action="remove"/>
+                    <send/>
+                </then>
+                <else>
+                    <header name="WSO2_AM_API_DEFAULT_VERSION" scope="transport" value="true"/>
+                    <property name="uri.var.portnum" expression="get-property('http.nio.port')"/>
+                    <send>
+                        <endpoint>
+                            <http uri-template="http://localhost:{uri.var.portnum}/api/device-mgt/windows/v1.0/discovery/post/1.0.0">
+                                <timeout>
+                                    <duration>60000</duration>
+                                    <responseAction>fault</responseAction>
+                                </timeout>
+                            </http>
+                        </endpoint>
+                    </send>
+                </else>
+            </filter>
+        </inSequence>
+        <outSequence>
+            <property name="FORCE_HTTP_CONTENT_LENGTH" scope="axis2" value="true"/>
+            <property name="COPY_CONTENT_LENGTH_FROM_INCOMING" value="true" scope="axis2"/>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.SynapsePropertiesHandler"/>
+    </handlers>
+</api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Discovery_Service_v1.0.0.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Discovery_Service_v1.0.0.xml
new file mode 100644
index 000000000..7bab00a0f
--- /dev/null
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Discovery_Service_v1.0.0.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows Discovery Service" context="/api/device-mgt/windows/v1.0/discovery/post/1.0.0" version="1.0.0" version-type="context">
+    <resource methods="POST" url-mapping="/*" faultSequence="fault">
+        <inSequence>
+            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
+                <then>
+                    <send>
+                        <endpoint name="admin--Windows Discovery Service_APIproductionEndpoint_0">
+                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/discovery/post"/>
+                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/discovery/post"/>
+                        </endpoint>
+                    </send>
+                </then>
+                <else>
+                    <sequence key="_sandbox_key_error_"/>
+                </else>
+            </filter>
+        </inSequence>
+        <outSequence>
+            <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
+            <property name="FORCE_HTTP_CONTENT_LENGTH" scope="axis2" value="true"/>
+            <property name="COPY_CONTENT_LENGTH_FROM_INCOMING" value="true" scope="axis2"/>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.APIMgtLatencyStatsHandler"/>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
+            <property name="apiImplementationType" value="ENDPOINT"/>
+        </handler>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.APIAuthenticationHandler"/>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.throttling.APIThrottleHandler">
+            <property name="policyKey" value="gov:/apimgt/applicationdata/tiers.xml"/>
+            <property name="policyKeyApplication" value="gov:/apimgt/applicationdata/app-tiers.xml"/>
+            <property name="id" value="A"/>
+            <property name="policyKeyResource" value="gov:/apimgt/applicationdata/res-tiers.xml"/>
+        </handler>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtUsageHandler"/>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtGoogleAnalyticsTrackingHandler">
+            <property name="configKey" value="gov:/apimgt/statistics/ga-config.xml"/>
+        </handler>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerExtensionHandler"/>
+    </handlers>
+</api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Enrollment_policy_Service.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Enrollment_policy_Service.xml
new file mode 100644
index 000000000..9e2e438d6
--- /dev/null
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Enrollment_policy_Service.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows Enrollment policy Service" context="/api/device-mgt/windows/v1.0/certificatepolicy/xcep">
+    <resource methods="HEAD DELETE POST GET OPTIONS PATCH PUT" url-mapping="/*" faultSequence="fault">
+        <inSequence>
+            <property name="isDefault" expression="$trp:WSO2_AM_API_DEFAULT_VERSION"/>
+            <filter source="$ctx:isDefault" regex="true">
+                <then>
+                    <log level="custom">
+                        <property name="STATUS" value="Faulty invoking through default API.Dropping message to avoid recursion.."/>
+                    </log>
+                    <payloadFactory media-type="xml">
+                        <format>
+                            <am:fault xmlns:am="http://wso2.org/apimanager">
+                                <am:code>500</am:code>
+                                <am:type>Status report</am:type>
+                                <am:message>Internal Server Error</am:message>
+                                <am:description>Faulty invoking through default API</am:description>
+                            </am:fault>
+                        </format>
+                        <args/>
+                    </payloadFactory>
+                    <property name="HTTP_SC" value="500" scope="axis2"/>
+                    <property name="RESPONSE" value="true"/>
+                    <header name="To" action="remove"/>
+                    <property name="NO_ENTITY_BODY" scope="axis2" action="remove"/>
+                    <property name="ContentType" scope="axis2" action="remove"/>
+                    <property name="Authorization" scope="transport" action="remove"/>
+                    <property name="Host" scope="transport" action="remove"/>
+                    <property name="Accept" scope="transport" action="remove"/>
+                    <send/>
+                </then>
+                <else>
+                    <header name="WSO2_AM_API_DEFAULT_VERSION" scope="transport" value="true"/>
+                    <property name="uri.var.portnum" expression="get-property('http.nio.port')"/>
+                    <send>
+                        <endpoint>
+                            <http uri-template="http://localhost:{uri.var.portnum}/api/device-mgt/windows/v1.0/certificatepolicy/xcep/1.0.0">
+                                <timeout>
+                                    <duration>60000</duration>
+                                    <responseAction>fault</responseAction>
+                                </timeout>
+                            </http>
+                        </endpoint>
+                    </send>
+                </else>
+            </filter>
+        </inSequence>
+        <outSequence>
+            <property name="FORCE_HTTP_CONTENT_LENGTH" scope="axis2" value="true"/>
+    <property name="COPY_CONTENT_LENGTH_FROM_INCOMING" value="true" scope="axis2"/>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.SynapsePropertiesHandler"/>
+    </handlers>
+</api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Enrollment_policy_Service_v1.0.0.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Enrollment_policy_Service_v1.0.0.xml
new file mode 100644
index 000000000..4b6e550a6
--- /dev/null
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Enrollment_policy_Service_v1.0.0.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows Enrollment policy Service" context="/api/device-mgt/windows/v1.0/certificatepolicy/xcep/1.0.0" version="1.0.0" version-type="context">
+    <resource methods="POST" url-mapping="/*" faultSequence="fault">
+        <inSequence>
+            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
+                <then>
+                    <send>
+                        <endpoint name="admin--Windows Enrollment policy Service_APIproductionEndpoint_0">
+                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/certificatepolicy/xcep"/>
+                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/certificatepolicy/xcep"/>
+                        </endpoint>
+                    </send>
+                </then>
+                <else>
+                    <sequence key="_sandbox_key_error_"/>
+                </else>
+            </filter>
+        </inSequence>
+        <outSequence>
+            <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
+            <property name="FORCE_HTTP_CONTENT_LENGTH" scope="axis2" value="true"/>
+    <property name="COPY_CONTENT_LENGTH_FROM_INCOMING" value="true" scope="axis2"/>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.APIMgtLatencyStatsHandler"/>
+        <!--handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
+            <property name="apiImplementationType" value="ENDPOINT"/>
+        </handler-->
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.APIAuthenticationHandler"/>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.throttling.APIThrottleHandler">
+            <property name="policyKey" value="gov:/apimgt/applicationdata/tiers.xml"/>
+            <property name="policyKeyApplication" value="gov:/apimgt/applicationdata/app-tiers.xml"/>
+            <property name="id" value="A"/>
+            <property name="policyKeyResource" value="gov:/apimgt/applicationdata/res-tiers.xml"/>
+        </handler>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtUsageHandler"/>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtGoogleAnalyticsTrackingHandler">
+            <property name="configKey" value="gov:/apimgt/statistics/ga-config.xml"/>
+        </handler>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerExtensionHandler"/>
+    </handlers>
+</api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/devicetypes/windows.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/devicetypes/windows.xml
index 517a9fe0b..a20e4ec38 100644
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/devicetypes/windows.xml
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/devicetypes/windows.xml
@@ -120,6 +120,13 @@
                        type="application/json">
             </Operation>
         </Feature>
+        <Feature code="DEVICE_REBOOT">
+            <Name>Reboot</Name>
+            <Description>Reboot the device</Description>
+            <Operation context="/api/device-mgt/windows/v1.0/admin/devices/reboot" method="POST"
+                       type="application/json">
+            </Operation>
+        </Feature>
         <Feature code="DEVICE_INFO">
             <Name>Device info</Name>
             <Description>Request device information</Description>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/p2.inf b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/p2.inf
index 2888d1ef1..e284e15ab 100644
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/p2.inf
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/p2.inf
@@ -7,7 +7,15 @@ org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../data
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/database/,target:${installFolder}/../../database/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/devicetypes/);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/devicetypes/,target:${installFolder}/../../deployment/server/devicetypes/,overwrite:true);\
-
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/apis/admin--Windows_Discovery_Service.xml,target:${installFolder}/../../deployment/server/synapse-configs/default/api/admin--Windows_Discovery_Service.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/apis/admin--Windows_Discovery_Service_v1.0.0.xml,target:${installFolder}/../../deployment/server/synapse-configs/default/api/admin--Windows_Discovery_Service_v1.0.0.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/apis/admin--Windows_Enrollment_policy_Service.xml,target:${installFolder}/../../deployment/server/synapse-configs/default/api/admin--Windows_Enrollment_policy_Service.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/apis/admin--Windows_Enrollment_policy_Service_v1.0.0.xml,target:${installFolder}/../../deployment/server/synapse-configs/default/api/admin--Windows_Enrollment_policy_Service_v1.0.0.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/apis/admin--Windows_10_Enrollment_Service.xml,target:${installFolder}/../../deployment/server/synapse-configs/default/api/admin--Windows_10_Enrollment_Service.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/apis/admin--Windows_10_Enrollment_Service_v1.0.0.xml,target:${installFolder}/../../deployment/server/synapse-configs/default/api/admin--Windows_10_Enrollment_Service_v1.0.0.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/apis/admin--Windows_10_Device_management.xml,target:${installFolder}/../../deployment/server/synapse-configs/default/api/admin--Windows_10_Device_management.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/apis/admin--Windows_10_Device_management_v1.0.0.xml,target:${installFolder}/../../deployment/server/synapse-configs/default/api/admin--Windows_10_Device_management_v1.0.0.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/apis/admin--Windows_10_Device_management.xml,target:${installFolder}/../../deployment/server/synapse-configs/default/api/admin--Windows_10_Device_management.xml,overwrite:true);\
 
 instructions.unconfigure = \
 org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/webapps/api#device-mgt#windows#v1.0.war);\
@@ -27,5 +35,4 @@ org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../dep
 org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.date-range-picker);\
 org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../dbscripts/cdm/plugins/windows);\
 org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../database/WSO2MobileWindows_DB.h2.db);\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../.
-./deployment/server/devicetypes/windows.xml);\
\ No newline at end of file
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/devicetypes/windows.xml);\
\ No newline at end of file

From 8655da595e85aefcaf5b9ddd2230943ca535b47b Mon Sep 17 00:00:00 2001
From: Hasunie <hasunie@wso2.com>
Date: Fri, 13 Jan 2017 16:05:10 +0530
Subject: [PATCH 02/10] removing swagger definition from the soap endpoints

---
 .../api/services/DeviceManagementService.java | 41 ++++++++-----------
 .../services/discovery/DiscoveryService.java  | 19 +--------
 .../discovery/beans/DiscoveryRequest.java     | 11 ++++-
 .../enrollment/EnrollmentService.java         | 19 ---------
 .../api/services/syncml/SyncmlService.java    | 19 +--------
 .../CertificateEnrollmentPolicyService.java   | 18 --------
 6 files changed, 28 insertions(+), 99 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/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 081158f30..602403cd6 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
@@ -21,11 +21,14 @@ package org.wso2.carbon.device.mgt.mobile.windows.api.services;
 
 import io.swagger.annotations.*;
 import org.w3c.dom.Document;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
+import org.wso2.carbon.apimgt.annotations.api.Scopes;
 import org.wso2.carbon.device.mgt.common.notification.mgt.NotificationManagementException;
 import org.wso2.carbon.device.mgt.mobile.windows.api.common.PluginConstants;
 import org.wso2.carbon.device.mgt.mobile.windows.api.common.exceptions.WindowsConfigurationException;
 import org.wso2.carbon.device.mgt.mobile.windows.api.common.exceptions.WindowsDeviceEnrolmentException;
 import org.wso2.carbon.device.mgt.mobile.windows.api.operations.WindowsOperationException;
+import org.wso2.carbon.device.mgt.mobile.windows.api.operations.util.Constants;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
@@ -38,25 +41,17 @@ import javax.ws.rs.core.Response;
 /**
  * Interface for Windows 10 Device management phase.
  */
-@SwaggerDefinition(
-        info = @Info(
-                version = "1.0.0",
-                title = "",
-                extensions = {
-                        @Extension(properties = {
-                                @ExtensionProperty(name = "name", value = "Windows 10 Device management"),
-                                @ExtensionProperty(name = "context",
-                                        value = "/api/device-mgt/windows/v1.0/management/devicemgt"),
-                        })
-                }
-        ),
-        tags = {
-                @Tag(name = "windows", description = "")
+@Path("/devicemgt")
+@Scopes(
+        scopes = {
+                @Scope(
+                        name = "Pending operations",
+                        description = "Register an Android device",
+                        key = "perm:windows:enroll",
+                        permissions = {"/device-mgt/devices/enroll/windows"}
+                )
         }
 )
-//@Api(value = "Windows 10 Device management",
-//        description = "This carries all the resources related to Windows 10 management session message flow.")
-@Path("/devicemgt")
 public interface DeviceManagementService {
     @Path("/pending-operations")
     @POST
@@ -68,14 +63,10 @@ public interface DeviceManagementService {
             notes = "Using this API to fetching more information to enroll the Device and " +
                     "getting pending operations.",
             tags = "Windows Device Management Administrative Service",
-            authorizations = {
-                    @Authorization(
-                            value = "permission",
-                            scopes = {@AuthorizationScope(
-                                    scope = "/device-mgt/devices/enroll/windows",
-                                    description = "Getting pending operations and " +
-                                            "device information to enroll the device")}
-                    )
+            extensions = {
+                    @Extension(properties = {
+                            @ExtensionProperty(name = Constants.SCOPE, value = "perm:android:enroll")
+                    })
             }
     )
     @ApiResponses(value = {
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/discovery/DiscoveryService.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/discovery/DiscoveryService.java
index db9a8125d..2b856cb85 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/discovery/DiscoveryService.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/discovery/DiscoveryService.java
@@ -42,24 +42,7 @@ import javax.xml.ws.soap.SOAPBinding;
 /**
  * Interface for Discovery service related operations.
  */
-@SwaggerDefinition(
-        info = @Info(
-                version = "1.0.0",
-                title = "",
-                extensions = {
-                        @Extension(properties = {
-                                @ExtensionProperty(name = "name", value = "Windows Discovery Service"),
-                                @ExtensionProperty(name = "context",
-                                        value = "/api/device-mgt/windows/v1.0/discovery/post"),
-                        })
-                }
-        ),
-        tags = {
-                @Tag(name = "windows", description = "")
-        }
-)
-@Api(value = "Windows Discovery Service",
-        description = "This carries all the resources related to Windows Discovery service.")
+
 @WebService(targetNamespace = PluginConstants.DISCOVERY_SERVICE_TARGET_NAMESPACE,
         name = "IDiscoveryService")
 @BindingType(value = SOAPBinding.SOAP12HTTP_BINDING)
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/discovery/beans/DiscoveryRequest.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/discovery/beans/DiscoveryRequest.java
index 2c8260fb9..d6e3a185e 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/discovery/beans/DiscoveryRequest.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/discovery/beans/DiscoveryRequest.java
@@ -86,4 +86,13 @@ public class DiscoveryRequest implements Serializable {
         this.osEdition = osEdition;
     }
 
-}
\ No newline at end of file
+    public String getApplicationVersion() {
+        return applicationVersion;
+    }
+
+    public void setApplicationVersion(String applicationVersion) {
+        this.applicationVersion = applicationVersion;
+    }
+
+
+}
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/enrollment/EnrollmentService.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/enrollment/EnrollmentService.java
index 2d2586c86..cb3e38091 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/enrollment/EnrollmentService.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/enrollment/EnrollmentService.java
@@ -35,25 +35,6 @@ import javax.xml.ws.ResponseWrapper;
 import javax.xml.ws.soap.SOAPBinding;
 import java.io.UnsupportedEncodingException;
 
-@SwaggerDefinition(
-        info = @Info(
-                version = "1.0.0",
-                title = "",
-                extensions = {
-                        @io.swagger.annotations.Extension(properties = {
-                                @ExtensionProperty(name = "name", value = "Windows 10 Enrollment Service"),
-                                @ExtensionProperty(name = "context",
-                                        value = "/api/device-mgt/windows/v1.0/deviceenrolment/enrollment"),
-                        })
-                }
-        ),
-        tags = {
-                @Tag(name = "windows", description = "")
-        }
-)
-//@Api(value = "Windows 10 Enrollment Service",
-//        description = "This carries all the resources related to Windows enrollment.")
-
 @WebService(targetNamespace = PluginConstants.DEVICE_ENROLLMENT_SERVICE_TARGET_NAMESPACE, name = "enrollment")
 @BindingType(value = SOAPBinding.SOAP12HTTP_BINDING)
 public interface EnrollmentService {
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/syncml/SyncmlService.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/syncml/SyncmlService.java
index 7ba8c570b..d165763ae 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/syncml/SyncmlService.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/syncml/SyncmlService.java
@@ -37,24 +37,7 @@ import javax.ws.rs.core.Response;
 /**
  * Interface for Windows 8.1 enrollment flow.
  */
-@SwaggerDefinition(
-        info = @Info(
-                version = "1.0.0",
-                title = "",
-                extensions = {
-                        @Extension(properties = {
-                                @ExtensionProperty(name = "name", value = "Windows 8.1 Device Management Service"),
-                                @ExtensionProperty(name = "context",
-                                        value = "/api/device-mgt/windows/v1.0/syncml"),
-                        })
-                }
-        ),
-        tags = {
-                @Tag(name = "windows", description = "")
-        }
-)
-@Api(value = "Windows 8.1 Device Management Service",
-        description = "This carries all the resources related to Windows syncml message flow.")
+
 @Path("/devicemanagement")
 public interface SyncmlService {
 
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/xcep/CertificateEnrollmentPolicyService.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/xcep/CertificateEnrollmentPolicyService.java
index 0934824c9..91cb4de1c 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/xcep/CertificateEnrollmentPolicyService.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/xcep/CertificateEnrollmentPolicyService.java
@@ -41,24 +41,6 @@ import javax.xml.ws.soap.SOAPBinding;
  * Interface for MS-XCEP implementation.
  */
 
-@SwaggerDefinition(
-        info = @Info(
-                version = "1.0.0",
-                title = "",
-                extensions = {
-                        @io.swagger.annotations.Extension(properties = {
-                                @ExtensionProperty(name = "name", value = "Windows Enrollment policy Service"),
-                                @ExtensionProperty(name = "context",
-                                        value = "/api/device-mgt/windows/v1.0/certificatepolicy/xcep"),
-                        })
-                }
-        ),
-        tags = {
-                @Tag(name = "windows", description = "")
-        }
-)
-@Api(value = "Windows Enrollment policy Service",
-        description = "This carries all the resources related to Windows enrollment policy.")
 @WebService(targetNamespace = PluginConstants.CERTIFICATE_ENROLLMENT_POLICY_SERVICE_TARGET_NAMESPACE,
 		name = "IPolicy")
 @BindingType(value = SOAPBinding.SOAP12HTTP_BINDING)

From 4c4fd0059342ca31b08a2ead2bdd23256b5dde53 Mon Sep 17 00:00:00 2001
From: Hasunie <hasunie@wso2.com>
Date: Fri, 13 Jan 2017 16:06:31 +0530
Subject: [PATCH 03/10] fixing issue in different type of windows device
 payloads

---
 .../api/services/discovery/impl/DiscoveryServiceImpl.java     | 4 ++--
 1 file 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/services/discovery/impl/DiscoveryServiceImpl.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/discovery/impl/DiscoveryServiceImpl.java
index da50c09c9..2ba4c9abc 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/discovery/impl/DiscoveryServiceImpl.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/discovery/impl/DiscoveryServiceImpl.java
@@ -68,8 +68,8 @@ public class DiscoveryServiceImpl implements DiscoveryService {
         String emailId = discoveryRequest.getEmailId();
         String[] userDomains = emailId.split(DELIMITER);
         String domain = userDomains[DOMAIN_SEGMENT];
-        String osVersion = discoveryRequest.getOsEdition();
-        String[] osVersions = osVersion .split(".");
+        String applicationVersion = discoveryRequest.getApplicationVersion();
+        String[] osVersions = applicationVersion .split("\\.");
         String os = osVersions[0];
         DiscoveryResponse discoveryResponse;
         if (PluginConstants.WindowsVersionProperties.OS_VERSION.equals(os) && FEDERATED.equals(getAuthPolicy())) {

From a2ae12f9d18349a7ee0951fea3f1ab398e0a5245 Mon Sep 17 00:00:00 2001
From: Hasunie <hasunie@wso2.com>
Date: Fri, 13 Jan 2017 16:08:58 +0530
Subject: [PATCH 04/10] adding windows 10 updates 1607/1511 changes

---
 .../impl/DeviceManagementServiceImpl.java     | 19 +++++++++++++------
 .../wstep/CertificateEnrollmentService.java   | 19 +------------------
 2 files changed, 14 insertions(+), 24 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/services/impl/DeviceManagementServiceImpl.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/impl/DeviceManagementServiceImpl.java
index f754ff80c..38dfde51d 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/impl/DeviceManagementServiceImpl.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/impl/DeviceManagementServiceImpl.java
@@ -89,7 +89,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
 
                         if (modifyEnrollWithMoreDetail(request)) {
                             pendingOperations = operationHandler.getPendingOperations(syncmlDocument);
-                            response = operationReply.generateReply(syncmlDocument,pendingOperations);
+                            response = operationReply.generateReply(syncmlDocument, pendingOperations);
                             return Response.status(Response.Status.OK).entity(response).build();
                         } else {
                             String msg = "Error occurred in while modify the enrollment.";
@@ -101,7 +101,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
                         log.error(msg);
                         return Response.status(Response.Status.UNAUTHORIZED).entity(msg).build();
                     }
-                } else  {
+                } else {
                     if ((syncmlDocument.getBody().getAlert() != null)) {
                         if (!syncmlDocument.getBody().getAlert().getData().equals(Constants.DISENROLL_ALERT_DATA)) {
                             pendingOperations = operationHandler.getPendingOperations(syncmlDocument);
@@ -155,8 +155,8 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
     private boolean modifyEnrollWithMoreDetail(Document request) throws WindowsDeviceEnrolmentException,
             WindowsOperationException {
 
-        String devMan;
-        String devMod;
+        String devMan = null;
+        String devMod = null;
         boolean status = false;
         String user;
         SyncmlDocument syncmlDocument;
@@ -165,8 +165,15 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
             syncmlDocument = SyncmlParser.parseSyncmlPayload(request);
             ReplaceTag replace = syncmlDocument.getBody().getReplace();
             List<ItemTag> itemList = replace.getItems();
-            devMan = itemList.get(PluginConstants.SyncML.DEVICE_MAN_POSITION).getData();
-            devMod = itemList.get(PluginConstants.SyncML.DEVICE_MODEL_POSITION).getData();
+            for (ItemTag itemTag : itemList) {
+                String locURI = itemTag.getSource().getLocURI();
+                if (OperationCode.Info.MANUFACTURER.getCode().equals(locURI)) {
+                    devMan = itemTag.getData();
+                }
+                if (OperationCode.Info.DEVICE_MODEL.getCode().equals(locURI)) {
+                    devMod = itemTag.getData();
+                }
+            }
             user = syncmlDocument.getHeader().getSource().getLocName();
             AuthenticationInfo authenticationInfo = new AuthenticationInfo();
             authenticationInfo.setUsername(user);
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/wstep/CertificateEnrollmentService.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/wstep/CertificateEnrollmentService.java
index eb6f7001a..1b29298b3 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/wstep/CertificateEnrollmentService.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/wstep/CertificateEnrollmentService.java
@@ -41,24 +41,7 @@ import java.io.UnsupportedEncodingException;
 /**
  * Interface of WSTEP implementation.
  */
-@SwaggerDefinition(
-        info = @Info(
-                version = "1.0.0",
-                title = "",
-                extensions = {
-                        @Extension(properties = {
-                                @ExtensionProperty(name = "name", value = "Windows 8.1 Enrollment Service"),
-                                @ExtensionProperty(name = "context",
-                                        value = "/api/device-mgt/windows/v1.0/deviceenrolment/wstep"),
-                        })
-                }
-        ),
-        tags = {
-                @Tag(name = "windows", description = "")
-        }
-)
-@Api(value = "Windows Enrollment service Management",
-        description = "This carries all the resources related to Windows enrollment service.")
+
 @WebService(targetNamespace = PluginConstants.DEVICE_ENROLLMENT_SERVICE_TARGET_NAMESPACE, name = "wstep")
 @BindingType(value = SOAPBinding.SOAP12HTTP_BINDING)
 public interface CertificateEnrollmentService {

From 97705311b9b1458cd2994a95e0169b230fa30405 Mon Sep 17 00:00:00 2001
From: Hasunie <hasunie@wso2.com>
Date: Fri, 13 Jan 2017 16:09:45 +0530
Subject: [PATCH 05/10] removing install app tab from the device view

---
 .../cdmf.unit.device.type.windows.device-view/device-view.hbs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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/device-view.hbs 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/device-view.hbs
index cb00b423a..18345645a 100644
--- 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/device-view.hbs
+++ 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/device-view.hbs
@@ -140,12 +140,12 @@
                         class="hidden-sm">Device Location</span>
                 </a>
             </li>
-            <li role="presentation" class="list-group-item">
+            <!--li role="presentation" class="list-group-item">
                 <a href="#installed_applications_tab" role="tab" data-toggle="tab"
                    aria-controls="installed_applications_tab">
                     <i class="icon fw fw-application"></i><span class="hidden-sm">Installed Applications</span>
                 </a>
-            </li>
+            </li-->
         {{/zone}}
 
         {{#zone "device-details-tab-contents"}}

From 7ea51183a9e518aa25f47d95806eb0487cac491d Mon Sep 17 00:00:00 2001
From: Hasunie <hasunie@wso2.com>
Date: Fri, 13 Jan 2017 16:10:57 +0530
Subject: [PATCH 06/10] adding synaps properties to non secured endpoints

---
 ...n--Windows_10_Device_management_v1.0.0.xml | 11 +----
 ...--Windows_10_Enrollment_Service_v1.0.0.xml | 15 +-----
 ...s_8.1_Device_Management_Service_v1.0.0.xml | 13 +----
 ...-Windows_8.1_Enrollment_Service_v1.0.0.xml | 13 +----
 ...dmin--Windows_Discovery_Service_v1.0.0.xml | 49 +++++++++++++++++++
 ...ndows_Enrollment_policy_Service_v1.0.0.xml | 15 +-----
 6 files changed, 56 insertions(+), 60 deletions(-)

diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Device_management_v1.0.0.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Device_management_v1.0.0.xml
index 2081ae6ef..2e1e3b2ec 100644
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Device_management_v1.0.0.xml
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Device_management_v1.0.0.xml
@@ -2,14 +2,9 @@
     <resource methods="POST" url-mapping="/pending-operations" faultSequence="fault">
         <inSequence>
             <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+            <property name="AM_KEY_TYPE" value="PRODUCTION" scope="default"/>
             <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
                 <then>
-<!--
-		<property name="ContentType" value="application/xml" scope="axis2"/>
-		<property name="messageType" value="application/xml" scope="axis2"/>
-		 <property name="DISABLE_CHUNKING" value="true" scope="axis2" />
--->
-
                     <send>
                         <endpoint name="admin--Windows 10 Device management_APIproductionEndpoint_0">
                             <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/management/devicemgt"/>
@@ -24,10 +19,6 @@
         </inSequence>
         <outSequence>
             <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
-<!--
-	    <property name="ContentType" value="application/vnd.syncml.dm+xml" scope="axis2"/>
-	    <property name="messageType" value="application/vnd.syncml.dm+xml" scope="axis2"/>
--->
             <send/>
         </outSequence>
     </resource>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Enrollment_Service_v1.0.0.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Enrollment_Service_v1.0.0.xml
index ced6d1129..648089b83 100644
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Enrollment_Service_v1.0.0.xml
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Enrollment_Service_v1.0.0.xml
@@ -2,6 +2,7 @@
     <resource methods="POST" url-mapping="/*" faultSequence="fault">
         <inSequence>
             <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+            <property name="AM_KEY_TYPE" value="PRODUCTION" scope="default"/>
             <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
                 <then>
                     <send>
@@ -25,20 +26,8 @@
     </resource>
     <handlers>
         <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.APIMgtLatencyStatsHandler"/>
-        <!--handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
             <property name="apiImplementationType" value="ENDPOINT"/>
-        </handler-->
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.APIAuthenticationHandler"/>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.throttling.APIThrottleHandler">
-            <property name="policyKey" value="gov:/apimgt/applicationdata/tiers.xml"/>
-            <property name="policyKeyApplication" value="gov:/apimgt/applicationdata/app-tiers.xml"/>
-            <property name="id" value="A"/>
-            <property name="policyKeyResource" value="gov:/apimgt/applicationdata/res-tiers.xml"/>
         </handler>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtUsageHandler"/>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtGoogleAnalyticsTrackingHandler">
-            <property name="configKey" value="gov:/apimgt/statistics/ga-config.xml"/>
-        </handler>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerExtensionHandler"/>
     </handlers>
 </api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_8.1_Device_Management_Service_v1.0.0.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_8.1_Device_Management_Service_v1.0.0.xml
index 771f35509..af46dfc72 100644
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_8.1_Device_Management_Service_v1.0.0.xml
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_8.1_Device_Management_Service_v1.0.0.xml
@@ -2,6 +2,7 @@
     <resource methods="POST" url-mapping="/request" faultSequence="fault">
         <inSequence>
             <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+            <property name="AM_KEY_TYPE" value="PRODUCTION" scope="default"/>
             <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
                 <then>
                     <send>
@@ -26,17 +27,5 @@
         <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
             <property name="apiImplementationType" value="ENDPOINT"/>
         </handler>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.APIAuthenticationHandler"/>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.throttling.APIThrottleHandler">
-            <property name="policyKey" value="gov:/apimgt/applicationdata/tiers.xml"/>
-            <property name="policyKeyApplication" value="gov:/apimgt/applicationdata/app-tiers.xml"/>
-            <property name="id" value="A"/>
-            <property name="policyKeyResource" value="gov:/apimgt/applicationdata/res-tiers.xml"/>
-        </handler>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtUsageHandler"/>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtGoogleAnalyticsTrackingHandler">
-            <property name="configKey" value="gov:/apimgt/statistics/ga-config.xml"/>
-        </handler>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerExtensionHandler"/>
     </handlers>
 </api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_8.1_Enrollment_Service_v1.0.0.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_8.1_Enrollment_Service_v1.0.0.xml
index 2be45de64..74724bd8c 100644
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_8.1_Enrollment_Service_v1.0.0.xml
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_8.1_Enrollment_Service_v1.0.0.xml
@@ -2,6 +2,7 @@
     <resource methods="POST" url-mapping="/*" faultSequence="fault">
         <inSequence>
             <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+            <property name="AM_KEY_TYPE" value="PRODUCTION" scope="default"/>
             <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
                 <then>
                     <send>
@@ -26,17 +27,5 @@
         <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
             <property name="apiImplementationType" value="ENDPOINT"/>
         </handler>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.APIAuthenticationHandler"/>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.throttling.APIThrottleHandler">
-            <property name="policyKey" value="gov:/apimgt/applicationdata/tiers.xml"/>
-            <property name="policyKeyApplication" value="gov:/apimgt/applicationdata/app-tiers.xml"/>
-            <property name="id" value="A"/>
-            <property name="policyKeyResource" value="gov:/apimgt/applicationdata/res-tiers.xml"/>
-        </handler>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtUsageHandler"/>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtGoogleAnalyticsTrackingHandler">
-            <property name="configKey" value="gov:/apimgt/statistics/ga-config.xml"/>
-        </handler>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerExtensionHandler"/>
     </handlers>
 </api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Discovery_Service_v1.0.0.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Discovery_Service_v1.0.0.xml
index 7bab00a0f..3052fa8cf 100644
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Discovery_Service_v1.0.0.xml
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Discovery_Service_v1.0.0.xml
@@ -42,3 +42,52 @@
         <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerExtensionHandler"/>
     </handlers>
 </api>
+
+
+        <?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows Discovery Service" context="/api/device-mgt/windows/v1.0/discovery/post/1.0.0" version="1.0.0" version-type="context">
+<resource methods="POST" url-mapping="/*" faultSequence="fault">
+    <inSequence>
+        <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+        <property name="AM_KEY_TYPE" value="PRODUCTION" scope="default"/>
+        <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
+            <then>
+                <send>
+                    <endpoint name="admin--Windows Discovery Service_APIproductionEndpoint_0">
+                        <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/discovery/post"/>
+                        <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/discovery/post"/>
+                    </endpoint>
+                </send>
+            </then>
+            <else>
+                <sequence key="_sandbox_key_error_"/>
+            </else>
+        </filter>
+    </inSequence>
+    <outSequence>
+        <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
+        <property name="FORCE_HTTP_CONTENT_LENGTH" scope="axis2" value="true"/>
+        <property name="COPY_CONTENT_LENGTH_FROM_INCOMING" value="true" scope="axis2"/>
+        <send/>
+    </outSequence>
+</resource>
+<handlers>
+    <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.APIMgtLatencyStatsHandler"/>
+    <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
+        <property name="apiImplementationType" value="ENDPOINT"/>
+    </handler>
+    <!--
+            <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.APIAuthenticationHandler"/>
+            <handler class="org.wso2.carbon.apimgt.gateway.handlers.throttling.APIThrottleHandler">
+                <property name="policyKey" value="gov:/apimgt/applicationdata/tiers.xml"/>
+                <property name="policyKeyApplication" value="gov:/apimgt/applicationdata/app-tiers.xml"/>
+                <property name="id" value="A"/>
+                <property name="policyKeyResource" value="gov:/apimgt/applicationdata/res-tiers.xml"/>
+            </handler>
+            <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtUsageHandler"/>
+            <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtGoogleAnalyticsTrackingHandler">
+                <property name="configKey" value="gov:/apimgt/statistics/ga-config.xml"/>
+            </handler>
+            <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerExtensionHandler"/>
+    -->
+</handlers>
+</api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Enrollment_policy_Service_v1.0.0.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Enrollment_policy_Service_v1.0.0.xml
index 4b6e550a6..1806cf1dd 100644
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Enrollment_policy_Service_v1.0.0.xml
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Enrollment_policy_Service_v1.0.0.xml
@@ -2,6 +2,7 @@
     <resource methods="POST" url-mapping="/*" faultSequence="fault">
         <inSequence>
             <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+            <property name="AM_KEY_TYPE" value="PRODUCTION" scope="default"/>
             <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
                 <then>
                     <send>
@@ -25,20 +26,8 @@
     </resource>
     <handlers>
         <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.APIMgtLatencyStatsHandler"/>
-        <!--handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
             <property name="apiImplementationType" value="ENDPOINT"/>
-        </handler-->
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.APIAuthenticationHandler"/>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.throttling.APIThrottleHandler">
-            <property name="policyKey" value="gov:/apimgt/applicationdata/tiers.xml"/>
-            <property name="policyKeyApplication" value="gov:/apimgt/applicationdata/app-tiers.xml"/>
-            <property name="id" value="A"/>
-            <property name="policyKeyResource" value="gov:/apimgt/applicationdata/res-tiers.xml"/>
         </handler>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtUsageHandler"/>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtGoogleAnalyticsTrackingHandler">
-            <property name="configKey" value="gov:/apimgt/statistics/ga-config.xml"/>
-        </handler>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerExtensionHandler"/>
     </handlers>
 </api>

From f84e3526f536ae34dadb6a1e1e499b33a9013d90 Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Fri, 13 Jan 2017 17:50:19 +0530
Subject: [PATCH 07/10] changed [fw-ok] with [fw-success]

---
 .../device-view.hbs                           |  2 +-
 .../public/js/device-detail.js                |  6 ++--
 .../public/templates/applications-list.hbs    |  2 +-
 .../public/templates/policy-compliance.hbs    |  4 +--
 .../public/templates/android-policy-edit.hbs  | 36 +++++++++----------
 .../public/templates/android-policy-view.hbs  | 36 +++++++++----------
 .../templates/android-policy-operations.hbs   | 36 +++++++++----------
 .../device-view.hbs                           |  2 +-
 .../public/js/device-detail.js                |  6 ++--
 .../public/templates/applications-list.hbs    |  2 +-
 .../public/templates/policy-compliance.hbs    |  4 +--
 .../public/templates/windows-policy-edit.hbs  | 16 ++++-----
 .../public/templates/windows-policy-view.hbs  | 16 ++++-----
 .../templates/windows-policy-operations.hbs   | 16 ++++-----
 14 files changed, 92 insertions(+), 92 deletions(-)

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.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/device-view.hbs
index 14a2c0a6d..ca9a91d54 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.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/device-view.hbs
@@ -52,7 +52,7 @@
                             <td class="sorting_1" style="padding:10px 15px; width: 15%;">Status</td>
                             <td style="padding:10px 15px;">
                                 {{#equal device.status "ACTIVE"}}<span><i
-                                        class="fw fw-ok icon-success"></i>Active</span>{{/equal}}
+                                        class="fw fw-success icon-success"></i>Active</span>{{/equal}}
                                 {{#equal device.status "INACTIVE"}}<span><i
                                         class="fw fw-warning icon-warning"></i>Inactive</span>{{/equal}}
                                 {{#equal device.status "BLOCKED"}}<span><i
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
index 0c08e071e..449dec84c 100755
--- 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
@@ -157,7 +157,7 @@ var InitiateViewOption = null;
                         var html;
                         switch (status) {
                             case "COMPLETED" :
-                                html = "<span><i class='fw fw-ok icon-success'></i> Completed</span>";
+                                html = "<span><i class='fw fw-success icon-success'></i> Completed</span>";
                                 break;
                             case "PENDING" :
                                 html = "<span><i class='fw fw-warning icon-warning'></i> Pending</span>";
@@ -166,10 +166,10 @@ var InitiateViewOption = null;
                                 html = "<span><i class='fw fw-error icon-danger'></i> Error</span>";
                                 break;
                             case "IN_PROGRESS" :
-                                html = "<span><i class='fw fw-ok icon-warning'></i> In Progress</span>";
+                                html = "<span><i class='fw fw-success icon-warning'></i> In Progress</span>";
                                 break;
                             case "REPEATED" :
-                                html = "<span><i class='fw fw-ok icon-warning'></i> Repeated</span>";
+                                html = "<span><i class='fw fw-success icon-warning'></i> Repeated</span>";
                                 break;
                         }
                         return html;
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
index 3b55136af..ec6029dcc 100755
--- 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
@@ -7,7 +7,7 @@
                 {{#equal platform "windows"}}<i class="icon fw fw-windows"></i>{{/equal}}
                 {{#equal isActive true}}
                     <span style="word-wrap: break-word;">
-                            <i class="fw fw-ok icon-success" style="font-size: 14px;"></i>
+                            <i class="fw fw-success icon-success" style="font-size: 14px;"></i>
                             &nbsp;Active
                         </span>
                     <span style="word-wrap: break-word;"><b>{{name}}</b></span>
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
index bae2aeb24..8fba741a6 100755
--- 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
@@ -34,7 +34,7 @@
                     <div>
                         <b>Compliance :</b>
                         {{#equal compliance "COMPLIANT"}}
-                            <span><i class="fw fw-ok icon-success"></i> Compliant</span>
+                            <span><i class="fw fw-success icon-success"></i> Compliant</span>
                         {{/equal}}
                         {{#equal compliance "NON-COMPLIANT"}}
                             <span><i class="fw fw-warning icon-danger"></i> Not Compliant</span>
@@ -70,7 +70,7 @@
         <tr data-type="selectable">
             <td data-display="{{featureCode}}" data-grid-label="Feature Code">{{featureCode}}</td>
             <td data-display="{{compliance}}" data-grid-label="Status">
-                {{#equal compliance true}}<span><i class="fw fw-ok icon-success"></i> Compliant</span>{{/equal}}
+                {{#equal compliance true}}<span><i class="fw fw-success icon-success"></i> Compliant</span>{{/equal}}
                 {{#equal compliance false}}<span><i class="fw fw-warning icon-danger"></i> Not Compliant</span>{{/equal}}
             </td>
         </tr>
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.policy-edit/public/templates/android-policy-edit.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.policy-edit/public/templates/android-policy-edit.hbs
index 2d4431205..b6aba2f23 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.policy-edit/public/templates/android-policy-edit.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.policy-edit/public/templates/android-policy-edit.hbs
@@ -23,8 +23,8 @@
                 </span>
             Passcode Policy
             <span id="passcode-policy-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="passcode-policy-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="passcode-policy-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="passcode-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('camera', this)">
@@ -32,8 +32,8 @@
                     <i class="fw fw-block fw-stack-2x"></i>
                 </span>
             Restrictions
-            <span id="camera-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-            <span id="camera-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="camera-configured" class="has-configured status-icon hidden"><i class="fw fw-success"></i></span>
+            <span id="camera-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span class="camera-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('encrypt-storage', this)">
@@ -42,8 +42,8 @@
                 </span>
             Encryption Settings
             <span id="encrypt-storage-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="encrypt-storage-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="encrypt-storage-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="encrypt-storage-error" class="encryption-error status-icon hidden"><i
                     class="fw fw-error"></i></span>
         </a>
@@ -52,8 +52,8 @@
                     <i class="fw fw-wifi fw-stack-2x"></i>
                 </span>
             Wi-Fi Settings
-            <span id="wifi-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-            <span id="wifi-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="wifi-configured" class="has-configured status-icon hidden"><i class="fw fw-success"></i></span>
+            <span id="wifi-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="wifi-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('vpn', this)">
@@ -61,8 +61,8 @@
                     <i class="fw fw-vpn fw-stack-2x"></i>
                 </span>
             Virtual Private Network
-            <span id="vpn-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-            <span id="vpn-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="vpn-configured" class="has-configured status-icon hidden"><i class="fw fw-success"></i></span>
+            <span id="vpn-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="vpn-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('work-profile', this)">
@@ -70,8 +70,8 @@
                  <i class="fw fw-service fw-stack-2x"></i>
              </span>
             Work-Profile Configurations
-            <span id="work-profile-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-            <span id="work-profile-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="work-profile-configured" class="has-configured status-icon hidden"><i class="fw fw-success"></i></span>
+            <span id="work-profile-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="work-profile-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('app-restriction', this)">
@@ -81,8 +81,8 @@
             </span>
             Application Restrictions
             <span id="app-restriction-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="app-restriction-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="app-restriction-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="app-restriction-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-system-update-policy', this)">
@@ -91,9 +91,9 @@
             </span>
             System Update Policy (COSU)
             <span id="cosu-system-update-policy-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
             <span id="cosu-system-update-policy-ok" class="has-success status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
             <span id="cosu-system-update-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-whitelisted-applications', this)" >
@@ -102,8 +102,8 @@
             </span>
             Whitelist Apps (COSU)
             <span id="cosu-whitelisted-applications-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="cosu-whitelisted-applications-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="cosu-whitelisted-applications-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="cosu-whitelisted-applications-error" class="has-error status-icon hidden"><i
                     class="fw fw-error"></i></span>
         </a>
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.policy-view/public/templates/android-policy-view.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.policy-view/public/templates/android-policy-view.hbs
index 45da8379c..2037c9c1c 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.policy-view/public/templates/android-policy-view.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.policy-view/public/templates/android-policy-view.hbs
@@ -6,8 +6,8 @@
                 </span>
             Passcode Policy
             <span id="passcode-policy-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="passcode-policy-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="passcode-policy-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="passcode-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('camera', this)">
@@ -15,8 +15,8 @@
                     <i class="fw fw-block fw-stack-2x"></i>
                 </span>
             Restrictions
-            <span id="camera-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-            <span id="camera-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="camera-configured" class="has-configured status-icon hidden"><i class="fw fw-success"></i></span>
+            <span id="camera-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span class="camera-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('encrypt-storage', this)">
@@ -25,8 +25,8 @@
                 </span>
             Encryption Settings
             <span id="encrypt-storage-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="encrypt-storage-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="encrypt-storage-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="encrypt-storage-error" class="encryption-error status-icon hidden"><i
                     class="fw fw-error"></i></span>
         </a>
@@ -35,8 +35,8 @@
                     <i class="fw fw-wifi fw-stack-2x"></i>
                 </span>
             Wi-Fi Settings
-            <span id="wifi-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-            <span id="wifi-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="wifi-configured" class="has-configured status-icon hidden"><i class="fw fw-success"></i></span>
+            <span id="wifi-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="wifi-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('vpn', this)">
@@ -44,8 +44,8 @@
                     <i class="fw fw-vpn fw-stack-2x"></i>
                 </span>
             Virtual Private Network
-            <span id="wifi-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-            <span id="wifi-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="wifi-configured" class="has-configured status-icon hidden"><i class="fw fw-success"></i></span>
+            <span id="wifi-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="wifi-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('work-profile', this)">
@@ -53,8 +53,8 @@
                  <i class="fw fw-service fw-stack-2x"></i>
              </span>
             Work-Profile Configurations
-            <span id="work-profile-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-            <span id="work-profile-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="work-profile-configured" class="has-configured status-icon hidden"><i class="fw fw-success"></i></span>
+            <span id="work-profile-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="work-profile-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('app-restriction', this)">
@@ -64,8 +64,8 @@
             </span>
             Applications Restrictions
             <span id="app-restriction-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="app-restriction-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="app-restriction-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="app-restriction-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-system-update-policy', this)" class="hide">
@@ -74,9 +74,9 @@
             </span>
             System Update Policy (COSU)
             <span id="cosu-system-update-policy-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
             <span id="cosu-system-update-policy-ok" class="has-success status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
             <span id="cosu-system-update-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-whitelisted-applications', this)" class="hide">
@@ -85,8 +85,8 @@
             </span>
             Whitelist Apps (COSU)
             <span id="cosu-whitelisted-applications-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="cosu-whitelisted-applications-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="cosu-whitelisted-applications-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="cosu-whitelisted-applications-error" class="has-error status-icon hidden"><i
                     class="fw fw-error"></i></span>
         </a>
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.policy-wizard/public/templates/android-policy-operations.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.policy-wizard/public/templates/android-policy-operations.hbs
index 2a3a18598..1f58ea329 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.policy-wizard/public/templates/android-policy-operations.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.policy-wizard/public/templates/android-policy-operations.hbs
@@ -23,8 +23,8 @@
                 </span>
             Passcode Policy
             <span id="passcode-policy-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="passcode-policy-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="passcode-policy-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="passcode-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('camera', this)">
@@ -32,8 +32,8 @@
                     <i class="fw fw-block fw-stack-2x"></i>
                 </span>
             Restrictions
-            <span id="camera-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-            <span id="camera-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="camera-configured" class="has-configured status-icon hidden"><i class="fw fw-success"></i></span>
+            <span id="camera-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span class="camera-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('encrypt-storage', this)">
@@ -42,8 +42,8 @@
                 </span>
             Encryption Settings
             <span id="encrypt-storage-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="encrypt-storage-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="encrypt-storage-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="encrypt-storage-error" class="encryption-error status-icon hidden"><i
                     class="fw fw-error"></i></span>
         </a>
@@ -52,8 +52,8 @@
                     <i class="fw fw-wifi fw-stack-2x"></i>
                 </span>
             Wi-Fi Settings
-            <span id="wifi-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-            <span id="wifi-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="wifi-configured" class="has-configured status-icon hidden"><i class="fw fw-success"></i></span>
+            <span id="wifi-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="wifi-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('vpn', this)">
@@ -61,8 +61,8 @@
                     <i class="fw fw-vpn fw-stack-2x"></i>
                 </span>
             Virtual Private Network
-            <span id="vpn-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-            <span id="vpn-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="vpn-configured" class="has-configured status-icon hidden"><i class="fw fw-success"></i></span>
+            <span id="vpn-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="vpn-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('work-profile', this)">
@@ -70,8 +70,8 @@
                  <i class="fw fw-service fw-stack-2x"></i>
              </span>
             Work-Profile Configurations
-            <span id="work-profile-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-            <span id="work-profile-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="work-profile-configured" class="has-configured status-icon hidden"><i class="fw fw-success"></i></span>
+            <span id="work-profile-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="work-profile-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('app-restriction', this)">
@@ -81,8 +81,8 @@
             </span>
             Application Restrictions
             <span id="app-restriction-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="app-restriction-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="app-restriction-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="app-restriction-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-system-update-policy', this)">
@@ -91,9 +91,9 @@
             </span>
             System Update Policy (COSU)
             <span id="cosu-system-update-policy-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
             <span id="cosu-system-update-policy-ok" class="has-success status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
             <span id="cosu-system-update-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-whitelisted-applications', this)">
@@ -102,8 +102,8 @@
             </span>
             Whitelist Apps (COSU)
             <span id="cosu-whitelisted-applications-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="cosu-whitelisted-applications-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="cosu-whitelisted-applications-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="cosu-whitelisted-applications-error" class="has-error status-icon hidden"><i
                     class="fw fw-error"></i></span>
         </a>
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/device-view.hbs 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/device-view.hbs
index cb00b423a..fe897ac41 100644
--- 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/device-view.hbs
+++ 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/device-view.hbs
@@ -52,7 +52,7 @@
                             <td class="sorting_1" style="padding:10px 15px; width: 15%;">Status</td>
                             <td style="padding:10px 15px;">
                                 {{#equal device.status "ACTIVE"}}<span><i
-                                        class="fw fw-ok icon-success"></i>Active</span>{{/equal}}
+                                        class="fw fw-success icon-success"></i>Active</span>{{/equal}}
                                 {{#equal device.status "INACTIVE"}}<span><i
                                         class="fw fw-warning icon-warning"></i>Inactive</span>{{/equal}}
                                 {{#equal device.status "BLOCKED"}}<span><i
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/device-detail.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/device-detail.js
index b6ae3ce2d..0e2375033 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/device-detail.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/device-detail.js
@@ -157,7 +157,7 @@ var InitiateViewOption = null;
                         var html;
                         switch (status) {
                             case "COMPLETED" :
-                                html = "<span><i class='fw fw-ok icon-success'></i> Completed</span>";
+                                html = "<span><i class='fw fw-success icon-success'></i> Completed</span>";
                                 break;
                             case "PENDING" :
                                 html = "<span><i class='fw fw-warning icon-warning'></i> Pending</span>";
@@ -166,10 +166,10 @@ var InitiateViewOption = null;
                                 html = "<span><i class='fw fw-error icon-danger'></i> Error</span>";
                                 break;
                             case "IN_PROGRESS" :
-                                html = "<span><i class='fw fw-ok icon-warning'></i> In Progress</span>";
+                                html = "<span><i class='fw fw-success icon-warning'></i> In Progress</span>";
                                 break;
                             case "REPEATED" :
-                                html = "<span><i class='fw fw-ok icon-warning'></i> Repeated</span>";
+                                html = "<span><i class='fw fw-success icon-warning'></i> Repeated</span>";
                                 break;
                         }
                         return html;
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/templates/applications-list.hbs 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/templates/applications-list.hbs
index 3b55136af..ec6029dcc 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/templates/applications-list.hbs
+++ 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/templates/applications-list.hbs
@@ -7,7 +7,7 @@
                 {{#equal platform "windows"}}<i class="icon fw fw-windows"></i>{{/equal}}
                 {{#equal isActive true}}
                     <span style="word-wrap: break-word;">
-                            <i class="fw fw-ok icon-success" style="font-size: 14px;"></i>
+                            <i class="fw fw-success icon-success" style="font-size: 14px;"></i>
                             &nbsp;Active
                         </span>
                     <span style="word-wrap: break-word;"><b>{{name}}</b></span>
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/templates/policy-compliance.hbs 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/templates/policy-compliance.hbs
index ec24e1ca6..1eb233dfe 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/templates/policy-compliance.hbs
+++ 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/templates/policy-compliance.hbs
@@ -34,7 +34,7 @@
                     <div>
                         <b>Compliance :</b>
                         {{#equal compliance "COMPLIANT"}}
-                            <span><i class="fw fw-ok icon-success"></i> Compliant</span>
+                            <span><i class="fw fw-success icon-success"></i> Compliant</span>
                         {{/equal}}
                         {{#equal compliance "NON-COMPLIANT"}}
                             <span><i class="fw fw-warning icon-danger"></i> Not Compliant</span>
@@ -69,7 +69,7 @@
         <tr data-type="selectable">
             <td data-display="{{featureCode}}" data-grid-label="Feature Code">{{featureCode}}</td>
             <td data-display="{{compliance}}" data-grid-label="Status">
-                {{#equal compliance true}}<span><i class="fw fw-ok icon-success"></i> Compliant</span>{{/equal}}
+                {{#equal compliance true}}<span><i class="fw fw-success icon-success"></i> Compliant</span>{{/equal}}
                 {{#equal compliance false}}<span><i class="fw fw-warning icon-danger"></i> Not Compliant</span>{{/equal}}
             </td>
         </tr>
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.policy-edit/public/templates/windows-policy-edit.hbs 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.policy-edit/public/templates/windows-policy-edit.hbs
index dd6361276..7e98d5019 100644
--- 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.policy-edit/public/templates/windows-policy-edit.hbs
+++ 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.policy-edit/public/templates/windows-policy-edit.hbs
@@ -5,8 +5,8 @@
                     <i class="fw fw-key fw-stack-2x"></i>
                 </span>Passcode Policy
             <span id="passcode-policy-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="passcode-policy-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="passcode-policy-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="passcode-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('camera', this)">
@@ -14,8 +14,8 @@
                     <i class="fw fw-block fw-stack-2x"></i>
                 </span>
             Restrictions on Camera
-            <span id="camera-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-            <span id="camera-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="camera-configured" class="has-configured status-icon hidden"><i class="fw fw-success"></i></span>
+            <span id="camera-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span class="camera-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('encrypt-storage', this)">
@@ -24,8 +24,8 @@
                 </span>
             Encryption Settings
             <span id="encrypt-storage-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="encrypt-storage-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="encrypt-storage-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="encrypt-storage-error" class="encryption-error status-icon hidden"><i
                     class="fw fw-error"></i></span>
         </a>
@@ -36,8 +36,8 @@
                 </span>
             Applications Restrictions
             <span id="app-restriction-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="app-restriction-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="app-restriction-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="app-restriction-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
     </div>
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.policy-view/public/templates/windows-policy-view.hbs 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.policy-view/public/templates/windows-policy-view.hbs
index f764fafaf..2d6c205ef 100644
--- 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.policy-view/public/templates/windows-policy-view.hbs
+++ 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.policy-view/public/templates/windows-policy-view.hbs
@@ -6,8 +6,8 @@
                 </span>
             Passcode Policy
             <span id="passcode-policy-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="passcode-policy-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="passcode-policy-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="passcode-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('camera', this)">
@@ -15,8 +15,8 @@
                     <i class="fw fw-block fw-stack-2x"></i>
                 </span>
             Restrictions on Camera
-            <span id="camera-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-            <span id="camera-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="camera-configured" class="has-configured status-icon hidden"><i class="fw fw-success"></i></span>
+            <span id="camera-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span class="camera-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('encrypt-storage', this)">
@@ -25,8 +25,8 @@
                 </span>
             Encryption Settings
             <span id="encrypt-storage-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="encrypt-storage-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="encrypt-storage-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="encrypt-storage-error" class="encryption-error status-icon hidden"><i
                     class="fw fw-error"></i></span>
         </a>
@@ -37,8 +37,8 @@
                 </span>
             Applications Restrictions
             <span id="app-restriction-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="app-restriction-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="app-restriction-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="app-restriction-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
     </div>
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.policy-wizard/public/templates/windows-policy-operations.hbs 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.policy-wizard/public/templates/windows-policy-operations.hbs
index dd6361276..7e98d5019 100644
--- 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.policy-wizard/public/templates/windows-policy-operations.hbs
+++ 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.policy-wizard/public/templates/windows-policy-operations.hbs
@@ -5,8 +5,8 @@
                     <i class="fw fw-key fw-stack-2x"></i>
                 </span>Passcode Policy
             <span id="passcode-policy-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="passcode-policy-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="passcode-policy-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="passcode-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('camera', this)">
@@ -14,8 +14,8 @@
                     <i class="fw fw-block fw-stack-2x"></i>
                 </span>
             Restrictions on Camera
-            <span id="camera-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-            <span id="camera-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="camera-configured" class="has-configured status-icon hidden"><i class="fw fw-success"></i></span>
+            <span id="camera-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span class="camera-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('encrypt-storage', this)">
@@ -24,8 +24,8 @@
                 </span>
             Encryption Settings
             <span id="encrypt-storage-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="encrypt-storage-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="encrypt-storage-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="encrypt-storage-error" class="encryption-error status-icon hidden"><i
                     class="fw fw-error"></i></span>
         </a>
@@ -36,8 +36,8 @@
                 </span>
             Applications Restrictions
             <span id="app-restriction-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="app-restriction-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="app-restriction-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="app-restriction-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
     </div>

From c162f379b45e25e51e3da8902569bb20a9308ef3 Mon Sep 17 00:00:00 2001
From: Hasunie <hasunie@wso2.com>
Date: Fri, 13 Jan 2017 18:19:40 +0530
Subject: [PATCH 08/10] adding windows operation scope

---
 .../DeviceManagementAdminService.java         |  2 +-
 .../private/config.json                       | 77 ++++++-------------
 2 files changed, 23 insertions(+), 56 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/services/DeviceManagementAdminService.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/DeviceManagementAdminService.java
index 5461cf3c0..936b353ac 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/DeviceManagementAdminService.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/DeviceManagementAdminService.java
@@ -76,7 +76,7 @@ import java.util.List;
                         name = "Un-enroll Device",
                         description = "Unregister an Windows device",
                         key = "perm:windows:disenroll",
-                        permissions = {"/device-mgt/devices/disenroll/windows"}
+                        permissions = {"/device-mgt/devices/owning-device/operations/windows/disenroll"}
                 ),
                 @Scope(
                         name = "Factory Reset",
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.type-view/private/config.json 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.type-view/private/config.json
index ed2bc42ca..f5d01d0d7 100644
--- 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.type-view/private/config.json
+++ 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.type-view/private/config.json
@@ -3,79 +3,46 @@
         "label": "Windows",
         "category": "mobile",
         "scopes" : [
-          "perm:windows:enroll"
+          "perm:windows:enroll",
+            "perm:windows:lock-devices",
+            "perm:windows:ring",
+            "perm:windows:wipe",
+            "perm:windows:lock-reset",
+            "perm:windows:reboot",
+            "perm:windows:location",
+            "perm:windows:disenroll"
         ],
         "analyticsEnabled": "false",
         "groupingEnabled": "false",
         "features": {
             "DEVICE_RING": {
-                "icon": "fw-dial-up"
+                "icon": "fw-dial-up",
+                "permission": "/device-mgt/devices/owning-device/operations/android/ring"
             },
             "DEVICE_LOCK": {
-                "icon": "fw-lock"
+                "icon": "fw-lock",
+                "permission": "/device-mgt/devices/owning-device/operations/windows/lock"
             },
             "DEVICE_LOCATION": {
-                "icon": "fw-map-location"
-            },
-            "CLEAR_PASSWORD": {
-                "icon": "fw-clear"
+                "icon": "fw-map-location",
+                "permission": "/device-mgt/devices/owning-device/operations/windows/location"
             },
             "DEVICE_REBOOT": {
-                "icon": "fw-refresh"
-            },
-            "UPGRADE_FIRMWARE": {
-                "icon": "fw-hardware",
-                "formParams": [
-                    {
-                        "type": "checkbox",
-                        "id": "immediate",
-                        "optional": true,
-                        "label": "Instant Upgrade",
-                        "helper": "Once enabled, device firmware upgrade process will start instantly."
-                    },
-                    {
-                        "type": "text",
-                        "id": "schedule",
-                        "optional": false,
-                        "label": "Enter the date and time to schedule firmware upgrade."
-                    },
-                    {
-                        "type": "text",
-                        "id": "server",
-                        "optional": true,
-                        "label": "Enter firmware upgrade server URL (ie. http://abc.com or http://abc.com/ota)"
-                    }
-                ]
-            },
-            "DEVICE_MUTE": {
-                "icon": "fw-mute"
-            },
-            "NOTIFICATION": {
-                "icon": "fw-message",
-                "formParams": [
-                    {
-                        "type": "text",
-                        "id": "messageText",
-                        "optional": false,
-                        "label": "Title Here..."
-                    },
-                    {
-                        "type": "text",
-                        "id": "messageTitle",
-                        "optional": false,
-                        "label": "Message Here..."
-                    }
-                ]
+                "icon": "fw-refresh",
+                "permission": "/device-mgt/devices/owning-device/operations/windows/reboot"
             },
             "LOCK_RESET": {
-                "icon": "fw-security"
+                "icon": "fw-security",
+                "permission": "/device-mgt/devices/owning-device/operations/windows/lock-reset"
 
             },
             "DISENROLL": {
-                "icon": "fw-block"
+                "icon": "fw-block",
+                "permission": "/device-mgt/devices/owning-device/operations/windows/disenroll"
             },
             "WIPE_DATA": {
-                "icon": "fw-delete"
+                "icon": "fw-delete",
+                "permission": "/device-mgt/devices/owning-device/operations/windows/wipe"
             }
         }
     }

From ed0b40215ab41b2c7cd1ff548c1f3dcacc1c56ef Mon Sep 17 00:00:00 2001
From: Hasunie <hasunie@wso2.com>
Date: Fri, 13 Jan 2017 18:43:03 +0530
Subject: [PATCH 09/10] fixing synapse config issues

---
 .../enrollment/beans/AdditionalContext.java   |   2 +-
 .../enrollment/beans/ContextItem.java         |   9 +-
 ...n--Windows_10_Device_management_v1.0.0.xml |  12 --
 ...--Windows_10_Enrollment_Service_v1.0.0.xml |   2 +-
 ...-Windows_Binary_Security_Token_Service.xml |  54 ------
 ...s_Binary_Security_Token_Service_v1.0.0.xml |  42 -----
 ...dmin--Windows_Configuration_Management.xml |  54 ------
 ...indows_Configuration_Management_v1.0.0.xml |  64 -------
 ...vice_Management_Administrative_Service.xml |  54 ------
 ...nagement_Administrative_Service_v1.0.0.xml | 174 ------------------
 ...dmin--Windows_Discovery_Service_v1.0.0.xml |  64 +------
 ...ndows_Enrollment_policy_Service_v1.0.0.xml |   2 +-
 .../src/main/resources/p2.inf                 |   4 +
 13 files changed, 12 insertions(+), 525 deletions(-)
 delete mode 100644 features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Binary_Security_Token_Service.xml
 delete mode 100644 features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Binary_Security_Token_Service_v1.0.0.xml
 delete mode 100644 features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Configuration_Management.xml
 delete mode 100644 features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Configuration_Management_v1.0.0.xml
 delete mode 100644 features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Device_Management_Administrative_Service.xml
 delete mode 100644 features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Device_Management_Administrative_Service_v1.0.0.xml

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/enrollment/beans/AdditionalContext.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/enrollment/beans/AdditionalContext.java
index fd62ef2ca..6ccb67774 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/enrollment/beans/AdditionalContext.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/enrollment/beans/AdditionalContext.java
@@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlType;
 import java.util.ArrayList;
 import java.util.List;
 
-@XmlAccessorType(XmlAccessType.FIELD)
+@XmlAccessorType(XmlAccessType.PROPERTY)
 @XmlType(name = "OIDCollection", namespace = PluginConstants.SOAP_AUTHORIZATION_TARGET_NAMESPACE,
         propOrder = {"contextitem"})
 @SuppressWarnings("unused")
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/enrollment/beans/ContextItem.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/enrollment/beans/ContextItem.java
index dbc690aa4..59bba8810 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/enrollment/beans/ContextItem.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/enrollment/beans/ContextItem.java
@@ -20,18 +20,15 @@ package org.wso2.carbon.device.mgt.mobile.windows.api.services.enrollment.beans;
 
 import org.wso2.carbon.device.mgt.mobile.windows.api.common.PluginConstants;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.*;
 
 @XmlAccessorType(XmlAccessType.PROPERTY)
 @XmlType(name = "ContextItem", namespace = PluginConstants.SOAP_AUTHORIZATION_TARGET_NAMESPACE)
 public class ContextItem {
 
-    @XmlElement(required = true, namespace = PluginConstants.SOAP_AUTHORIZATION_TARGET_NAMESPACE)
+    @XmlAttribute(required = true, namespace = PluginConstants.SOAP_AUTHORIZATION_TARGET_NAMESPACE)
     protected String Name;
-    @XmlElement(required = true, namespace = PluginConstants.SOAP_AUTHORIZATION_TARGET_NAMESPACE)
+    @XmlValue
     protected String Value;
 
     public String getValue() {
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Device_management_v1.0.0.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Device_management_v1.0.0.xml
index 2e1e3b2ec..dfbbd89b3 100644
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Device_management_v1.0.0.xml
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Device_management_v1.0.0.xml
@@ -27,17 +27,5 @@
         <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
             <property name="apiImplementationType" value="ENDPOINT"/>
         </handler>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.APIAuthenticationHandler"/>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.throttling.APIThrottleHandler">
-            <property name="policyKey" value="gov:/apimgt/applicationdata/tiers.xml"/>
-            <property name="policyKeyApplication" value="gov:/apimgt/applicationdata/app-tiers.xml"/>
-            <property name="id" value="A"/>
-            <property name="policyKeyResource" value="gov:/apimgt/applicationdata/res-tiers.xml"/>
-        </handler>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtUsageHandler"/>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtGoogleAnalyticsTrackingHandler">
-            <property name="configKey" value="gov:/apimgt/statistics/ga-config.xml"/>
-        </handler>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerExtensionHandler"/>
     </handlers>
 </api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Enrollment_Service_v1.0.0.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Enrollment_Service_v1.0.0.xml
index 648089b83..10e325d62 100644
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Enrollment_Service_v1.0.0.xml
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Enrollment_Service_v1.0.0.xml
@@ -20,7 +20,7 @@
         <outSequence>
             <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
             <property name="FORCE_HTTP_CONTENT_LENGTH" scope="axis2" value="true"/>
-    <property name="COPY_CONTENT_LENGTH_FROM_INCOMING" value="true" scope="axis2"/>
+            <property name="COPY_CONTENT_LENGTH_FROM_INCOMING" value="true" scope="axis2"/>
             <send/>
         </outSequence>
     </resource>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Binary_Security_Token_Service.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Binary_Security_Token_Service.xml
deleted file mode 100644
index 640df9ea0..000000000
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Binary_Security_Token_Service.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows Binary Security Token Service" context="/api/device-mgt/windows/v1.0/federated">
-    <resource methods="HEAD DELETE POST GET OPTIONS PATCH PUT" url-mapping="/*" faultSequence="fault">
-        <inSequence>
-            <property name="isDefault" expression="$trp:WSO2_AM_API_DEFAULT_VERSION"/>
-            <filter source="$ctx:isDefault" regex="true">
-                <then>
-                    <log level="custom">
-                        <property name="STATUS" value="Faulty invoking through default API.Dropping message to avoid recursion.."/>
-                    </log>
-                    <payloadFactory media-type="xml">
-                        <format>
-                            <am:fault xmlns:am="http://wso2.org/apimanager">
-                                <am:code>500</am:code>
-                                <am:type>Status report</am:type>
-                                <am:message>Internal Server Error</am:message>
-                                <am:description>Faulty invoking through default API</am:description>
-                            </am:fault>
-                        </format>
-                        <args/>
-                    </payloadFactory>
-                    <property name="HTTP_SC" value="500" scope="axis2"/>
-                    <property name="RESPONSE" value="true"/>
-                    <header name="To" action="remove"/>
-                    <property name="NO_ENTITY_BODY" scope="axis2" action="remove"/>
-                    <property name="ContentType" scope="axis2" action="remove"/>
-                    <property name="Authorization" scope="transport" action="remove"/>
-                    <property name="Host" scope="transport" action="remove"/>
-                    <property name="Accept" scope="transport" action="remove"/>
-                    <send/>
-                </then>
-                <else>
-                    <header name="WSO2_AM_API_DEFAULT_VERSION" scope="transport" value="true"/>
-                    <property name="uri.var.portnum" expression="get-property('http.nio.port')"/>
-                    <send>
-                        <endpoint>
-                            <http uri-template="http://localhost:{uri.var.portnum}/api/device-mgt/windows/v1.0/federated/1.0.0">
-                                <timeout>
-                                    <duration>60000</duration>
-                                    <responseAction>fault</responseAction>
-                                </timeout>
-                            </http>
-                        </endpoint>
-                    </send>
-                </else>
-            </filter>
-        </inSequence>
-        <outSequence>
-            <send/>
-        </outSequence>
-    </resource>
-    <handlers>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.SynapsePropertiesHandler"/>
-    </handlers>
-</api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Binary_Security_Token_Service_v1.0.0.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Binary_Security_Token_Service_v1.0.0.xml
deleted file mode 100644
index 830055ddf..000000000
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Binary_Security_Token_Service_v1.0.0.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows Binary Security Token Service" context="/api/device-mgt/windows/v1.0/federated/1.0.0" version="1.0.0" version-type="context">
-    <resource methods="POST" url-mapping="/authentication" faultSequence="fault">
-        <inSequence>
-            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
-            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
-                <then>
-                    <send>
-                        <endpoint name="admin--Windows Binary Security Token Service_APIproductionEndpoint_0">
-                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/federated"/>
-                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/federated"/>
-                        </endpoint>
-                    </send>
-                </then>
-                <else>
-                    <sequence key="_sandbox_key_error_"/>
-                </else>
-            </filter>
-        </inSequence>
-        <outSequence>
-            <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
-            <send/>
-        </outSequence>
-    </resource>
-    <handlers>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.APIMgtLatencyStatsHandler"/>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
-            <property name="apiImplementationType" value="ENDPOINT"/>
-        </handler>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.APIAuthenticationHandler"/>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.throttling.APIThrottleHandler">
-            <property name="policyKey" value="gov:/apimgt/applicationdata/tiers.xml"/>
-            <property name="policyKeyApplication" value="gov:/apimgt/applicationdata/app-tiers.xml"/>
-            <property name="id" value="A"/>
-            <property name="policyKeyResource" value="gov:/apimgt/applicationdata/res-tiers.xml"/>
-        </handler>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtUsageHandler"/>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtGoogleAnalyticsTrackingHandler">
-            <property name="configKey" value="gov:/apimgt/statistics/ga-config.xml"/>
-        </handler>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerExtensionHandler"/>
-    </handlers>
-</api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Configuration_Management.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Configuration_Management.xml
deleted file mode 100644
index ecabcf446..000000000
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Configuration_Management.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows Configuration Management" context="/api/device-mgt/windows/v1.0/configuration">
-    <resource methods="HEAD DELETE POST GET OPTIONS PATCH PUT" url-mapping="/*" faultSequence="fault">
-        <inSequence>
-            <property name="isDefault" expression="$trp:WSO2_AM_API_DEFAULT_VERSION"/>
-            <filter source="$ctx:isDefault" regex="true">
-                <then>
-                    <log level="custom">
-                        <property name="STATUS" value="Faulty invoking through default API.Dropping message to avoid recursion.."/>
-                    </log>
-                    <payloadFactory media-type="xml">
-                        <format>
-                            <am:fault xmlns:am="http://wso2.org/apimanager">
-                                <am:code>500</am:code>
-                                <am:type>Status report</am:type>
-                                <am:message>Internal Server Error</am:message>
-                                <am:description>Faulty invoking through default API</am:description>
-                            </am:fault>
-                        </format>
-                        <args/>
-                    </payloadFactory>
-                    <property name="HTTP_SC" value="500" scope="axis2"/>
-                    <property name="RESPONSE" value="true"/>
-                    <header name="To" action="remove"/>
-                    <property name="NO_ENTITY_BODY" scope="axis2" action="remove"/>
-                    <property name="ContentType" scope="axis2" action="remove"/>
-                    <property name="Authorization" scope="transport" action="remove"/>
-                    <property name="Host" scope="transport" action="remove"/>
-                    <property name="Accept" scope="transport" action="remove"/>
-                    <send/>
-                </then>
-                <else>
-                    <header name="WSO2_AM_API_DEFAULT_VERSION" scope="transport" value="true"/>
-                    <property name="uri.var.portnum" expression="get-property('http.nio.port')"/>
-                    <send>
-                        <endpoint>
-                            <http uri-template="http://localhost:{uri.var.portnum}/api/device-mgt/windows/v1.0/configuration/1.0.0">
-                                <timeout>
-                                    <duration>60000</duration>
-                                    <responseAction>fault</responseAction>
-                                </timeout>
-                            </http>
-                        </endpoint>
-                    </send>
-                </else>
-            </filter>
-        </inSequence>
-        <outSequence>
-            <send/>
-        </outSequence>
-    </resource>
-    <handlers>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.SynapsePropertiesHandler"/>
-    </handlers>
-</api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Configuration_Management_v1.0.0.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Configuration_Management_v1.0.0.xml
deleted file mode 100644
index 2f5edcf76..000000000
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Configuration_Management_v1.0.0.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows Configuration Management" context="/api/device-mgt/windows/v1.0/configuration/1.0.0" version="1.0.0" version-type="context">
-    <resource methods="PUT GET" url-mapping="/*" faultSequence="fault">
-        <inSequence>
-            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
-            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
-                <then>
-                    <send>
-                        <endpoint name="admin--Windows Configuration Management_APIproductionEndpoint_0">
-                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/configuration"/>
-                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/configuration"/>
-                        </endpoint>
-                    </send>
-                </then>
-                <else>
-                    <sequence key="_sandbox_key_error_"/>
-                </else>
-            </filter>
-        </inSequence>
-        <outSequence>
-            <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
-            <send/>
-        </outSequence>
-    </resource>
-    <resource methods="GET" url-mapping="/license" faultSequence="fault">
-        <inSequence>
-            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
-            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
-                <then>
-                    <send>
-                        <endpoint name="admin--Windows Configuration Management_APIproductionEndpoint_1">
-                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/configuration"/>
-                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/configuration"/>
-                        </endpoint>
-                    </send>
-                </then>
-                <else>
-                    <sequence key="_sandbox_key_error_"/>
-                </else>
-            </filter>
-        </inSequence>
-        <outSequence>
-            <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
-            <send/>
-        </outSequence>
-    </resource>
-    <handlers>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.APIMgtLatencyStatsHandler"/>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
-            <property name="apiImplementationType" value="ENDPOINT"/>
-        </handler>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.APIAuthenticationHandler"/>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.throttling.APIThrottleHandler">
-            <property name="policyKey" value="gov:/apimgt/applicationdata/tiers.xml"/>
-            <property name="policyKeyApplication" value="gov:/apimgt/applicationdata/app-tiers.xml"/>
-            <property name="id" value="A"/>
-            <property name="policyKeyResource" value="gov:/apimgt/applicationdata/res-tiers.xml"/>
-        </handler>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtUsageHandler"/>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtGoogleAnalyticsTrackingHandler">
-            <property name="configKey" value="gov:/apimgt/statistics/ga-config.xml"/>
-        </handler>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerExtensionHandler"/>
-    </handlers>
-</api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Device_Management_Administrative_Service.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Device_Management_Administrative_Service.xml
deleted file mode 100644
index 93a2834aa..000000000
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Device_Management_Administrative_Service.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows Device Management Administrative Service" context="/api/device-mgt/windows/v1.0/admin/devices">
-    <resource methods="HEAD DELETE POST GET OPTIONS PATCH PUT" url-mapping="/*" faultSequence="fault">
-        <inSequence>
-            <property name="isDefault" expression="$trp:WSO2_AM_API_DEFAULT_VERSION"/>
-            <filter source="$ctx:isDefault" regex="true">
-                <then>
-                    <log level="custom">
-                        <property name="STATUS" value="Faulty invoking through default API.Dropping message to avoid recursion.."/>
-                    </log>
-                    <payloadFactory media-type="xml">
-                        <format>
-                            <am:fault xmlns:am="http://wso2.org/apimanager">
-                                <am:code>500</am:code>
-                                <am:type>Status report</am:type>
-                                <am:message>Internal Server Error</am:message>
-                                <am:description>Faulty invoking through default API</am:description>
-                            </am:fault>
-                        </format>
-                        <args/>
-                    </payloadFactory>
-                    <property name="HTTP_SC" value="500" scope="axis2"/>
-                    <property name="RESPONSE" value="true"/>
-                    <header name="To" action="remove"/>
-                    <property name="NO_ENTITY_BODY" scope="axis2" action="remove"/>
-                    <property name="ContentType" scope="axis2" action="remove"/>
-                    <property name="Authorization" scope="transport" action="remove"/>
-                    <property name="Host" scope="transport" action="remove"/>
-                    <property name="Accept" scope="transport" action="remove"/>
-                    <send/>
-                </then>
-                <else>
-                    <header name="WSO2_AM_API_DEFAULT_VERSION" scope="transport" value="true"/>
-                    <property name="uri.var.portnum" expression="get-property('http.nio.port')"/>
-                    <send>
-                        <endpoint>
-                            <http uri-template="http://localhost:{uri.var.portnum}/api/device-mgt/windows/v1.0/admin/devices/1.0.0">
-                                <timeout>
-                                    <duration>60000</duration>
-                                    <responseAction>fault</responseAction>
-                                </timeout>
-                            </http>
-                        </endpoint>
-                    </send>
-                </else>
-            </filter>
-        </inSequence>
-        <outSequence>
-            <send/>
-        </outSequence>
-    </resource>
-    <handlers>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.SynapsePropertiesHandler"/>
-    </handlers>
-</api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Device_Management_Administrative_Service_v1.0.0.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Device_Management_Administrative_Service_v1.0.0.xml
deleted file mode 100644
index 73e001e5c..000000000
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Device_Management_Administrative_Service_v1.0.0.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows Device Management Administrative Service" context="/api/device-mgt/windows/v1.0/admin/devices/1.0.0" version="1.0.0" version-type="context">
-    <resource methods="POST" url-mapping="/lock-devices" faultSequence="fault">
-        <inSequence>
-            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
-            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
-                <then>
-                    <send>
-                        <endpoint name="admin--Windows Device Management Administrative Service_APIproductionEndpoint_0">
-                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
-                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
-                        </endpoint>
-                    </send>
-                </then>
-                <else>
-                    <sequence key="_sandbox_key_error_"/>
-                </else>
-            </filter>
-        </inSequence>
-        <outSequence>
-            <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
-            <send/>
-        </outSequence>
-    </resource>
-    <resource methods="POST" url-mapping="/location" faultSequence="fault">
-        <inSequence>
-            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
-            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
-                <then>
-                    <send>
-                        <endpoint name="admin--Windows Device Management Administrative Service_APIproductionEndpoint_1">
-                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
-                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
-                        </endpoint>
-                    </send>
-                </then>
-                <else>
-                    <sequence key="_sandbox_key_error_"/>
-                </else>
-            </filter>
-        </inSequence>
-        <outSequence>
-            <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
-            <send/>
-        </outSequence>
-    </resource>
-    <resource methods="POST" url-mapping="/reboot" faultSequence="fault">
-        <inSequence>
-            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
-            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
-                <then>
-                    <send>
-                        <endpoint name="admin--Windows Device Management Administrative Service_APIproductionEndpoint_2">
-                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
-                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
-                        </endpoint>
-                    </send>
-                </then>
-                <else>
-                    <sequence key="_sandbox_key_error_"/>
-                </else>
-            </filter>
-        </inSequence>
-        <outSequence>
-            <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
-            <send/>
-        </outSequence>
-    </resource>
-    <resource methods="POST" url-mapping="/wipe-devices" faultSequence="fault">
-        <inSequence>
-            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
-            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
-                <then>
-                    <send>
-                        <endpoint name="admin--Windows Device Management Administrative Service_APIproductionEndpoint_3">
-                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
-                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
-                        </endpoint>
-                    </send>
-                </then>
-                <else>
-                    <sequence key="_sandbox_key_error_"/>
-                </else>
-            </filter>
-        </inSequence>
-        <outSequence>
-            <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
-            <send/>
-        </outSequence>
-    </resource>
-    <resource methods="POST" url-mapping="/ring-devices" faultSequence="fault">
-        <inSequence>
-            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
-            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
-                <then>
-                    <send>
-                        <endpoint name="admin--Windows Device Management Administrative Service_APIproductionEndpoint_4">
-                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
-                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
-                        </endpoint>
-                    </send>
-                </then>
-                <else>
-                    <sequence key="_sandbox_key_error_"/>
-                </else>
-            </filter>
-        </inSequence>
-        <outSequence>
-            <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
-            <send/>
-        </outSequence>
-    </resource>
-    <resource methods="POST" url-mapping="/disenroll-devices" faultSequence="fault">
-        <inSequence>
-            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
-            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
-                <then>
-                    <send>
-                        <endpoint name="admin--Windows Device Management Administrative Service_APIproductionEndpoint_5">
-                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
-                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
-                        </endpoint>
-                    </send>
-                </then>
-                <else>
-                    <sequence key="_sandbox_key_error_"/>
-                </else>
-            </filter>
-        </inSequence>
-        <outSequence>
-            <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
-            <send/>
-        </outSequence>
-    </resource>
-    <resource methods="POST" url-mapping="/lock-reset-devices" faultSequence="fault">
-        <inSequence>
-            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
-            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
-                <then>
-                    <send>
-                        <endpoint name="admin--Windows Device Management Administrative Service_APIproductionEndpoint_6">
-                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
-                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
-                        </endpoint>
-                    </send>
-                </then>
-                <else>
-                    <sequence key="_sandbox_key_error_"/>
-                </else>
-            </filter>
-        </inSequence>
-        <outSequence>
-            <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
-            <send/>
-        </outSequence>
-    </resource>
-    <handlers>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.APIMgtLatencyStatsHandler"/>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
-            <property name="apiImplementationType" value="ENDPOINT"/>
-        </handler>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.APIAuthenticationHandler"/>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.throttling.APIThrottleHandler">
-            <property name="policyKey" value="gov:/apimgt/applicationdata/tiers.xml"/>
-            <property name="policyKeyApplication" value="gov:/apimgt/applicationdata/app-tiers.xml"/>
-            <property name="id" value="A"/>
-            <property name="policyKeyResource" value="gov:/apimgt/applicationdata/res-tiers.xml"/>
-        </handler>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtUsageHandler"/>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtGoogleAnalyticsTrackingHandler">
-            <property name="configKey" value="gov:/apimgt/statistics/ga-config.xml"/>
-        </handler>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerExtensionHandler"/>
-    </handlers>
-</api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Discovery_Service_v1.0.0.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Discovery_Service_v1.0.0.xml
index 3052fa8cf..dfcd34408 100644
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Discovery_Service_v1.0.0.xml
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Discovery_Service_v1.0.0.xml
@@ -2,6 +2,7 @@
     <resource methods="POST" url-mapping="/*" faultSequence="fault">
         <inSequence>
             <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+            <property name="AM_KEY_TYPE" value="PRODUCTION" scope="default"/>
             <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
                 <then>
                     <send>
@@ -28,66 +29,5 @@
         <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
             <property name="apiImplementationType" value="ENDPOINT"/>
         </handler>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.APIAuthenticationHandler"/>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.throttling.APIThrottleHandler">
-            <property name="policyKey" value="gov:/apimgt/applicationdata/tiers.xml"/>
-            <property name="policyKeyApplication" value="gov:/apimgt/applicationdata/app-tiers.xml"/>
-            <property name="id" value="A"/>
-            <property name="policyKeyResource" value="gov:/apimgt/applicationdata/res-tiers.xml"/>
-        </handler>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtUsageHandler"/>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtGoogleAnalyticsTrackingHandler">
-            <property name="configKey" value="gov:/apimgt/statistics/ga-config.xml"/>
-        </handler>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerExtensionHandler"/>
     </handlers>
-</api>
-
-
-        <?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows Discovery Service" context="/api/device-mgt/windows/v1.0/discovery/post/1.0.0" version="1.0.0" version-type="context">
-<resource methods="POST" url-mapping="/*" faultSequence="fault">
-    <inSequence>
-        <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
-        <property name="AM_KEY_TYPE" value="PRODUCTION" scope="default"/>
-        <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
-            <then>
-                <send>
-                    <endpoint name="admin--Windows Discovery Service_APIproductionEndpoint_0">
-                        <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/discovery/post"/>
-                        <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/discovery/post"/>
-                    </endpoint>
-                </send>
-            </then>
-            <else>
-                <sequence key="_sandbox_key_error_"/>
-            </else>
-        </filter>
-    </inSequence>
-    <outSequence>
-        <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
-        <property name="FORCE_HTTP_CONTENT_LENGTH" scope="axis2" value="true"/>
-        <property name="COPY_CONTENT_LENGTH_FROM_INCOMING" value="true" scope="axis2"/>
-        <send/>
-    </outSequence>
-</resource>
-<handlers>
-    <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.APIMgtLatencyStatsHandler"/>
-    <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
-        <property name="apiImplementationType" value="ENDPOINT"/>
-    </handler>
-    <!--
-            <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.APIAuthenticationHandler"/>
-            <handler class="org.wso2.carbon.apimgt.gateway.handlers.throttling.APIThrottleHandler">
-                <property name="policyKey" value="gov:/apimgt/applicationdata/tiers.xml"/>
-                <property name="policyKeyApplication" value="gov:/apimgt/applicationdata/app-tiers.xml"/>
-                <property name="id" value="A"/>
-                <property name="policyKeyResource" value="gov:/apimgt/applicationdata/res-tiers.xml"/>
-            </handler>
-            <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtUsageHandler"/>
-            <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtGoogleAnalyticsTrackingHandler">
-                <property name="configKey" value="gov:/apimgt/statistics/ga-config.xml"/>
-            </handler>
-            <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerExtensionHandler"/>
-    -->
-</handlers>
-</api>
+</api>
\ No newline at end of file
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Enrollment_policy_Service_v1.0.0.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Enrollment_policy_Service_v1.0.0.xml
index 1806cf1dd..63fcea443 100644
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Enrollment_policy_Service_v1.0.0.xml
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Enrollment_policy_Service_v1.0.0.xml
@@ -20,7 +20,7 @@
         <outSequence>
             <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
             <property name="FORCE_HTTP_CONTENT_LENGTH" scope="axis2" value="true"/>
-    <property name="COPY_CONTENT_LENGTH_FROM_INCOMING" value="true" scope="axis2"/>
+            <property name="COPY_CONTENT_LENGTH_FROM_INCOMING" value="true" scope="axis2"/>
             <send/>
         </outSequence>
     </resource>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/p2.inf b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/p2.inf
index e284e15ab..95c8bcca6 100644
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/p2.inf
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/p2.inf
@@ -16,6 +16,10 @@ org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../featur
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/apis/admin--Windows_10_Device_management.xml,target:${installFolder}/../../deployment/server/synapse-configs/default/api/admin--Windows_10_Device_management.xml,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/apis/admin--Windows_10_Device_management_v1.0.0.xml,target:${installFolder}/../../deployment/server/synapse-configs/default/api/admin--Windows_10_Device_management_v1.0.0.xml,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/apis/admin--Windows_10_Device_management.xml,target:${installFolder}/../../deployment/server/synapse-configs/default/api/admin--Windows_10_Device_management.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/apis/admin--Windows_8.1_Device_Management_Service.xml,target:${installFolder}/../../deployment/server/synapse-configs/default/api/admin--Windows_8.1_Device_Management_Service.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/apis/admin--Windows_8.1_Device_Management_Service_v1.0.0.xml,target:${installFolder}/../../deployment/server/synapse-configs/default/api/admin--Windows_8.1_Device_Management_Service_v1.0.0.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/apis/admin--Windows_8.1_Enrollment_Service.xml,target:${installFolder}/../../deployment/server/synapse-configs/default/api/admin--Windows_8.1_Enrollment_Service.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/apis/admin--Windows_8.1_Enrollment_Service_v1.0.0.xml,target:${installFolder}/../../deployment/server/synapse-configs/default/api/admin--Windows_8.1_Enrollment_Service_v1.0.0.xml,overwrite:true);\
 
 instructions.unconfigure = \
 org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/webapps/api#device-mgt#windows#v1.0.war);\

From bd0f1f1900fa72b551375616834144c5b2e3d06f Mon Sep 17 00:00:00 2001
From: Hasunie <hasunie@wso2.com>
Date: Fri, 13 Jan 2017 19:31:35 +0530
Subject: [PATCH 10/10] fixing windows requestToken issue

---
 .../api/services/enrollment/beans/AdditionalContext.java | 2 +-
 .../api/services/enrollment/beans/ContextItem.java       | 9 ++++++---
 2 files changed, 7 insertions(+), 4 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/services/enrollment/beans/AdditionalContext.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/enrollment/beans/AdditionalContext.java
index 6ccb67774..fd62ef2ca 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/enrollment/beans/AdditionalContext.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/enrollment/beans/AdditionalContext.java
@@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlType;
 import java.util.ArrayList;
 import java.util.List;
 
-@XmlAccessorType(XmlAccessType.PROPERTY)
+@XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "OIDCollection", namespace = PluginConstants.SOAP_AUTHORIZATION_TARGET_NAMESPACE,
         propOrder = {"contextitem"})
 @SuppressWarnings("unused")
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/enrollment/beans/ContextItem.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/enrollment/beans/ContextItem.java
index 59bba8810..dbc690aa4 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/enrollment/beans/ContextItem.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/enrollment/beans/ContextItem.java
@@ -20,15 +20,18 @@ package org.wso2.carbon.device.mgt.mobile.windows.api.services.enrollment.beans;
 
 import org.wso2.carbon.device.mgt.mobile.windows.api.common.PluginConstants;
 
-import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
 
 @XmlAccessorType(XmlAccessType.PROPERTY)
 @XmlType(name = "ContextItem", namespace = PluginConstants.SOAP_AUTHORIZATION_TARGET_NAMESPACE)
 public class ContextItem {
 
-    @XmlAttribute(required = true, namespace = PluginConstants.SOAP_AUTHORIZATION_TARGET_NAMESPACE)
+    @XmlElement(required = true, namespace = PluginConstants.SOAP_AUTHORIZATION_TARGET_NAMESPACE)
     protected String Name;
-    @XmlValue
+    @XmlElement(required = true, namespace = PluginConstants.SOAP_AUTHORIZATION_TARGET_NAMESPACE)
     protected String Value;
 
     public String getValue() {