mirror of
https://repository.entgra.net/community/device-mgt-plugins.git
synced 2025-09-16 23:42:15 +00:00
merging changes with upstream
partial
This commit is contained in:
Ace
commit
daf37338c6
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>iot-analytics</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>analytics</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>androidsense-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<artifactId>androidsense-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -84,8 +84,7 @@ public class AndroidSenseServiceImpl implements AndroidSenseService {
|
||||
log.error(e.getErrorMessage(), e);
|
||||
return Response.status(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode()).build();
|
||||
} catch (OperationManagementException e) {
|
||||
String msg = "Error occurred while executing command operation to send keywords";
|
||||
log.error(msg, e);
|
||||
log.error("Error occurred while executing command operation to send keywords", e);
|
||||
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
|
||||
}
|
||||
}
|
||||
@ -123,8 +122,7 @@ public class AndroidSenseServiceImpl implements AndroidSenseService {
|
||||
} catch (DeviceAccessAuthorizationException e) {
|
||||
return Response.status(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode()).build();
|
||||
} catch (OperationManagementException e) {
|
||||
String msg = "Error occurred while executing command operation to set threashold";
|
||||
log.error(msg, e);
|
||||
log.error("Error occurred while executing command operation to set threashold", e);
|
||||
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
|
||||
}
|
||||
}
|
||||
@ -163,8 +161,7 @@ public class AndroidSenseServiceImpl implements AndroidSenseService {
|
||||
log.error(e.getErrorMessage(), e);
|
||||
return Response.status(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode()).build();
|
||||
} catch (OperationManagementException e) {
|
||||
String msg = "Error occurred while executing command operation to remove words";
|
||||
log.error(msg, e);
|
||||
log.error("Error occurred while executing command operation to remove words", e);
|
||||
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
|
||||
}
|
||||
}
|
||||
@ -300,5 +297,4 @@ public class AndroidSenseServiceImpl implements AndroidSenseService {
|
||||
return Response.status(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode()).entity(false).build();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -3,10 +3,10 @@ package org.wso2.carbon.device.mgt.iot.androidsense.service.impl.util;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.wso2.carbon.analytics.api.AnalyticsDataAPI;
|
||||
import org.wso2.carbon.analytics.api.AnalyticsDataAPIUtil;
|
||||
import org.wso2.carbon.analytics.dataservice.commons.AnalyticsDataResponse;
|
||||
import org.wso2.carbon.analytics.dataservice.commons.SearchResultEntry;
|
||||
import org.wso2.carbon.analytics.dataservice.commons.SortByField;
|
||||
import org.wso2.carbon.analytics.dataservice.core.AnalyticsDataServiceUtils;
|
||||
import org.wso2.carbon.analytics.datasource.commons.Record;
|
||||
import org.wso2.carbon.analytics.datasource.commons.exception.AnalyticsException;
|
||||
import org.wso2.carbon.apimgt.application.extension.APIManagementProviderService;
|
||||
@ -88,7 +88,7 @@ public class APIUtil {
|
||||
sortByFields);
|
||||
List<String> recordIds = getRecordIds(resultEntries);
|
||||
AnalyticsDataResponse response = analyticsDataAPI.get(tenantId, tableName, 1, null, recordIds);
|
||||
Map<String, SensorRecord> sensorDatas = createSensorData(AnalyticsDataServiceUtils.listRecords(
|
||||
Map<String, SensorRecord> sensorDatas = createSensorData(AnalyticsDataAPIUtil.listRecords(
|
||||
analyticsDataAPI, response));
|
||||
List<SensorRecord> sortedSensorData = getSortedSensorData(sensorDatas, resultEntries);
|
||||
return sortedSensorData;
|
||||
|
||||
@ -63,5 +63,4 @@
|
||||
<method>POST</method>
|
||||
<scope>android_sense_user</scope>
|
||||
</Permission>
|
||||
|
||||
</PermissionConfiguration>
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>androidsense-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -74,9 +74,9 @@
|
||||
<div class="panel-body">
|
||||
<div id="operations-spinner" class="wr-advance-operations-init hidden">
|
||||
<br>
|
||||
|
||||
|
||||
<i class="fw fw-settings fw-spin fw-2x"></i>
|
||||
|
||||
|
||||
Loading Operations Log . . .
|
||||
<br>
|
||||
<br>
|
||||
|
||||
@ -41,7 +41,7 @@
|
||||
</div>
|
||||
<div class="wr-input-control wr-btn-grp">
|
||||
<button id="save-general-btn" class="wr-btn" onclick="addConfiguration();">
|
||||
Save
|
||||
Save
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -42,18 +42,18 @@
|
||||
<ul class="list-unstyled">
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">STEP 01</span>
|
||||
Go ahead and click [Enroll Device].
|
||||
Go ahead and click [Enroll Device].
|
||||
</li>
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">STEP 02</span>
|
||||
You can either scan the QR code or directly download Android agent.
|
||||
You can either scan the QR code or directly download Android agent.
|
||||
</li>
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">STEP 03</span>
|
||||
Install Android agent into your Android Device.
|
||||
Install Android agent into your Android Device.
|
||||
</li>
|
||||
<li class="padding-top-double"><span class="circle">STEP 04</span>
|
||||
Proceed to [Prepare] section.
|
||||
Proceed to [Prepare] section.
|
||||
</ul>
|
||||
<br>
|
||||
<a href="#" class="download-link btn-operations">
|
||||
@ -84,7 +84,7 @@
|
||||
<div class="buttons">
|
||||
<a href="#" id="device-401-link" class="blue-button">
|
||||
Goto Login Page
|
||||
</a>
|
||||
</a>
|
||||
<a href="#" onclick="hidePopup();" class="btn-operations">
|
||||
Cancel
|
||||
</a>
|
||||
@ -147,17 +147,17 @@
|
||||
<ul class="list-unstyled">
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">01</span>
|
||||
Connect Android device to network.
|
||||
Connect Android device to network.
|
||||
</li>
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">02</span>
|
||||
Start Android Sense app in your device.
|
||||
Start Android Sense app in your device.
|
||||
</li>
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">03</span>
|
||||
Fill login form with the credentials.
|
||||
<i>(Use server URL as [ https://<WSO2_IoT_SERVER_HOST>:<
|
||||
HTTPS_SERVER_PORT> ] and click on
|
||||
Fill login form with the credentials.
|
||||
<i>(Use server URL as [ https://<WSO2_IoT_SERVER_HOST>:<
|
||||
HTTPS_SERVER_PORT> ] and click on
|
||||
<strong>Register Device</strong> button.)</i>
|
||||
</li>
|
||||
<li>
|
||||
@ -169,7 +169,7 @@
|
||||
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">04</span>
|
||||
Once the device is enrolled, click on <strong>[+]</strong> button to
|
||||
Once the device is enrolled, click on <strong>[+]</strong> button to
|
||||
select the sensors.
|
||||
<a href="{{@unit.publicUri}}/images/selectSensorView.png" target="_blank"
|
||||
class="padding-top-double">
|
||||
@ -178,7 +178,7 @@
|
||||
</li>
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">05</span>
|
||||
Click on <i>[Publish data]</i> button to publish sensor readings to
|
||||
Click on <i>[Publish data]</i> button to publish sensor readings to
|
||||
IoT server.
|
||||
<a href="{{@unit.publicUri}}/images/publishDataView.png" target="_blank"
|
||||
class="padding-top-double">
|
||||
@ -198,7 +198,7 @@
|
||||
<i class="fw fw-ring fw-stack-2x"></i>
|
||||
<i class="fw fw-right-arrow fw-stack-1x"></i>
|
||||
</span>
|
||||
You can view all your connected devices
|
||||
You can view all your connected devices
|
||||
<a href="{{@app.context}}/devices">[Device Management]</a> page.
|
||||
</li>
|
||||
<li class="padding-top-double">
|
||||
@ -206,14 +206,14 @@
|
||||
<i class="fw fw-ring fw-stack-2x"></i>
|
||||
<i class="fw fw-right-arrow fw-stack-1x"></i>
|
||||
</span>
|
||||
You can select any one of your connected devices for available
|
||||
You can select any one of your connected devices for available
|
||||
operations and Real-Time data monitoring.
|
||||
</li>
|
||||
<li class="padding-top-double">
|
||||
<span class="fw-stack fw-lg margin-right">
|
||||
<i class="fw fw-ring fw-stack-2x"></i>
|
||||
<i class="fw fw-right-arrow fw-stack-1x"></i>
|
||||
</span> For historical analytics of sensor data navigate to device
|
||||
</span> For historical analytics of sensor data navigate to device
|
||||
analytics page.
|
||||
</li>
|
||||
</ul>
|
||||
@ -237,7 +237,7 @@
|
||||
<i class="fw fw-add fw-stack-1x fw-inverse"></i>
|
||||
</span>
|
||||
</span>
|
||||
Add your new mobile device to {{@app.conf.appName}}
|
||||
Add your new mobile device to {{@app.conf.appName}}
|
||||
</h4>
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
|
||||
</div>
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>iot-plugins</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>arduino-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>arduino-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@ import org.wso2.carbon.analytics.dataservice.commons.AnalyticsDataResponse;
|
||||
import org.wso2.carbon.analytics.dataservice.commons.AnalyticsDrillDownRequest;
|
||||
import org.wso2.carbon.analytics.dataservice.commons.SearchResultEntry;
|
||||
import org.wso2.carbon.analytics.dataservice.commons.SortByField;
|
||||
import org.wso2.carbon.analytics.dataservice.core.AnalyticsDataServiceUtils;
|
||||
import org.wso2.carbon.analytics.api.AnalyticsDataAPIUtil;
|
||||
import org.wso2.carbon.analytics.datasource.commons.Record;
|
||||
import org.wso2.carbon.analytics.datasource.commons.exception.AnalyticsException;
|
||||
import org.wso2.carbon.apimgt.application.extension.APIManagementProviderService;
|
||||
@ -81,7 +81,7 @@ public class APIUtil {
|
||||
sortByFields);
|
||||
List<String> recordIds = getRecordIds(resultEntries);
|
||||
AnalyticsDataResponse response = analyticsDataAPI.get(tenantId, tableName, 1, null, recordIds);
|
||||
Map<String, SensorRecord> sensorDatas = createSensorData(AnalyticsDataServiceUtils.listRecords(
|
||||
Map<String, SensorRecord> sensorDatas = createSensorData(AnalyticsDataAPIUtil.listRecords(
|
||||
analyticsDataAPI, response));
|
||||
List<SensorRecord> sortedSensorData = getSortedSensorData(sensorDatas, resultEntries);
|
||||
return sortedSensorData;
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<artifactId>arduino-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -64,9 +64,9 @@
|
||||
<div class="panel-body">
|
||||
<div id="operations-spinner" class="wr-advance-operations-init hidden">
|
||||
<br>
|
||||
|
||||
|
||||
<i class="fw fw-settings fw-spin fw-2x"></i>
|
||||
|
||||
|
||||
Loading Operations Log . . .
|
||||
<br>
|
||||
<br>
|
||||
|
||||
@ -52,7 +52,7 @@
|
||||
</div>
|
||||
<div class="wr-input-control wr-btn-grp">
|
||||
<button id="save-general-btn" class="wr-btn" onclick="addConfiguration();">
|
||||
Save
|
||||
Save
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -41,24 +41,24 @@
|
||||
<ul class="list-unstyled">
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">ITEM 01</span>
|
||||
Arduino UNO Board.
|
||||
Arduino UNO Board.
|
||||
</li>
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">ITEM 02</span>
|
||||
Adafruit Wifi Shield for Arduino.
|
||||
Adafruit Wifi Shield for Arduino.
|
||||
</li>
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">ITEM 03</span>
|
||||
LED bulb connected to Pin 13.
|
||||
LED bulb connected to Pin 13.
|
||||
<i>(If not available, will use the one on the board.)</i>
|
||||
</li>
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">ITEM 04</span>
|
||||
Resister( e.g 330 ohms )
|
||||
Resister( e.g 330 ohms )
|
||||
</li>
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">STEP 05</span>
|
||||
Proceed to [Prepare] section.
|
||||
Proceed to [Prepare] section.
|
||||
</ul>
|
||||
<br>
|
||||
<a href="/api-store/apis/info?name={{@uriParams.deviceType}}&version=1.0.0&provider=admin"
|
||||
@ -90,7 +90,7 @@
|
||||
<input type="hidden" class="deviceType" name="deviceType"
|
||||
value="{{@uriParams.deviceType}}"/>
|
||||
<input type="hidden" class="sketchType" name="sketchType"
|
||||
value="{{@uriParams.deviceType}}"/>
|
||||
value="{{@uriParams.deviceType}}"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="buttons" style="padding-bottom: 0px">
|
||||
@ -134,7 +134,7 @@
|
||||
<div class="buttons">
|
||||
<a href="#" id="device-401-link" class="blue-button">
|
||||
Goto Login Page
|
||||
</a>
|
||||
</a>
|
||||
<a href="#" onclick="hidePopup();" class="btn-operations">
|
||||
Cancel
|
||||
</a>
|
||||
@ -196,11 +196,11 @@
|
||||
<ul class="list-unstyled">
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">01</span>
|
||||
Wifi-Shield mounted onto the Arduino-UNO board
|
||||
Wifi-Shield mounted onto the Arduino-UNO board
|
||||
</li>
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">02</span>
|
||||
Connect LED bulb to arduino as follows
|
||||
Connect LED bulb to arduino as follows
|
||||
<br/><br/>
|
||||
<a href="{{@unit.publicUri}}/images/schematicsGuide.png" target="_blank">
|
||||
<img src="{{@unit.publicUri}}/images/schematicsGuide.png" class="img-responsive">
|
||||
@ -210,20 +210,20 @@
|
||||
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">03</span>
|
||||
Download Arduino-Sketch from [Download Sketch] link above.
|
||||
Download Arduino-Sketch from [Download Sketch] link above.
|
||||
</li>
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">04</span>
|
||||
Unzip the downloaded Arduino Agent
|
||||
Unzip the downloaded Arduino Agent
|
||||
</li>
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">05</span>
|
||||
Create a folder called "ArduinoBoardSketch" and move all source files
|
||||
Create a folder called "ArduinoBoardSketch" and move all source files
|
||||
inside
|
||||
</li>
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">06</span>
|
||||
Open ArduinoBoardSketch.h and provide appropriate values for
|
||||
Open ArduinoBoardSketch.h and provide appropriate values for
|
||||
<i>[WLAN_SSID]</i>,
|
||||
<i>[WLAN_PASS]</i>,
|
||||
<i>[SERVICE_PORT]</i>,
|
||||
@ -233,22 +233,22 @@
|
||||
</li>
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">07</span>
|
||||
Burn the sketch onto your Arduino board and let the program run.
|
||||
Burn the sketch onto your Arduino board and let the program run.
|
||||
</li>
|
||||
<li class="padding-top-double">
|
||||
|
||||
|
||||
<span class="fw-stack fw-lg margin-right">
|
||||
<i class="fw fw-ring fw-stack-2x"></i>
|
||||
<i class="fw fw-right-arrow fw-stack-1x"></i>
|
||||
</span>
|
||||
Arduino will publish it's internal temperature to WSO2-IoT-Server
|
||||
Arduino will publish it's internal temperature to WSO2-IoT-Server
|
||||
<br/><br/>
|
||||
|
||||
|
||||
<span class="fw-stack fw-lg margin-right">
|
||||
<i class="fw fw-ring fw-stack-2x"></i>
|
||||
<i class="fw fw-right-arrow fw-stack-1x"></i>
|
||||
</span>
|
||||
LED on <i>PIN 13</i> can be controlled from Device Management page.
|
||||
LED on <i>PIN 13</i> can be controlled from Device Management page.
|
||||
</li>
|
||||
</ul>
|
||||
<br>
|
||||
@ -261,17 +261,17 @@
|
||||
<ul class="list-unstyled">
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">01</span>
|
||||
You can view all your connected devices at
|
||||
You can view all your connected devices at
|
||||
<a href="{{@app.context}}/devices">[Device Management]</a> page.
|
||||
</li>
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">02</span>
|
||||
Select one of connected devices and check for available control
|
||||
Select one of connected devices and check for available control
|
||||
operations and monitor Real-Time data.
|
||||
</li>
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">03</span>
|
||||
You can also view analytics of the data published to IoT-Server by
|
||||
You can also view analytics of the data published to IoT-Server by
|
||||
navigating to Device Analytics page.
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>iot-plugins</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>raspberrypi-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>raspberrypi-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@ import org.wso2.carbon.analytics.dataservice.commons.AnalyticsDataResponse;
|
||||
import org.wso2.carbon.analytics.dataservice.commons.AnalyticsDrillDownRequest;
|
||||
import org.wso2.carbon.analytics.dataservice.commons.SearchResultEntry;
|
||||
import org.wso2.carbon.analytics.dataservice.commons.SortByField;
|
||||
import org.wso2.carbon.analytics.dataservice.core.AnalyticsDataServiceUtils;
|
||||
import org.wso2.carbon.analytics.api.AnalyticsDataAPIUtil;
|
||||
import org.wso2.carbon.analytics.datasource.commons.Record;
|
||||
import org.wso2.carbon.analytics.datasource.commons.exception.AnalyticsException;
|
||||
import org.wso2.carbon.apimgt.application.extension.APIManagementProviderService;
|
||||
@ -78,7 +78,7 @@ public class APIUtil {
|
||||
sortByFields);
|
||||
List<String> recordIds = getRecordIds(resultEntries);
|
||||
AnalyticsDataResponse response = analyticsDataAPI.get(tenantId, tableName, 1, null, recordIds);
|
||||
Map<String, SensorRecord> sensorDatas = createSensorData(AnalyticsDataServiceUtils.listRecords(
|
||||
Map<String, SensorRecord> sensorDatas = createSensorData(AnalyticsDataAPIUtil.listRecords(
|
||||
analyticsDataAPI, response));
|
||||
List<SensorRecord> sortedSensorData = getSortedSensorData(sensorDatas, resultEntries);
|
||||
return sortedSensorData;
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<artifactId>raspberrypi-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -64,9 +64,9 @@
|
||||
<div class="panel-body">
|
||||
<div id="operations-spinner" class="wr-advance-operations-init hidden">
|
||||
<br>
|
||||
|
||||
|
||||
<i class="fw fw-settings fw-spin fw-2x"></i>
|
||||
|
||||
|
||||
Loading Operations Log . . .
|
||||
<br>
|
||||
<br>
|
||||
|
||||
@ -62,7 +62,7 @@
|
||||
</div>
|
||||
<div class="wr-input-control wr-btn-grp">
|
||||
<button id="save-general-btn" class="wr-btn" onclick="addConfiguration();">
|
||||
Save
|
||||
Save
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -40,28 +40,28 @@
|
||||
<ul class="list-unstyled">
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">ITEM 01</span>
|
||||
Raspberry Pi with SD Card(Internet Enabled [Wifi or Ethernet]).
|
||||
Raspberry Pi with SD Card(Internet Enabled [Wifi or Ethernet]).
|
||||
</li>
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">ITEM 02</span>
|
||||
Adafruit DHT11 Temperature Sensor.
|
||||
Adafruit DHT11 Temperature Sensor.
|
||||
</li>
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">ITEM 03</span>
|
||||
LED Bulb.
|
||||
LED Bulb.
|
||||
</li>
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">ITEM 04</span>
|
||||
Resister (eg : 470 ohm).
|
||||
Resister (eg : 470 ohm).
|
||||
</li>
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">STEP 05</span>
|
||||
Proceed to [Prepare] section.
|
||||
Proceed to [Prepare] section.
|
||||
</ul>
|
||||
<br>
|
||||
<a href="/api-store/apis/info?name={{@uriParams.deviceType}}&version=1.0.0&provider=admin"
|
||||
class="btn-operations"
|
||||
target="_blank"><i class="fw fw-api"></i> View API</i>
|
||||
target="_blank"><i class="fw fw-api"></i> View API</i>
|
||||
</a>
|
||||
<a href="#" class="download-link btn-operations">
|
||||
<i class="fw fw-download"></i>Download Agent
|
||||
@ -93,11 +93,11 @@
|
||||
</div>
|
||||
<div class="buttons" style="padding-bottom: 0px">
|
||||
<a class="btn btn-operations" onclick="downloadAgent()">Download Now</a>
|
||||
|
||||
|
||||
<a href="#" id="download-device-download-link"
|
||||
class="btn btn-operations"> Copy Link
|
||||
</a>
|
||||
|
||||
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
@ -135,7 +135,7 @@
|
||||
<div class="buttons">
|
||||
<a href="#" id="device-401-link" class="blue-button">
|
||||
Goto Login Page
|
||||
</a>
|
||||
</a>
|
||||
<a href="#" onclick="hidePopup();" class="btn-operations">
|
||||
Cancel
|
||||
</a>
|
||||
@ -195,43 +195,43 @@
|
||||
<ul class="list-unstyled">
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">01</span>
|
||||
Connect RaspberryPi, DHT11 Temperature sensor and LED as per the
|
||||
Connect RaspberryPi, DHT11 Temperature sensor and LED as per the
|
||||
schematic below.
|
||||
</li>
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">02</span>
|
||||
Ensure your RaspberryPi Board can connect to Internet.
|
||||
Ensure your RaspberryPi Board can connect to Internet.
|
||||
</li>
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">03</span>
|
||||
Download RaspberryPi Agent via [Download Agent] button above.
|
||||
Download RaspberryPi Agent via [Download Agent] button above.
|
||||
(Alternatively you can use the "curl" command to directly download the Agent to your
|
||||
RaspberryPi.)
|
||||
</li>
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">04</span>
|
||||
Copy downloaded Agent into your RaspberryPi.
|
||||
Copy downloaded Agent into your RaspberryPi.
|
||||
</li>
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">05</span>
|
||||
Unzip the downloaded Agent and start terminal to run below commands.
|
||||
Unzip the downloaded Agent and start terminal to run below commands.
|
||||
</li>
|
||||
<li class="padding-top-double">
|
||||
|
||||
|
||||
<span class="fw-stack fw-lg margin-right">
|
||||
<i class="fw fw-ring fw-stack-2x"></i>
|
||||
<i class="fw fw-right-arrow fw-stack-1x"></i>
|
||||
</span>
|
||||
[sudo ./testAgent.sh] - Script to test agent
|
||||
[sudo ./testAgent.sh] - Script to test agent
|
||||
functionality.
|
||||
</li>
|
||||
<li class="padding-top-double">
|
||||
|
||||
|
||||
<span class="fw-stack fw-lg margin-right">
|
||||
<i class="fw fw-ring fw-stack-2x"></i>
|
||||
<i class="fw fw-right-arrow fw-stack-1x"></i>
|
||||
</span>
|
||||
[sudo ./startService.sh] - Use this to start
|
||||
[sudo ./startService.sh] - Use this to start
|
||||
agent as Daemon.
|
||||
</li>
|
||||
</ul>
|
||||
@ -254,17 +254,17 @@
|
||||
<ul class="list-unstyled">
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">01</span>
|
||||
You can view all your connected devices at
|
||||
You can view all your connected devices at
|
||||
<a href="{{@app.context}}/devices">[Device Management]</a> page.
|
||||
</li>
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">02</span>
|
||||
Select one of connected devices and check for available control
|
||||
Select one of connected devices and check for available control
|
||||
operations and monitor Real-Time data.
|
||||
</li>
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">03</span>
|
||||
You can also view analytics of the data published to IoT-Server by
|
||||
You can also view analytics of the data published to IoT-Server by
|
||||
navigating to Device Analytics page.
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>iot-plugins</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<artifactId>virtual-fire-alarm-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<artifactId>virtual-fire-alarm-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>virtual-fire-alarm-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -3,11 +3,10 @@ package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.wso2.carbon.analytics.api.AnalyticsDataAPI;
|
||||
import org.wso2.carbon.analytics.api.AnalyticsDataAPIUtil;
|
||||
import org.wso2.carbon.analytics.dataservice.commons.AnalyticsDataResponse;
|
||||
import org.wso2.carbon.analytics.dataservice.commons.AnalyticsDrillDownRequest;
|
||||
import org.wso2.carbon.analytics.dataservice.commons.SearchResultEntry;
|
||||
import org.wso2.carbon.analytics.dataservice.commons.SortByField;
|
||||
import org.wso2.carbon.analytics.dataservice.core.AnalyticsDataServiceUtils;
|
||||
import org.wso2.carbon.analytics.datasource.commons.Record;
|
||||
import org.wso2.carbon.analytics.datasource.commons.exception.AnalyticsException;
|
||||
import org.wso2.carbon.apimgt.application.extension.APIManagementProviderService;
|
||||
@ -21,7 +20,6 @@ import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterService;
|
||||
import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
@ -79,7 +77,7 @@ public class APIUtil {
|
||||
sortByFields);
|
||||
List<String> recordIds = getRecordIds(resultEntries);
|
||||
AnalyticsDataResponse response = analyticsDataAPI.get(tenantId, tableName, 1, null, recordIds);
|
||||
Map<String, SensorRecord> sensorDatas = createSensorData(AnalyticsDataServiceUtils.listRecords(
|
||||
Map<String, SensorRecord> sensorDatas = createSensorData(AnalyticsDataAPIUtil.listRecords(
|
||||
analyticsDataAPI, response));
|
||||
List<SensorRecord> sortedSensorData = getSortedSensorData(sensorDatas, resultEntries);
|
||||
return sortedSensorData;
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<artifactId>virtual-fire-alarm-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>virtual-fire-alarm-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<artifactId>virtual-fire-alarm-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -66,9 +66,9 @@
|
||||
<div class="panel-body">
|
||||
<div id="policy-spinner" class="wr-advance-operations-init hidden">
|
||||
<br>
|
||||
|
||||
|
||||
<i class="fw fw-settings fw-spin fw-2x"></i>
|
||||
|
||||
|
||||
Loading Policies . . .
|
||||
<br>
|
||||
<br>
|
||||
@ -95,9 +95,9 @@
|
||||
<div class="panel-body">
|
||||
<div id="operations-spinner" class="wr-advance-operations-init hidden">
|
||||
<br>
|
||||
|
||||
|
||||
<i class="fw fw-settings fw-spin fw-2x"></i>
|
||||
|
||||
|
||||
Loading Operations Log . . .
|
||||
<br>
|
||||
<br>
|
||||
|
||||
@ -63,7 +63,7 @@
|
||||
</div>
|
||||
<div class="wr-input-control wr-btn-grp">
|
||||
<button id="save-general-btn-virtualfirealarm" class="wr-btn" onclick="addConfiguration();">
|
||||
Save
|
||||
Save
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -41,21 +41,21 @@
|
||||
<ul class="list-unstyled">
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">STEP 01</span>
|
||||
Go ahead and [Download] the Device.
|
||||
Go ahead and [Download] the Device.
|
||||
</li>
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">STEP 02</span>
|
||||
Proceed to [Prepare] section.
|
||||
Proceed to [Prepare] section.
|
||||
</li>
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">STEP 03</span>
|
||||
Read [Try Out] section to further experiment with the device.
|
||||
Read [Try Out] section to further experiment with the device.
|
||||
</li>
|
||||
</ul>
|
||||
<br>
|
||||
<a href="/api-store/apis/info?name={{@uriParams.deviceType}}&version=1.0.0&provider=admin"
|
||||
class="btn-operations"
|
||||
target="_blank"><i class="fw fw-api"></i> View API</i>
|
||||
target="_blank"><i class="fw fw-api"></i> View API</i>
|
||||
</a>
|
||||
<a href="#" class="download-link btn-operations">
|
||||
<i class="fw fw-download"></i>Download Agent</a>
|
||||
@ -71,7 +71,7 @@
|
||||
<i class="fw fw-add fw-stack-1x fw-inverse"></i>
|
||||
</span>
|
||||
</span>
|
||||
Add your new firealarm device to {{@app.conf.appName}}
|
||||
Add your new firealarm device to {{@app.conf.appName}}
|
||||
</h4>
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i>
|
||||
</button>
|
||||
@ -99,7 +99,7 @@
|
||||
<input type="radio" name="sketchType" value="virtual_firealarm"
|
||||
id="virtual_firealarm"
|
||||
checked>
|
||||
<label for="simple_agent">Simple Agent</label>
|
||||
<label for="simple_agent">Simple Agent</label>
|
||||
<input type="radio" name="sketchType"
|
||||
value="virtual_firealarm_advanced"
|
||||
id="virtual_firealarm_advanced">
|
||||
@ -148,7 +148,7 @@
|
||||
<div class="buttons">
|
||||
<a href="#" id="device-401-link" class="blue-button">
|
||||
Goto Login Page
|
||||
</a>
|
||||
</a>
|
||||
<a href="#" onclick="hidePopup();" class="btn-operations">
|
||||
Cancel
|
||||
</a>
|
||||
@ -209,19 +209,19 @@
|
||||
<ul class="list-unstyled">
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">01</span>
|
||||
Download your VirtualFireAlarm using [Download Agent] button above.
|
||||
Download your VirtualFireAlarm using [Download Agent] button above.
|
||||
</li>
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">02</span>
|
||||
Unzip the downloaded Agent.
|
||||
Unzip the downloaded Agent.
|
||||
</li>
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">03</span>
|
||||
Move into the unzipped Agent folder in the terminal.
|
||||
Move into the unzipped Agent folder in the terminal.
|
||||
</li>
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">04</span>
|
||||
Unzip the downloaded Agent and start terminal to run this command: [sh
|
||||
Unzip the downloaded Agent and start terminal to run this command: [sh
|
||||
start-device.sh]
|
||||
</li>
|
||||
</ul>
|
||||
@ -244,17 +244,17 @@
|
||||
<ul class="list-unstyled">
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">01</span>
|
||||
You can view all your connected devices at
|
||||
You can view all your connected devices at
|
||||
<a href="{{@app.context}}/devices">[Device Management]</a> page.
|
||||
</li>
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">02</span>
|
||||
Select one of connected devices and check for available control
|
||||
Select one of connected devices and check for available control
|
||||
operations and monitor Real-Time data.
|
||||
</li>
|
||||
<li class="padding-top-double">
|
||||
<span class="circle">03</span>
|
||||
You can also view analytics of the data published to IoT-Server by
|
||||
You can also view analytics of the data published to IoT-Server by
|
||||
navigating to Device Analytics page.
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>iot-plugins</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>appm-connector</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -68,8 +68,8 @@ public class IOSApplicationOperationUtil {
|
||||
appStoreApplication.setPreventBackupOfAppData((Boolean) application.getProperties().
|
||||
get(MDMAppConstants.IOSConstants.IS_PREVENT_BACKUP));
|
||||
appStoreApplication.setBundleId(application.getId());
|
||||
appStoreApplication.setiTunesStoreID((Integer) application.getProperties().
|
||||
get(MDMAppConstants.IOSConstants.I_TUNES_ID));
|
||||
appStoreApplication.setiTunesStoreID(Integer.parseInt((String)application.getProperties().
|
||||
get(MDMAppConstants.IOSConstants.I_TUNES_ID)));
|
||||
operation.setCode(MDMAppConstants.IOSConstants.OPCODE_INSTALL_STORE_APPLICATION);
|
||||
operation.setType(Operation.Type.COMMAND);
|
||||
operation.setPayLoad(appStoreApplication.toJSON());
|
||||
@ -106,7 +106,7 @@ public class IOSApplicationOperationUtil {
|
||||
operation.setCode(MDMAppConstants.IOSConstants.OPCODE_REMOVE_APPLICATION);
|
||||
operation.setType(Operation.Type.PROFILE);
|
||||
RemoveApplication removeApplication = new RemoveApplication();
|
||||
removeApplication.setBundleId(application.getIdentifier());
|
||||
removeApplication.setBundleId(application.getPackageName());
|
||||
operation.setPayLoad(removeApplication.toJSON());
|
||||
return operation;
|
||||
}
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>extensions</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
@ -55,4 +55,5 @@
|
||||
</plugins>
|
||||
</pluginManagement>
|
||||
</build>
|
||||
|
||||
</project>
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<parent>
|
||||
<artifactId>cdmf-adapters</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<parent>
|
||||
<artifactId>cdmf-adapters</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<parent>
|
||||
<artifactId>cdmf-adapters</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<parent>
|
||||
<artifactId>cdmf-adapters</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<parent>
|
||||
<artifactId>cdmf-adapters</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>cdmf-adapters</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>cdmf-adapters</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -360,7 +360,7 @@ public class UIEventAdapter implements OutputEventAdapter {
|
||||
|
||||
// fetch the queryString Key:Value pair map of the given session.
|
||||
Map<String, String> queryParamValuePairs = webSocketSessionUtil.getQueryParamValuePairs();
|
||||
if (queryParamValuePairs != null) {
|
||||
if (queryParamValuePairs != null && !queryParamValuePairs.isEmpty()) {
|
||||
// fetch the different attribute values received as part of the current event.
|
||||
Object[] eventMetaData = event.getMetaData();
|
||||
Object[] eventCorrelationData = event.getCorrelationData();
|
||||
|
||||
@ -113,11 +113,9 @@ public class OAuthTokenValidaterStubFactory extends BasePoolableObjectFactory {
|
||||
client.setOptions(options);
|
||||
if (hostURL.getProtocol().equals("https")) {
|
||||
// set up ssl factory since axis2 https transport is used.
|
||||
EasySSLProtocolSocketFactory sslProtocolSocketFactory =
|
||||
createProtocolSocketFactory();
|
||||
Protocol authhttps = new Protocol(hostURL.getProtocol(),
|
||||
(ProtocolSocketFactory) sslProtocolSocketFactory,
|
||||
hostURL.getPort());
|
||||
EasySSLProtocolSocketFactory sslProtocolSocketFactory = createProtocolSocketFactory();
|
||||
Protocol authhttps = new Protocol(hostURL.getProtocol()
|
||||
, (ProtocolSocketFactory) sslProtocolSocketFactory, hostURL.getPort());
|
||||
Protocol.registerProtocol(hostURL.getProtocol(), authhttps);
|
||||
options.setProperty(HTTPConstants.CUSTOM_PROTOCOL_HANDLER, authhttps);
|
||||
}
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
/*
|
||||
* Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
||||
* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
||||
*
|
||||
* WSO2 Inc. licenses this file to you under the Apache License,
|
||||
* Version 2.0 (the "License"); you may not use this file except
|
||||
* in compliance with the License.
|
||||
* you may obtain a copy of the License at
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
@ -35,7 +35,7 @@ public class WebSocketSessionRequest {
|
||||
|
||||
private static final String QUERY_STRING_SEPERATOR = "&";
|
||||
private static final String QUERY_KEY_VALUE_SEPERATOR = "=";
|
||||
private Map<String, String> queryParamValuePairs = null;
|
||||
private Map<String, String> queryParamValuePairs = new HashMap<>();
|
||||
private Session session;
|
||||
|
||||
public WebSocketSessionRequest(Session session) {
|
||||
@ -65,9 +65,6 @@ public class WebSocketSessionRequest {
|
||||
log.warn("Invalid query string [" + queryString + "] passed in.");
|
||||
break;
|
||||
}
|
||||
if (queryParamValuePairs == null) {
|
||||
queryParamValuePairs = new HashMap<>();
|
||||
}
|
||||
queryParamValuePairs.put(thisQueryParamPair[0], thisQueryParamPair[1]);
|
||||
}
|
||||
}
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<parent>
|
||||
<artifactId>cdmf-adapters</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>extensions</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>android-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -36,7 +36,7 @@ import java.util.List;
|
||||
@XmlAccessorType(XmlAccessType.NONE)
|
||||
@ApiModel(
|
||||
value = "PlatformConfiguration",
|
||||
description = "This class carries all information related to a Tenant configuration"
|
||||
description = "This class carries all the information related to Android platform configurations."
|
||||
)
|
||||
public class AndroidPlatformConfiguration implements Serializable {
|
||||
public static final int INVALID_NOTIFIER_FREQUENCY = -1;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -39,7 +39,7 @@ import java.util.List;
|
||||
tags = {"devicemgt_android"})
|
||||
|
||||
@Api(value = "Android Device Management",
|
||||
description = "This carries all the resources related to Android device management functionalities")
|
||||
description = "This carries all the resources related to the Android device management functionalities.")
|
||||
@Path("/devices")
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
@Consumes(MediaType.APPLICATION_JSON)
|
||||
@ -51,13 +51,14 @@ public interface DeviceManagementService {
|
||||
produces = MediaType.APPLICATION_JSON,
|
||||
consumes = MediaType.APPLICATION_JSON,
|
||||
httpMethod = "PUT",
|
||||
value = "Update the application list of a device",
|
||||
value = "Updating the Application Details on Android Devices",
|
||||
notes = "Update the details of the applications that are installed on Android devices.",
|
||||
tags = "Android Device Management"
|
||||
)
|
||||
@ApiResponses(value = {
|
||||
@ApiResponse(
|
||||
code = 200,
|
||||
message = "OK. \n Application list has been updated successfully",
|
||||
message = "OK. \n Successfully updated the application details.",
|
||||
responseHeaders = {
|
||||
@ResponseHeader(
|
||||
name = "Content-Location",
|
||||
@ -71,17 +72,17 @@ public interface DeviceManagementService {
|
||||
"Used by caches, or in conditional requests."),
|
||||
@ResponseHeader(
|
||||
name = "Last-Modified",
|
||||
description = "Date and time the resource has been modified the last time.\n" +
|
||||
description = "Date and time the resource was last modified.\n" +
|
||||
"Used by caches, or in conditional requests.")}),
|
||||
@ApiResponse(
|
||||
code = 400,
|
||||
message = "Bad Request. \n Invalid request or validation error."),
|
||||
@ApiResponse(
|
||||
code = 404,
|
||||
message = "Not Found. \n Resource to be deleted does not exist."),
|
||||
message = "Not Found. \n The specified resource does not exist."),
|
||||
@ApiResponse(
|
||||
code = 415,
|
||||
message = "Unsupported media type. \n The entity of the request was in a not supported format."),
|
||||
message = "Unsupported media type. \n The format of the requested entity was not supported."),
|
||||
@ApiResponse(
|
||||
code = 500,
|
||||
message = "Internal Server Error. \n " +
|
||||
@ -91,14 +92,14 @@ public interface DeviceManagementService {
|
||||
Response updateApplicationList(
|
||||
@ApiParam(
|
||||
name = "id",
|
||||
value = "Device Identifier")
|
||||
value = "The unique device identifier.")
|
||||
@NotNull
|
||||
@Size(min = 2 , max = 45)
|
||||
@Pattern(regexp = "^[A-Za-z0-9]*$")
|
||||
@PathParam("id") String id,
|
||||
@ApiParam(
|
||||
name = "applications",
|
||||
value = "List of applications that need to be persisted against the device")
|
||||
value = "The properties to update application details. Multiple applications can be updated using comma separated values.")
|
||||
List<AndroidApplication> androidApplications);
|
||||
|
||||
@PUT
|
||||
@ -106,16 +107,18 @@ public interface DeviceManagementService {
|
||||
@ApiOperation(
|
||||
produces = MediaType.APPLICATION_JSON,
|
||||
httpMethod = "PUT",
|
||||
value = "Get the operation list pending for the device",
|
||||
value = "Getting the Pending Operation List",
|
||||
responseContainer = "List",
|
||||
notes = "The Android agent communicates with the server to get the operations that are queued up " +
|
||||
"at the server end for a given device using via this particular resource",
|
||||
"at the server end via this REST API." +
|
||||
" While getting the pending operations the details of the operations executed at the device end is shared with the server. " +
|
||||
"The server then updates the status of the operations that were carried out on the device.",
|
||||
response = Operation.class,
|
||||
tags = "Android Device Management")
|
||||
@ApiResponses(value = {
|
||||
@ApiResponse(
|
||||
code = 200,
|
||||
message = "OK. \n Successfully fetched the pending application list of the Android device.",
|
||||
message = "OK. \n Successfully fetched the pending operations of the Android device.",
|
||||
response = Operation.class,
|
||||
responseContainer = "List",
|
||||
responseHeaders = {
|
||||
@ -128,33 +131,36 @@ public interface DeviceManagementService {
|
||||
"Used by caches, or in conditional requests."),
|
||||
@ResponseHeader(
|
||||
name = "Last-Modified",
|
||||
description = "Date and time the resource has been modified the last time.\n" +
|
||||
description = "Date and time the resource was last modified.\n" +
|
||||
"Used by caches, or in conditional requests.")
|
||||
}),
|
||||
@ApiResponse(
|
||||
code = 304,
|
||||
message = "Not Modified. \n Empty body because the client has already the latest version of the requested resource."),
|
||||
message = "Not Modified. \n Empty body because the client already has the latest version of the requested resource."),
|
||||
@ApiResponse(
|
||||
code = 406,
|
||||
message = "Not Acceptable.\n The requested media type is not supported"),
|
||||
@ApiResponse(
|
||||
code = 500,
|
||||
message = "Internal Server Error. \n Server error occurred while fetching policies.")
|
||||
message = "Internal Server Error. \n Server error occurred while fetching the list of pending operations.")
|
||||
})
|
||||
@Permission(name = "Enroll Device", permission = "/device-mgt/devices/enroll/android")
|
||||
Response getPendingOperations(
|
||||
@ApiParam(
|
||||
name = "id",
|
||||
value = "Device Identifier")
|
||||
value = "The unique device identifier.",
|
||||
required = true)
|
||||
@PathParam("id") String id,
|
||||
@ApiParam(
|
||||
name = "If-Modified-Since",
|
||||
value = "Validates if the requested variant has not been modified since the time specified",
|
||||
value = "Checks if the requested variant was modified, since the specified date-time.\n" +
|
||||
"Provide the value in the following format: EEE, d MMM yyyy HH:mm:ss Z.\n" +
|
||||
"Example: Mon, 05 Jan 2014 15:10:00 +0200.",
|
||||
required = false)
|
||||
@HeaderParam("If-Modified-Since") String ifModifiedSince,
|
||||
@ApiParam(
|
||||
name = "resultOperations",
|
||||
value = "Device Operation Status")
|
||||
value = "Properties to update the device operations and their status.")
|
||||
List<? extends Operation> resultOperations);
|
||||
|
||||
@POST
|
||||
@ -162,17 +168,17 @@ public interface DeviceManagementService {
|
||||
produces = MediaType.APPLICATION_JSON,
|
||||
consumes = MediaType.APPLICATION_JSON,
|
||||
httpMethod = "POST",
|
||||
value = "Register an Android Device",
|
||||
notes = "When carrying out device registration via an Android device, you need to initially install" +
|
||||
" an Android Agent on the device, before being able to register the device with WSO2 EMM. Instead," +
|
||||
value = "Registering an Android Device",
|
||||
notes = "When registering an Android device, you need to install" +
|
||||
" the Android Agent on the device, before being able to register the device with WSO2 EMM. Instead," +
|
||||
" you can use this REST API to register an Android device with WSO2 EMM, without having to install" +
|
||||
" an Android Agent on the respective device",
|
||||
" an Android Agent. This API can be mainly used to test the device enrollment process.",
|
||||
tags = "Android Device Management"
|
||||
)
|
||||
@ApiResponses(value = {
|
||||
@ApiResponse(
|
||||
code = 201,
|
||||
message = "Created. \n Device enrollment has successfully been created",
|
||||
message = "Created. \n Successfully created an instance of the device.",
|
||||
responseHeaders = {
|
||||
@ResponseHeader(
|
||||
name = "Content-Location",
|
||||
@ -186,11 +192,11 @@ public interface DeviceManagementService {
|
||||
"Used by caches, or in conditional requests."),
|
||||
@ResponseHeader(
|
||||
name = "Last-Modified",
|
||||
description = "Date and time the resource has been modified the last time.\n" +
|
||||
description = "Date and time the resource was last modified.\n" +
|
||||
"Used by caches, or in conditional requests.")}),
|
||||
@ApiResponse(
|
||||
code = 303,
|
||||
message = "See Other. \n Source can be retrieved from the URL specified at the Location header.",
|
||||
message = "See Other. \n The source can be retrieved from the URL specified in the location header.",
|
||||
responseHeaders = {
|
||||
@ResponseHeader(
|
||||
name = "Content-Location",
|
||||
@ -200,14 +206,16 @@ public interface DeviceManagementService {
|
||||
message = "Bad Request. \n Invalid request or validation error."),
|
||||
@ApiResponse(
|
||||
code = 415,
|
||||
message = "Unsupported media type. \n The entity of the request was in a not supported format."),
|
||||
message = "Unsupported media type. \n The format of the requested entity was not supported.\n"),
|
||||
@ApiResponse(
|
||||
code = 500,
|
||||
message = "Internal Server Error. \n " +
|
||||
"Server error occurred while adding a new device.")
|
||||
})
|
||||
@Permission(name = "Enroll Device", permission = "/device-mgt/devices/enroll/android")
|
||||
Response enrollDevice(@ApiParam(name = "device", value = "Device Information to be enroll")
|
||||
Response enrollDevice(@ApiParam(
|
||||
name = "device",
|
||||
value = "The properties required to enroll a device.")
|
||||
@Valid AndroidDevice device);
|
||||
|
||||
@GET
|
||||
@ -215,7 +223,7 @@ public interface DeviceManagementService {
|
||||
@ApiOperation(
|
||||
httpMethod = "GET",
|
||||
value = "Getting the Registration Status of an Android Device",
|
||||
notes = "Use this REST API to retrieve the registration status of an Android device",
|
||||
notes = "Use this REST API to retrieve the registration status of an Android device.",
|
||||
tags = "Android Device Management"
|
||||
)
|
||||
@ApiResponses(value = {
|
||||
@ -232,12 +240,12 @@ public interface DeviceManagementService {
|
||||
"Used by caches, or in conditional requests."),
|
||||
@ResponseHeader(
|
||||
name = "Last-Modified",
|
||||
description = "Date and time the resource has been modified the last time.\n" +
|
||||
description = "Date and time the resource was last modified.\n" +
|
||||
"Used by caches, or in conditional requests."),
|
||||
}),
|
||||
@ApiResponse(
|
||||
code = 304,
|
||||
message = "Not Modified. \n Empty body because the client has already the latest version of the requested resource."),
|
||||
message = "Not Modified. \n Empty body because the client already has the latest version of the requested resource."),
|
||||
@ApiResponse(
|
||||
code = 406,
|
||||
message = "Not Acceptable.\n The requested media type is not supported"),
|
||||
@ -249,11 +257,13 @@ public interface DeviceManagementService {
|
||||
Response isEnrolled(
|
||||
@ApiParam(
|
||||
name = "id",
|
||||
value = "Device Identifier")
|
||||
value = "The unique device identifier")
|
||||
@PathParam("id") String id,
|
||||
@ApiParam(
|
||||
name = "If-Modified-Since",
|
||||
value = "Validates if the requested variant has not been modified since the time specified",
|
||||
value = "Checks if the requested variant was modified, since the specified date-time.\n" +
|
||||
"Provide the value in the following format: EEE, d MMM yyyy HH:mm:ss Z.\n" +
|
||||
"Example: Mon, 05 Jan 2014 15:10:00 +0200",
|
||||
required = false)
|
||||
@HeaderParam("If-Modified-Since") String ifModifiedSince);
|
||||
|
||||
@ -262,14 +272,14 @@ public interface DeviceManagementService {
|
||||
@ApiOperation(
|
||||
httpMethod = "PUT",
|
||||
value = "Updating the Registration Details of an Android Device",
|
||||
notes = "Use this REST API to update the registration details of an Android device",
|
||||
notes = "Use this REST API to update the registration details of an Android device.",
|
||||
tags = "Android Device Management"
|
||||
)
|
||||
@ApiResponses(
|
||||
value = {
|
||||
@ApiResponse(
|
||||
code = 200,
|
||||
message = "OK. \n Device enrollment has been updated successfully",
|
||||
message = "OK. \n Successfully updated the device enrollment details.",
|
||||
responseHeaders = {
|
||||
@ResponseHeader(
|
||||
name = "Content-Location",
|
||||
@ -283,17 +293,17 @@ public interface DeviceManagementService {
|
||||
"Used by caches, or in conditional requests."),
|
||||
@ResponseHeader(
|
||||
name = "Last-Modified",
|
||||
description = "Date and time the resource has been modified the last time.\n" +
|
||||
description = "Date and time the resource was last modified.\n" +
|
||||
"Used by caches, or in conditional requests.")}),
|
||||
@ApiResponse(
|
||||
code = 400,
|
||||
message = "Bad Request. \n Invalid request or validation error."),
|
||||
@ApiResponse(
|
||||
code = 404,
|
||||
message = "Not Found. \n Resource to be deleted does not exist."),
|
||||
message = "Not Found. \n The specified resource does not exist."),
|
||||
@ApiResponse(
|
||||
code = 415,
|
||||
message = "Unsupported media type. \n The entity of the request was in a not supported format."),
|
||||
message = "Unsupported media type. \n The format of the requested entity was not supported."),
|
||||
@ApiResponse(
|
||||
code = 500,
|
||||
message = "Internal Server Error. \n " +
|
||||
@ -303,27 +313,27 @@ public interface DeviceManagementService {
|
||||
Response modifyEnrollment(
|
||||
@ApiParam(
|
||||
name = "id",
|
||||
value = "Device Identifier")
|
||||
value = "The unique device identifier.")
|
||||
@PathParam("id") String id,
|
||||
@ApiParam(
|
||||
name = "device",
|
||||
value = "Device information to be modify") @Valid AndroidDevice androidDevice);
|
||||
value = "The properties of required to update device enrollment details.") @Valid AndroidDevice androidDevice);
|
||||
|
||||
@DELETE
|
||||
@Path("/{id}")
|
||||
@ApiOperation(
|
||||
httpMethod = "DELETE",
|
||||
value = "Un-register an Android Device",
|
||||
notes = "Use this REST API to un-register a specific Android device",
|
||||
value = "Unregistering an Android Device",
|
||||
notes = "Use this REST API to unregister an Android device.",
|
||||
tags = "Android Device Management"
|
||||
)
|
||||
@ApiResponses(value = {
|
||||
@ApiResponse(
|
||||
code = 200,
|
||||
message = "OK. \n Device has successfully been dis-enrolled"),
|
||||
message = "OK. \n Successfully disenrolled the device."),
|
||||
@ApiResponse(
|
||||
code = 404,
|
||||
message = "Not Found. \n Resource to be deleted does not exist."),
|
||||
message = "Not Found. \n The specified resource does not exist."),
|
||||
@ApiResponse(
|
||||
code = 500,
|
||||
message = "Internal Server Error. \n " +
|
||||
@ -333,7 +343,7 @@ public interface DeviceManagementService {
|
||||
Response disEnrollDevice(
|
||||
@ApiParam(
|
||||
name = "id",
|
||||
value = "Device Identifier")
|
||||
value = "The unique device identifier.")
|
||||
@PathParam("id") String id);
|
||||
|
||||
}
|
||||
|
||||
@ -34,8 +34,7 @@ import javax.ws.rs.core.Response;
|
||||
context = "/api/device-mgt/android/v1.0/configuration",
|
||||
tags = {"devicemgt_android"})
|
||||
|
||||
@Api(value = "Android Configuration Management", description = "This API carries all resource associated with " +
|
||||
"manipulating the general configurations of Android platform")
|
||||
@Api(value = "Android Configuration Management", description = "This API carries all the resource used to mange the Android platform configurations.")
|
||||
@Path("/configuration")
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
@Consumes(MediaType.APPLICATION_JSON)
|
||||
@ -46,14 +45,14 @@ public interface DeviceTypeConfigurationService {
|
||||
produces = MediaType.APPLICATION_JSON,
|
||||
httpMethod = "GET",
|
||||
value = "Getting Android Platform Configurations",
|
||||
notes = "Get the Android platform configuration details using this REST API",
|
||||
notes = "Get the Android platform configuration details using this REST API.",
|
||||
response = PlatformConfiguration.class,
|
||||
tags = "Android Configuration Management"
|
||||
)
|
||||
@ApiResponses(value = {
|
||||
@ApiResponse(
|
||||
code = 200,
|
||||
message = "OK. \n Successfully fetched Android platform configuration.",
|
||||
message = "OK. \n Successfully fetched the Android platform configurations.",
|
||||
response = PlatformConfiguration.class,
|
||||
responseHeaders = {
|
||||
@ResponseHeader(
|
||||
@ -65,27 +64,29 @@ public interface DeviceTypeConfigurationService {
|
||||
"Used by caches, or in conditional requests."),
|
||||
@ResponseHeader(
|
||||
name = "Last-Modified",
|
||||
description = "Date and time the resource has been modified the last time.\n" +
|
||||
description = "Date and time the resource was last modified.\n" +
|
||||
"Used by caches, or in conditional requests."),
|
||||
}),
|
||||
@ApiResponse(
|
||||
code = 304,
|
||||
message = "Not Modified. \n Empty body because the client has already the latest version of the requested resource."),
|
||||
message = "Not Modified. \n Empty body because the client already has the latest version of the requested resource."),
|
||||
@ApiResponse(
|
||||
code = 404,
|
||||
message = "Not Found. \n Resource to be deleted does not exist."),
|
||||
message = "Not Found. \n The specified resource does not exist."),
|
||||
@ApiResponse(
|
||||
code = 406,
|
||||
message = "Not Acceptable.\n The requested media type is not supported"),
|
||||
@ApiResponse(
|
||||
code = 500,
|
||||
message = "Internal Server Error. \n Server error occurred while fetching Android platform configuration.")
|
||||
message = "Internal Server Error. \n Server error occurred while fetching the Android platform configuration.")
|
||||
})
|
||||
@Permission(name = "View Configurations", permission = "/device-mgt/platform-configurations/view")
|
||||
Response getConfiguration(
|
||||
@ApiParam(
|
||||
name = "If-Modified-Since",
|
||||
value = "Validates if the requested variant has not been modified since the time specified",
|
||||
value = "Checks if the requested variant was modified, since the specified date-time.\n" +
|
||||
"Provide the value in the following format: EEE, d MMM yyyy HH:mm:ss Z.\n" +
|
||||
"Example: Mon, 05 Jan 2014 15:10:00 +0200",
|
||||
required = false)
|
||||
@HeaderParam("If-Modified-Since") String ifModifiedSince);
|
||||
|
||||
@ -94,14 +95,14 @@ public interface DeviceTypeConfigurationService {
|
||||
consumes = MediaType.APPLICATION_JSON,
|
||||
produces = MediaType.APPLICATION_JSON,
|
||||
httpMethod = "PUT",
|
||||
value = "Updating Android Platform Configuration.",
|
||||
value = "Updating Android Platform Configurations",
|
||||
notes = "Update the Android platform configurations using this REST API.",
|
||||
tags = "Android Configuration Management"
|
||||
)
|
||||
@ApiResponses(value = {
|
||||
@ApiResponse(
|
||||
code = 200,
|
||||
message = "OK. \n Android platform configuration has been updated successfully",
|
||||
message = "OK. \n Successfully updated the Android platform configurations.",
|
||||
responseHeaders = {
|
||||
@ResponseHeader(
|
||||
name = "Content-Location",
|
||||
@ -115,26 +116,26 @@ public interface DeviceTypeConfigurationService {
|
||||
"Used by caches, or in conditional requests."),
|
||||
@ResponseHeader(
|
||||
name = "Last-Modified",
|
||||
description = "Date and time the resource has been modified the last time.\n" +
|
||||
description = "Date and time the resource was last modified.\n" +
|
||||
"Used by caches, or in conditional requests.")}),
|
||||
@ApiResponse(
|
||||
code = 400,
|
||||
message = "Bad Request. \n Invalid request or validation error."),
|
||||
@ApiResponse(
|
||||
code = 404,
|
||||
message = "Not Found. \n Resource to be deleted does not exist."),
|
||||
message = "Not Found. \n The specified resource does not exist."),
|
||||
@ApiResponse(
|
||||
code = 415,
|
||||
message = "Unsupported media type. \n The entity of the request was in a not supported format."),
|
||||
message = "Unsupported media type. \n The format of the requested entity was not supported."),
|
||||
@ApiResponse(
|
||||
code = 500,
|
||||
message = "Internal Server Error. \n " +
|
||||
"Server error occurred while modifying Android platform configuration.")
|
||||
"Server error occurred while modifying the Android platform configuration.")
|
||||
})
|
||||
@Permission(name = "Manage Configurations", permission = "/device-mgt/platform-configurations/manage")
|
||||
Response updateConfiguration(
|
||||
@ApiParam(name = "configuration",
|
||||
value = "AndroidPlatformConfiguration")
|
||||
value = "The properties to update the Android platform configurations.")
|
||||
@Valid AndroidPlatformConfiguration androidPlatformConfiguration);
|
||||
|
||||
@GET
|
||||
@ -143,9 +144,9 @@ public interface DeviceTypeConfigurationService {
|
||||
@ApiOperation(
|
||||
produces = MediaType.TEXT_PLAIN,
|
||||
httpMethod = "GET",
|
||||
value = "Getting the License Agreement for Android Device Registration",
|
||||
value = "Getting the License Agreement for the Android Device Registration",
|
||||
notes = "Use this REST API to retrieve the license agreement that is used for the Android device " +
|
||||
"registration process",
|
||||
"registration process.",
|
||||
response = String.class,
|
||||
tags = "Android Configuration Management")
|
||||
@ApiResponses(value = {
|
||||
@ -163,27 +164,29 @@ public interface DeviceTypeConfigurationService {
|
||||
"Used by caches, or in conditional requests."),
|
||||
@ResponseHeader(
|
||||
name = "Last-Modified",
|
||||
description = "Date and time the resource has been modified the last time.\n" +
|
||||
description = "Date and time the resource was last modified.\n" +
|
||||
"Used by caches, or in conditional requests."),
|
||||
}),
|
||||
@ApiResponse(
|
||||
code = 304,
|
||||
message = "Not Modified. \n Empty body because the client has already the latest version of the requested resource."),
|
||||
message = "Not Modified. \n Empty body because the client already has the latest version of the requested resource."),
|
||||
@ApiResponse(
|
||||
code = 404,
|
||||
message = "Not Found. \n Resource to be deleted does not exist."),
|
||||
message = "Not Found. \n The specified resource does not exist."),
|
||||
@ApiResponse(
|
||||
code = 406,
|
||||
message = "Not Acceptable.\n The requested media type is not supported"),
|
||||
@ApiResponse(
|
||||
code = 500,
|
||||
message = "Internal Server Error. \n Server error occurred while fetching Android license configuration.")
|
||||
message = "Internal Server Error. \n Server error occurred while fetching the Android license configuration.")
|
||||
})
|
||||
@Permission(name = "Enroll Device", permission = "/device-mgt/devices/enroll/android")
|
||||
Response getLicense(
|
||||
@ApiParam(
|
||||
name = "If-Modified-Since",
|
||||
value = "Validates if the requested variant has not been modified since the time specified",
|
||||
value = "Checks if the requested variant was modified, since the specified date-time.\n" +
|
||||
"Provide the value in the following format: EEE, d MMM yyyy HH:mm:ss Z.\n" +
|
||||
"Example: Mon, 05 Jan 2014 15:10:00 +0200.",
|
||||
required = false)
|
||||
@HeaderParam("If-Modified-Since") String ifModifiedSince) throws AndroidAgentException;
|
||||
|
||||
|
||||
@ -35,9 +35,9 @@ import javax.ws.rs.core.Response;
|
||||
context = "/api/device-mgt/android/v1.0/events",
|
||||
tags = {"devicemgt_android"})
|
||||
|
||||
@Api(value = "Event Receiver", description = "Event publishing/retrieving related APIs.To enable Eventing need to" +
|
||||
" configure as ref-https://docs.wso2.com/display/EMM210/Managing+Event+Publishing+with+WSO2+Data+Analytics+Server, " +
|
||||
"https://docs.wso2.com/display/EMM210/Creating+a+New+Event+Stream+and+Receiver")
|
||||
@Api(value = "Event Receiver", description = "Event publishing/retrieving related APIs. To enable event publishing/retrieving you need to" +
|
||||
" configure WSO2 EMM as explained in https://docs.wso2.com/display/EMM220/Managing+Event+Publishing+with+WSO2+Data+Analytics+Server, " +
|
||||
"https://docs.wso2.com/display/EMM220/Creating+a+New+Event+Stream+and+Receiver")
|
||||
@Path("/events")
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
@Consumes(MediaType.APPLICATION_JSON)
|
||||
@ -49,13 +49,13 @@ public interface EventReceiverService {
|
||||
produces = MediaType.APPLICATION_JSON,
|
||||
consumes = MediaType.APPLICATION_JSON,
|
||||
httpMethod = "POST",
|
||||
value = "Event publishing via REST API.",
|
||||
notes = "Publish events received by the EMM Android client to WSO2 DAS using this API.",
|
||||
value = "Publishing Events",
|
||||
notes = "Publish events received by the WSO2 EMM Android client to the WSO2 Data Analytics Server (DAS) using this API.",
|
||||
tags = "Event Receiver"
|
||||
)
|
||||
@ApiResponses(
|
||||
value = {
|
||||
@ApiResponse(code = 201, message = "Created. \n Event is published successfully. Location header " +
|
||||
@ApiResponse(code = 201, message = "Created. \n Successfully published the event. Location header " +
|
||||
"contains URL of newly enrolled device",
|
||||
responseHeaders = {
|
||||
@ResponseHeader(
|
||||
@ -70,12 +70,12 @@ public interface EventReceiverService {
|
||||
"Used by caches, or in conditional requests."),
|
||||
@ResponseHeader(
|
||||
name = "Last-Modified",
|
||||
description = "Date and time the resource has been modified the last time.\n" +
|
||||
description = "Date and time the resource was last modified.\n" +
|
||||
"Used by caches, or in conditional requests.")
|
||||
}),
|
||||
@ApiResponse(
|
||||
code = 303,
|
||||
message = "See Other. \n Source can be retrieved from the URL specified at the Location header.",
|
||||
message = "See Other. \n The source can be retrieved from the URL specified in the location header.",
|
||||
responseHeaders = {
|
||||
@ResponseHeader(
|
||||
name = "Content-Location",
|
||||
@ -85,7 +85,7 @@ public interface EventReceiverService {
|
||||
message = "Bad Request. \n Invalid request or validation error."),
|
||||
@ApiResponse(
|
||||
code = 415,
|
||||
message = "Unsupported media type. \n The entity of the request was in a not supported format."),
|
||||
message = "Unsupported media type. \n The format of the requested entity was not supported."),
|
||||
@ApiResponse(
|
||||
code = 500,
|
||||
message = "Internal Server Error. \n " +
|
||||
@ -104,10 +104,10 @@ public interface EventReceiverService {
|
||||
produces = MediaType.APPLICATION_JSON,
|
||||
httpMethod = "GET",
|
||||
value = "Getting event details for a given time period.",
|
||||
notes = "Get the event details of a device for a given time duration using this API.Request must contain " +
|
||||
"the device identifier. Optionally, both, date from and date to value should be present to get " +
|
||||
"alerts between times. Based on device type and the device identifier also filtering can be done" +
|
||||
"(This cannot be combined with to and from parameters).",
|
||||
notes = "Get the event details of a device for a given time duration using this API. The request must contain " +
|
||||
"the device identifier. Optionally, both date from and date to value should be present to get " +
|
||||
"alerts between a specified time. Filtering can also be done based on the device type and the device identifier." +
|
||||
"(This cannot be combined with the to and from parameters).",
|
||||
response = DeviceState.class,
|
||||
responseContainer = "List",
|
||||
tags = "Event Receiver"
|
||||
@ -116,12 +116,11 @@ public interface EventReceiverService {
|
||||
value = {
|
||||
@ApiResponse(
|
||||
code = 200,
|
||||
message = "OK. \n Event details of a device for a given time duration have been successfully fetched",
|
||||
message = "OK. \n Successfully fetched the event details of the specified device for a given time duration.",
|
||||
response = DeviceState.class, responseContainer = "List"),
|
||||
@ApiResponse(
|
||||
code = 303,
|
||||
message = "See Other. \n Source can be retrieved from the URL specified at" +
|
||||
" the Location header.",
|
||||
message = "See Other. \n The source can be retrieved from the URL specified in the location header.",
|
||||
responseHeaders = {
|
||||
@ResponseHeader(name = "Content-Location", description = "Source URL of the document.")
|
||||
}),
|
||||
@ -132,39 +131,44 @@ public interface EventReceiverService {
|
||||
@ApiResponse(
|
||||
code = 400,
|
||||
message = "Bad Request. \n Invalid request or validation error. You must provide" +
|
||||
" the device identifier. Additionally, the device identifier can be combined with either the type" +
|
||||
" OR date from and to."),
|
||||
" the device identifier. Additionally, the device identifier can be combined with either the device type" +
|
||||
" OR the from and to date."),
|
||||
@ApiResponse(
|
||||
code = 404,
|
||||
message = "Not Found. \n Resource requested does not exist."),
|
||||
message = "Not Found. \n The specified resource does not exist."),
|
||||
@ApiResponse(
|
||||
code = 500,
|
||||
message = "Error occurred while getting published events for specific device.")
|
||||
message = "Error occurred while getting the published events for the specified device.")
|
||||
})
|
||||
@Permission(name = "Publish Events to DAS", permission = "/device-mgt/devices/enroll/android")
|
||||
Response retrieveAlerts(
|
||||
@ApiParam(
|
||||
name = "id",
|
||||
value = "Device Identifier to be need to retrieve events.",
|
||||
value = "The unique device identifier.",
|
||||
required = true)
|
||||
@Size(min = 2, max = 45)
|
||||
@QueryParam("id") String deviceId,
|
||||
@ApiParam(
|
||||
name = "from",
|
||||
value = "From Date.")
|
||||
value = "Specify the time and date from when you want to get the data." +
|
||||
"Provide the time and date format in the unix/epoch format as the value for {unixTimestamp}. Use a Epoch convertor, to convert the time and date to this format.")
|
||||
@QueryParam("from") long from,
|
||||
@ApiParam(
|
||||
name = "to",
|
||||
value = "To Date.")
|
||||
value = "Specify the time and date up to when you require the data." +
|
||||
"Provide the time and date format in the unix/epoch format as the value for {unixTimestamp}. Use a Epoch convertor, to convert the time and date to this format.")
|
||||
@QueryParam("to") long to,
|
||||
@ApiParam(
|
||||
name = "type",
|
||||
value = "Type of the Alert to be need to retrieve events.")
|
||||
value = "The alert type to retrieve the events." +
|
||||
"Provide APPLICATION_STATE or RUNTIME_STATE as the value.")
|
||||
@Size(min = 2, max = 45)
|
||||
@QueryParam("type") String type,
|
||||
@ApiParam(
|
||||
name = "If-Modified-Since",
|
||||
value = "Validates if the requested variant has not been modified since the time specified",
|
||||
value = "Checks if the requested variant was modified, since the specified date-time.\n" +
|
||||
"Provide the value in the following format: EEE, d MMM yyyy HH:mm:ss Z.\n" +
|
||||
"Example: Mon, 05 Jan 2014 15:10:00 +0200",
|
||||
required = false)
|
||||
@HeaderParam("If-Modified-Since") String ifModifiedSince);
|
||||
|
||||
|
||||
@ -1072,7 +1072,7 @@ public class DeviceManagementAdminServiceImpl implements DeviceManagementAdminSe
|
||||
|
||||
private static void validateScheduleDate(String dateString){
|
||||
try {
|
||||
if (dateString != null) {
|
||||
if (dateString != null && !dateString.isEmpty()) {
|
||||
SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT);
|
||||
sdf.setLenient(false);
|
||||
sdf.parse(dateString);
|
||||
|
||||
@ -24,7 +24,7 @@ import org.apache.commons.logging.LogFactory;
|
||||
import org.wso2.carbon.analytics.api.AnalyticsDataAPI;
|
||||
import org.wso2.carbon.analytics.dataservice.commons.AnalyticsDataResponse;
|
||||
import org.wso2.carbon.analytics.dataservice.commons.SearchResultEntry;
|
||||
import org.wso2.carbon.analytics.dataservice.core.AnalyticsDataServiceUtils;
|
||||
import org.wso2.carbon.analytics.api.AnalyticsDataAPIUtil;
|
||||
import org.wso2.carbon.analytics.datasource.commons.Record;
|
||||
import org.wso2.carbon.analytics.datasource.commons.exception.AnalyticsException;
|
||||
import org.wso2.carbon.context.CarbonContext;
|
||||
@ -218,7 +218,7 @@ public class AndroidAPIUtils {
|
||||
List<SearchResultEntry> resultEntries = analyticsDataAPI.search(tenantId, tableName, query, 0, eventCount);
|
||||
List<String> recordIds = getRecordIds(resultEntries);
|
||||
AnalyticsDataResponse response = analyticsDataAPI.get(tenantId, tableName, 1, null, recordIds);
|
||||
Map<String, DeviceState> deviceStateses = createDeviceStatusData(AnalyticsDataServiceUtils.listRecords(
|
||||
Map<String, DeviceState> deviceStateses = createDeviceStatusData(AnalyticsDataAPIUtil.listRecords(
|
||||
analyticsDataAPI, response));
|
||||
return getSortedDeviceStateData(deviceStateses, resultEntries);
|
||||
}
|
||||
|
||||
@ -51,7 +51,7 @@
|
||||
<property name="version" value="1.0"/>
|
||||
<property name="host" value="localhost:9443"/>
|
||||
<property name="schemes" value="https" />
|
||||
<property name="basePath" value="/api-device-mgt-android-v1.0"/>
|
||||
<property name="basePath" value="/api/device-mgt/android/v1.0"/>
|
||||
<property name="title" value="Android Device Management API Definitions"/>
|
||||
<property name="contact" value="dev@wso2.org"/>
|
||||
<property name="license" value="Apache 2.0"/>
|
||||
|
||||
@ -23,13 +23,13 @@
|
||||
<parent>
|
||||
<artifactId>android-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>org.wso2.carbon.device.mgt.mobile.android.ui</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<name>WSO2 Carbon - Mobile Android UI</name>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
|
||||
@ -55,9 +55,9 @@
|
||||
<div class="panel-body">
|
||||
<div id="policy-spinner" class="wr-advance-operations-init hidden">
|
||||
<br>
|
||||
|
||||
|
||||
<i class="fw fw-settings fw-spin fw-2x"></i>
|
||||
|
||||
|
||||
Loading Policies . . .
|
||||
<br>
|
||||
<br>
|
||||
@ -85,9 +85,9 @@
|
||||
<div id="policy-spinner"
|
||||
class="wr-advance-operations-init hidden">
|
||||
<br>
|
||||
|
||||
|
||||
<i class="fw fw-settings fw-spin fw-2x"></i>
|
||||
|
||||
|
||||
Loading Policy Compliance . . .
|
||||
<br>
|
||||
<br>
|
||||
@ -123,9 +123,9 @@
|
||||
<div class="panel-body">
|
||||
<div id="apps-spinner" class="wr-advance-operations-init hidden">
|
||||
<br>
|
||||
|
||||
|
||||
<i class="fw fw-settings fw-spin fw-2x"></i>
|
||||
|
||||
|
||||
Loading App List . . .
|
||||
<br>
|
||||
<br>
|
||||
@ -147,9 +147,9 @@
|
||||
<div id="operations-spinner"
|
||||
class="wr-advance-operations-init hidden">
|
||||
<br>
|
||||
|
||||
|
||||
<i class="fw fw-settings fw-spin fw-2x"></i>
|
||||
|
||||
|
||||
Loading Operations Log . . .
|
||||
<br>
|
||||
<br>
|
||||
|
||||
@ -14,8 +14,8 @@
|
||||
<div class="wr-advance-operations">
|
||||
<div class="wr-advance-operations-init">
|
||||
<br>
|
||||
<i class="fw fw-settings fw-spin fw-2x"></i>
|
||||
Loading platform features . . .
|
||||
<i class="fw fw-settings fw-spin fw-2x"></i>
|
||||
Loading platform features . . .
|
||||
<br><br>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
{
|
||||
"deviceType": {
|
||||
"label": "Android",
|
||||
"category" : "mobile"
|
||||
"category": "mobile",
|
||||
"analyticsEnabled": "false",
|
||||
"groupingEnabled": "false"
|
||||
}
|
||||
}
|
||||
|
||||
@ -21,13 +21,13 @@
|
||||
<h3 class="uppercase">What You Need</h3>
|
||||
<hr>
|
||||
<ul class="list-unstyled">
|
||||
<li class="padding-top-double"><span class="circle">STEP 01</span> Android
|
||||
<li class="padding-top-double"><span class="circle">STEP 01</span> Android
|
||||
Mobile.
|
||||
</li>
|
||||
<li class="padding-top-double"><span class="circle">STEP 02</span> Go ahead
|
||||
<li class="padding-top-double"><span class="circle">STEP 02</span> Go ahead
|
||||
and click [Enroll Device].
|
||||
</li>
|
||||
<li class="padding-top-double"><span class="circle">STEP 03</span> Proceed
|
||||
<li class="padding-top-double"><span class="circle">STEP 03</span> Proceed
|
||||
to the [Prepare] section.
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>android-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>mobile-plugins</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>windows-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -50,7 +50,7 @@ public interface ConfigurationMgtService {
|
||||
produces = MediaType.APPLICATION_JSON,
|
||||
httpMethod = "GET",
|
||||
value = "Getting Windows Platform Configurations",
|
||||
notes = "Get the Windows platform configuration details using this REST API",
|
||||
notes = "Get the Windows platform configuration details using this REST API.",
|
||||
response = PlatformConfiguration.class,
|
||||
tags = "Windows Configuration Management"
|
||||
)
|
||||
@ -74,16 +74,16 @@ public interface ConfigurationMgtService {
|
||||
}),
|
||||
@ApiResponse(
|
||||
code = 304,
|
||||
message = "Not Modified. \n Empty body because the client has already the latest version of the requested resource."),
|
||||
message = "Not Modified. \n Applications can be blacklisted via the application restriction policy too.."),
|
||||
@ApiResponse(
|
||||
code = 404,
|
||||
message = "Not Found. \n Resource to be deleted does not exist."),
|
||||
message = "Not Found. \n Th resource to be deleted does not exist."),
|
||||
@ApiResponse(
|
||||
code = 406,
|
||||
message = "Not Acceptable.\n The requested media type is not supported"),
|
||||
message = "Not Acceptable.\n The requested media type is not supported."),
|
||||
@ApiResponse(
|
||||
code = 500,
|
||||
message = "Internal Server Error. \n Server error occurred while fetching Windows platform configuration.")
|
||||
message = "Internal Server Error. \n Server error occurred while fetching the Windows platform configuration.")
|
||||
})
|
||||
@Permission(name = "View Configurations", permission = "/device-mgt/platform-configurations/view")
|
||||
PlatformConfiguration getConfiguration() throws WindowsConfigurationException;
|
||||
@ -100,14 +100,14 @@ public interface ConfigurationMgtService {
|
||||
consumes = MediaType.APPLICATION_JSON,
|
||||
produces = MediaType.APPLICATION_JSON,
|
||||
httpMethod = "PUT",
|
||||
value = "Updating Windows Platform Configuration.",
|
||||
value = "Updating Windows Platform Configurations",
|
||||
notes = "Update the Windows platform configurations using this REST API.",
|
||||
tags = "Windows Configuration Management"
|
||||
)
|
||||
@ApiResponses(value = {
|
||||
@ApiResponse(
|
||||
code = 200,
|
||||
message = "OK. \n Windows platform configuration has been updated successfully",
|
||||
message = "OK. \n Successfully updated the Windows platform configurations.",
|
||||
responseHeaders = {
|
||||
@ResponseHeader(
|
||||
name = "Content-Location",
|
||||
@ -121,25 +121,28 @@ public interface ConfigurationMgtService {
|
||||
"Used by caches, or in conditional requests."),
|
||||
@ResponseHeader(
|
||||
name = "Last-Modified",
|
||||
description = "Date and time the resource has been modified the last time.\n" +
|
||||
description = "Date and time the resource was last modified.\n" +
|
||||
"Used by caches, or in conditional requests.")}),
|
||||
@ApiResponse(
|
||||
code = 400,
|
||||
message = "Bad Request. \n Invalid request or validation error."),
|
||||
@ApiResponse(
|
||||
code = 404,
|
||||
message = "Not Found. \n Resource to be deleted does not exist."),
|
||||
message = "Not Found. \n The specified resource does not exist."),
|
||||
@ApiResponse(
|
||||
code = 415,
|
||||
message = "Unsupported media type. \n The entity of the request was in a not supported format."),
|
||||
message = "Unsupported media type. \n The format of the requested entity was not supported."),
|
||||
@ApiResponse(
|
||||
code = 500,
|
||||
message = "Internal Server Error. \n " +
|
||||
"Server error occurred while modifying Windows platform configuration.")
|
||||
"Server error occurred while modifying the Windows platform configurations.")
|
||||
})
|
||||
@Permission(name = "Manage Configurations", permission = "/device-mgt/configurations/manage")
|
||||
Message updateConfiguration( @ApiParam(name = "configuration",
|
||||
value = "PlatformConfiguration")PlatformConfiguration configuration) throws WindowsConfigurationException;
|
||||
Message updateConfiguration
|
||||
( @ApiParam(
|
||||
name = "configuration",
|
||||
value = "The properties to update the Windows platform configurations.")
|
||||
PlatformConfiguration configuration) throws WindowsConfigurationException;
|
||||
|
||||
@GET
|
||||
@Path("license")
|
||||
@ -147,9 +150,9 @@ public interface ConfigurationMgtService {
|
||||
@ApiOperation(
|
||||
produces = MediaType.TEXT_PLAIN,
|
||||
httpMethod = "GET",
|
||||
value = "Getting the License Agreement for Windows Device Registration",
|
||||
value = "Getting the License Agreement to Register a Windows Device",
|
||||
notes = "Use this REST API to retrieve the license agreement that is used for the Windows device " +
|
||||
"registration process",
|
||||
"registration process.",
|
||||
response = String.class,
|
||||
tags = "Windows Configuration Management")
|
||||
@ApiResponses(value = {
|
||||
@ -167,27 +170,29 @@ public interface ConfigurationMgtService {
|
||||
"Used by caches, or in conditional requests."),
|
||||
@ResponseHeader(
|
||||
name = "Last-Modified",
|
||||
description = "Date and time the resource has been modified the last time.\n" +
|
||||
description = "Date and time the resource was last modified.\n" +
|
||||
"Used by caches, or in conditional requests."),
|
||||
}),
|
||||
@ApiResponse(
|
||||
code = 304,
|
||||
message = "Not Modified. \n Empty body because the client has already the latest version of the requested resource."),
|
||||
message = "Not Modified. \n Empty body because the client already has the latest version of the requested resource."),
|
||||
@ApiResponse(
|
||||
code = 404,
|
||||
message = "Not Found. \n Resource to be deleted does not exist."),
|
||||
message = "Not Found. \n The specified resource does not exist."),
|
||||
@ApiResponse(
|
||||
code = 406,
|
||||
message = "Not Acceptable.\n The requested media type is not supported"),
|
||||
message = "Not Acceptable.\n The requested media type is not supported."),
|
||||
@ApiResponse(
|
||||
code = 500,
|
||||
message = "Internal Server Error. \n Server error occurred while fetching Windows license configuration.")
|
||||
message = "Internal Server Error. \n Server error occurred while fetching the Windows license configuration.")
|
||||
})
|
||||
@Permission(name = "Enroll Device", permission = "/device-mgt/devices/enroll/windows")
|
||||
Response getLicense(
|
||||
@ApiParam(
|
||||
name = "If-Modified-Since",
|
||||
value = "Validates if the requested variant has not been modified since the time specified",
|
||||
value = "Checks if the requested variant was modified, since the specified date-time.\n" +
|
||||
"Provide the value in the following format: EEE, d MMM yyyy HH:mm:ss Z.\n" +
|
||||
"Example: Mon, 05 Jan 2014 15:10:00 +0200",
|
||||
required = false)
|
||||
@HeaderParam("If-Modified-Since") String ifModifiedSince) throws WindowsConfigurationException;
|
||||
|
||||
|
||||
@ -23,13 +23,13 @@
|
||||
<parent>
|
||||
<artifactId>windows-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>org.wso2.carbon.device.mgt.mobile.windows.ui</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<name>WSO2 Carbon - Mobile Windows UI</name>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
{
|
||||
"deviceType": {
|
||||
"label": "Windows",
|
||||
"category" : "mobile"
|
||||
"category": "mobile",
|
||||
"analyticsEnabled": "false",
|
||||
"groupingEnabled": "false"
|
||||
}
|
||||
}
|
||||
|
||||
@ -38,12 +38,10 @@
|
||||
<h3 class="uppercase">What You Need</h3>
|
||||
<hr>
|
||||
<ul class="list-unstyled">
|
||||
<li class="padding-top-double"><span class="circle">STEP 01</span> Windows Mobile.</li>
|
||||
<li class="padding-top-double"><span class="circle">STEP 02</span> Go ahead and click [Enroll
|
||||
Device].
|
||||
<li class="padding-top-double"><span class="circle">STEP 01</span> Windows Mobile.</li>
|
||||
<li class="padding-top-double"><span class="circle">STEP 02</span> Go ahead and click [Enroll Device].
|
||||
</li>
|
||||
<li class="padding-top-double"><span class="circle">STEP 03</span> Proceed to [Prepare]
|
||||
section.
|
||||
<li class="padding-top-double"><span class="circle">STEP 03</span> Proceed to [Prepare] section.
|
||||
</li>
|
||||
</ul>
|
||||
<br>
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>windows-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>mobile-plugins</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,13 +23,13 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>analytics-feature</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>org.wso2.carbon.device.mgt.iot.analytics.feature</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>WSO2 Carbon - IoT Server Analytics Feature</name>
|
||||
<url>http://wso2.org</url>
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,13 +23,13 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>androidsense-plugin-feature</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>org.wso2.carbon.device.mgt.iot.androidsense.feature</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>WSO2 Carbon - IoT Server Android Sense Feature</name>
|
||||
<url>http://wso2.org</url>
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>iot-plugins-feature</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>arduino-plugin-feature</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>iot-plugins-feature</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,13 +22,13 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>device-types-feature</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>WSO2 Carbon - Device Management IoT Plugins Feature</name>
|
||||
<url>http://wso2.org</url>
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>raspberrypi-plugin-feature</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>iot-plugins-feature</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>virtual-fire-alarm-plugin-feature</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>iot-plugins-feature</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -20,13 +20,13 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>extensions-feature</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<artifactId>org.wso2.carbon.appmgt.mdm.osgiconnector.feature</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<name>WSO2 Carbon - App management MDM OSGI Connector</name>
|
||||
<url>http://wso2.org</url>
|
||||
<description>This feature contains the core bundles required for APP management OSGI MDM connection
|
||||
@ -36,7 +36,7 @@
|
||||
<dependency>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>org.wso2.carbon.appmgt.mdm.osgiconnector</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>org.apache.ws.commons.axiom</groupId>
|
||||
|
||||
@ -23,14 +23,14 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>extensions-feature</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>org.wso2.carbon.device.mgt.adapter.feature</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<name>WSO2 Carbon - Device Management Adapters Feature</name>
|
||||
<url>http://wso2.org</url>
|
||||
<description>This feature contains the adapter bundles required for IoT Server</description>
|
||||
|
||||
@ -22,13 +22,13 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>extensions-feature</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>WSO2 Carbon - Device Management Extensions</name>
|
||||
<url>http://wso2.org</url>
|
||||
|
||||
@ -22,14 +22,14 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>android-plugin-feature</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>org.wso2.carbon.device.mgt.mobile.android.feature</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<name>WSO2 Carbon - Android Device Management Feature</name>
|
||||
<url>http://wso2.org</url>
|
||||
<description>This feature contains the core bundles required for Android Device Management
|
||||
|
||||
@ -22,13 +22,13 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>mobile-plugins-feature</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>android-plugin-feature</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>WSO2 Carbon - Device Management Android Plugin Feature</name>
|
||||
<url>http://wso2.org</url>
|
||||
|
||||
@ -22,13 +22,13 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>mobile-plugins-feature</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>WSO2 Carbon - Device Management EMM Plugins Feature</name>
|
||||
<url>http://wso2.org</url>
|
||||
|
||||
@ -22,14 +22,14 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>windows-plugin-feature</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>org.wso2.carbon.device.mgt.mobile.windows.feature</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<name>WSO2 Carbon - Windows Device Management Feature</name>
|
||||
<url>http://wso2.org</url>
|
||||
<description>This feature contains the core bundles required for Windows Device Management
|
||||
|
||||
@ -22,13 +22,13 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>mobile-plugins-feature</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>windows-plugin-feature</artifactId>
|
||||
<version>2.2.5-SNAPSHOT</version>
|
||||
<version>2.2.6-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>WSO2 Carbon - Device Management Windows Plugin Feature</name>
|
||||
<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