diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.annotations/pom.xml b/components/apimgt-extensions/org.wso2.carbon.apimgt.annotations/pom.xml index 04c78fbbb56..e139bb93fe2 100644 --- a/components/apimgt-extensions/org.wso2.carbon.apimgt.annotations/pom.xml +++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.annotations/pom.xml @@ -22,13 +22,13 @@ apimgt-extensions org.wso2.carbon.devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.apimgt.annotations - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT bundle WSO2 Carbon - API Management Annotations WSO2 Carbon - API Management Custom Annotation Module diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/pom.xml b/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/pom.xml index 03dd8332692..ccb4cd89cfc 100644 --- a/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/pom.xml +++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/pom.xml @@ -21,12 +21,12 @@ apimgt-extensions org.wso2.carbon.devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml 4.0.0 - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT org.wso2.carbon.apimgt.application.extension.api war WSO2 Carbon - API Application Management API diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/pom.xml b/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/pom.xml index f40a55a5488..444aaa99bc7 100644 --- a/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/pom.xml +++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/pom.xml @@ -22,12 +22,12 @@ apimgt-extensions org.wso2.carbon.devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml 4.0.0 - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT org.wso2.carbon.apimgt.application.extension bundle WSO2 Carbon - API Application Management diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/pom.xml b/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/pom.xml index 81a7681c51b..1c503730197 100644 --- a/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/pom.xml +++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/pom.xml @@ -21,13 +21,13 @@ apimgt-extensions org.wso2.carbon.devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.apimgt.handlers - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT bundle WSO2 Carbon - API Security Handler Component WSO2 Carbon - API Management Security Handler Module diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/pom.xml b/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/pom.xml index c85dae676d3..49ec26d4136 100644 --- a/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/pom.xml +++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/pom.xml @@ -13,13 +13,13 @@ apimgt-extensions org.wso2.carbon.devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.apimgt.integration.client - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT bundle WSO2 Carbon - API Management Integration Client WSO2 Carbon - API Management Integration Client diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.generated.client/pom.xml b/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.generated.client/pom.xml index 56cc9f54166..702dcbc7c0f 100644 --- a/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.generated.client/pom.xml +++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.generated.client/pom.xml @@ -13,13 +13,13 @@ apimgt-extensions org.wso2.carbon.devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.apimgt.integration.generated.client - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT bundle WSO2 Carbon - API Management Integration Generated Client WSO2 Carbon - API Management Integration Client diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/pom.xml b/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/pom.xml index f4c475dd97d..cb65c33f18e 100644 --- a/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/pom.xml +++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/pom.xml @@ -22,13 +22,13 @@ apimgt-extensions org.wso2.carbon.devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.apimgt.webapp.publisher - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT bundle WSO2 Carbon - API Management Webapp Publisher WSO2 Carbon - API Management Webapp Publisher diff --git a/components/apimgt-extensions/pom.xml b/components/apimgt-extensions/pom.xml index 14bd0faeeb5..60b05dddaff 100644 --- a/components/apimgt-extensions/pom.xml +++ b/components/apimgt-extensions/pom.xml @@ -22,13 +22,13 @@ org.wso2.carbon.devicemgt carbon-devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../../pom.xml 4.0.0 apimgt-extensions - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT pom WSO2 Carbon - API Management Extensions Component http://wso2.org diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/pom.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/pom.xml index f75cd23361d..d6c2892ef41 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/pom.xml +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/pom.xml @@ -22,7 +22,7 @@ certificate-mgt org.wso2.carbon.devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/pom.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/pom.xml index 70c43d39a9a..361362620d3 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/pom.xml +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/pom.xml @@ -22,7 +22,7 @@ certificate-mgt org.wso2.carbon.devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.v09.api/pom.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.v09.api/pom.xml index b2f9855d23d..7c9ba87ede4 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.v09.api/pom.xml +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.v09.api/pom.xml @@ -24,7 +24,7 @@ certificate-mgt org.wso2.carbon.devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml index c54913cc058..890bc86604f 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml @@ -21,13 +21,13 @@ org.wso2.carbon.devicemgt certificate-mgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.certificate.mgt.core - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT bundle WSO2 Carbon - Certificate Management Core WSO2 Carbon - Certificate Management Core diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.v09.api/pom.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.v09.api/pom.xml index 1edd8e981e6..491a0b625a1 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.v09.api/pom.xml +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.v09.api/pom.xml @@ -24,7 +24,7 @@ certificate-mgt org.wso2.carbon.devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml diff --git a/components/certificate-mgt/pom.xml b/components/certificate-mgt/pom.xml index 0b1366a7ffc..a9c48e031c9 100644 --- a/components/certificate-mgt/pom.xml +++ b/components/certificate-mgt/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt carbon-devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../../pom.xml 4.0.0 org.wso2.carbon.devicemgt certificate-mgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT pom WSO2 Carbon - Certificate Management Component http://wso2.org diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/pom.xml b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/pom.xml index 9e2175d2c3d..208e619d11f 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/pom.xml +++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/pom.xml @@ -22,7 +22,7 @@ device-mgt-extensions org.wso2.carbon.devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.pull.notification/pom.xml b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.pull.notification/pom.xml index 10d1eb4500c..4adb6cea87e 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.pull.notification/pom.xml +++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.pull.notification/pom.xml @@ -22,7 +22,7 @@ device-mgt-extensions org.wso2.carbon.devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/pom.xml b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/pom.xml index dbaa8a2b61a..34554cfb9c6 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/pom.xml +++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/pom.xml @@ -22,7 +22,7 @@ device-mgt-extensions org.wso2.carbon.devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/pom.xml b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/pom.xml index a84c3929b07..3c17cad1a58 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/pom.xml +++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/pom.xml @@ -22,7 +22,7 @@ device-mgt-extensions org.wso2.carbon.devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/pom.xml b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/pom.xml index ed0fd0ee27e..3c1ca121d9d 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/pom.xml +++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/pom.xml @@ -22,7 +22,7 @@ device-mgt-extensions org.wso2.carbon.devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/pom.xml b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/pom.xml index 40f3aae5855..79a3c45e375 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/pom.xml +++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/pom.xml @@ -22,7 +22,7 @@ device-mgt-extensions org.wso2.carbon.devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml diff --git a/components/device-mgt-extensions/pom.xml b/components/device-mgt-extensions/pom.xml index 9cb090e74ea..d95950359ad 100644 --- a/components/device-mgt-extensions/pom.xml +++ b/components/device-mgt-extensions/pom.xml @@ -22,7 +22,7 @@ carbon-devicemgt org.wso2.carbon.devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../../pom.xml diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml index eab11d444b2..b64c6d4999a 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.devicemgt device-mgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml index 1733daceeb9..e294a5f3b1b 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml @@ -22,7 +22,7 @@ device-mgt org.wso2.carbon.devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/ActivityInfoProviderService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/ActivityInfoProviderService.java index 302869e107f..b1c84d48423 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/ActivityInfoProviderService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/ActivityInfoProviderService.java @@ -67,8 +67,8 @@ import javax.ws.rs.core.Response; } ) @Path("/activities") -@Api(value = "Activity Info Provider", description = "Activity related information manipulation. For example" + - " operation details and responses from devices.") +@Api(value = "Getting Activity Details", description = "Get the details of the operations/activities executed by the" + + " server on the registered devices during a defined time period.") @Scopes( scopes = { @Scope( @@ -88,9 +88,9 @@ public interface ActivityInfoProviderService { @ApiOperation( produces = MediaType.APPLICATION_JSON, httpMethod = "GET", - value = "Getting Details of an Activity", - notes = "Retrieve the details of a specific activity/operation, such as the meta information of " + - "an operation, including the responses from the devices.", + value = "Getting the Details of a Specific Activity", + notes = "Retrieve the details of a specific activity/operation, such as the meta information of an " + + "operation, and the responses from the devices.", tags = "Activity Info Provider", extensions = { @Extension(properties = { @@ -142,7 +142,7 @@ public interface ActivityInfoProviderService { Response getActivity( @ApiParam( name = "id", - value = "Activity id of the operation/activity.", + value = "Activity ID of the operation/activity.", required = true, defaultValue = "ACTIVITY_1") @PathParam("id") @@ -161,9 +161,10 @@ public interface ActivityInfoProviderService { @ApiOperation( produces = MediaType.APPLICATION_JSON, httpMethod = "GET", - value = "Getting Details of activities for given set of activity/operation Ids", - notes = "Retrieve the details of specific activity/operation Ids, such as the meta information of " + - "an operation, including the responses from the devices.", + value = "Getting Activity Details of Specified Activity/Operation IDs", + notes = "Retrieve the details of activities or operations, such as the meta information of an operation," + + " and the responses from the devices."+ + "Define the activity or operation IDs as comma separated values.", tags = "Activity Info Provider", extensions = { @Extension(properties = { @@ -213,7 +214,7 @@ public interface ActivityInfoProviderService { Response getActivities( @ApiParam( name = "ids", - value = "Comma separated activity/operation ids", + value = "Comma separated activity/operation IDs", required = true, defaultValue = "ACTIVITY_0") @QueryParam("ids") ActivityIdList activityIdList); @@ -224,9 +225,8 @@ public interface ActivityInfoProviderService { @ApiOperation( produces = MediaType.APPLICATION_JSON, httpMethod = "GET", - value = "Getting Details of an Activity for a specific device", - notes = "Retrieve the details of a specific activity/operation, such as the meta information of " + - "an operation, including the responses from a given device", + value = "Getting a Specific Activity Details of a Device", + notes = "Retrieve the details of a specific activity/operation, that was sent to a specific device.", tags = "Activity Info Provider", extensions = { @Extension(properties = { @@ -286,7 +286,7 @@ public interface ActivityInfoProviderService { String id, @ApiParam( name = "devicetype", - value = "The device type name, such as ios, android, windows or fire-alarm.", + value = "The device type name, such as ios, android, windows, or fire-alarm.", required = true) @PathParam("devicetype") @Size(max = 45) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/ConfigurationManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/ConfigurationManagementService.java index 840f4692a37..9a739196169 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/ConfigurationManagementService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/ConfigurationManagementService.java @@ -60,8 +60,8 @@ import javax.ws.rs.core.Response; } ) @Path("/configuration") -@Api(value = "Configuration Management", description = "The general platform configuration management capabilities are exposed " + - "through this API.") +@Api(value = "Configuration Management", description = "The general platform configuration management capabilities " + + "are exposed through this API.") @Produces(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON) @Scopes(scopes = { @@ -86,9 +86,9 @@ public interface ConfigurationManagementService { produces = MediaType.APPLICATION_JSON, httpMethod = "GET", value = "Getting General Platform Configurations", - notes = "WSO2 EMM monitors policies to verify that the devices comply with the policies enforced on them. " + - "General platform configurations include the settings on how often the device need to be monitored. " + - "Using this REST API you can get the general platform level configurations.", + notes = "WSO2 EMM monitors policies to verify that the devices comply with the policies enforced on them." + + "General platform configurations include the settings on how often the device need to be " + + "monitored." + "Using this REST API you can get the general platform level configurations.", tags = "Configuration Management", extensions = { @Extension(properties = { @@ -119,7 +119,8 @@ public interface ConfigurationManagementService { ), @ApiResponse( code = 304, - message = "Not Modified. \n Empty body because the client already has 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."), @@ -146,8 +147,8 @@ public interface ConfigurationManagementService { httpMethod = "PUT", value = "Updating General Platform Configurations", notes = "WSO2 EMM monitors policies to verify that the devices comply with the policies enforced on them." + - "General platform configurations include the settings on how often the the device need to be monitored." + - "Using this REST API you can update the general platform level configurations.", + "General platform configurations include the settings on how often the the device need to be " + + "monitored. Using this REST API you can update the general platform level configurations.", tags = "Configuration Management", extensions = { @Extension(properties = { diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceAgentService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceAgentService.java index 1d6d6a4728c..e295b06c506 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceAgentService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceAgentService.java @@ -112,8 +112,8 @@ public interface DeviceAgentService { @ApiOperation( produces = MediaType.APPLICATION_JSON, httpMethod = "POST", - value = "Create a device instance", - notes = "Create a device Instance", + value = "Creating a Device Instance", + notes = "Create a device instance using this API. Since this is not a physical device you are not able to try out device operations.", tags = "Device Management", extensions = { @Extension(properties = { @@ -157,7 +157,7 @@ public interface DeviceAgentService { "Server error occurred while retrieving the device details.", response = ErrorResponse.class) }) - Response enrollDevice(@ApiParam(name = "device", value = "Device object with data.", required = true) + Response enrollDevice(@ApiParam(name = "device", value = "Define the payload to create a device instance. You can double click on the Example Value and define your values in it to create the instance.", required = true) @Valid Device device); @DELETE @@ -186,7 +186,7 @@ public interface DeviceAgentService { "Server error occurred while dis-enrolling the device.") }) Response disEnrollDevice( - @ApiParam(name = "type", value = "The unique device identifier.") @PathParam("type") String type, + @ApiParam(name = "type", value = "Define the device type, such as android, ios, or windows.") @PathParam("type") String type, @ApiParam(name = "id", value = "The unique device identifier.") @PathParam("id") String id); @PUT @@ -194,8 +194,8 @@ public interface DeviceAgentService { @ApiOperation( produces = MediaType.APPLICATION_JSON, httpMethod = "PUT", - value = "modify device", - notes = "modify device", + value = "Updating the Device Details", + notes = "You are able to update the details of a device using the API.", tags = "Device Agent Management", extensions = { @Extension(properties = { @@ -239,15 +239,15 @@ public interface DeviceAgentService { "Server error occurred while retrieving the device details.", response = ErrorResponse.class) }) - Response updateDevice(@ApiParam(name = "type", value = "The device type, such as ios, android or windows....etc", required = true) + Response updateDevice(@ApiParam(name = "type", value = "The device type, such as ios, android, or windows.", required = true) @PathParam("type") String type, - @ApiParam(name = "id", value = "The device id.", required = true) + @ApiParam(name = "id", value = "The device ID.", required = true) @PathParam("id") String deviceId, - @ApiParam(name = "device", value = "Device object with data.", required = true) + @ApiParam(name = "device", value = "Update the device details in the device object.", required = true) @Valid Device updateDevice); @POST - @Path("/events/publish/{type}/{deviceId}") + @Path("events/publish{type}/{deviceId}") @ApiOperation( produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, @@ -303,11 +303,11 @@ public interface DeviceAgentService { Map payloadData, @ApiParam( name = "type", - value = "name of the device type") + value = "The name of the device type, such as android, ios, or windows.") @PathParam("type") String type, @ApiParam( name = "deviceId", - value = "deviceId of the device") + value = "The device ID.") @PathParam("deviceId") String deviceId); @POST @@ -317,7 +317,8 @@ public interface DeviceAgentService { consumes = MediaType.APPLICATION_JSON, httpMethod = "POST", value = "Publishing Events data only", - notes = "Publish events received by the device client to the WSO2 Data Analytics Server (DAS) using this API.", + notes = "Publish events received by the device client to the WSO2 Data Analytics Server (DAS) using this" + + " API.", tags = "Device Agent Management", extensions = { @Extension(properties = { @@ -343,7 +344,8 @@ public interface DeviceAgentService { }), @ApiResponse( code = 303, - message = "See Other. \n The source can be retrieved from the URL specified in 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", @@ -353,7 +355,8 @@ public interface DeviceAgentService { message = "Bad Request. \n Invalid request or validation error."), @ApiResponse( code = 415, - message = "Unsupported media type. \n The format of the requested entity was not supported."), + message = "Unsupported media type. \n The format of the requested entity was not " + + "supported."), @ApiResponse( code = 500, message = "Internal Server Error. \n " + @@ -380,8 +383,8 @@ public interface DeviceAgentService { produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, httpMethod = "GET", - value = "Get pending operation of the given device", - notes = "Returns the Operations.", + value = "Getting All the Pending Operations of a Device", + notes = "You can get all the list of pending operations of a device.", tags = "Device Agent Management", extensions = { @Extension(properties = { @@ -405,7 +408,8 @@ public interface DeviceAgentService { "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 has been modified the last " + + "time.\n" + "Used by caches, or in conditional requests."), }), @ApiResponse( @@ -426,9 +430,9 @@ public interface DeviceAgentService { "Server error occurred while retrieving information requested device.", response = ErrorResponse.class) }) - Response getPendingOperations(@ApiParam(name = "type", value = "The device type, such as ios, android or windows.", required = true) + Response getPendingOperations(@ApiParam(name = "type", value = "The device type, such as ios, android, or windows.", required = true) @PathParam("type") String type, - @ApiParam(name = "id", value = "The device id.", required = true) + @ApiParam(name = "id", value = "The device ID.", required = true) @PathParam("id") String deviceId); @GET @@ -437,8 +441,9 @@ public interface DeviceAgentService { produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, httpMethod = "GET", - value = "Get pending operation of the given device", - notes = "Returns the Operation.", + value = "Getting the Next Pending Operations of a Device", + notes = "There can be many operations that are pending on the device end. Get the next pending operation " + + "of a specific device using this API.", tags = "Device Agent Management", extensions = { @Extension(properties = { @@ -483,9 +488,10 @@ public interface DeviceAgentService { "Server error occurred while retrieving information requested device.", response = ErrorResponse.class) }) - Response getNextPendingOperation(@ApiParam(name = "type", value = "The device type, such as ios, android or windows.", required = true) + Response getNextPendingOperation(@ApiParam(name = "type", value = "The device type, such as ios, android, or " + + "windows.", required = true) @PathParam("type") String type, - @ApiParam(name = "id", value = "The device id.", required = true) + @ApiParam(name = "id", value = "The device ID.", required = true) @PathParam("id") String deviceId); @PUT @@ -494,7 +500,7 @@ public interface DeviceAgentService { produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, httpMethod = "PUT", - value = "Update Operation", + value = "Updating an Operation", notes = "Update the Operations.", tags = "Device Agent Management", extensions = { @@ -539,11 +545,12 @@ public interface DeviceAgentService { "Server error occurred while retrieving information requested device.", response = ErrorResponse.class) }) - Response updateOperation(@ApiParam(name = "type", value = "The device type, such as ios, android or windows.", required = true) + Response updateOperation(@ApiParam(name = "type", value = "The device type, such as ios, android, or windows.", + required = true) @PathParam("type") String type, - @ApiParam(name = "id", value = "The device id.", required = true) + @ApiParam(name = "id", value = "The device ID.", required = true) @PathParam("id") String deviceId, - @ApiParam(name = "operation", value = "Operation object with data.", required = true) + @ApiParam(name = "operation", value = "Update the operation object with data.", required = true) @Valid Operation operation); @PUT @@ -552,7 +559,7 @@ public interface DeviceAgentService { produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, httpMethod = "PUT", - value = "Update Properties", + value = "Updating Device Properties", notes = "Update device properties.", tags = "Device Agent Management", extensions = { @@ -597,11 +604,12 @@ public interface DeviceAgentService { "Server error occurred while retrieving information requested device.", response = ErrorResponse.class) }) - Response updateDeviceProperties(@ApiParam(name = "type", value = "The device type, such as ios, android or windows.", required = true) + Response updateDeviceProperties(@ApiParam(name = "type", value = "The device type, such as ios, android, or " + + "windows.", required = true) @PathParam("type") String type, - @ApiParam(name = "id", value = "The device id.", required = true) + @ApiParam(name = "id", value = "The device ID.", required = true) @PathParam("id") String deviceId, - @ApiParam(name = "properties", value = "device properties list.", required = true) + @ApiParam(name = "properties", value = "The device properties list.", required = true) @Valid List properties); @GET @@ -610,8 +618,9 @@ public interface DeviceAgentService { produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, httpMethod = "GET", - value = "Get pending operation of the given device", - notes = "Returns the Operations.", + value = "Getting Specific Operations of a Device", + notes = "Device operations can be in the IN_PROGRESS, PENDING, COMPLETED, ERROR, or REPEATED status. " + + "You can use this API to get a list of all the operations that are in a specific status for a given device.", tags = "Device Agent Management", extensions = { @Extension(properties = { @@ -656,9 +665,10 @@ public interface DeviceAgentService { "Server error occurred while retrieving information requested device.", response = ErrorResponse.class) }) - Response getOperationsByDeviceAndStatus(@ApiParam(name = "type", value = "The device type, such as ios, android or windows.", required = true) + Response getOperationsByDeviceAndStatus(@ApiParam(name = "type", value = "The device type, such as ios, android," + + " or windows.", required = true) @PathParam("type") String type, - @ApiParam(name = "id", value = "The device id.", required = true) + @ApiParam(name = "id", value = "The device ID.", required = true) @PathParam("id") String deviceId, @ApiParam(name = "status", value = "status of the operation.", required = true) @QueryParam("status")Operation.Status status); diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceEventManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceEventManagementService.java index 8b6d7ed030e..cf9b403994e 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceEventManagementService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceEventManagementService.java @@ -77,8 +77,8 @@ public interface DeviceEventManagementService { @ApiOperation( produces = MediaType.APPLICATION_JSON, httpMethod = "POST", - value = "Add Event Type Defnition", - notes = "Add the event definition for the device.", + value = "Adding the Event Type Definition", + notes = "Add the event definition for a device.", tags = "Device Event Management", extensions = { @Extension(properties = { @@ -120,9 +120,11 @@ public interface DeviceEventManagementService { response = ErrorResponse.class) } ) - Response deployDeviceTypeEventDefinition(@ApiParam(name = "type", value = "name of the device type", required = false) + Response deployDeviceTypeEventDefinition(@ApiParam(name = "type", value = "The device type, such as android, ios," + + " and windows.", required = false) @PathParam("type")String deviceType, - @ApiParam(name = "deviceTypeEvent", value = "DeviceTypeEvent object with data.", required = true) + @ApiParam(name = "deviceTypeEvent", value = "Add the data to complete " + + "the DeviceTypeEvent object.", required = true) @Valid DeviceTypeEvent deviceTypeEvent); @DELETE @@ -130,8 +132,8 @@ public interface DeviceEventManagementService { @ApiOperation( produces = MediaType.APPLICATION_JSON, httpMethod = "DELETE", - value = "Delete Event Type Defnition", - notes = "Delete the event definition for the device.", + value = "Delete Event Type Definition", + notes = "Delete the event definition of a device.", tags = "Device Event Management", extensions = { @Extension(properties = { @@ -173,7 +175,8 @@ public interface DeviceEventManagementService { response = ErrorResponse.class) } ) - Response deleteDeviceTypeEventDefinitions(@ApiParam(name = "type", value = "name of the device type", required = false) + Response deleteDeviceTypeEventDefinitions(@ApiParam(name = "type", value = "The device type, such as android, " + + "ios, and windows.", required = false) @PathParam("type")String deviceType); @GET @@ -244,7 +247,7 @@ public interface DeviceEventManagementService { produces = MediaType.APPLICATION_JSON, httpMethod = "GET", value = "Getting Last Known Device Events", - notes = "Get the Last Known events for the device.", + notes = "Get the last known events for the device.", tags = "Device Event Management", extensions = { @Extension(properties = { @@ -287,9 +290,9 @@ public interface DeviceEventManagementService { response = ErrorResponse.class) } ) - Response getLastKnownData(@ApiParam(name = "deviceId", value = "id of the device ", required = false) + Response getLastKnownData(@ApiParam(name = "deviceId", value = "The device ID.", required = false) @PathParam("deviceId") String deviceId, - @ApiParam(name = "type", value = "name of the device type", required = false) + @ApiParam(name = "type", value = "The device type, such as android, ios, or windows.", required = false) @PathParam("type") String deviceType); @GET @@ -297,7 +300,7 @@ public interface DeviceEventManagementService { @ApiOperation( produces = MediaType.APPLICATION_JSON, httpMethod = "GET", - value = "Getting Event Type Defnition", + value = "Getting Event Type Definition", notes = "Get the event definition for the device.", tags = "Device Event Management", extensions = { @@ -341,7 +344,8 @@ public interface DeviceEventManagementService { response = ErrorResponse.class) } ) - Response getDeviceTypeEventDefinition(@ApiParam(name = "type", value = "name of the device type", required = false) + Response getDeviceTypeEventDefinition(@ApiParam(name = "type", value = "The type of the device, such as android," + + " ios, or windows.", required = false) @PathParam("type")String deviceType) ; } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceManagementService.java index 4fbc97f41b3..d4b52f2aab7 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceManagementService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceManagementService.java @@ -208,13 +208,13 @@ public interface DeviceManagementService { Response getDevices( @ApiParam( name = "name", - value = "The device name, such as shamu, bullhead or angler Nexus device names. ", + value = "The device name. For example, Nexus devices can have names, suhc as shamu, bullhead or angler.", required = false) @Size(max = 45) String name, @ApiParam( name = "type", - value = "The device type, such as ios, android or windows.", + value = "The device type, such as ios, android, or windows.", required = false) @QueryParam("type") @Size(max = 45) @@ -227,7 +227,7 @@ public interface DeviceManagementService { String user, @ApiParam( name = "userPattern", - value = "The pattern of username of the owner of the device.", + value = "Define a few letters of the username in the order they appear. For example, you want to get the devices that belong to the admin, you can give \\\"ad\\\" or \\\"min\\\" here and you will get the devices that are enrolled under a user who has the given combination as part of the username .", required = false) @QueryParam("userPattern") String userPattern, @@ -303,8 +303,8 @@ public interface DeviceManagementService { @ApiOperation( produces = MediaType.APPLICATION_JSON, httpMethod = "GET", - value = "Getting Details of Registered Devices owned by authenticated user", - notes = "Provides details of devices enrolled by authenticated user.", + value = "Getting Details of Registered Devices Owned by an Authenticated User", + notes = "Provides details of devices enrolled by authenticated users.", tags = "Device Management", extensions = { @Extension(properties = { @@ -460,8 +460,8 @@ public interface DeviceManagementService { @ApiOperation( produces = MediaType.APPLICATION_JSON, httpMethod = "GET", - value = "Get device enrollment status", - notes = "Get device enrollment status", + value = "Getting the Device Enrollment Status", + notes = "Get the device enrollment status and the device details of the device.", tags = "Device Management", extensions = { @Extension(properties = { @@ -564,7 +564,7 @@ public interface DeviceManagementService { Response getDeviceLocation( @ApiParam( name = "type", - value = "The device type name, such as ios, android, windows or fire-alarm.", + value = "The device type name, such as ios, android, windows, or fire-alarm.", required = true) @PathParam("type") @Size(max = 45) @@ -592,7 +592,7 @@ public interface DeviceManagementService { @ApiOperation( produces = MediaType.APPLICATION_JSON, httpMethod = "GET", - value = "Getting the information of a Device", + value = "Getting the Information of a Device", notes = "Get the information of a device by specifying the device type and device identifier.", tags = "Device Management", extensions = { @@ -641,7 +641,7 @@ public interface DeviceManagementService { Response getDeviceInformation( @ApiParam( name = "type", - value = "The device type name, such as ios, android, windows or fire-alarm.", + value = "The device type name, such as ios, android, windows, or fire-alarm.", required = true) @PathParam("type") @Size(max = 45) @@ -670,8 +670,8 @@ public interface DeviceManagementService { produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, httpMethod = "POST", - value = "Update the device specified by device id", - notes = "Returns the status of the updated device operation.", + value = "Update the Displayed Name of the Device", + notes = "Use this API to rename a device so that it is easy for you to identify devices.", tags = "Device Management", extensions = { @Extension(properties = { @@ -719,12 +719,12 @@ public interface DeviceManagementService { Response renameDevice( @ApiParam( name = "device", - value = "The payload containing new name for device with updated name.", + value = "The payload containing the new name of the device.", required = true) Device device, @ApiParam( name = "device-type", - value = "The device type, such as ios, android or windows.", + value = "The device type, such as ios, android, or windows.", required = true) @PathParam("device-type") @Size(max = 45) @@ -745,8 +745,8 @@ public interface DeviceManagementService { produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, httpMethod = "DELETE", - value = "Remove the device specified by device id", - notes = "Returns the status of the deleted device operation.", + value = "Remove the Device Specified by the Device ID", + notes = "Returns the status of the deleted device operation and the details of the deleted device.", tags = "Device Management", extensions = { @Extension(properties = { @@ -794,7 +794,7 @@ public interface DeviceManagementService { Response deleteDevice( @ApiParam( name = "device-type", - value = "The device type, such as ios, android or windows.", + value = "The device type, such as ios, android, or windows.", required = true) @PathParam("device-type") @Size(max = 45) @@ -1041,7 +1041,7 @@ public interface DeviceManagementService { Response getInstalledApplications( @ApiParam( name = "type", - value = "The device type name, such as ios, android, windows or fire-alarm.", + value = "The device type name, such as ios, android, windows, or fire-alarm.", required = true) @PathParam("type") @Size(max = 45) @@ -1190,7 +1190,7 @@ public interface DeviceManagementService { @ApiOperation( produces = MediaType.APPLICATION_JSON, httpMethod = "GET", - value = "Get the details of the policy that is enforced on a device.", + value = "Getting the Details of a Policy Enforced on a Device", notes = "A policy is enforced on all the devices that register with WSO2 IoTS." + "WSO2 IoTS filters the policies based on the device platform (device type)," + "the device ownership type, the user role or name and finally, the policy that matches these filters will be enforced on the device.", @@ -1252,14 +1252,14 @@ public interface DeviceManagementService { Response getEffectivePolicyOfDevice( @ApiParam( name = "type", - value = "The device type name, such as ios, android, windows or fire-alarm.", + value = "The device type name, such as ios, android, windows, or fire-alarm.", required = true) @PathParam("type") @Size(max = 45) String type, @ApiParam( name = "id", - value = "The device identifier.", + value = "The device ID.", required = true) @PathParam("id") @Size(max = 45) @@ -1327,8 +1327,8 @@ public interface DeviceManagementService { produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, httpMethod = "PUT", - value = "Change device status by device id.", - notes = "Returns the status of the changed device operation.", + value = "Changing the Status of a Device", + notes = "Change the status of a device from one state to another.", tags = "Device Management", extensions = { @Extension(properties = { @@ -1376,21 +1376,21 @@ public interface DeviceManagementService { Response changeDeviceStatus( @ApiParam( name = "type", - value = "The device type, such as ios, android or windows.", + value = "The device type, such as ios, android, or windows.", required = true) @PathParam("type") @Size(max = 45) String type, @ApiParam( name = "id", - value = "Device id", + value = "Device ID.", required = true) @PathParam("id") @Size(max = 45) String id, @ApiParam( name = "newStatus", - value = "New status of the device.", + value = "The available device statuses are CREATED, ACTIVE, INACTIVE, UNREACHABLE, UNCLAIMED, SUSPENDED, BLOCKED, REMOVED, and DISENROLLMENT_REQUESTED.", required = true) @QueryParam("newStatus") EnrolmentInfo.Status newStatus); @@ -1401,8 +1401,8 @@ public interface DeviceManagementService { produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, httpMethod = "POST", - value = "Add operation to set of devices for a given device type", - notes = "Returns the Activity Related to the operation.", + value = "Sending an Operation to Specific Device Types", + notes = "You can send an operation to a group of devices that belong to a specific device type using this API. For example, you can send a ring operation to all the enrolled Android devices.", tags = "Device Management", extensions = { @Extension(properties = { diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GeoLocationBasedService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GeoLocationBasedService.java index dee70ef707d..a05285f7905 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GeoLocationBasedService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GeoLocationBasedService.java @@ -92,8 +92,8 @@ public interface GeoLocationBasedService { consumes = "application/json", produces = "application/json", httpMethod = "GET", - value = "Retrieve Analytics for the device type", - notes = "", + value = "Getting the Location Details of a Device", + notes = "Get the location details of a device during a define time period.", response = Response.class, tags = "Geo Service Management", extensions = { @@ -131,24 +131,24 @@ public interface GeoLocationBasedService { Response getGeoDeviceStats( @ApiParam( name = "deviceId", - value = "The registered device Id.", + value = "The device ID.", required = true) @PathParam("deviceId") String deviceId, @ApiParam( name = "device-type", - value = "The device type, such as ios, android or windows.", + value = "The device type, such as ios, android, or windows.", required = true) @PathParam("deviceType") @Size(max = 45) String deviceType, @ApiParam( name = "from", - value = "Get stats from what time", + value = "Define the time to start getting the geo location history of the device in the Epoch or UNIX format.", required = true) @QueryParam("from") long from, @ApiParam( name = "to", - value = "Get stats up to what time", + value = "Define the time to finish getting the geo location history of the device in the Epoch or UNIX format.", required = true) @QueryParam("to") long to); @@ -161,8 +161,8 @@ public interface GeoLocationBasedService { consumes = "application/json", produces = "application/json", httpMethod = "GET", - value = "Retrieve locations of devices", - notes = "", + value = "Getting the Devices in a Defined Geofence", + notes = "Get the details of the devices that are within the defined geofence coordinates. The geofence you are defining is enclosed with four coordinates in the shape of a square or rectangle. This is done by defining two points of the geofence. The other two points are automatically created using the given points. You can define the zoom level or scale of the map too.", response = Response.class, tags = "Geo Service Management", extensions = { @@ -200,28 +200,33 @@ public interface GeoLocationBasedService { Response getGeoDeviceLocations( @ApiParam( name = "minLat", - value = "minimum latitude", - required = true) + value = "Define the minimum latitude of the geofence.", + required = true, + defaultValue ="79.85213577747345") @QueryParam("minLat") double minLat, @ApiParam( name = "maxLat", - value = "maxmimum latitude", - required = true) + value = "Define the maximum latitude of the geofence.", + required = true, + defaultValue ="79.85266149044037") @QueryParam("maxLat") double maxLat, @ApiParam( name = "minLong", - value = "minimum longitude", - required = true) + value = "Define the minimum longitude of the geofence.", + required = true, + defaultValue ="6.909673257977737") @QueryParam("minLong") double minLong, @ApiParam( name = "maxLong", - value = "maximum longitudeude", - required = true) + value = "Define the maximum longitude of the geofence", + required = true, + defaultValue ="6.909673257977737") @QueryParam("maxLong") double maxLong, @ApiParam( name = "zoom", - value = "zoom level", - required = true) + value = "Define the level to zoom or scale the map. You can define any value between 1 to 14.", + required = true, + defaultValue ="2") @QueryParam("zoom") int zoom); @@ -233,9 +238,9 @@ public interface GeoLocationBasedService { @ApiOperation( consumes = "application/json", produces = "application/json", - httpMethod = "GET", - value = "Create Geo alerts for the device", - notes = "", + httpMethod = "POST", + value = "Retrieving a Specific Geo Alert Type from a Device", + notes = "Retrieve a specific geo alert from a device, such as getting a speed alert that was sent to a device.", response = Response.class, tags = "Geo Service Management", extensions = { @@ -274,19 +279,19 @@ public interface GeoLocationBasedService { @Valid Alert alert, @ApiParam( name = "deviceId", - value = "The registered device Id.", + value = "The device ID.", required = true) @PathParam("deviceId") String deviceId, @ApiParam( name = "device-type", - value = "The device type, such as ios, android or windows.", + value = "The device type, such as ios, android, or windows.", required = true) @PathParam("deviceType") @Size(max = 45) String deviceType, @ApiParam( name = "alertType", - value = "The alert type, such as Within, Speed, Stationary", + value = "The alert type, such as Within, Speed,Exit, or Stationary.", required = true) @PathParam("alertType") String alertType); @@ -298,9 +303,9 @@ public interface GeoLocationBasedService { @ApiOperation( consumes = "application/json", produces = "application/json", - httpMethod = "GET", - value = "Update Geo alerts for the device", - notes = "", + httpMethod = "PUT", + value = "Updating the Geo Alerts of a Device", + notes = "Update the a geo alert that was sent to a device.", response = Response.class, tags = "Geo Service Management", extensions = { @@ -339,19 +344,19 @@ public interface GeoLocationBasedService { @Valid Alert alert, @ApiParam( name = "deviceId", - value = "The registered device Id.", + value = "The device ID.", required = true) @PathParam("deviceId") String deviceId, @ApiParam( name = "device-type", - value = "The device type, such as ios, android or windows.", + value = "The device type, such as ios, android, or windows.", required = true) @PathParam("deviceType") @Size(max = 45) String deviceType, @ApiParam( name = "alertType", - value = "The alert type, such as Within, Speed, Stationary", + value = "The alert type, such as Within, Speed, Exit, or Stationary", required = true) @PathParam("alertType") String alertType); @@ -364,8 +369,8 @@ public interface GeoLocationBasedService { consumes = "application/json", produces = "application/json", httpMethod = "GET", - value = "Retrieve Geo alerts for the device", - notes = "", + value = "Getting a Geo Alert from a Device", + notes = "Retrieve a specific geo alert from a device, such as getting a speed alert that was sent to a device.", response = Response.class, tags = "Geo Service Management", extensions = { @@ -403,19 +408,19 @@ public interface GeoLocationBasedService { Response getGeoAlerts( @ApiParam( name = "deviceId", - value = "The registered device Id.", + value = "The device ID.", required = true) @PathParam("deviceId") String deviceId, @ApiParam( name = "device-type", - value = "The device type, such as ios, android or windows.", + value = "The device type, such as ios, android. or windows.", required = true) @PathParam("deviceType") @Size(max = 45) String deviceType, @ApiParam( name = "alertType", - value = "The alert type, such as Within, Speed, Stationary", + value = "The alert type, such as Within, Speed, Exit, or Stationary", required = true) @PathParam("alertType") String alertType); @@ -428,8 +433,8 @@ public interface GeoLocationBasedService { consumes = "application/json", produces = "application/json", httpMethod = "GET", - value = "Retrieve Geo alerts history for the device", - notes = "", + value = "Getting the Geo Service Alert History of a Device", + notes = "Get the geo alert history of a device during the defined time period.", response = Response.class, tags = "Geo Service Management", extensions = { @@ -467,24 +472,24 @@ public interface GeoLocationBasedService { Response getGeoAlertsHistory( @ApiParam( name = "deviceId", - value = "The registered device Id.", + value = "The device ID.", required = true) @PathParam("deviceId") String deviceId, @ApiParam( name = "device-type", - value = "The device type, such as ios, android or windows.", + value = "The device type, such as ios, android, or windows.", required = true) @PathParam("deviceType") @Size(max = 45) String deviceType, @ApiParam( name = "from", - value = "Get stats from what time", + value = "Define the time to start getting the geo location history of the device in the Epoch or UNIX format.", required = true) @QueryParam("from") long from, @ApiParam( name = "to", - value = "Get stats up to what time", + value = "Define the time to finish getting the geo location history of the device in the Epoch or UNIX format.", required = true) @QueryParam("to") long to); @@ -494,8 +499,8 @@ public interface GeoLocationBasedService { consumes = "application/json", produces = "application/json", httpMethod = "DELETE", - value = "Deletes Geo alerts for the device", - notes = "", + value = "Deleting a Geo Alert from a Device", + notes = "Delete a specific geo alert from a device, such as deleting a speed alert that was sent to the device.", response = Response.class, tags = "Geo Service Management", extensions = { @@ -529,22 +534,23 @@ public interface GeoLocationBasedService { Response removeGeoAlerts( @ApiParam( name = "deviceId", - value = "The registered device Id.", + value = "The device ID.", required = true) @PathParam("deviceId") String deviceId, @ApiParam( name = "deviceType", - value = "The device type, such as ios, android or windows.", + value = "The device type, such as ios, android, or windows.", required = true) @PathParam("deviceType") String deviceType, @ApiParam( name = "alertType", - value = "The alert type, such as Within, Speed, Stationary", + value = "The alert type, such as Within, Speed, Exit, or Stationary", required = true) @PathParam("alertType") String alertType, @ApiParam( name = "queryName", - value = "The query name.", + value = "When you define a geofence you define a fence name for it. That name needs to be defined" + + " here.", required = true) @QueryParam("queryName") String queryName); } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java index a815304fb0b..d060f3a3df9 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java @@ -72,8 +72,8 @@ import java.util.List; ), tags = { @Tag(name = "device_management", description = "Device group related REST-API. " + - "This can be used to manipulated device group related " + - "details.") + "This can be used to manipulated device group related " + + "details.") } ) @Scopes( @@ -166,7 +166,7 @@ import java.util.List; ) @Path("/groups") @Api(value = "Device Group Management", description = "This API carries all device group management related " + - "operations such as get all the available groups, etc.") + "operations such as get all the available groups, etc.") @Produces(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON) public interface GroupManagementService { @@ -175,13 +175,13 @@ public interface GroupManagementService { @ApiOperation( produces = MediaType.APPLICATION_JSON, httpMethod = HTTPConstants.HEADER_GET, - value = "Get the list of groups belongs to current user.", - notes = "Returns all permitted groups enrolled with the system.", + value = "Getting the List of Groups", + notes = "Returns all groups enrolled with the system.", tags = "Device Group Management", extensions = { - @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:groups") - }) + @Extension(properties = { + @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:groups") + }) } ) @ApiResponses(value = { @@ -194,16 +194,16 @@ public interface GroupManagementService { @ResponseHeader( name = "ETag", description = "Entity Tag of the response resource.\n" + - "Used by caches, or in conditional requests."), + "Used by caches, or in conditional requests."), @ResponseHeader( name = "Last-Modified", description = "Date and time the resource has been modified the last time.\n" + - "Used by caches, or in conditional requests."), + "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."), + "the requested resource."), @ApiResponse( code = 406, message = "Not Acceptable.\n The requested media type is not supported."), @@ -213,8 +213,8 @@ public interface GroupManagementService { response = ErrorResponse.class) }) Response getGroups(@ApiParam( - name = "name", - value = "Name of the group.") + name = "name", + value = "Name of the group.") @QueryParam("name") String name, @ApiParam( @@ -230,7 +230,8 @@ public interface GroupManagementService { int offset, @ApiParam( name = "limit", - value = "Provide how many device details you require from the starting pagination index/offset.", + value = "Provide how many device details you require from the starting pagination " + + "index/offset.", defaultValue = "5") @QueryParam("limit") int limit); @@ -240,13 +241,13 @@ public interface GroupManagementService { @ApiOperation( produces = MediaType.APPLICATION_JSON, httpMethod = HTTPConstants.HEADER_GET, - value = "Get the count of groups belongs to current user.", - notes = "Returns count of all permitted groups enrolled with the system.", + value = "Getting the Number of Device Groups", + notes = "Get the number of device groups in the server that the current signed in user can access.", tags = "Device Group Management", extensions = { - @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:count") - }) + @Extension(properties = { + @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:count") + }) } ) @@ -260,16 +261,16 @@ public interface GroupManagementService { @ResponseHeader( name = "ETag", description = "Entity Tag of the response resource.\n" + - "Used by caches, or in conditional requests."), + "Used by caches, or in conditional requests."), @ResponseHeader( name = "Last-Modified", description = "Date and time the resource has been modified the last time.\n" + - "Used by caches, or in conditional requests."), + "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."), + "the requested resource."), @ApiResponse( code = 406, message = "Not Acceptable.\n The requested media type is not supported."), @@ -284,13 +285,13 @@ public interface GroupManagementService { @ApiOperation( consumes = MediaType.APPLICATION_JSON, httpMethod = HTTPConstants.HEADER_POST, - value = "Add new device group to the system.", - notes = "Add device group with current user as the owner.", + value = "Adding a New Device Group", + notes = "Add device group with the current user as the owner.", tags = "Device Group Management", extensions = { - @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:add") - }) + @Extension(properties = { + @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:add") + }) } ) @ApiResponses( @@ -308,16 +309,17 @@ public interface GroupManagementService { @ResponseHeader( name = "ETag", description = "Entity Tag of the response resource.\n" + - "Used by caches, or in conditional requests."), + "Used by caches, or in conditional requests."), @ResponseHeader( name = "Last-Modified", - description = "Date and time the resource has been modified the last time.\n" + - "Used by caches, or in conditional requests.") + description = "Date and time the resource has been modified the last time" + + ".\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 Source can be retrieved from the URL specified at the Location " + + "header.", responseHeaders = { @ResponseHeader( name = "Content-Location", @@ -332,17 +334,18 @@ public interface GroupManagementService { response = ErrorResponse.class), @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 entity of the request was in a not supported " + + "format."), @ApiResponse( code = 500, message = "Internal Server Error. \n " + - "Server error occurred while adding a new device group.", + "Server error occurred while adding a new device group.", response = ErrorResponse.class) }) Response createGroup(@ApiParam( - name = "group", - value = "Group object with data.", - required = true) + name = "group", + value = "Define the group object with data.", + required = true) @Valid DeviceGroup group); @Path("/id/{groupId}") @@ -350,13 +353,13 @@ public interface GroupManagementService { @ApiOperation( produces = MediaType.APPLICATION_JSON, httpMethod = HTTPConstants.HEADER_GET, - value = "View group specified.", - notes = "Returns details of group enrolled with the system.", + value = "Getting Details of a Specific Device Group", + notes = "Get the details of a specific device group.", tags = "Device Group Management", extensions = { - @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:groups-view") - }) + @Extension(properties = { + @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:groups-view") + }) } ) @ApiResponses(value = { @@ -369,16 +372,16 @@ public interface GroupManagementService { @ResponseHeader( name = "ETag", description = "Entity Tag of the response resource.\n" + - "Used by caches, or in conditional requests."), + "Used by caches, or in conditional requests."), @ResponseHeader( name = "Last-Modified", description = "Date and time the resource has been modified the last time.\n" + - "Used by caches, or in conditional requests."), + "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."), + "the requested resource."), @ApiResponse( code = 404, message = "Group found.", @@ -392,9 +395,9 @@ public interface GroupManagementService { response = ErrorResponse.class) }) Response getGroup(@ApiParam( - name = "groupId", - value = "ID of the group to view.", - required = true) + name = "groupId", + value = "The ID of the group.", + required = true) @PathParam("groupId") int groupId); @Path("/id/{groupId}") @@ -402,14 +405,13 @@ public interface GroupManagementService { @ApiOperation( produces = MediaType.APPLICATION_JSON, httpMethod = HTTPConstants.HEADER_PUT, - value = "Update a group.", - notes = "If you wish to make changes to an existing group, that can be done by updating the group using " + - "this resource.", + value = "Updating a Device Group", + notes = "If you wish to make changes to an existing group, that can be done by updating the group using this API", tags = "Device Group Management", extensions = { - @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:update") - }) + @Extension(properties = { + @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:update") + }) } ) @ApiResponses(value = { @@ -421,16 +423,16 @@ public interface GroupManagementService { @ResponseHeader( name = "ETag", description = "Entity Tag of the response resource.\n" + - "Used by caches, or in conditional requests."), + "Used by caches, or in conditional requests."), @ResponseHeader( name = "Last-Modified", description = "Date and time the resource has been modified the last time.\n" + - "Used by caches, or in conditional requests."), + "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."), + "the requested resource."), @ApiResponse( code = 404, message = "Group not found.", @@ -444,13 +446,13 @@ public interface GroupManagementService { response = ErrorResponse.class) }) Response updateGroup(@ApiParam( - name = "groupId", - value = "ID of the group to be updated.", - required = true) + name = "groupId", + value = "ID of the group to be updated.", + required = true) @PathParam("groupId") int groupId, @ApiParam( name = "group", - value = "Group object with data.", + value = "Update the content of the group object.", required = true) @Valid DeviceGroup deviceGroup); @@ -459,14 +461,13 @@ public interface GroupManagementService { @ApiOperation( produces = MediaType.APPLICATION_JSON, httpMethod = HTTPConstants.HEADER_DELETE, - value = "Delete a group.", - notes = "If you wish to remove an existing group, that can be done by updating the group using " + - "this resource.", + value = "Deleting a Group", + notes = "If you wish to remove an existing group, that can be done by updating the group using this API.", tags = "Device Group Management", extensions = { - @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:remove") - }) + @Extension(properties = { + @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:remove") + }) } ) @ApiResponses(value = { @@ -478,16 +479,16 @@ public interface GroupManagementService { @ResponseHeader( name = "ETag", description = "Entity Tag of the response resource.\n" + - "Used by caches, or in conditional requests."), + "Used by caches, or in conditional requests."), @ResponseHeader( name = "Last-Modified", description = "Date and time the resource has been modified the last time.\n" + - "Used by caches, or in conditional requests."), + "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."), + "the requested resource."), @ApiResponse( code = 404, message = "Group not found.", @@ -501,9 +502,9 @@ public interface GroupManagementService { response = ErrorResponse.class) }) Response deleteGroup(@ApiParam( - name = "groupId", - value = "ID of the group to be deleted.", - required = true) + name = "groupId", + value = "ID of the group to be deleted.", + required = true) @PathParam("groupId") int groupId); @Path("/id/{groupId}/share") @@ -511,14 +512,14 @@ public interface GroupManagementService { @ApiOperation( produces = MediaType.APPLICATION_JSON, httpMethod = HTTPConstants.HEADER_POST, - value = "Manage group sharing with a user.", - notes = "If you wish to share /un share an existing group with a user under defined sharing roles, " + - "that can be done using this resource.", + value = "Sharing a Group", + notes = "A device group can be shared with different user-roles. The users that belong to that role can " + + "then view the groups and the devices in it. Use this API to share a group among user roles.", tags = "Device Group Management", extensions = { - @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:share") - }) + @Extension(properties = { + @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:share") + }) } ) @ApiResponses(value = { @@ -530,16 +531,16 @@ public interface GroupManagementService { @ResponseHeader( name = "ETag", description = "Entity Tag of the response resource.\n" + - "Used by caches, or in conditional requests."), + "Used by caches, or in conditional requests."), @ResponseHeader( name = "Last-Modified", description = "Date and time the resource has been modified the last time.\n" + - "Used by caches, or in conditional requests."), + "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."), + "the requested resource."), @ApiResponse( code = 404, message = "Group not found.", @@ -553,9 +554,9 @@ public interface GroupManagementService { response = ErrorResponse.class) }) Response manageGroupSharing(@ApiParam( - name = "groupName", - value = "Name of the group to be shared or unshared.", - required = true) + name = "groupName", + value = "Name of the group to be shared or unshared.", + required = true) @PathParam("groupId") int groupId, @ApiParam( name = "userRoles", @@ -568,13 +569,14 @@ public interface GroupManagementService { @ApiOperation( produces = MediaType.APPLICATION_JSON, httpMethod = HTTPConstants.HEADER_GET, - value = "View list of roles of a device group.", - notes = "Returns details of roles which particular group has been shared with.", + value = "Getting the List of Roles the Group is Shared With", + notes = "A device group can be shared with different user-roles. The users that belong to that role can" + + "then view the groups and the devices in it. Using this API you get the list of roles the device group is shared with.", tags = "Device Group Management", extensions = { - @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:roles") - }) + @Extension(properties = { + @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:roles") + }) } ) @ApiResponses(value = { @@ -610,9 +612,9 @@ public interface GroupManagementService { response = ErrorResponse.class) }) Response getRolesOfGroup(@ApiParam( - name = "groupId", - value = "ID of the group.", - required = true) + name = "groupId", + value = "ID of the group.", + required = true) @PathParam("groupId") int groupId); @Path("/id/{groupId}/devices") @@ -620,13 +622,13 @@ public interface GroupManagementService { @ApiOperation( produces = MediaType.APPLICATION_JSON, httpMethod = HTTPConstants.HEADER_GET, - value = "View list of devices in the device group.", - notes = "Returns list of devices in the device group.", + value = "Getting the List of Devices in a Group", + notes = "Returns the list of devices in a device group.", tags = "Device Group Management", extensions = { - @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:devices") - }) + @Extension(properties = { + @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:devices") + }) } ) @ApiResponses(value = { @@ -639,16 +641,16 @@ public interface GroupManagementService { @ResponseHeader( name = "ETag", description = "Entity Tag of the response resource.\n" + - "Used by caches, or in conditional requests."), + "Used by caches, or in conditional requests."), @ResponseHeader( name = "Last-Modified", description = "Date and time the resource has been modified the last time.\n" + - "Used by caches, or in conditional requests."), + "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."), + "the requested resource."), @ApiResponse( code = 404, message = "Group not found.", @@ -662,9 +664,9 @@ public interface GroupManagementService { response = ErrorResponse.class) }) Response getDevicesOfGroup(@ApiParam( - name = "groupId", - value = "ID of the group.", - required = true) + name = "groupId", + value = "ID of the group.", + required = true) @PathParam("groupId") int groupId, @ApiParam( @@ -675,7 +677,8 @@ public interface GroupManagementService { int offset, @ApiParam( name = "limit", - value = "Provide how many device details you require from the starting pagination index/offset.", + value = "Provide how many group details you require from the starting " + + "pagination index/offset.", defaultValue = "5") @QueryParam("limit") int limit); @@ -685,13 +688,13 @@ public interface GroupManagementService { @ApiOperation( produces = MediaType.APPLICATION_JSON, httpMethod = HTTPConstants.HEADER_GET, - value = "View list of device count in the device group.", - notes = "Returns device count in the device group.", + value = "Getting the Number of Devices in a Group", + notes = "Get the number of devices in a group using this API.", tags = "Device Group Management", extensions = { - @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:devices-count") - }) + @Extension(properties = { + @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:devices-count") + }) } ) @ApiResponses(value = { @@ -704,16 +707,16 @@ public interface GroupManagementService { @ResponseHeader( name = "ETag", description = "Entity Tag of the response resource.\n" + - "Used by caches, or in conditional requests."), + "Used by caches, or in conditional requests."), @ResponseHeader( name = "Last-Modified", description = "Date and time the resource has been modified the last time.\n" + - "Used by caches, or in conditional requests."), + "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."), + "the requested resource."), @ApiResponse( code = 404, message = "No groups found.", @@ -727,23 +730,23 @@ public interface GroupManagementService { response = ErrorResponse.class) }) Response getDeviceCountOfGroup(@ApiParam( - name = "groupId", - value = "ID of the group.", - required = true) - @PathParam("groupId") int groupId); + name = "groupId", + value = "ID of the group.", + required = true) + @PathParam("groupId") int groupId); @Path("/id/{groupId}/devices/add") @POST @ApiOperation( produces = MediaType.APPLICATION_JSON, httpMethod = HTTPConstants.HEADER_POST, - value = "Add devices to group.", - notes = "Add existing devices to the device group.", + value = "Adding Devices to a Group", + notes = "Add the enrolled devices to a group.", tags = "Device Group Management", extensions = { - @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:devices-add") - }) + @Extension(properties = { + @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:devices-add") + }) } ) @ApiResponses(value = { @@ -755,16 +758,16 @@ public interface GroupManagementService { @ResponseHeader( name = "ETag", description = "Entity Tag of the response resource.\n" + - "Used by caches, or in conditional requests."), + "Used by caches, or in conditional requests."), @ResponseHeader( name = "Last-Modified", description = "Date and time the resource has been modified the last time.\n" + - "Used by caches, or in conditional requests."), + "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."), + "the requested resource."), @ApiResponse( code = 404, message = "No groups found.", @@ -778,9 +781,9 @@ public interface GroupManagementService { response = ErrorResponse.class) }) Response addDevicesToGroup(@ApiParam( - name = "groupId", - value = "ID of the group.", - required = true) + name = "groupId", + value = "ID of the group.", + required = true) @PathParam("groupId") int groupId, @ApiParam( name = "deviceIdentifiers", @@ -793,13 +796,13 @@ public interface GroupManagementService { @ApiOperation( produces = MediaType.APPLICATION_JSON, httpMethod = HTTPConstants.HEADER_DELETE, - value = "Remove devices from group.", - notes = "Remove existing devices from the device group.", + value = "Removing Devices from a Group", + notes = "Remove a device from a group using this API.", tags = "Device Group Management", extensions = { - @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:devices-remove") - }) + @Extension(properties = { + @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:devices-remove") + }) } ) @ApiResponses(value = { @@ -811,16 +814,16 @@ public interface GroupManagementService { @ResponseHeader( name = "ETag", description = "Entity Tag of the response resource.\n" + - "Used by caches, or in conditional requests."), + "Used by caches, or in conditional requests."), @ResponseHeader( name = "Last-Modified", description = "Date and time the resource has been modified the last time.\n" + - "Used by caches, or in conditional requests."), + "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."), + "the requested resource."), @ApiResponse( code = 404, message = "No groups found.", @@ -834,13 +837,14 @@ public interface GroupManagementService { response = ErrorResponse.class) }) Response removeDevicesFromGroup(@ApiParam( - name = "groupId", - value = "ID of the group.", - required = true) + name = "groupId", + value = "ID of the group.", + required = true) @PathParam("groupId") int groupId, @ApiParam( name = "deviceIdentifiers", - value = "Device identifiers of the devices which needed to be removed.", + value = "The device identifiers of the devices that needed to be removed."+ + " You can define many device IDs as comma separated values.", required = true) @Valid List deviceIdentifiers); @@ -849,8 +853,8 @@ public interface GroupManagementService { @ApiOperation( produces = MediaType.APPLICATION_JSON, httpMethod = HTTPConstants.HEADER_POST, - value = "Assign devices to groups", - notes = "Add existing device to device groups.", + value = "Adding a Device to Many Groups", + notes = "Add an already enrolled device to many groups, using this API.", tags = "Device Group Management", extensions = { @Extension(properties = { @@ -867,16 +871,16 @@ public interface GroupManagementService { @ResponseHeader( name = "ETag", description = "Entity Tag of the response resource.\n" + - "Used by caches, or in conditional requests."), + "Used by caches, or in conditional requests."), @ResponseHeader( name = "Last-Modified", description = "Date and time the resource has been modified the last time.\n" + - "Used by caches, or in conditional requests."), + "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."), + "the requested resource."), @ApiResponse( code = 404, message = "No groups found.", @@ -892,7 +896,9 @@ public interface GroupManagementService { Response updateDeviceAssigningToGroups( @ApiParam( name = "deviceToGroupsAssignment", - value = "Device to groups assignment", + value = "In the payload, define the group IDs that you need to add the device to as comma " + + "separated values, and the device identifier and type of the device, such as android, " + + "ios, and windows, that needs to be added to the groups.", required = true) @Valid DeviceToGroupsAssignment deviceToGroupsAssignment); @@ -901,8 +907,9 @@ public interface GroupManagementService { @ApiOperation( produces = MediaType.APPLICATION_JSON, httpMethod = HTTPConstants.HEADER_GET, - value = "List of groups that have the device", - notes = "List of groups that have the device.", + value = "Getting Device Groups that Include the Specific Device", + notes = " device can be added to one or many groups. This API gives you the list of groups the device " + + "has been added to.", tags = "Device Group Management", extensions = { @Extension(properties = { @@ -919,16 +926,16 @@ public interface GroupManagementService { @ResponseHeader( name = "ETag", description = "Entity Tag of the response resource.\n" + - "Used by caches, or in conditional requests."), + "Used by caches, or in conditional requests."), @ResponseHeader( name = "Last-Modified", description = "Date and time the resource has been modified the last time.\n" + - "Used by caches, or in conditional requests."), + "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."), + "the requested resource."), @ApiResponse( code = 406, message = "Not Acceptable.\n The requested media type is not supported."), @@ -940,13 +947,13 @@ public interface GroupManagementService { Response getGroups( @ApiParam( name = "deviceId", - value = "Id of the device.", + value = "The device ID.", required = true) @QueryParam("deviceId") String deviceId, @ApiParam( name = "deviceType", - value = "Type of the device.", + value = "The type of the device, such as android, ios, or windows.", required = true) @QueryParam("deviceType") String deviceType); diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/NotificationManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/NotificationManagementService.java index 2f98f96030f..71d173c11f0 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/NotificationManagementService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/NotificationManagementService.java @@ -221,9 +221,9 @@ public interface NotificationManagementService { @ApiOperation( produces = MediaType.APPLICATION_JSON, httpMethod = "PUT", - value = "Clear all notifications", + value = "Clearing All Notifications", notes = "When a user needs to mark all the notifications as checked/read this " + - "function can be used to clear all notifications", + "function can be used to clear all notifications.", tags = "Device Notification Management", extensions = { @Extension(properties = { diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/PolicyManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/PolicyManagementService.java index ed49af08cc3..0b25518d46b 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/PolicyManagementService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/PolicyManagementService.java @@ -136,7 +136,8 @@ import java.util.List; ) } ) -@Api(value = "Device Policy Management", description = "This API includes the functionality around device policy management") +@Api(value = "Device Policy Management", description = "This API includes the functionality around device policy " + + "management") @Path("/policies") @Produces(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON) @@ -148,8 +149,10 @@ public interface PolicyManagementService { produces = MediaType.APPLICATION_JSON, httpMethod = "POST", value = "Adding a Policy", - notes = "Add a policy using this REST API command. When adding a policy you will have the option of saving the policy or saving and publishing the policy." + - "Using this REST API you are able to save a created Policy and this policy will be in the inactive state.", + notes = "Add a policy using this REST API command. When adding a policy you will have the option of " + + "saving the policy or saving and publishing the policy." + + "Using this REST API you are able to save a created Policy and this policy will be in the " + + "inactive state.", tags = "Device Policy Management", extensions = { @Extension(properties = { @@ -181,7 +184,8 @@ public interface PolicyManagementService { ), @ApiResponse( code = 303, - message = "See Other. \n The source can be retrieved from the URL specified in 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", @@ -192,11 +196,13 @@ public interface PolicyManagementService { response = ErrorResponse.class), @ApiResponse( code = 401, - message = "Not Found. \n The user that is currently logged in is not authorized to add policies.", + message = "Not Found. \n The user that is currently logged in is not authorized to add " + + "policies.", response = ErrorResponse.class), @ApiResponse( code = 415, - message = "Unsupported media type. \n The format of the requested entity was not supported."), + message = "Unsupported media type. \n The format of the requested entity was not " + + "supported."), @ApiResponse( code = 500, message = "Internal Server Error. \n " + @@ -248,7 +254,8 @@ public interface PolicyManagementService { ), @ApiResponse( code = 304, - message = "Not Modified. \n Empty body because the client already has 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 = 400, message = "Bad Request. \n Invalid request or validation error.", @@ -322,7 +329,8 @@ public interface PolicyManagementService { ), @ApiResponse( code = 304, - message = "Not Modified. \n Empty body because the client already has the latest version of the requested resource.\n"), + message = "Not Modified. \n Empty body because the client already has the latest version " + + "of the requested resource.\n"), @ApiResponse( code = 404, message = "Not Found. \n A specified policy was not found.", @@ -400,7 +408,8 @@ public interface PolicyManagementService { response = ErrorResponse.class), @ApiResponse( code = 415, - message = "Unsupported media type. \n The format of the requested entity was not supported."), + message = "Unsupported media type. \n The format of the requested entity was not " + + "supported."), @ApiResponse( code = 500, message = "Internal Server Error. \n " + @@ -451,7 +460,8 @@ public interface PolicyManagementService { response = ErrorResponse.class), @ApiResponse( code = 415, - message = "Unsupported media type. \n The format of the requested entity was not supported.\n " + message = "Unsupported media type. \n The format of the requested entity was not " + + "supported.\n " + "supported format."), @ApiResponse( code = 500, @@ -474,7 +484,8 @@ public interface PolicyManagementService { produces = MediaType.APPLICATION_JSON, httpMethod = "POST", value = "Activating Policies", - notes = "Publish a policy using this API to bring a policy that is in the inactive state to the active state.", + notes = "Publish a policy using this API to bring a policy that is in the inactive state to the active " + + "state.", tags = "Device Policy Management", extensions = { @Extension(properties = { @@ -515,7 +526,8 @@ public interface PolicyManagementService { produces = MediaType.APPLICATION_JSON, httpMethod = "POST", value = "Deactivating Policies", - notes = "Unpublish a policy using this API to bring a policy that is in the active state to the inactive state.", + notes = "Unpublish a policy using this API to bring a policy that is in the active state to the inactive " + + "state.", tags = "Device Policy Management", extensions = { @Extension(properties = { @@ -655,7 +667,8 @@ public interface PolicyManagementService { ), @ApiResponse( code = 304, - message = "Not Modified. \n Empty body because the client already has the latest version of the requested resource.\n"), + message = "Not Modified. \n Empty body because the client already has the latest version " + + "of the requested resource.\n"), @ApiResponse( code = 404, message = "Not Found. \n A specified policy was not found.", diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/RemoteSessionService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/RemoteSessionService.java index 52c0eaf7f23..9717ce1c27f 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/RemoteSessionService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/RemoteSessionService.java @@ -78,8 +78,8 @@ public interface RemoteSessionService { consumes = "application/json", produces = "application/json", httpMethod = "GET", - value = "Retrieve Connection Information for the device type", - notes = "", + value = "Connecting to a Device", + notes = "You able to connect to a device to start a remote session using this API.", response = Response.class, tags = "Remote Session Service Management", extensions = { @@ -117,12 +117,12 @@ public interface RemoteSessionService { Response getRemoteSessionDeviceConnect( @ApiParam( name = "deviceId", - value = "The registered device Id.", + value = "The device ID.", required = true) @PathParam("deviceId") String deviceId, @ApiParam( name = "device-type", - value = "The device type, such as ios, android or windows.", + value = "The device type, such as ios, android, or windows.", required = true) @PathParam("deviceType") @Size(max = 45) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/RoleManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/RoleManagementService.java index 295fb475559..b5d8343ade4 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/RoleManagementService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/RoleManagementService.java @@ -185,7 +185,7 @@ public interface RoleManagementService { @ApiOperation( produces = MediaType.APPLICATION_JSON, httpMethod = "GET", - value = "Getting the List of Roles filtered by the given prefix", + value = "Getting the List of Roles Filtered by the Given Prefix", notes = "WSO2 IoTS supports role-based access control (RBAC) and role management. Using this API you can the list of roles that are in WSO2 IoTS.\n" + "Note: Internal roles, roles created for service-providers, and application related roles will not be given in the output.", tags = "Role Management", @@ -482,7 +482,9 @@ public interface RoleManagementService { produces = MediaType.APPLICATION_JSON, httpMethod = "POST", value = "Adding a combined Role", - notes = "WSO2 IoTS supports role-based access control (RBAC) and role management. Add a new combined role to WSO2 IoTS using this REST API.", + notes = "You are able to combine two roles that already exist and create one role. For example, you " + + "might want a role that has device owner and application management role permissions, you can" + + " now select these two roles and create another new role that has all their permissions.", tags = "Role Management", extensions = { @Extension(properties = { @@ -511,7 +513,8 @@ public interface RoleManagementService { "Used by caches, or in conditional requests.")}), @ApiResponse( code = 303, - message = "See Other. \n The source can be retrieved from the URL specified in 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", @@ -597,7 +600,8 @@ public interface RoleManagementService { name = "role", value = "The properties required to update a role.\n" + "NOTE: Don't change the role and the permissions of the admin user. " + - "If you want to try out this API by updating all the properties, create a new role and update the properties accordingly.", + "If you want to try out this API by updating all the properties, create a new role " + + "and update the properties accordingly.", required = true) RoleInfo role, @ApiParam( name = "user-store", @@ -610,7 +614,8 @@ public interface RoleManagementService { @ApiOperation( httpMethod = "DELETE", value = "Deleting a Role", - notes = "Roles become obsolete over time due to various reasons. In a situation where your Organization identifies that a specific role is no longer required, you " + + notes = "Roles become obsolete over time due to various reasons. In a situation where your " + + "Organization identifies that a specific role is no longer required, you " + "can delete a role using this REST API.", tags = "Role Management", extensions = { @@ -659,8 +664,10 @@ public interface RoleManagementService { notes = "Defining users to a role at the point of creating a new role is optional. " + "You can update the users that belong to a given role after you have created " + "a role using this REST API.\n" + - "Example: Your Organization hires 30 new engineers. Updating the role details for each user can " + - "be cumbersome. Therefore, you can define all the new employees that belong to the engineering " + + "Example: Your Organization hires 30 new engineers. Updating the role details for each user " + + "can " + + "be cumbersome. Therefore, you can define all the new employees that belong to the " + + "engineering " + "role using this API.", tags = "Role Management", extensions = { @@ -684,7 +691,8 @@ public interface RoleManagementService { "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 has been modified the last " + + "time.\n" + "Used by caches, or in conditional requests.")}), @ApiResponse( code = 400, @@ -696,7 +704,8 @@ public interface RoleManagementService { response = ErrorResponse.class), @ApiResponse( code = 415, - message = "Unsupported media type. \n The format of the requested entity was not supported.\n" + + message = "Unsupported media type. \n The format of the requested entity was not " + + "supported.\n" + "supported format.", response = ErrorResponse.class), @ApiResponse( diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/UserManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/UserManagementService.java index ff3de73d80a..d0924d96c24 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/UserManagementService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/UserManagementService.java @@ -155,7 +155,8 @@ public interface UserManagementService { produces = MediaType.APPLICATION_JSON, httpMethod = "POST", value = "Adding a User", - notes = "WSO2 IoTS supports user management. Add a new user to the WSO2 IoTS user management system via this REST API", + notes = "WSO2 IoTS supports user management. Add a new user to the WSO2 IoTS user management system via " + + "this REST API", tags = "User Management", extensions = { @Extension(properties = { @@ -243,7 +244,8 @@ public interface UserManagementService { }), @ApiResponse( code = 304, - message = "Not Modified. \n Empty body because the client already has 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 The specified resource does not exist.", @@ -351,7 +353,8 @@ public interface UserManagementService { @ApiOperation( httpMethod = "DELETE", value = "Deleting a User", - notes = "When an employee leaves the organization, you can remove the user details from WSO2 IoTS using this REST API.", + notes = "When an employee leaves the organization, you can remove the user details from WSO2 IoTS using " + + "this REST API.", tags = "User Management", extensions = { @Extension(properties = { @@ -378,7 +381,8 @@ public interface UserManagementService { @ApiParam( name = "username", value = "Username of the user to be deleted.\n" + - "INFO: If you want to try out this API, make sure to create a new user and then remove that user. Do not remove the admin user.", + "INFO: If you want to try out this API, make sure to create a new user and then remove " + + "that user. Do not remove the admin user.", required = true, defaultValue = "[Create a new user named Jim, and then try out this API.]") @PathParam("username") String username, @@ -394,7 +398,8 @@ public interface UserManagementService { produces = MediaType.APPLICATION_JSON, httpMethod = "GET", value = "Getting the Role Details of a User", - notes = "A user can be assigned to one or more role in IoTS. Using this REST API you can get the role/roles a user is assigned to.", + notes = "A user can be assigned to one or more role in IoTS. Using this REST API you can get the " + + "role/roles a user is assigned to.", tags = "User Management", extensions = { @Extension(properties = { @@ -422,7 +427,8 @@ public interface UserManagementService { }), @ApiResponse( code = 304, - message = "Not Modified. \n Empty body because the client already has 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 The specified resource does not exist.\n", @@ -455,7 +461,8 @@ public interface UserManagementService { produces = MediaType.APPLICATION_JSON, httpMethod = "GET", value = "Getting Details of Users", - notes = "You are able to manage users in WSO2 IoTS by adding, updating and removing users. If you wish to get the list of users registered with WSO2 IoTS, you can do so " + notes = "You are able to manage users in WSO2 IoTS by adding, updating and removing users. If you wish to" + + " get the list of users registered with WSO2 IoTS, you can do so " + "using this REST API", tags = "User Management", extensions = { @@ -492,7 +499,8 @@ public interface UserManagementService { response = ErrorResponse.class), @ApiResponse( code = 500, - message = "Internal Server Error. \n Server error occurred while fetching the list of WSO2 IoTS users.", + message = "Internal Server Error. \n Server error occurred while fetching the list of WSO2 IoTS " + + "users.", response = ErrorResponse.class) }) Response getUsers( @@ -551,7 +559,8 @@ public interface UserManagementService { response = ErrorResponse.class), @ApiResponse( code = 500, - message = "Internal Server Error. \n Server error occurred while fetching the total number of users in WSO2 IoTS.", + message = "Internal Server Error. \n Server error occurred while fetching the total number of " + + "users in WSO2 IoTS.", response = ErrorResponse.class) }) Response getUserCount(); @@ -602,7 +611,8 @@ public interface UserManagementService { produces = MediaType.APPLICATION_JSON, httpMethod = "GET", value = "Searching for a User Name", - notes = "If you are unsure of the user name of a user and need to retrieve the details of a specific user, you can " + notes = "If you are unsure of the user name of a user and need to retrieve the details of a specific " + + "user, you can " + "search for that user by giving a character or a few characters in the username. " + "You will be given a list of users having the user name in the exact order of the " + "characters you provided.", @@ -634,14 +644,16 @@ public interface UserManagementService { }), @ApiResponse( code = 304, - message = "Not Modified. \n Empty body because the client already has 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", response = ErrorResponse.class), @ApiResponse( code = 500, - message = "Internal Server Error. \n Server error occurred while fetching the list of users that matched the given filter.", + message = "Internal Server Error. \n Server error occurred while fetching the list of users that " + + "matched the given filter.", response = ErrorResponse.class) }) Response getUserNames( @@ -727,7 +739,9 @@ public interface UserManagementService { httpMethod = "POST", value = "Sending Enrollment Invitations to Users", notes = "Send the users a mail inviting them to enroll their devices using the REST API given below.\n" + - "Before running the REST API command to send the enrollment invitations to users make sure to configure WSO2 IoTS as explained in step 4, under the WSO2 IoTS general server configurations documentation.", + "Before running the REST API command to send the enrollment invitations to users make sure to " + + "configure WSO2 IoTS as explained in step 4, under the WSO2 IoTS general server configurations " + + "documentation.", tags = "User Management", extensions = { @Extension(properties = { diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml index 002b2fcaaf3..7ba284069c2 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml @@ -21,7 +21,7 @@ device-mgt org.wso2.carbon.devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml index 77865f71ff6..48e1e345d61 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.devicemgt device-mgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml index 18d0f6a62b8..a3e4f04e5ec 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml @@ -22,7 +22,7 @@ device-mgt org.wso2.carbon.devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.ui/pom.xml index 79fb7a416cf..75b6089c3d3 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/pom.xml @@ -22,7 +22,7 @@ device-mgt org.wso2.carbon.devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs index 151a91e9fd6..cb2a518ef66 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs @@ -736,6 +736,7 @@ var geoLocationLink = $(".initGeoLocationLink"); if (geoLocationLink) { geoLocationLink.on('click', function () { + loadGeoFencing(); initializeGeoLocation({{geoServicesEnabled}}); }); geoPublicUri = $("#geo-charts").data("geo-public-uri"); diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/app.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/app.js index 9c9632f3df1..266433f1c44 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/app.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/app.js @@ -46,7 +46,8 @@ function initialLoad(geoFencingEnabled) { } function initializeMap() { - if (typeof(map) !== 'undefined') { + ///map.zoomControl is added to fix UI loading issue on Safari + if (typeof(map) !== 'undefined' && map.zoomControl != null) { map.remove(); } if (document.getElementById('map') == null) { diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_fencing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_fencing.js index 5996dbcac35..07a42cefd8a 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_fencing.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_fencing.js @@ -23,10 +23,9 @@ var drawnItems; var lastId; var controlDiv; -loadGeoFencing(); - function loadGeoFencing() { - if (map == null) { + ///map.zoomControl is added to fix UI loading issue on Safari + if (map == null || map.zoomControl == null) { setTimeout(loadGeoFencing, 1000); // give everything some time to render } else { map.on('draw:created', function (e) { diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.url.printer/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.url.printer/pom.xml index 82b3e4f079a..599f72eb779 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.url.printer/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.url.printer/pom.xml @@ -23,7 +23,7 @@ device-mgt org.wso2.carbon.devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.v09.api/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.v09.api/pom.xml index 2ccb7a028d5..b5e26d1bd64 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.v09.api/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.v09.api/pom.xml @@ -22,7 +22,7 @@ device-mgt org.wso2.carbon.devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml diff --git a/components/device-mgt/pom.xml b/components/device-mgt/pom.xml index e9e8b65708a..0e11d344399 100644 --- a/components/device-mgt/pom.xml +++ b/components/device-mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.devicemgt carbon-devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../../pom.xml diff --git a/components/email-sender/org.wso2.carbon.email.sender.core/pom.xml b/components/email-sender/org.wso2.carbon.email.sender.core/pom.xml index d556cea10ff..595c6d212ad 100644 --- a/components/email-sender/org.wso2.carbon.email.sender.core/pom.xml +++ b/components/email-sender/org.wso2.carbon.email.sender.core/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.devicemgt email-sender - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml diff --git a/components/email-sender/pom.xml b/components/email-sender/pom.xml index 172b9dd4135..2097c0b687f 100644 --- a/components/email-sender/pom.xml +++ b/components/email-sender/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.devicemgt carbon-devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../../pom.xml diff --git a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml b/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml index 9c51e6db9ed..9e9289a3793 100644 --- a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml +++ b/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml @@ -22,13 +22,13 @@ org.wso2.carbon.devicemgt identity-extensions - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.device.mgt.oauth.extensions - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT bundle WSO2 Carbon - OAuth Extensions http://wso2.org diff --git a/components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml b/components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml index 7442ec11f95..742b013acf1 100644 --- a/components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml +++ b/components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml @@ -21,7 +21,7 @@ identity-extensions org.wso2.carbon.devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT 4.0.0 diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/pom.xml b/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/pom.xml index a513f1b9e5e..464e96b4b5a 100644 --- a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/pom.xml +++ b/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.devicemgt identity-extensions - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml diff --git a/components/identity-extensions/pom.xml b/components/identity-extensions/pom.xml index 684a2ba55a2..e549a403600 100644 --- a/components/identity-extensions/pom.xml +++ b/components/identity-extensions/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.devicemgt carbon-devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../../pom.xml diff --git a/components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml b/components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml index 0dc6eac44d4..e2433cbd8f2 100644 --- a/components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml +++ b/components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt policy-mgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.devicemgt org.wso2.carbon.complex.policy.decision.point - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT bundle WSO2 Carbon - Policy Decision Point WSO2 Carbon - Policy Decision Point diff --git a/components/policy-mgt/org.wso2.carbon.policy.decision.point/pom.xml b/components/policy-mgt/org.wso2.carbon.policy.decision.point/pom.xml index 64153d2d82d..5b10b90a1fd 100644 --- a/components/policy-mgt/org.wso2.carbon.policy.decision.point/pom.xml +++ b/components/policy-mgt/org.wso2.carbon.policy.decision.point/pom.xml @@ -3,14 +3,14 @@ org.wso2.carbon.devicemgt policy-mgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.devicemgt org.wso2.carbon.policy.decision.point - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT bundle WSO2 Carbon - Policy Decision Point WSO2 Carbon - Policy Decision Point diff --git a/components/policy-mgt/org.wso2.carbon.policy.information.point/pom.xml b/components/policy-mgt/org.wso2.carbon.policy.information.point/pom.xml index 089d3cfc6e8..f2e3b8ffd78 100644 --- a/components/policy-mgt/org.wso2.carbon.policy.information.point/pom.xml +++ b/components/policy-mgt/org.wso2.carbon.policy.information.point/pom.xml @@ -3,7 +3,7 @@ org.wso2.carbon.devicemgt policy-mgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml @@ -11,7 +11,7 @@ 4.0.0 org.wso2.carbon.devicemgt org.wso2.carbon.policy.information.point - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT bundle WSO2 Carbon - Policy Information Point WSO2 Carbon - Policy Information Point diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml b/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml index 0be05ecfaf3..02bf370df6e 100644 --- a/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml +++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt policy-mgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.devicemgt org.wso2.carbon.policy.mgt.common - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT bundle WSO2 Carbon - Policy Management Common WSO2 Carbon - Policy Management Common diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml index 7904f0d5fcb..6a3d2197201 100644 --- a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml +++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt policy-mgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.devicemgt org.wso2.carbon.policy.mgt.core - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT bundle WSO2 Carbon - Policy Management Core WSO2 Carbon - Policy Management Core diff --git a/components/policy-mgt/pom.xml b/components/policy-mgt/pom.xml index 3cd58d90928..11f4909cb02 100644 --- a/components/policy-mgt/pom.xml +++ b/components/policy-mgt/pom.xml @@ -23,13 +23,13 @@ org.wso2.carbon.devicemgt carbon-devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../../pom.xml 4.0.0 policy-mgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT pom WSO2 Carbon - Policy Management Component http://wso2.org diff --git a/components/test-coverage/pom.xml b/components/test-coverage/pom.xml index 699fd4e3bdb..d8ab3645a2b 100644 --- a/components/test-coverage/pom.xml +++ b/components/test-coverage/pom.xml @@ -21,7 +21,7 @@ carbon-devicemgt org.wso2.carbon.devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml index 892d90b51fa..18fefe60f52 100644 --- a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml +++ b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml @@ -21,14 +21,14 @@ org.wso2.carbon.devicemgt webapp-authenticator-framework - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.devicemgt org.wso2.carbon.webapp.authenticator.framework - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT bundle WSO2 Carbon - Web Application Authenticator Framework Bundle WSO2 Carbon - Web Application Authenticator Framework Bundle diff --git a/components/webapp-authenticator-framework/pom.xml b/components/webapp-authenticator-framework/pom.xml index f318d50da29..64756a47914 100644 --- a/components/webapp-authenticator-framework/pom.xml +++ b/components/webapp-authenticator-framework/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt carbon-devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../../pom.xml 4.0.0 org.wso2.carbon.devicemgt webapp-authenticator-framework - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT pom WSO2 Carbon - Webapp Authenticator Framework http://wso2.org diff --git a/features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/pom.xml b/features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/pom.xml index 0d186b9910e..12b09552571 100644 --- a/features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/pom.xml +++ b/features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/pom.xml @@ -21,14 +21,14 @@ org.wso2.carbon.devicemgt apimgt-extensions-feature - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.apimgt.application.extension.feature pom - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT WSO2 Carbon - API Management Application Extension Feature http://wso2.org This feature contains an implementation of a api application registration, which takes care of subscription diff --git a/features/apimgt-extensions/org.wso2.carbon.apimgt.handler.server.feature/pom.xml b/features/apimgt-extensions/org.wso2.carbon.apimgt.handler.server.feature/pom.xml index 7daa69b923d..1d8dd99deef 100644 --- a/features/apimgt-extensions/org.wso2.carbon.apimgt.handler.server.feature/pom.xml +++ b/features/apimgt-extensions/org.wso2.carbon.apimgt.handler.server.feature/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt apimgt-extensions-feature - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.apimgt.handler.server.feature pom - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT WSO2 Carbon - Device Management - APIM handler Server Feature http://wso2.org This feature contains the handler for the api authentications diff --git a/features/apimgt-extensions/org.wso2.carbon.apimgt.integration.client.feature/pom.xml b/features/apimgt-extensions/org.wso2.carbon.apimgt.integration.client.feature/pom.xml index c00d745bf14..3d233cd4ffe 100644 --- a/features/apimgt-extensions/org.wso2.carbon.apimgt.integration.client.feature/pom.xml +++ b/features/apimgt-extensions/org.wso2.carbon.apimgt.integration.client.feature/pom.xml @@ -21,13 +21,13 @@ org.wso2.carbon.devicemgt apimgt-extensions-feature - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.apimgt.integration.client.feature - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT pom WSO2 Carbon - APIM Integration Client Feature http://wso2.org diff --git a/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml b/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml index 4486a7860ea..0d258f4b40a 100644 --- a/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml +++ b/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml @@ -21,14 +21,14 @@ org.wso2.carbon.devicemgt apimgt-extensions-feature - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.apimgt.webapp.publisher.feature pom - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT WSO2 Carbon - API Management Webapp Publisher Feature http://wso2.org This feature contains an implementation of a Tomcat lifecycle listener, which takes care of publishing diff --git a/features/apimgt-extensions/pom.xml b/features/apimgt-extensions/pom.xml index 6b48f0d2e2e..23d795acca2 100644 --- a/features/apimgt-extensions/pom.xml +++ b/features/apimgt-extensions/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt carbon-devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../../pom.xml 4.0.0 org.wso2.carbon.devicemgt apimgt-extensions-feature - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT pom WSO2 Carbon - API Management Extensions Feature http://wso2.org diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml index 904af6e557c..6eff66db117 100644 --- a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml +++ b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.devicemgt certificate-mgt-feature - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/pom.xml b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/pom.xml index 5684bb39588..7b3f02d99eb 100644 --- a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/pom.xml +++ b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.devicemgt certificate-mgt-feature - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml index 1ecec78b346..441b2a51c7b 100644 --- a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml +++ b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt certificate-mgt-feature - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.certificate.mgt.server.feature pom - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT WSO2 Carbon - Certificate Management Server Feature http://wso2.org This feature contains the core bundles required for back-end Certificate Management functionality diff --git a/features/certificate-mgt/pom.xml b/features/certificate-mgt/pom.xml index dc4f3ea67ed..3023801b156 100644 --- a/features/certificate-mgt/pom.xml +++ b/features/certificate-mgt/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt carbon-devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../../pom.xml 4.0.0 org.wso2.carbon.devicemgt certificate-mgt-feature - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT pom WSO2 Carbon - Certificate Management Feature http://wso2.org diff --git a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature/pom.xml b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature/pom.xml index cbb42e16af7..b46f2f5322f 100644 --- a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature/pom.xml +++ b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt device-mgt-extensions-feature - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature pom - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT WSO2 Carbon - Device Type Deployer Feature http://wso2.org WSO2 Carbon - Device Type Deployer Feature diff --git a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml index a5ed71b16e1..73dff83cbb2 100644 --- a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml +++ b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt device-mgt-extensions-feature - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature pom - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT WSO2 Carbon - FCM Based Push Notification Provider Feature http://wso2.org WSO2 Carbon - MQTT Based Push Notification Provider Feature diff --git a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature/pom.xml b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature/pom.xml index 22075c861e0..efa8eb55004 100644 --- a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature/pom.xml +++ b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt device-mgt-extensions-feature - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature pom - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT WSO2 Carbon - MQTT Based Push Notification Provider Feature http://wso2.org WSO2 Carbon - MQTT Based Push Notification Provider Feature diff --git a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml index 74c191f6da6..f94ad54a8ec 100644 --- a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml +++ b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt device-mgt-extensions-feature - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature pom - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT WSO2 Carbon - MQTT Based Push Notification Provider Feature http://wso2.org WSO2 Carbon - MQTT Based Push Notification Provider Feature diff --git a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml index dc68f7e92ba..52a8a063bfc 100644 --- a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml +++ b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt device-mgt-extensions-feature - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature pom - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT WSO2 Carbon - XMPP Based Push Notification Provider Feature http://wso2.org WSO2 Carbon - XMPP Based Push Notification Provider Feature diff --git a/features/device-mgt-extensions/pom.xml b/features/device-mgt-extensions/pom.xml index a68d8069edb..6fb79bd8df8 100644 --- a/features/device-mgt-extensions/pom.xml +++ b/features/device-mgt-extensions/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.devicemgt carbon-devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../../pom.xml diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher.feature/pom.xml index 9999f94bc93..5b3519f7ac5 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher.feature/pom.xml +++ b/features/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher.feature/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt device-mgt-feature - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.device.mgt.analytics.data.publisher.feature pom - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT WSO2 Carbon - Device Management Server Feature http://wso2.org This feature contains bundles related to device analytics data publisher diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml index 3c2d6a9e0be..ab0627e1740 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml +++ b/features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.devicemgt device-mgt-feature - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/pom.xml index 64c38298bce..8919350ac47 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/pom.xml +++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.devicemgt device-mgt-feature - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml index 34a869b287a..859fdeb3624 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml +++ b/features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml @@ -4,14 +4,14 @@ org.wso2.carbon.devicemgt device-mgt-feature - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.device.mgt.extensions.feature pom - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT WSO2 Carbon - Device Management Extensions Feature http://wso2.org This feature contains common extensions used by key device management functionalities diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml index dab6e1dde98..476cc0091f1 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml +++ b/features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.devicemgt device-mgt-feature - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml index 22110a4ecd9..42ffde47eab 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml +++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt device-mgt-feature - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.device.mgt.server.feature pom - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT WSO2 Carbon - Device Management Server Feature http://wso2.org This feature contains the core bundles required for Back-end Device Management functionality diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/pom.xml index a8c75056ad6..7f5194a1312 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/pom.xml +++ b/features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.devicemgt device-mgt-feature - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml diff --git a/features/device-mgt/pom.xml b/features/device-mgt/pom.xml index c4f10cdbbf0..5e34307382a 100644 --- a/features/device-mgt/pom.xml +++ b/features/device-mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.devicemgt carbon-devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../../pom.xml diff --git a/features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml b/features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml index ca3d467921c..570de6e9e70 100644 --- a/features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml +++ b/features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt email-sender-feature - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.email.sender.feature pom - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT WSO2 Carbon - Email Sender Feature http://wso2.org This feature contains the core bundles required for email sender related functionality diff --git a/features/email-sender/pom.xml b/features/email-sender/pom.xml index d60c1bdfe21..5532565d017 100644 --- a/features/email-sender/pom.xml +++ b/features/email-sender/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt carbon-devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../../pom.xml 4.0.0 org.wso2.carbon.devicemgt email-sender-feature - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT pom WSO2 Carbon - Email Sender Feature http://wso2.org diff --git a/features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml b/features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml index b101ee6b012..56ebe365b35 100644 --- a/features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml +++ b/features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml @@ -23,14 +23,14 @@ org.wso2.carbon.devicemgt jwt-client-feature - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.identity.jwt.client.extension.feature pom - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT WSO2 Carbon - JWT Client Feature http://wso2.org This feature contains jwt client implementation from which we can get a access token using the jwt diff --git a/features/jwt-client/pom.xml b/features/jwt-client/pom.xml index a41c22b6fd7..54ae2277189 100644 --- a/features/jwt-client/pom.xml +++ b/features/jwt-client/pom.xml @@ -23,13 +23,13 @@ org.wso2.carbon.devicemgt carbon-devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../../pom.xml 4.0.0 jwt-client-feature - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT pom WSO2 Carbon - JWT Client Extension Feature http://wso2.org diff --git a/features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml b/features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml index 8721bb5b635..63af2613801 100644 --- a/features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml +++ b/features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml @@ -23,14 +23,14 @@ org.wso2.carbon.devicemgt oauth-extensions-feature - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.device.mgt.oauth.extensions.feature pom - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT WSO2 Carbon - Device Mgt OAuth Extensions Feature http://wso2.org This feature contains devicemgt related OAuth extensions diff --git a/features/oauth-extensions/pom.xml b/features/oauth-extensions/pom.xml index 3d575d979f0..c20624d705c 100644 --- a/features/oauth-extensions/pom.xml +++ b/features/oauth-extensions/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt carbon-devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../../pom.xml 4.0.0 org.wso2.carbon.devicemgt oauth-extensions-feature - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT pom WSO2 Carbon - Device Management OAuth Extensions Feature http://wso2.org diff --git a/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml b/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml index 0ac274cf2e9..fc7f7f6f3b4 100644 --- a/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml +++ b/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml @@ -23,14 +23,14 @@ org.wso2.carbon.devicemgt policy-mgt-feature - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.policy.mgt.server.feature pom - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT WSO2 Carbon - Policy Management Server Feature http://wso2.org This feature contains the core bundles required for Back-end Device Management functionality diff --git a/features/policy-mgt/pom.xml b/features/policy-mgt/pom.xml index 8077d496a70..bb5dbdcc212 100644 --- a/features/policy-mgt/pom.xml +++ b/features/policy-mgt/pom.xml @@ -23,14 +23,14 @@ org.wso2.carbon.devicemgt carbon-devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../../pom.xml 4.0.0 org.wso2.carbon.devicemgt policy-mgt-feature - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT pom WSO2 Carbon - Policy Management Feature http://wso2.org diff --git a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml b/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml index c45428f8841..ba7163a2922 100644 --- a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml +++ b/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt webapp-authenticator-framework-feature - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.webapp.authenticator.framework.server.feature pom - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT WSO2 Carbon - Webapp Authenticator Framework Server Feature http://wso2.org This feature contains the core bundles required for Back-end Device Management functionality diff --git a/features/webapp-authenticator-framework/pom.xml b/features/webapp-authenticator-framework/pom.xml index a00d1d59323..8b3657c19ab 100644 --- a/features/webapp-authenticator-framework/pom.xml +++ b/features/webapp-authenticator-framework/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt carbon-devicemgt - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT ../../pom.xml 4.0.0 org.wso2.carbon.devicemgt webapp-authenticator-framework-feature - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT pom WSO2 Carbon - Webapp Authenticator Framework Feature http://wso2.org diff --git a/pom.xml b/pom.xml index 13c4327c900..0e7e03645c2 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.devicemgt carbon-devicemgt pom - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT WSO2 Carbon - Device Management - Parent http://wso2.org WSO2 Connected Device Manager Components @@ -1875,7 +1875,7 @@ 1.2.11.wso2v10 - 3.0.241-SNAPSHOT + 3.0.244-SNAPSHOT 4.4.8