mirror of
https://repository.entgra.net/community/device-mgt-plugins.git
synced 2025-09-16 23:42:15 +00:00
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into add-emm-analytics
This commit is contained in:
commit
2891f4c8da
@ -21,7 +21,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>iot-analytics</artifactId>
|
<artifactId>iot-analytics</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>iot-analytics</artifactId>
|
<artifactId>iot-analytics</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>iot-analytics</artifactId>
|
<artifactId>iot-analytics</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>iot-analytics</artifactId>
|
<artifactId>iot-analytics</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>analytics</artifactId>
|
<artifactId>analytics</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>androidsense-plugin</artifactId>
|
<artifactId>androidsense-plugin</artifactId>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>androidsense-plugin</artifactId>
|
<artifactId>androidsense-plugin</artifactId>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>androidsense-plugin</artifactId>
|
<artifactId>androidsense-plugin</artifactId>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>device-types</artifactId>
|
<artifactId>device-types</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>arduino-plugin</artifactId>
|
<artifactId>arduino-plugin</artifactId>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>arduino-plugin</artifactId>
|
<artifactId>arduino-plugin</artifactId>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>arduino-plugin</artifactId>
|
<artifactId>arduino-plugin</artifactId>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>device-types</artifactId>
|
<artifactId>device-types</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>raspberrypi-plugin</artifactId>
|
<artifactId>raspberrypi-plugin</artifactId>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>raspberrypi-plugin</artifactId>
|
<artifactId>raspberrypi-plugin</artifactId>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>raspberrypi-plugin</artifactId>
|
<artifactId>raspberrypi-plugin</artifactId>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>device-types</artifactId>
|
<artifactId>device-types</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>virtual-fire-alarm-plugin</artifactId>
|
<artifactId>virtual-fire-alarm-plugin</artifactId>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>virtual-fire-alarm-plugin</artifactId>
|
<artifactId>virtual-fire-alarm-plugin</artifactId>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>virtual-fire-alarm-plugin</artifactId>
|
<artifactId>virtual-fire-alarm-plugin</artifactId>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>virtual-fire-alarm-plugin</artifactId>
|
<artifactId>virtual-fire-alarm-plugin</artifactId>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>device-types</artifactId>
|
<artifactId>device-types</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -18,7 +18,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>appm-connector</artifactId>
|
<artifactId>appm-connector</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -18,7 +18,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>appm-connector</artifactId>
|
<artifactId>appm-connector</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>extensions</artifactId>
|
<artifactId>extensions</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>cdmf-transport-adapters</artifactId>
|
<artifactId>cdmf-transport-adapters</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>cdmf-transport-adapters</artifactId>
|
<artifactId>cdmf-transport-adapters</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>cdmf-transport-adapters</artifactId>
|
<artifactId>cdmf-transport-adapters</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>cdmf-transport-adapters</artifactId>
|
<artifactId>cdmf-transport-adapters</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>cdmf-transport-adapters</artifactId>
|
<artifactId>cdmf-transport-adapters</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>cdmf-transport-adapters</artifactId>
|
<artifactId>cdmf-transport-adapters</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>cdmf-transport-adapters</artifactId>
|
<artifactId>cdmf-transport-adapters</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>cdmf-transport-adapters</artifactId>
|
<artifactId>cdmf-transport-adapters</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>cdmf-transport-adapters</artifactId>
|
<artifactId>cdmf-transport-adapters</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>extensions</artifactId>
|
<artifactId>extensions</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>mb-extensions</artifactId>
|
<artifactId>mb-extensions</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>mb-extensions</artifactId>
|
<artifactId>mb-extensions</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>extensions</artifactId>
|
<artifactId>extensions</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>pull-notification-listeners</artifactId>
|
<artifactId>pull-notification-listeners</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>extensions</artifactId>
|
<artifactId>extensions</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>siddhi-extensions</artifactId>
|
<artifactId>siddhi-extensions</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>siddhi-extensions</artifactId>
|
<artifactId>siddhi-extensions</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>extensions</artifactId>
|
<artifactId>extensions</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>android-plugin</artifactId>
|
<artifactId>android-plugin</artifactId>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>android-plugin</artifactId>
|
<artifactId>android-plugin</artifactId>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -23,13 +23,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>android-plugin</artifactId>
|
<artifactId>android-plugin</artifactId>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<artifactId>org.wso2.carbon.device.mgt.mobile.android.ui</artifactId>
|
<artifactId>org.wso2.carbon.device.mgt.mobile.android.ui</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<name>WSO2 Carbon - Mobile Android UI</name>
|
<name>WSO2 Carbon - Mobile Android UI</name>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>android-plugin</artifactId>
|
<artifactId>android-plugin</artifactId>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>mobile-plugins</artifactId>
|
<artifactId>mobile-plugins</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>windows-plugin</artifactId>
|
<artifactId>windows-plugin</artifactId>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -352,11 +352,10 @@ public final class PluginConstants {
|
|||||||
private WindowsEnrollmentProperties() {
|
private WindowsEnrollmentProperties() {
|
||||||
throw new AssertionError();
|
throw new AssertionError();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final String DEVICE_NAME = "DeviceName";
|
public static final String DEVICE_NAME = "DeviceName";
|
||||||
public static final String DEVICE_VERSION = "OSVersion";
|
public static final String DEVICE_VERSION = "OSVersion";
|
||||||
public static final String DEVICE_ID = "DeviceID";
|
public static final String DEVICE_ID = "DeviceID";
|
||||||
public static final String IMEI = "MobileEquipmentId";
|
public static final String IMEI = "MobileEquipmentId";
|
||||||
|
public static final String TYPE = "DeviceType";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -38,9 +38,9 @@ public class ChallengeTag {
|
|||||||
|
|
||||||
public void buildChallengeElement(Document doc, Element rootElement) {
|
public void buildChallengeElement(Document doc, Element rootElement) {
|
||||||
Element challenge = doc.createElement(Constants.CHALLENGE);
|
Element challenge = doc.createElement(Constants.CHALLENGE);
|
||||||
rootElement.appendChild(challenge);
|
|
||||||
if (getMeta() != null) {
|
if (getMeta() != null) {
|
||||||
getMeta().buildMetaElement(doc, challenge);
|
getMeta().buildMetaElement(doc, challenge);
|
||||||
}
|
}
|
||||||
|
rootElement.appendChild(challenge);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -44,6 +44,17 @@ public class StatusTag {
|
|||||||
this.data = data;
|
this.data = data;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public StatusTag(int commandId, int messageReference, int commandReference, String command,
|
||||||
|
ChallengeTag challengeTag, String targetReference, String data) {
|
||||||
|
this.commandId = commandId;
|
||||||
|
this.messageReference = messageReference;
|
||||||
|
this.commandReference = commandReference;
|
||||||
|
this.command = command;
|
||||||
|
this.challenge = challengeTag;
|
||||||
|
this.targetReference = targetReference;
|
||||||
|
this.data = data;
|
||||||
|
}
|
||||||
|
|
||||||
public StatusTag() {
|
public StatusTag() {
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -140,5 +151,4 @@ public class StatusTag {
|
|||||||
status.appendChild(data);
|
status.appendChild(data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -87,6 +87,7 @@ public class Constants {
|
|||||||
public final class SyncMLResponseCodes {
|
public final class SyncMLResponseCodes {
|
||||||
public static final String AUTHENTICATION_ACCEPTED = "212";
|
public static final String AUTHENTICATION_ACCEPTED = "212";
|
||||||
public static final String ACCEPTED = "200";
|
public static final String ACCEPTED = "200";
|
||||||
|
public static final String UNAUTHORIZED = "401";
|
||||||
public static final String ACCEPTED_FOR_PROCESSING = "202";
|
public static final String ACCEPTED_FOR_PROCESSING = "202";
|
||||||
public static final String PIN_NOTFOUND = "405";
|
public static final String PIN_NOTFOUND = "405";
|
||||||
public static final String LOCK_RESET_NOTIFICATION = "Error occurred in Device Lock Operation. " +
|
public static final String LOCK_RESET_NOTIFICATION = "Error occurred in Device Lock Operation. " +
|
||||||
|
|||||||
@ -22,7 +22,6 @@ import org.apache.commons.logging.Log;
|
|||||||
import org.apache.commons.logging.LogFactory;
|
import org.apache.commons.logging.LogFactory;
|
||||||
import org.json.JSONException;
|
import org.json.JSONException;
|
||||||
import org.json.JSONObject;
|
import org.json.JSONObject;
|
||||||
import org.wso2.carbon.context.PrivilegedCarbonContext;
|
|
||||||
import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
|
import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
|
||||||
import org.wso2.carbon.device.mgt.common.DeviceManagementException;
|
import org.wso2.carbon.device.mgt.common.DeviceManagementException;
|
||||||
import org.wso2.carbon.device.mgt.common.device.details.DeviceInfo;
|
import org.wso2.carbon.device.mgt.common.device.details.DeviceInfo;
|
||||||
@ -32,15 +31,21 @@ import org.wso2.carbon.device.mgt.common.notification.mgt.NotificationManagement
|
|||||||
import org.wso2.carbon.device.mgt.common.notification.mgt.NotificationManagementService;
|
import org.wso2.carbon.device.mgt.common.notification.mgt.NotificationManagementService;
|
||||||
import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
|
import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
|
||||||
import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
|
import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
|
||||||
import org.wso2.carbon.device.mgt.core.device.details.mgt.DeviceDetailsMgtException;
|
|
||||||
import org.wso2.carbon.device.mgt.mobile.windows.api.common.PluginConstants;
|
|
||||||
import org.wso2.carbon.device.mgt.mobile.windows.api.common.util.WindowsAPIUtils;
|
|
||||||
import org.wso2.carbon.device.mgt.mobile.windows.api.services.syncml.beans.Profile;
|
|
||||||
import org.wso2.carbon.device.mgt.mobile.windows.api.operations.*;
|
|
||||||
import org.wso2.carbon.policy.mgt.common.PolicyManagementException;
|
|
||||||
import org.wso2.carbon.device.mgt.common.policy.mgt.ProfileFeature;
|
import org.wso2.carbon.device.mgt.common.policy.mgt.ProfileFeature;
|
||||||
import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.ComplianceFeature;
|
import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.ComplianceFeature;
|
||||||
import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.PolicyComplianceException;
|
import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.PolicyComplianceException;
|
||||||
|
import org.wso2.carbon.device.mgt.core.device.details.mgt.DeviceDetailsMgtException;
|
||||||
|
import org.wso2.carbon.device.mgt.mobile.windows.api.common.PluginConstants;
|
||||||
|
import org.wso2.carbon.device.mgt.mobile.windows.api.common.util.WindowsAPIUtils;
|
||||||
|
import org.wso2.carbon.device.mgt.mobile.windows.api.operations.StatusTag;
|
||||||
|
import org.wso2.carbon.device.mgt.mobile.windows.api.operations.SyncmlDocument;
|
||||||
|
import org.wso2.carbon.device.mgt.mobile.windows.api.operations.SyncmlHeader;
|
||||||
|
import org.wso2.carbon.device.mgt.mobile.windows.api.operations.ItemTag;
|
||||||
|
import org.wso2.carbon.device.mgt.mobile.windows.api.operations.WindowsOperationException;
|
||||||
|
import org.wso2.carbon.device.mgt.mobile.windows.api.operations.ResultsTag;
|
||||||
|
import org.wso2.carbon.device.mgt.mobile.windows.api.operations.SyncmlBody;
|
||||||
|
import org.wso2.carbon.device.mgt.mobile.windows.api.services.syncml.beans.Profile;
|
||||||
|
import org.wso2.carbon.policy.mgt.common.PolicyManagementException;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -226,6 +231,20 @@ public class OperationHandler {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void updateDisenrollOperationStatus(DeviceIdentifier deviceIdentifier) throws OperationManagementException {
|
||||||
|
List<? extends Operation> pendingDeviceInfoOperations;
|
||||||
|
try {
|
||||||
|
pendingDeviceInfoOperations = WindowsAPIUtils.getPendingOperations(deviceIdentifier);
|
||||||
|
} catch (DeviceManagementException e) {
|
||||||
|
throw new OperationManagementException("Error occurred while getting pending operations.");
|
||||||
|
}
|
||||||
|
for (Operation operation : pendingDeviceInfoOperations) {
|
||||||
|
if (PluginConstants.OperationCodes.DISENROLL.equals(operation.getCode())) {
|
||||||
|
operation.setStatus(Operation.Status.COMPLETED);
|
||||||
|
updateStatus(deviceIdentifier.getId(), pendingDeviceInfoOperations);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void updateDeviceInfoStatus(DeviceIdentifier deviceIdentifier) throws OperationManagementException {
|
public void updateDeviceInfoStatus(DeviceIdentifier deviceIdentifier) throws OperationManagementException {
|
||||||
List<? extends Operation> pendingDeviceInfoOperations;
|
List<? extends Operation> pendingDeviceInfoOperations;
|
||||||
@ -294,6 +313,9 @@ public class OperationHandler {
|
|||||||
if (OperationCode.Command.TOTAL_RAM.getCode().equals(itemTag.getSource().getLocURI())) {
|
if (OperationCode.Command.TOTAL_RAM.getCode().equals(itemTag.getSource().getLocURI())) {
|
||||||
updateDeviceInfo(syncmlDocument);
|
updateDeviceInfo(syncmlDocument);
|
||||||
}
|
}
|
||||||
|
if (OperationCode.Command.BATTERY_CHARGE_REMAINING.equals(itemTag.getSource().getLocURI())) {
|
||||||
|
updateDeviceInfo(syncmlDocument);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
UpdateUriOperations(syncmlDocument);
|
UpdateUriOperations(syncmlDocument);
|
||||||
@ -562,6 +584,7 @@ public class OperationHandler {
|
|||||||
String totalRAM;
|
String totalRAM;
|
||||||
String deviceID = null;
|
String deviceID = null;
|
||||||
String totalStorage;
|
String totalStorage;
|
||||||
|
Double battery;
|
||||||
|
|
||||||
List<ItemTag> deviceInformations = syncmlDocument.getBody().getResults().getItem();
|
List<ItemTag> deviceInformations = syncmlDocument.getBody().getResults().getItem();
|
||||||
DeviceInfo deviceInfo = new DeviceInfo();
|
DeviceInfo deviceInfo = new DeviceInfo();
|
||||||
@ -598,6 +621,10 @@ public class OperationHandler {
|
|||||||
if (OperationCode.Info.DEV_ID.getCode().equals(source)) {
|
if (OperationCode.Info.DEV_ID.getCode().equals(source)) {
|
||||||
deviceID = item.getData();
|
deviceID = item.getData();
|
||||||
}
|
}
|
||||||
|
if (OperationCode.Info.BATTERY_CHARGE_REMAINING.getCode().equals(source)) {
|
||||||
|
battery = Double.valueOf(item.getData());
|
||||||
|
deviceInfo.setBatteryLevel(battery);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
DeviceIdentifier deviceIdentifier = convertToDeviceIdentifierObject(deviceID);
|
DeviceIdentifier deviceIdentifier = convertToDeviceIdentifierObject(deviceID);
|
||||||
try {
|
try {
|
||||||
@ -636,6 +663,16 @@ public class OperationHandler {
|
|||||||
} catch (OperationManagementException e) {
|
} catch (OperationManagementException e) {
|
||||||
throw new WindowsOperationException("Error occurred while updating Device Location operation status.");
|
throw new WindowsOperationException("Error occurred while updating Device Location operation status.");
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void checkForDeviceWipe(List<? extends Operation> pendingDeviceInfoOperations
|
||||||
|
, DeviceIdentifier deviceIdentifier) throws OperationManagementException {
|
||||||
|
for (Operation operation : pendingDeviceInfoOperations) {
|
||||||
|
if (PluginConstants.OperationCodes.WIPE_DATA.equals(operation.getCode())) {
|
||||||
|
operation.setStatus(Operation.Status.COMPLETED);
|
||||||
|
updateStatus(deviceIdentifier.getId(), pendingDeviceInfoOperations);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -21,6 +21,8 @@ package org.wso2.carbon.device.mgt.mobile.windows.api.operations.util;
|
|||||||
import com.google.gson.Gson;
|
import com.google.gson.Gson;
|
||||||
import org.json.JSONException;
|
import org.json.JSONException;
|
||||||
import org.json.JSONObject;
|
import org.json.JSONObject;
|
||||||
|
import org.w3c.dom.Document;
|
||||||
|
import org.w3c.dom.Element;
|
||||||
import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
|
import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
|
||||||
import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
|
import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
|
||||||
import org.wso2.carbon.device.mgt.mobile.windows.api.common.PluginConstants;
|
import org.wso2.carbon.device.mgt.mobile.windows.api.common.PluginConstants;
|
||||||
@ -162,22 +164,27 @@ public class OperationReply {
|
|||||||
SyncmlBody sourceSyncmlBody = syncmlDocument.getBody();
|
SyncmlBody sourceSyncmlBody = syncmlDocument.getBody();
|
||||||
SyncmlHeader sourceHeader = syncmlDocument.getHeader();
|
SyncmlHeader sourceHeader = syncmlDocument.getHeader();
|
||||||
StatusTag headerStatus;
|
StatusTag headerStatus;
|
||||||
|
ChallengeTag challengeTag = new ChallengeTag();
|
||||||
|
MetaTag metaTag = new MetaTag();
|
||||||
|
metaTag.setFormat(Constants.CRED_FORMAT);
|
||||||
|
metaTag.setType(Constants.CRED_TYPE);
|
||||||
|
metaTag.setNextNonce(Constants.INITIAL_NONCE);
|
||||||
|
challengeTag.setMeta(metaTag);
|
||||||
SyncmlBody syncmlBodyReply = new SyncmlBody();
|
SyncmlBody syncmlBodyReply = new SyncmlBody();
|
||||||
List<StatusTag> statuses = new ArrayList<>();
|
List<StatusTag> statuses = new ArrayList<>();
|
||||||
List<StatusTag> sourceStatuses = sourceSyncmlBody.getStatus();
|
List<StatusTag> sourceStatuses = sourceSyncmlBody.getStatus();
|
||||||
if (sourceStatuses.isEmpty()) {
|
if (sourceStatuses.isEmpty()) {
|
||||||
headerStatus =
|
headerStatus =
|
||||||
new StatusTag(headerCommandId, sourceHeader.getMsgID(), HEADER_STATUS_ID,
|
new StatusTag(headerCommandId, sourceHeader.getMsgID(), HEADER_STATUS_ID,
|
||||||
HEADER_COMMAND_TEXT, sourceHeader.getSource().getLocURI(),
|
HEADER_COMMAND_TEXT, challengeTag,sourceHeader.getSource().getLocURI(),
|
||||||
String.valueOf(Constants.SyncMLResponseCodes.AUTHENTICATION_ACCEPTED));
|
String.valueOf(Constants.SyncMLResponseCodes.UNAUTHORIZED));
|
||||||
statuses.add(headerStatus);
|
statuses.add(headerStatus);
|
||||||
} else {
|
} else {
|
||||||
for (StatusTag sourceStatus : sourceStatuses) {
|
for (StatusTag sourceStatus : sourceStatuses) {
|
||||||
if (sourceStatus.getChallenge() != null && HEADER_COMMAND_TEXT.equals(sourceStatus.getCommand())) {
|
if (sourceStatus.getChallenge() != null && HEADER_COMMAND_TEXT.equals(sourceStatus.getCommand())) {
|
||||||
|
|
||||||
headerStatus =
|
headerStatus =
|
||||||
new StatusTag(headerCommandId, sourceHeader.getMsgID(), HEADER_STATUS_ID,
|
new StatusTag(headerCommandId, sourceHeader.getMsgID(), HEADER_STATUS_ID,
|
||||||
HEADER_COMMAND_TEXT, sourceHeader.getSource().getLocURI(),
|
HEADER_COMMAND_TEXT, challengeTag, sourceHeader.getSource().getLocURI(),
|
||||||
String.valueOf(Constants.SyncMLResponseCodes.AUTHENTICATION_ACCEPTED));
|
String.valueOf(Constants.SyncMLResponseCodes.AUTHENTICATION_ACCEPTED));
|
||||||
statuses.add(headerStatus);
|
statuses.add(headerStatus);
|
||||||
}
|
}
|
||||||
@ -230,7 +237,6 @@ public class OperationReply {
|
|||||||
|
|
||||||
private void appendOperations(SyncmlBody syncmlBody) throws PolicyManagementException,
|
private void appendOperations(SyncmlBody syncmlBody) throws PolicyManagementException,
|
||||||
FeatureManagementException, JSONException, SyncmlOperationException {
|
FeatureManagementException, JSONException, SyncmlOperationException {
|
||||||
|
|
||||||
GetTag getElement = new GetTag();
|
GetTag getElement = new GetTag();
|
||||||
List<ItemTag> getElements = new ArrayList<>();
|
List<ItemTag> getElements = new ArrayList<>();
|
||||||
List<ExecuteTag> executeElements = new ArrayList<>();
|
List<ExecuteTag> executeElements = new ArrayList<>();
|
||||||
|
|||||||
@ -18,6 +18,7 @@
|
|||||||
|
|
||||||
package org.wso2.carbon.device.mgt.mobile.windows.api.services.enrollment.impl;
|
package org.wso2.carbon.device.mgt.mobile.windows.api.services.enrollment.impl;
|
||||||
|
|
||||||
|
import com.google.gson.Gson;
|
||||||
import org.apache.commons.codec.binary.Base64;
|
import org.apache.commons.codec.binary.Base64;
|
||||||
import org.apache.commons.codec.digest.DigestUtils;
|
import org.apache.commons.codec.digest.DigestUtils;
|
||||||
import org.apache.commons.logging.Log;
|
import org.apache.commons.logging.Log;
|
||||||
@ -40,6 +41,7 @@ import org.wso2.carbon.device.mgt.mobile.windows.api.common.exceptions.WAPProvis
|
|||||||
import org.wso2.carbon.device.mgt.mobile.windows.api.common.exceptions.WindowsDeviceEnrolmentException;
|
import org.wso2.carbon.device.mgt.mobile.windows.api.common.exceptions.WindowsDeviceEnrolmentException;
|
||||||
import org.wso2.carbon.device.mgt.mobile.windows.api.common.util.DeviceUtil;
|
import org.wso2.carbon.device.mgt.mobile.windows.api.common.util.DeviceUtil;
|
||||||
import org.wso2.carbon.device.mgt.mobile.windows.api.common.util.WindowsAPIUtils;
|
import org.wso2.carbon.device.mgt.mobile.windows.api.common.util.WindowsAPIUtils;
|
||||||
|
import org.wso2.carbon.device.mgt.mobile.windows.api.operations.util.DeviceInfo;
|
||||||
import org.wso2.carbon.device.mgt.mobile.windows.api.operations.util.SyncmlCredentialUtil;
|
import org.wso2.carbon.device.mgt.mobile.windows.api.operations.util.SyncmlCredentialUtil;
|
||||||
import org.wso2.carbon.device.mgt.mobile.windows.api.services.enrollment.EnrollmentService;
|
import org.wso2.carbon.device.mgt.mobile.windows.api.services.enrollment.EnrollmentService;
|
||||||
import org.wso2.carbon.device.mgt.mobile.windows.api.services.enrollment.beans.*;
|
import org.wso2.carbon.device.mgt.mobile.windows.api.services.enrollment.beans.*;
|
||||||
@ -98,7 +100,6 @@ public class EnrollmentServiceImpl implements EnrollmentService {
|
|||||||
AdditionalContext additionalContext,
|
AdditionalContext additionalContext,
|
||||||
Holder<RequestSecurityTokenResponse> response)
|
Holder<RequestSecurityTokenResponse> response)
|
||||||
throws WindowsDeviceEnrolmentException, UnsupportedEncodingException, WAPProvisioningException {
|
throws WindowsDeviceEnrolmentException, UnsupportedEncodingException, WAPProvisioningException {
|
||||||
|
|
||||||
String headerBinarySecurityToken = null;
|
String headerBinarySecurityToken = null;
|
||||||
String headerTo = null;
|
String headerTo = null;
|
||||||
String encodedWap;
|
String encodedWap;
|
||||||
@ -199,7 +200,6 @@ public class EnrollmentServiceImpl implements EnrollmentService {
|
|||||||
TransformerFactory transformerFactory = TransformerFactory.newInstance();
|
TransformerFactory transformerFactory = TransformerFactory.newInstance();
|
||||||
Transformer transformer = transformerFactory.newTransformer();
|
Transformer transformer = transformerFactory.newTransformer();
|
||||||
transformer.transform(DOMSource, streamResult);
|
transformer.transform(DOMSource, streamResult);
|
||||||
|
|
||||||
return stringWriter.toString();
|
return stringWriter.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -220,14 +220,12 @@ public class EnrollmentServiceImpl implements EnrollmentService {
|
|||||||
String signedCertEncodedString;
|
String signedCertEncodedString;
|
||||||
X509Certificate signedCertificate;
|
X509Certificate signedCertificate;
|
||||||
String provisioningXmlString;
|
String provisioningXmlString;
|
||||||
|
|
||||||
CertificateManagementServiceImpl certMgtServiceImpl = CertificateManagementServiceImpl.getInstance();
|
CertificateManagementServiceImpl certMgtServiceImpl = CertificateManagementServiceImpl.getInstance();
|
||||||
Base64 base64Encoder = new Base64();
|
Base64 base64Encoder = new Base64();
|
||||||
try {
|
try {
|
||||||
X509Certificate rootCACertificate = (X509Certificate) certMgtServiceImpl.getCACertificate();
|
X509Certificate rootCACertificate = (X509Certificate) certMgtServiceImpl.getCACertificate();
|
||||||
rootCertEncodedString = base64Encoder.encodeAsString(rootCACertificate.getEncoded());
|
rootCertEncodedString = base64Encoder.encodeAsString(rootCACertificate.getEncoded());
|
||||||
|
|
||||||
|
|
||||||
signedCertificate = certMgtServiceImpl.getSignedCertificateFromCSR(binarySecurityToken);
|
signedCertificate = certMgtServiceImpl.getSignedCertificateFromCSR(binarySecurityToken);
|
||||||
signedCertEncodedString = base64Encoder.encodeAsString(signedCertificate.getEncoded());
|
signedCertEncodedString = base64Encoder.encodeAsString(signedCertificate.getEncoded());
|
||||||
|
|
||||||
@ -312,7 +310,6 @@ public class EnrollmentServiceImpl implements EnrollmentService {
|
|||||||
Node pollValue = pollingAttributes.getNamedItem(PluginConstants.CertificateEnrolment.VALUE);
|
Node pollValue = pollingAttributes.getNamedItem(PluginConstants.CertificateEnrolment.VALUE);
|
||||||
pollValue.setTextContent(pollingFrequency);
|
pollValue.setTextContent(pollingFrequency);
|
||||||
provisioningXmlString = convertDocumentToString(document);
|
provisioningXmlString = convertDocumentToString(document);
|
||||||
|
|
||||||
} catch (ParserConfigurationException e) {
|
} catch (ParserConfigurationException e) {
|
||||||
throw new WAPProvisioningException("Problem occurred while creating configuration request", e);
|
throw new WAPProvisioningException("Problem occurred while creating configuration request", e);
|
||||||
} catch (CertificateEncodingException e) {
|
} catch (CertificateEncodingException e) {
|
||||||
@ -368,7 +365,7 @@ public class EnrollmentServiceImpl implements EnrollmentService {
|
|||||||
* @return Value added Device.
|
* @return Value added Device.
|
||||||
*/
|
*/
|
||||||
private Device generateDevice(WindowsDevice windowsDevice) {
|
private Device generateDevice(WindowsDevice windowsDevice) {
|
||||||
|
Gson gson = new Gson();
|
||||||
Device generatedDevice = new Device();
|
Device generatedDevice = new Device();
|
||||||
|
|
||||||
Device.Property OSVersionProperty = new Device.Property();
|
Device.Property OSVersionProperty = new Device.Property();
|
||||||
@ -383,16 +380,26 @@ public class EnrollmentServiceImpl implements EnrollmentService {
|
|||||||
IMEIProperty.setName(PluginConstants.SyncML.IMEI);
|
IMEIProperty.setName(PluginConstants.SyncML.IMEI);
|
||||||
IMEIProperty.setValue(windowsDevice.getImei());
|
IMEIProperty.setValue(windowsDevice.getImei());
|
||||||
|
|
||||||
|
Device.Property deviceInfoProperties = new Device.Property();
|
||||||
|
deviceInfoProperties.setName(PluginConstants.WindowsEnrollmentProperties.TYPE);
|
||||||
|
deviceInfoProperties.setValue(windowsDevice.getWindowsType());
|
||||||
|
String deviceInfo = gson.toJson(deviceInfoProperties);
|
||||||
|
|
||||||
|
Device.Property winDeviceType = new Device.Property();
|
||||||
|
winDeviceType.setName(PluginConstants.SyncML.DEVICE_INFO);
|
||||||
|
winDeviceType.setValue(deviceInfo);
|
||||||
|
|
||||||
List<Device.Property> propertyList = new ArrayList<>();
|
List<Device.Property> propertyList = new ArrayList<>();
|
||||||
propertyList.add(OSVersionProperty);
|
propertyList.add(OSVersionProperty);
|
||||||
propertyList.add(IMSEIProperty);
|
propertyList.add(IMSEIProperty);
|
||||||
propertyList.add(IMEIProperty);
|
propertyList.add(IMEIProperty);
|
||||||
|
propertyList.add(winDeviceType);
|
||||||
|
|
||||||
EnrolmentInfo enrolmentInfo = new EnrolmentInfo();
|
EnrolmentInfo enrolmentInfo = new EnrolmentInfo();
|
||||||
enrolmentInfo.setOwner(windowsDevice.getUser());
|
enrolmentInfo.setOwner(windowsDevice.getUser());
|
||||||
enrolmentInfo.setOwnership(EnrolmentInfo.OwnerShip.BYOD);
|
enrolmentInfo.setOwnership(EnrolmentInfo.OwnerShip.BYOD);
|
||||||
enrolmentInfo.setStatus(EnrolmentInfo.Status.ACTIVE);
|
enrolmentInfo.setStatus(EnrolmentInfo.Status.ACTIVE);
|
||||||
|
|
||||||
generatedDevice.setEnrolmentInfo(enrolmentInfo);
|
generatedDevice.setEnrolmentInfo(enrolmentInfo);
|
||||||
generatedDevice.setDeviceIdentifier(windowsDevice.getDeviceId());
|
generatedDevice.setDeviceIdentifier(windowsDevice.getDeviceId());
|
||||||
generatedDevice.setProperties(propertyList);
|
generatedDevice.setProperties(propertyList);
|
||||||
@ -430,6 +437,9 @@ public class EnrollmentServiceImpl implements EnrollmentService {
|
|||||||
if (PluginConstants.WindowsEnrollmentProperties.DEVICE_VERSION.equals(contextItem.getName())) {
|
if (PluginConstants.WindowsEnrollmentProperties.DEVICE_VERSION.equals(contextItem.getName())) {
|
||||||
windowsDevice.setOsVersion(contextItem.getValue());
|
windowsDevice.setOsVersion(contextItem.getValue());
|
||||||
}
|
}
|
||||||
|
if (PluginConstants.WindowsEnrollmentProperties.TYPE.equals(contextItem.getName())) {
|
||||||
|
windowsDevice.setWindowsType(contextItem.getValue());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Device device = generateDevice(windowsDevice);
|
Device device = generateDevice(windowsDevice);
|
||||||
WindowsAPIUtils.getDeviceManagementService().enrollDevice(device);
|
WindowsAPIUtils.getDeviceManagementService().enrollDevice(device);
|
||||||
|
|||||||
@ -87,39 +87,54 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
|
|||||||
|
|
||||||
if ((PluginConstants.SyncML.SYNCML_FIRST_MESSAGE_ID == msgId) &&
|
if ((PluginConstants.SyncML.SYNCML_FIRST_MESSAGE_ID == msgId) &&
|
||||||
(PluginConstants.SyncML.SYNCML_FIRST_SESSION_ID == sessionId)) {
|
(PluginConstants.SyncML.SYNCML_FIRST_SESSION_ID == sessionId)) {
|
||||||
token = syncmlHeader.getCredential().getData();
|
if (syncmlHeader.getCredential() != null) {
|
||||||
MobileCacheEntry cacheToken = DeviceUtil.getTokenEntry(token);
|
token = syncmlHeader.getCredential().getData();
|
||||||
DeviceUtil.persistChallengeToken(token, deviceIdentifier.getId(), user);
|
MobileCacheEntry cacheToken = DeviceUtil.getTokenEntry(token);
|
||||||
PrivilegedCarbonContext carbonCtx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
|
DeviceUtil.persistChallengeToken(token, deviceIdentifier.getId(), user);
|
||||||
carbonCtx.setTenantId(cacheToken.getTenanatID(), true);
|
PrivilegedCarbonContext carbonCtx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
|
||||||
|
carbonCtx.setTenantId(cacheToken.getTenanatID(), true);
|
||||||
if ((cacheToken.getUsername() != null) && (cacheToken.getUsername().equals(user))) {
|
if ((cacheToken.getUsername() != null) && (cacheToken.getUsername().equals(user))) {
|
||||||
|
if (modifyEnrollWithMoreDetail(request, cacheToken.getTenantDomain(), cacheToken.getTenanatID())) {
|
||||||
if (modifyEnrollWithMoreDetail(request, cacheToken.getTenantDomain(), cacheToken.getTenanatID())) {
|
pendingOperations = operationHandler.getPendingOperations(syncmlDocument);
|
||||||
pendingOperations = operationHandler.getPendingOperations(syncmlDocument);
|
operationHandler.checkForDeviceWipe(pendingOperations, deviceIdentifier);
|
||||||
response = operationReply.generateReply(syncmlDocument, pendingOperations);
|
response = operationReply.generateReply(syncmlDocument, pendingOperations);
|
||||||
return Response.status(Response.Status.OK).entity(response).build();
|
return Response.status(Response.Status.OK).entity(response).build();
|
||||||
|
} else {
|
||||||
|
String msg = "Error occurred in while modify the enrollment.";
|
||||||
|
log.error(msg);
|
||||||
|
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build();
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
String msg = "Error occurred in while modify the enrollment.";
|
String msg = "Authentication failure due to incorrect credentials.";
|
||||||
log.error(msg);
|
log.error(msg);
|
||||||
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build();
|
return Response.status(Response.Status.UNAUTHORIZED).entity(msg).build();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
String msg = "Authentication failure due to incorrect credentials.";
|
return Response.ok().entity(operationReply.generateReply(syncmlDocument, null)).build();
|
||||||
log.error(msg);
|
|
||||||
return Response.status(Response.Status.UNAUTHORIZED).entity(msg).build();
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
MobileCacheEntry cacheToken = DeviceUtil.getTokenEntryFromDeviceId(deviceIdentifier.getId());
|
if (DeviceUtil.getTokenEntryFromDeviceId(deviceIdentifier.getId()) == null) {
|
||||||
PrivilegedCarbonContext carbonCtx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
|
if (syncmlHeader.getCredential() != null) {
|
||||||
carbonCtx.setTenantId(cacheToken.getTenanatID());
|
token = syncmlHeader.getCredential().getData();
|
||||||
|
MobileCacheEntry cacheToken = DeviceUtil.getTokenEntry(token);
|
||||||
|
DeviceUtil.persistChallengeToken(token, deviceIdentifier.getId(), user);
|
||||||
|
PrivilegedCarbonContext carbonCtx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
|
||||||
|
carbonCtx.setTenantId(cacheToken.getTenanatID(), true);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
MobileCacheEntry cacheToken = DeviceUtil.getTokenEntryFromDeviceId(deviceIdentifier.getId());
|
||||||
|
PrivilegedCarbonContext carbonCtx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
|
||||||
|
carbonCtx.setTenantId(cacheToken.getTenanatID());
|
||||||
|
}
|
||||||
if ((syncmlDocument.getBody().getAlert() != null)) {
|
if ((syncmlDocument.getBody().getAlert() != null)) {
|
||||||
if (!syncmlDocument.getBody().getAlert().getData().equals(Constants.DISENROLL_ALERT_DATA)) {
|
if (!syncmlDocument.getBody().getAlert().getData().equals(Constants.DISENROLL_ALERT_DATA)) {
|
||||||
pendingOperations = operationHandler.getPendingOperations(syncmlDocument);
|
pendingOperations = operationHandler.getPendingOperations(syncmlDocument);
|
||||||
|
operationHandler.checkForDeviceWipe(pendingOperations, deviceIdentifier);
|
||||||
return Response.ok().entity(operationReply.generateReply(
|
return Response.ok().entity(operationReply.generateReply(
|
||||||
syncmlDocument, pendingOperations)).build();
|
syncmlDocument, pendingOperations)).build();
|
||||||
} else {
|
} else {
|
||||||
if (WindowsAPIUtils.getDeviceManagementService().getDevice(deviceIdentifier, false) != null) {
|
if (WindowsAPIUtils.getDeviceManagementService().getDevice(deviceIdentifier, false) != null) {
|
||||||
|
operationHandler.updateDisenrollOperationStatus(deviceIdentifier);
|
||||||
WindowsAPIUtils.getDeviceManagementService().disenrollDevice(deviceIdentifier);
|
WindowsAPIUtils.getDeviceManagementService().disenrollDevice(deviceIdentifier);
|
||||||
return Response.ok().entity(operationReply.generateReply(syncmlDocument, null)).build();
|
return Response.ok().entity(operationReply.generateReply(syncmlDocument, null)).build();
|
||||||
} else {
|
} else {
|
||||||
@ -130,6 +145,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
pendingOperations = operationHandler.getPendingOperations(syncmlDocument);
|
pendingOperations = operationHandler.getPendingOperations(syncmlDocument);
|
||||||
|
operationHandler.checkForDeviceWipe(pendingOperations, deviceIdentifier);
|
||||||
return Response.ok().entity(operationReply.generateReply(
|
return Response.ok().entity(operationReply.generateReply(
|
||||||
syncmlDocument, pendingOperations)).build();
|
syncmlDocument, pendingOperations)).build();
|
||||||
}
|
}
|
||||||
@ -171,7 +187,6 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
|
|||||||
boolean status = false;
|
boolean status = false;
|
||||||
String user;
|
String user;
|
||||||
SyncmlDocument syncmlDocument;
|
SyncmlDocument syncmlDocument;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
syncmlDocument = SyncmlParser.parseSyncmlPayload(request);
|
syncmlDocument = SyncmlParser.parseSyncmlPayload(request);
|
||||||
ReplaceTag replace = syncmlDocument.getBody().getReplace();
|
ReplaceTag replace = syncmlDocument.getBody().getReplace();
|
||||||
@ -196,7 +211,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
|
|||||||
Device existingDevice = WindowsAPIUtils.getDeviceManagementService().getDevice(deviceIdentifier);
|
Device existingDevice = WindowsAPIUtils.getDeviceManagementService().getDevice(deviceIdentifier);
|
||||||
if (!existingDevice.getProperties().isEmpty()) {
|
if (!existingDevice.getProperties().isEmpty()) {
|
||||||
List<Device.Property> existingProperties = new ArrayList<>();
|
List<Device.Property> existingProperties = new ArrayList<>();
|
||||||
|
|
||||||
Device.Property vendorProperty = new Device.Property();
|
Device.Property vendorProperty = new Device.Property();
|
||||||
vendorProperty.setName(PluginConstants.SyncML.VENDOR);
|
vendorProperty.setName(PluginConstants.SyncML.VENDOR);
|
||||||
vendorProperty.setValue(devMan);
|
vendorProperty.setValue(devMan);
|
||||||
|
|||||||
@ -32,6 +32,15 @@ public class WindowsDevice {
|
|||||||
private String model;
|
private String model;
|
||||||
private String user;
|
private String user;
|
||||||
private String deviceName;
|
private String deviceName;
|
||||||
|
private String windowsType;
|
||||||
|
|
||||||
|
public String getWindowsType() {
|
||||||
|
return windowsType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setWindowsType(String windowsType) {
|
||||||
|
this.windowsType = windowsType;
|
||||||
|
}
|
||||||
|
|
||||||
public String getImei() {
|
public String getImei() {
|
||||||
return imei;
|
return imei;
|
||||||
|
|||||||
@ -29,7 +29,7 @@
|
|||||||
</characteristic>
|
</characteristic>
|
||||||
<characteristic type="APPLICATION">
|
<characteristic type="APPLICATION">
|
||||||
<parm name="APPID" value="w7"/>
|
<parm name="APPID" value="w7"/>
|
||||||
<parm name="PROVIDER-ID" value="TestMDMServer"/>
|
<parm name="PROVIDER-ID" value="MobiCDMServer"/>
|
||||||
<parm name="NAME" value="Microsoft"/>
|
<parm name="NAME" value="Microsoft"/>
|
||||||
<parm name="ADDR" value="https://DM.contoso.com:443/omadm/Windows.ashx"/>
|
<parm name="ADDR" value="https://DM.contoso.com:443/omadm/Windows.ashx"/>
|
||||||
<parm name="CONNRETRYFREQ" value="6" />
|
<parm name="CONNRETRYFREQ" value="6" />
|
||||||
@ -42,8 +42,8 @@
|
|||||||
<characteristic type="APPAUTH">
|
<characteristic type="APPAUTH">
|
||||||
<parm name="AAUTHLEVEL" value="CLIENT"/>
|
<parm name="AAUTHLEVEL" value="CLIENT"/>
|
||||||
<parm name="AAUTHTYPE" value="DIGEST"/>
|
<parm name="AAUTHTYPE" value="DIGEST"/>
|
||||||
<parm name="AAUTHSECRET" value="password1"/>
|
<parm name="AAUTHSECRET" value="dummy"/>
|
||||||
<parm name="AAUTHDATA" value="B64encodedBinaryNonceInsertedHere"/>
|
<parm name="AAUTHDATA" value="ZHVtbXk="/>
|
||||||
</characteristic>
|
</characteristic>
|
||||||
<characteristic type="APPAUTH">
|
<characteristic type="APPAUTH">
|
||||||
<parm name="AAUTHLEVEL" value="APPSRV"/>
|
<parm name="AAUTHLEVEL" value="APPSRV"/>
|
||||||
|
|||||||
@ -23,13 +23,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>windows-plugin</artifactId>
|
<artifactId>windows-plugin</artifactId>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<artifactId>org.wso2.carbon.device.mgt.mobile.windows.ui</artifactId>
|
<artifactId>org.wso2.carbon.device.mgt.mobile.windows.ui</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<name>WSO2 Carbon - Mobile Windows UI</name>
|
<name>WSO2 Carbon - Mobile Windows UI</name>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>windows-plugin</artifactId>
|
<artifactId>windows-plugin</artifactId>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>mobile-plugins</artifactId>
|
<artifactId>mobile-plugins</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>analytics-feature</artifactId>
|
<artifactId>analytics-feature</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -23,13 +23,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>analytics-feature</artifactId>
|
<artifactId>analytics-feature</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<artifactId>org.wso2.carbon.device.mgt.iot.analytics.feature</artifactId>
|
<artifactId>org.wso2.carbon.device.mgt.iot.analytics.feature</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<name>WSO2 Carbon - IoT Server Analytics Feature</name>
|
<name>WSO2 Carbon - IoT Server Analytics Feature</name>
|
||||||
<url>http://wso2.org</url>
|
<url>http://wso2.org</url>
|
||||||
|
|||||||
@ -23,13 +23,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>analytics-feature</artifactId>
|
<artifactId>analytics-feature</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<artifactId>org.wso2.carbon.iot.device.statistics.dashboard.feature</artifactId>
|
<artifactId>org.wso2.carbon.iot.device.statistics.dashboard.feature</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<name>WSO2 Carbon - IoT Server Analytics Feature</name>
|
<name>WSO2 Carbon - IoT Server Analytics Feature</name>
|
||||||
<url>http://wso2.org</url>
|
<url>http://wso2.org</url>
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>analytics-feature</artifactId>
|
<artifactId>analytics-feature</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -23,13 +23,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>androidsense-plugin-feature</artifactId>
|
<artifactId>androidsense-plugin-feature</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<artifactId>org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature</artifactId>
|
<artifactId>org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<name>WSO2 Carbon - IoT Server Android Sense Analytics Feature</name>
|
<name>WSO2 Carbon - IoT Server Android Sense Analytics Feature</name>
|
||||||
<url>http://wso2.org</url>
|
<url>http://wso2.org</url>
|
||||||
|
|||||||
@ -23,13 +23,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>androidsense-plugin-feature</artifactId>
|
<artifactId>androidsense-plugin-feature</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<artifactId>org.wso2.carbon.device.mgt.iot.androidsense.backend.feature</artifactId>
|
<artifactId>org.wso2.carbon.device.mgt.iot.androidsense.backend.feature</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<name>WSO2 Carbon - IoT Server Android Sense Backend Feature</name>
|
<name>WSO2 Carbon - IoT Server Android Sense Backend Feature</name>
|
||||||
<url>http://wso2.org</url>
|
<url>http://wso2.org</url>
|
||||||
|
|||||||
@ -23,13 +23,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>androidsense-plugin-feature</artifactId>
|
<artifactId>androidsense-plugin-feature</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<artifactId>org.wso2.carbon.device.mgt.iot.androidsense.ui.feature</artifactId>
|
<artifactId>org.wso2.carbon.device.mgt.iot.androidsense.ui.feature</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<name>WSO2 Carbon - IoT Server Android Sense UI Feature</name>
|
<name>WSO2 Carbon - IoT Server Android Sense UI Feature</name>
|
||||||
<url>http://wso2.org</url>
|
<url>http://wso2.org</url>
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>device-types-feature</artifactId>
|
<artifactId>device-types-feature</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>arduino-plugin-feature</artifactId>
|
<artifactId>arduino-plugin-feature</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>arduino-plugin-feature</artifactId>
|
<artifactId>arduino-plugin-feature</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>arduino-plugin-feature</artifactId>
|
<artifactId>arduino-plugin-feature</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>device-types-feature</artifactId>
|
<artifactId>device-types-feature</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -22,13 +22,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<artifactId>device-types-feature</artifactId>
|
<artifactId>device-types-feature</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<name>WSO2 Carbon - Device Management IoT Plugins Feature</name>
|
<name>WSO2 Carbon - Device Management IoT Plugins Feature</name>
|
||||||
<url>http://wso2.org</url>
|
<url>http://wso2.org</url>
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>raspberrypi-plugin-feature</artifactId>
|
<artifactId>raspberrypi-plugin-feature</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>raspberrypi-plugin-feature</artifactId>
|
<artifactId>raspberrypi-plugin-feature</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>raspberrypi-plugin-feature</artifactId>
|
<artifactId>raspberrypi-plugin-feature</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>device-types-feature</artifactId>
|
<artifactId>device-types-feature</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>virtual-fire-alarm-plugin-feature</artifactId>
|
<artifactId>virtual-fire-alarm-plugin-feature</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>virtual-fire-alarm-plugin-feature</artifactId>
|
<artifactId>virtual-fire-alarm-plugin-feature</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>virtual-fire-alarm-plugin-feature</artifactId>
|
<artifactId>virtual-fire-alarm-plugin-feature</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>device-types-feature</artifactId>
|
<artifactId>device-types-feature</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>extensions-feature</artifactId>
|
<artifactId>extensions-feature</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>extensions-feature</artifactId>
|
<artifactId>extensions-feature</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -20,13 +20,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>extensions-feature</artifactId>
|
<artifactId>extensions-feature</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>org.wso2.carbon.appmgt.mdm.osgiconnector.feature</artifactId>
|
<artifactId>org.wso2.carbon.appmgt.mdm.osgiconnector.feature</artifactId>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<name>WSO2 Carbon - App management MDM OSGI Connector</name>
|
<name>WSO2 Carbon - App management MDM OSGI Connector</name>
|
||||||
<url>http://wso2.org</url>
|
<url>http://wso2.org</url>
|
||||||
<description>This feature contains the core bundles required for APP management OSGI MDM connection
|
<description>This feature contains the core bundles required for APP management OSGI MDM connection
|
||||||
@ -36,7 +36,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>org.wso2.carbon.appmgt.mdm.osgiconnector</artifactId>
|
<artifactId>org.wso2.carbon.appmgt.mdm.osgiconnector</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<exclusions>
|
<exclusions>
|
||||||
<exclusion>
|
<exclusion>
|
||||||
<groupId>org.apache.ws.commons.axiom</groupId>
|
<groupId>org.apache.ws.commons.axiom</groupId>
|
||||||
|
|||||||
@ -20,13 +20,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>extensions-feature</artifactId>
|
<artifactId>extensions-feature</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>org.wso2.carbon.appmgt.mdm.restconnector.feature</artifactId>
|
<artifactId>org.wso2.carbon.appmgt.mdm.restconnector.feature</artifactId>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<name>WSO2 Carbon - App management MDM REST Connector</name>
|
<name>WSO2 Carbon - App management MDM REST Connector</name>
|
||||||
<url>http://wso2.org</url>
|
<url>http://wso2.org</url>
|
||||||
<description>This feature contains the core bundles required for APP management MDM REST connection
|
<description>This feature contains the core bundles required for APP management MDM REST connection
|
||||||
@ -36,7 +36,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>org.wso2.carbon.appmgt.mdm.restconnector</artifactId>
|
<artifactId>org.wso2.carbon.appmgt.mdm.restconnector</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<exclusions>
|
<exclusions>
|
||||||
<exclusion>
|
<exclusion>
|
||||||
<groupId>org.apache.ws.commons.axiom</groupId>
|
<groupId>org.apache.ws.commons.axiom</groupId>
|
||||||
|
|||||||
@ -23,14 +23,14 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>extensions-feature</artifactId>
|
<artifactId>extensions-feature</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<artifactId>org.wso2.carbon.device.mgt.adapter.feature</artifactId>
|
<artifactId>org.wso2.carbon.device.mgt.adapter.feature</artifactId>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<name>WSO2 Carbon - Device Management Adapters Feature</name>
|
<name>WSO2 Carbon - Device Management Adapters Feature</name>
|
||||||
<url>http://wso2.org</url>
|
<url>http://wso2.org</url>
|
||||||
<description>This feature contains the adapter bundles required for IoT Server</description>
|
<description>This feature contains the adapter bundles required for IoT Server</description>
|
||||||
|
|||||||
@ -3,14 +3,14 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>extensions-feature</artifactId>
|
<artifactId>extensions-feature</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<artifactId>org.wso2.carbon.device.mgt.notification.listener.feature</artifactId>
|
<artifactId>org.wso2.carbon.device.mgt.notification.listener.feature</artifactId>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<name>WSO2 Carbon - Notification Listener</name>
|
<name>WSO2 Carbon - Notification Listener</name>
|
||||||
<url>http://wso2.org</url>
|
<url>http://wso2.org</url>
|
||||||
<description>This feature contains the core bundles required iot core listeners</description>
|
<description>This feature contains the core bundles required iot core listeners</description>
|
||||||
|
|||||||
@ -20,13 +20,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>extensions-feature</artifactId>
|
<artifactId>extensions-feature</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>org.wso2.extension.siddhi.execution.json.feature</artifactId>
|
<artifactId>org.wso2.extension.siddhi.execution.json.feature</artifactId>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<name>WSO2 Siddhi Execution Extension - Json Feature</name>
|
<name>WSO2 Siddhi Execution Extension - Json Feature</name>
|
||||||
<url>http://wso2.org</url>
|
<url>http://wso2.org</url>
|
||||||
<description>This feature contains Siddhi extension feature for changing a json string to individual properties.</description>
|
<description>This feature contains Siddhi extension feature for changing a json string to individual properties.</description>
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>extensions-feature</artifactId>
|
<artifactId>extensions-feature</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -22,13 +22,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<artifactId>extensions-feature</artifactId>
|
<artifactId>extensions-feature</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<name>WSO2 Carbon - Device Management Extensions</name>
|
<name>WSO2 Carbon - Device Management Extensions</name>
|
||||||
<url>http://wso2.org</url>
|
<url>http://wso2.org</url>
|
||||||
|
|||||||
@ -22,14 +22,14 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>android-plugin-feature</artifactId>
|
<artifactId>android-plugin-feature</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<artifactId>org.wso2.carbon.device.mgt.mobile.android.feature</artifactId>
|
<artifactId>org.wso2.carbon.device.mgt.mobile.android.feature</artifactId>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<name>WSO2 Carbon - Android Device Management Feature</name>
|
<name>WSO2 Carbon - Android Device Management Feature</name>
|
||||||
<url>http://wso2.org</url>
|
<url>http://wso2.org</url>
|
||||||
<description>This feature contains the core bundles required for Android Device Management
|
<description>This feature contains the core bundles required for Android Device Management
|
||||||
|
|||||||
@ -22,13 +22,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||||
<artifactId>mobile-plugins-feature</artifactId>
|
<artifactId>mobile-plugins-feature</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<artifactId>android-plugin-feature</artifactId>
|
<artifactId>android-plugin-feature</artifactId>
|
||||||
<version>4.0.86-SNAPSHOT</version>
|
<version>4.0.88-SNAPSHOT</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<name>WSO2 Carbon - Device Management Android Plugin Feature</name>
|
<name>WSO2 Carbon - Device Management Android Plugin Feature</name>
|
||||||
<url>http://wso2.org</url>
|
<url>http://wso2.org</url>
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user