inosh
/
device-mgt-plugins
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing synapse config issues

Browse Source
revert-dabc3590
Hasunie 8 years ago
parent 1362e2d7fe
commit 164ae997b1
6 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File

3
components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/operations/util/OperationHandler.java
Unescape View File

@ -362,6 +362,9 @@ public class OperationHandler {
operation.getId() == status.getCommandReference()) { operation.getId() == status.getCommandReference()) {
operation.setStatus(Operation.Status.COMPLETED); operation.setStatus(Operation.Status.COMPLETED);
} }
if (PluginConstants.OperationCodes.POLICY_REVOKE.equals(operation.getCode())) {
operation.setStatus(Operation.Status.COMPLETED);
}
} }
updateStatus(syncmlDocument.getHeader().getSource().getLocURI(), updateStatus(syncmlDocument.getHeader().getSource().getLocURI(),
pendingDataOperations); pendingDataOperations);

5
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
Unescape View File

@ -3,12 +3,13 @@
<inSequence> <inSequence>
<property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/> <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
<property name="AM_KEY_TYPE" value="PRODUCTION" scope="default"/> <property name="AM_KEY_TYPE" value="PRODUCTION" scope="default"/>
<property name="uri.var.portnum" expression="get-property('system','iot.core.https.port')"/>
<property name="uri.var.hostname" expression="get-property('system','iot.core.host')"/>
<filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION"> <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
<then> <then>
<send> <send>
<endpoint name="admin--Windows 10 Enrollment Service_APIproductionEndpoint_0"> <endpoint name="admin--Windows 10 Enrollment Service_APIproductionEndpoint_0">
<http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/deviceenrolment/enrollment"/> <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/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> </endpoint>
</send> </send>
</then> </then>

4
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
Unescape View File

@ -3,11 +3,13 @@
<inSequence> <inSequence>
<property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/> <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
<property name="AM_KEY_TYPE" value="PRODUCTION" scope="default"/> <property name="AM_KEY_TYPE" value="PRODUCTION" scope="default"/>
<property name="uri.var.portnum" expression="get-property('system','iot.core.https.port')"/>
<property name="uri.var.hostname" expression="get-property('system','iot.core.host')"/>
<filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION"> <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
<then> <then>
<send> <send>
<endpoint name="admin--Windows 8.1 Device Management Service_APIproductionEndpoint_0"> <endpoint name="admin--Windows 8.1 Device Management Service_APIproductionEndpoint_0">
<http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/syncml/devicemanagement"/> <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/api/device-mgt/windows/v1.0/syncml/devicemanagement"/>
</endpoint> </endpoint>
</send> </send>
</then> </then>

5
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
Unescape View File

@ -3,12 +3,13 @@
<inSequence> <inSequence>
<property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/> <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
<property name="AM_KEY_TYPE" value="PRODUCTION" scope="default"/> <property name="AM_KEY_TYPE" value="PRODUCTION" scope="default"/>
<property name="uri.var.portnum" expression="get-property('system','iot.core.https.port')"/>
<property name="uri.var.hostname" expression="get-property('system','iot.core.host')"/>
<filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION"> <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
<then> <then>
<send> <send>
<endpoint name="admin--Windows 8.1 Enrollment Service_APIproductionEndpoint_0"> <endpoint name="admin--Windows 8.1 Enrollment Service_APIproductionEndpoint_0">
<http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/deviceenrolment/wstep"/> <http uri-template="https:/{uri.var.hostname}:{uri.var.portnum}/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> </endpoint>
</send> </send>
</then> </then>

5
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
Unescape View File

@ -3,12 +3,13 @@
<inSequence> <inSequence>
<property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/> <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
<property name="AM_KEY_TYPE" value="PRODUCTION" scope="default"/> <property name="AM_KEY_TYPE" value="PRODUCTION" scope="default"/>
<property name="uri.var.portnum" expression="get-property('system','iot.core.https.port')"/>
<property name="uri.var.hostname" expression="get-property('system','iot.core.host')"/>
<filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION"> <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
<then> <then>
<send> <send>
<endpoint name="admin--Windows Discovery Service_APIproductionEndpoint_0"> <endpoint name="admin--Windows Discovery Service_APIproductionEndpoint_0">
<http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/discovery/post"/> <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/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> </endpoint>
</send> </send>
</then> </then>

5
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
Unescape View File

@ -3,12 +3,13 @@
<inSequence> <inSequence>
<property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/> <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
<property name="AM_KEY_TYPE" value="PRODUCTION" scope="default"/> <property name="AM_KEY_TYPE" value="PRODUCTION" scope="default"/>
<property name="uri.var.portnum" expression="get-property('system','iot.core.https.port')"/>
<property name="uri.var.hostname" expression="get-property('system','iot.core.host')"/>
<filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION"> <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
<then> <then>
<send> <send>
<endpoint name="admin--Windows Enrollment policy Service_APIproductionEndpoint_0"> <endpoint name="admin--Windows Enrollment policy Service_APIproductionEndpoint_0">
<http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/certificatepolicy/xcep"/> <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/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> </endpoint>
</send> </send>
</then> </then>

Write Preview
Loading…
Cancel
Save