mirror of
https://repository.entgra.net/community/device-mgt-plugins.git
synced 2025-09-16 23:42:15 +00:00
Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
This commit is contained in:
Ace
commit
0cb99be949
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>androidsense-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<artifactId>androidsense-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
<parent>
|
||||
<artifactId>androidsense-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>androidsense-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -33,7 +33,7 @@ function setPopupMaxHeight() {
|
||||
* show popup function.
|
||||
*/
|
||||
function showPopup() {
|
||||
$(modalPopup).show();
|
||||
$(modalPopup).modal('show');
|
||||
setPopupMaxHeight();
|
||||
$('#downloadForm').validate({
|
||||
rules: {
|
||||
@ -65,7 +65,7 @@ function hidePopup() {
|
||||
$('label[for=deviceName]').remove();
|
||||
$('.control-group').removeClass('success').removeClass('error');
|
||||
$(modalPopupContent).html('');
|
||||
$(modalPopup).hide();
|
||||
$(modalPopup).modal('hide');
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>iot-plugins</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>arduino-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>arduino-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>arduino-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<artifactId>arduino-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -33,7 +33,7 @@ function setPopupMaxHeight() {
|
||||
* show popup function.
|
||||
*/
|
||||
function showPopup() {
|
||||
$(modalPopup).show();
|
||||
$(modalPopup).modal('show');
|
||||
setPopupMaxHeight();
|
||||
$('#downloadForm').validate({
|
||||
rules: {
|
||||
@ -65,7 +65,7 @@ function hidePopup() {
|
||||
$('label[for=deviceName]').remove();
|
||||
$('.control-group').removeClass('success').removeClass('error');
|
||||
$(modalPopupContent).html('');
|
||||
$(modalPopup).hide();
|
||||
$(modalPopup).modal('hide');
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>iot-plugins</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>iot-analytics</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>iot-plugins</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<parent>
|
||||
<artifactId>iot-base-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<parent>
|
||||
<artifactId>iot-base-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<parent>
|
||||
<artifactId>iot-base-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<parent>
|
||||
<artifactId>iot-base-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<parent>
|
||||
<artifactId>iot-base-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>iot-base-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>iot-base-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<parent>
|
||||
<artifactId>iot-base-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<artifactId>iot-base-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<artifactId>iot-base-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>iot-plugins</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>raspberrypi-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>raspberrypi-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<artifactId>raspberrypi-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<artifactId>raspberrypi-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -33,7 +33,7 @@ function setPopupMaxHeight() {
|
||||
* show popup function.
|
||||
*/
|
||||
function showPopup() {
|
||||
$(modalPopup).show();
|
||||
$(modalPopup).modal('show');
|
||||
setPopupMaxHeight();
|
||||
$('#downloadForm').validate({
|
||||
rules: {
|
||||
@ -65,7 +65,7 @@ function hidePopup() {
|
||||
$('label[for=deviceName]').remove();
|
||||
$('.control-group').removeClass('success').removeClass('error');
|
||||
$(modalPopupContent).html('');
|
||||
$(modalPopup).hide();
|
||||
$(modalPopup).modal('hide');
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>iot-plugins</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<artifactId>virtual-fire-alarm-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<artifactId>virtual-fire-alarm-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>virtual-fire-alarm-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<artifactId>virtual-fire-alarm-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>virtual-fire-alarm-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<artifactId>virtual-fire-alarm-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -33,7 +33,7 @@ function setPopupMaxHeight() {
|
||||
* Shows agent download popup.
|
||||
*/
|
||||
function showAgentDownloadPopup() {
|
||||
$(modalPopup).show();
|
||||
$(modalPopup).modal('show');
|
||||
setPopupMaxHeight();
|
||||
var deviceType = "";
|
||||
$('.deviceType').each(function () {
|
||||
@ -50,7 +50,7 @@ function hideAgentDownloadPopup() {
|
||||
$('label[for=deviceName]').remove();
|
||||
$('.control-group').removeClass('success').removeClass('error');
|
||||
$(modalPopupContent).html('');
|
||||
$(modalPopup).hide();
|
||||
$(modalPopup).modal('hide');
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>iot-plugins</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>android-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -44,6 +44,8 @@ public class ApplicationInstallation extends AndroidOperation implements Seriali
|
||||
|
||||
@ApiModelProperty(name = "url", value = "Application URL", required = true)
|
||||
private String url;
|
||||
@ApiModelProperty(name = "schedule", value = "Application install schedule.", required = false)
|
||||
private String schedule;
|
||||
|
||||
public String getAppIdentifier() {
|
||||
return appIdentifier;
|
||||
@ -68,4 +70,12 @@ public class ApplicationInstallation extends AndroidOperation implements Seriali
|
||||
public void setUrl(String url) {
|
||||
this.url = url;
|
||||
}
|
||||
|
||||
public String getSchedule() {
|
||||
return schedule;
|
||||
}
|
||||
|
||||
public void setSchedule(String schedule) {
|
||||
this.schedule = schedule;
|
||||
}
|
||||
}
|
||||
|
||||
@ -43,10 +43,6 @@ public class ApplicationUninstallation extends AndroidOperation implements Seria
|
||||
@Pattern(regexp = "^[A-Za-z]*$")
|
||||
private String type;
|
||||
|
||||
@ApiModelProperty(name = "name", value = "The name of the application.", required = true)
|
||||
@Size(min = 2, max = 45)
|
||||
private String name;
|
||||
|
||||
public String getAppIdentifier() {
|
||||
return appIdentifier;
|
||||
}
|
||||
@ -63,11 +59,4 @@ public class ApplicationUninstallation extends AndroidOperation implements Seria
|
||||
this.type = type;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
}
|
||||
|
||||
@ -44,7 +44,7 @@ public class ApplicationUpdate extends AndroidOperation implements Serializable
|
||||
private String type;
|
||||
@ApiModelProperty(name = "url", value = "The URL of the application.", required = true)
|
||||
private String url;
|
||||
@ApiModelProperty(name = "schedule", value = "Application update schedule.", required = true)
|
||||
@ApiModelProperty(name = "schedule", value = "Application update schedule.", required = false)
|
||||
private String schedule;
|
||||
|
||||
public String getAppIdentifier() {
|
||||
|
||||
@ -21,7 +21,6 @@ package org.wso2.carbon.mdm.services.android.services;
|
||||
import io.swagger.annotations.*;
|
||||
import org.wso2.carbon.apimgt.annotations.api.API;
|
||||
import org.wso2.carbon.apimgt.annotations.api.Permission;
|
||||
import org.wso2.carbon.apimgt.annotations.api.Scope;
|
||||
import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
|
||||
import org.wso2.carbon.mdm.services.android.bean.wrapper.AndroidApplication;
|
||||
import org.wso2.carbon.mdm.services.android.bean.wrapper.AndroidDevice;
|
||||
@ -330,7 +329,7 @@ public interface DeviceManagementService {
|
||||
message = "Internal Server Error. \n " +
|
||||
"Server error occurred while dis-enrolling the device.")
|
||||
})
|
||||
@Permission(name = "Enroll Device", permission = "/device-mgt/devices/enroll/android")
|
||||
@Permission(name = "Disenroll Device", permission = "/device-mgt/devices/disenroll/android")
|
||||
Response disEnrollDevice(
|
||||
@ApiParam(
|
||||
name = "id",
|
||||
|
||||
@ -534,6 +534,18 @@ public class DeviceManagementAdminServiceImpl implements DeviceManagementAdminSe
|
||||
throw new BadRequestException(
|
||||
new ErrorResponse.ErrorResponseBuilder().setCode(400l).setMessage(errorMessage).build());
|
||||
}
|
||||
String scheduledTime = applicationInstallationBeanWrapper.getOperation().getSchedule();
|
||||
if (scheduledTime != null && !scheduledTime.isEmpty()) {
|
||||
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ");
|
||||
try {
|
||||
String formattedScheduledDate = format.format(format.parse(scheduledTime));
|
||||
applicationInstallationBeanWrapper.getOperation().setSchedule(formattedScheduledDate);
|
||||
} catch (ParseException e) {
|
||||
String errorMessage = "Invalid date string is provided in for schedule parameter";
|
||||
throw new BadRequestException(
|
||||
new ErrorResponse.ErrorResponseBuilder().setCode(400l).setMessage(errorMessage).build());
|
||||
}
|
||||
}
|
||||
|
||||
ApplicationInstallation applicationInstallation = applicationInstallationBeanWrapper.getOperation();
|
||||
JSONObject payload = new JSONObject(applicationInstallation.toJSON());
|
||||
@ -615,6 +627,18 @@ public class DeviceManagementAdminServiceImpl implements DeviceManagementAdminSe
|
||||
throw new BadRequestException(
|
||||
new ErrorResponse.ErrorResponseBuilder().setCode(400l).setMessage(errorMessage).build());
|
||||
}
|
||||
String scheduledTime = applicationUpdateBeanWrapper.getOperation().getSchedule();
|
||||
if (scheduledTime != null && !scheduledTime.isEmpty()) {
|
||||
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ");
|
||||
try {
|
||||
String formattedScheduledDate = format.format(format.parse(scheduledTime));
|
||||
applicationUpdateBeanWrapper.getOperation().setSchedule(formattedScheduledDate);
|
||||
} catch (ParseException e) {
|
||||
String errorMessage = "Invalid date string is provided in for schedule parameter";
|
||||
throw new BadRequestException(
|
||||
new ErrorResponse.ErrorResponseBuilder().setCode(400l).setMessage(errorMessage).build());
|
||||
}
|
||||
}
|
||||
ApplicationUpdate applicationUpdate = applicationUpdateBeanWrapper.getOperation();
|
||||
ProfileOperation operation = new ProfileOperation();
|
||||
operation.setCode(AndroidConstants.OperationCodes.UPDATE_APPLICATION);
|
||||
|
||||
@ -32,7 +32,7 @@ import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementExcept
|
||||
import org.wso2.carbon.mdm.services.android.bean.ErrorResponse;
|
||||
import org.wso2.carbon.mdm.services.android.bean.wrapper.AndroidApplication;
|
||||
import org.wso2.carbon.mdm.services.android.bean.wrapper.AndroidDevice;
|
||||
import org.wso2.carbon.mdm.services.android.exception.*;
|
||||
import org.wso2.carbon.mdm.services.android.exception.UnexpectedServerErrorException;
|
||||
import org.wso2.carbon.mdm.services.android.services.DeviceManagementService;
|
||||
import org.wso2.carbon.mdm.services.android.util.AndroidAPIUtils;
|
||||
import org.wso2.carbon.mdm.services.android.util.AndroidConstants;
|
||||
@ -179,8 +179,8 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
|
||||
notification.setOperationId(operation.getId());
|
||||
notification.setStatus(org.wso2.carbon.device.mgt.common.notification.mgt.Notification.
|
||||
Status.NEW.toString());
|
||||
notification.setDescription("Operation " + operation.getCode() + " failed to execute on device " +
|
||||
deviceName + ". Device ID : " + deviceId);
|
||||
notification.setDescription(operation.getCode() + " operation did fail to execute on device " +
|
||||
deviceName + " with identifier " + deviceId);
|
||||
AndroidAPIUtils.getNotificationManagementService().addNotification(id, notification);
|
||||
}
|
||||
if (log.isDebugEnabled()) {
|
||||
|
||||
@ -124,6 +124,15 @@
|
||||
<method>POST</method>
|
||||
</Permission>
|
||||
|
||||
<Permission>
|
||||
<name>GET Events</name>
|
||||
<path>/device-mgt/admin/events/get</path>
|
||||
<url>/events</url>
|
||||
<method>GET</method>
|
||||
</Permission>
|
||||
|
||||
|
||||
|
||||
<!-- End of event related permissions -->
|
||||
|
||||
<!-- Operations related permissions -->
|
||||
@ -156,6 +165,13 @@
|
||||
<method>POST</method>
|
||||
</Permission>
|
||||
|
||||
<Permission>
|
||||
<name>Logcat</name>
|
||||
<path>/device-mgt/admin/device/android/operation/logcat</path>
|
||||
<url>/admin/devices/logcat</url>
|
||||
<method>POST</method>
|
||||
</Permission>
|
||||
|
||||
<Permission>
|
||||
<name>Configure VPN</name>
|
||||
<path>/device-mgt/admin/device/android/operation/configure-vpn</path>
|
||||
|
||||
@ -23,13 +23,13 @@
|
||||
<parent>
|
||||
<artifactId>android-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>org.wso2.carbon.device.mgt.mobile.android.ui</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<name>WSO2 Carbon - Mobile Android UI</name>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>android-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>mobile-plugins</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<artifactId>mobile-base-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -15,6 +15,7 @@
|
||||
specific language governing permissions and limitations
|
||||
under the License.
|
||||
}}
|
||||
|
||||
{{unit "cdmf.unit.ui.title" pageTitle="Device Management"}}
|
||||
|
||||
{{unit "cdmf.unit.data-tables-extended"}}
|
||||
@ -37,33 +38,23 @@
|
||||
|
||||
{{#zone "navbarActions"}}
|
||||
{{#if permissions.ENROLL_DEVICE}}
|
||||
<li id = "enroll-btn">
|
||||
<li id="enroll-btn" class="hidden">
|
||||
<a href="javascript:toggleEnrollment()">
|
||||
<span class="fw-stack">
|
||||
<i class="fw fw-ring fw-stack-2x"></i>
|
||||
<i class="fw fw-mobile fw-stack-1x"></i>
|
||||
<span class="fw-stack fw-move-right fw-move-top">
|
||||
<i class="fw fw-circle fw-stack-2x fw-stroke fw-inverse"></i>
|
||||
<i class="fw fw-circle fw-stack-2x"></i>
|
||||
<i class="fw fw-ring fw-stroke fw-stack-2x"></i>
|
||||
<i class="fw fw-add fw-stack-1x"></i>
|
||||
</span>
|
||||
</span>
|
||||
Enroll Device
|
||||
Add New Device
|
||||
</a>
|
||||
</li>
|
||||
{{/if}}
|
||||
{{#if permissions.ADVANCED_SEARCH}}
|
||||
<li id = "advanced-search-btn">
|
||||
<li id="advanced-search-btn" class="hidden">
|
||||
<a href="{{appContext}}devices/search">
|
||||
<span class="fw-stack">
|
||||
<i class="fw fw-ring fw-stack-2x"></i>
|
||||
<i class="fw fw-mobile fw-stack-1x"></i>
|
||||
<span class="fw-stack fw-move-right fw-move-top">
|
||||
<i class="fw fw-circle fw-stack-2x fw-stroke fw-inverse"></i>
|
||||
<i class="fw fw-circle fw-stack-2x"></i>
|
||||
<i class="fw fw-ring fw-stroke fw-stack-2x"></i>
|
||||
<i class="fw fw-search fw-stack-1x"></i>
|
||||
</span>
|
||||
</span>
|
||||
Advanced Search
|
||||
</a>
|
||||
</li>
|
||||
@ -72,25 +63,26 @@
|
||||
|
||||
{{#zone "content"}}
|
||||
{{#if permissions.VIEW_DEVICES}}
|
||||
<div id="loading-content" class="col-centered">
|
||||
<i class="fw fw-settings fw-spin fw-2x"></i>
|
||||
|
||||
Loading devices . . .
|
||||
<br>
|
||||
<div id="no-device-view" class="ast-container list-view hidden">
|
||||
<div class="ctrl-info-panel col-centered text-center wr-login">
|
||||
<h3 class="text-muted">
|
||||
<i class="fw fw-mobile fw-3x"></i>
|
||||
</h3>
|
||||
<h3 class="text-muted">You do not have any enrolled device at the moment</h3>
|
||||
<h3>
|
||||
<a href="javascript:toggleEnrollment()" class="btn-operations btn-default">
|
||||
<span class="fw-stack">
|
||||
<i class="fw fw-ring fw-stack-2x"></i>
|
||||
<i class="fw fw-add fw-stack-1x"></i>
|
||||
</span>
|
||||
Add New Device
|
||||
</a>
|
||||
</h3>
|
||||
</div>
|
||||
<div id="device-listing-status" class="raw hidden">
|
||||
<ul style="list-style-type: none;">
|
||||
<li class="message message-info">
|
||||
<h4>
|
||||
<i class="icon fw fw-info"></i>
|
||||
<a id="device-listing-status-msg"></a>
|
||||
</h4>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div id="device-table">
|
||||
<table class="table table-striped table-hover list-table display responsive nowrap data-table grid-view"
|
||||
id="device-grid">
|
||||
<div id="device-table" class="hidden">
|
||||
<table id="device-grid"
|
||||
class="table table-striped table-hover list-table display responsive nowrap data-table grid-view">
|
||||
<thead>
|
||||
<tr class="sort-row">
|
||||
<th class="no-sort"></th>
|
||||
@ -136,25 +128,6 @@
|
||||
<a href="#">By Ownership</a>
|
||||
</div>
|
||||
</div>
|
||||
<div id="no-device-view" class="ast-container list-view hidden">
|
||||
<div class="ctrl-info-panel col-centered text-center wr-login">
|
||||
<h2>You do not have any device enrolled at the moment.</h2>
|
||||
<p class="text-center">
|
||||
<a href="javascript:toggleEnrollment()" class="wr-btn">
|
||||
<span class="fw-stack">
|
||||
<i class="fw fw-ring fw-stack-2x"></i>
|
||||
<i class="fw fw-mobile fw-stack-1x"></i>
|
||||
<span class="fw-stack fw-move-right fw-move-bottom">
|
||||
<i class="fw fw-ring fw-stack-2x"></i>
|
||||
<i class="fw fw-circle fw-stack-2x fw-stroke text-info"></i>
|
||||
<i class="fw fw-add fw-stack-1x fw-inverse"></i>
|
||||
</span>
|
||||
</span>
|
||||
Enroll New Device
|
||||
</a>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
{{else}}
|
||||
<h1 class="page-sub-title">
|
||||
Permission Denied
|
||||
|
||||
@ -76,26 +76,81 @@ function loadDevices() {
|
||||
return {};
|
||||
}
|
||||
|
||||
var fnCreatedRow = function (nRow, aData, dataIndex) {
|
||||
$(nRow).attr('data-type', 'selectable');
|
||||
$(nRow).attr('data-deviceid', aData.deviceIdentifier);
|
||||
$(nRow).attr('data-devicetype', aData.deviceType);
|
||||
var dataFilter = function (data) {
|
||||
var noDeviceView = "#no-device-view";
|
||||
|
||||
data = JSON.parse(data);
|
||||
var json;
|
||||
|
||||
if (data["count"] == 0) {
|
||||
if ($(noDeviceView).length) {
|
||||
$(noDeviceView).removeClass('hidden');
|
||||
}
|
||||
|
||||
$(".bulk-action-row").addClass('hidden');
|
||||
|
||||
json = {
|
||||
"recordsTotal": 0,
|
||||
"recordsFiltered": 0,
|
||||
"data": []
|
||||
};
|
||||
|
||||
} else if (data["count"] > 0) {
|
||||
$(noDeviceView).remove();
|
||||
$("#enroll-btn").removeClass('hidden');
|
||||
$("#advanced-search-btn").removeClass('hidden');
|
||||
$(".bulk-action-row").removeClass('hidden');
|
||||
$("#device-table").removeClass('hidden');
|
||||
|
||||
var objects = [];
|
||||
|
||||
$(data.devices).each(function (index) {
|
||||
objects.push(
|
||||
{
|
||||
model: getPropertyValue(data.devices[index].properties, "DEVICE_MODEL"),
|
||||
vendor: getPropertyValue(data.devices[index].properties, "VENDOR"),
|
||||
user: data.devices[index].enrolmentInfo.owner,
|
||||
status: data.devices[index].enrolmentInfo.status,
|
||||
ownership: data.devices[index].enrolmentInfo.ownership,
|
||||
deviceType: data.devices[index].type,
|
||||
deviceIdentifier: data.devices[index].deviceIdentifier,
|
||||
name : data.devices[index].name
|
||||
}
|
||||
);
|
||||
});
|
||||
|
||||
json = {
|
||||
"recordsTotal": data["count"],
|
||||
"recordsFiltered": data["count"],
|
||||
"data": objects
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
return JSON.stringify(json);
|
||||
};
|
||||
|
||||
// possible params - nRow, aData, dataIndex
|
||||
var fnCreatedRow = function (nRow, aData) {
|
||||
$(nRow).attr('data-type', 'selectable');
|
||||
$(nRow).attr('data-devicetype', aData["deviceType"]);
|
||||
$(nRow).attr('data-deviceid', aData["deviceIdentifier"]);
|
||||
};
|
||||
|
||||
var columns = [
|
||||
{
|
||||
class : 'remove-padding icon-only content-fill viewEnabledIcon',
|
||||
data : 'icon',
|
||||
data : null,
|
||||
render: function (data, type, row) {
|
||||
var deviceType = row.deviceType;
|
||||
var deviceIdentifier = row.deviceIdentifier;
|
||||
var url = "#";
|
||||
if (status != 'REMOVED') {
|
||||
if (row.status != 'REMOVED') {
|
||||
url = "device/" + deviceType + "?id=" + deviceIdentifier;
|
||||
}
|
||||
return '<div onclick="javascript:InitiateViewOption(\'' + url + '\')" class="thumbnail icon">' +
|
||||
'<i class="square-element text fw fw-mobile"></i></div>'
|
||||
'<i class="square-element text fw fw-mobile"></i>' +
|
||||
'</div>'
|
||||
}
|
||||
},
|
||||
{
|
||||
@ -156,35 +211,6 @@ function loadDevices() {
|
||||
}
|
||||
];
|
||||
|
||||
|
||||
var dataFilter = function (data) {
|
||||
data = JSON.parse(data);
|
||||
|
||||
var objects = [];
|
||||
|
||||
$(data.devices).each(function (index) {
|
||||
objects.push(
|
||||
{
|
||||
model: getPropertyValue(data.devices[index].properties, "DEVICE_MODEL"),
|
||||
vendor: getPropertyValue(data.devices[index].properties, "VENDOR"),
|
||||
user: data.devices[index].enrolmentInfo.owner,
|
||||
status: data.devices[index].enrolmentInfo.status,
|
||||
ownership: data.devices[index].enrolmentInfo.ownership,
|
||||
deviceType: data.devices[index].type,
|
||||
deviceIdentifier: data.devices[index].deviceIdentifier,
|
||||
name : data.devices[index].name
|
||||
}
|
||||
);
|
||||
});
|
||||
|
||||
var json = {
|
||||
"recordsTotal": data.count,
|
||||
"recordsFiltered": data.count,
|
||||
"data": objects
|
||||
};
|
||||
return JSON.stringify(json);
|
||||
};
|
||||
|
||||
$('#device-grid').datatables_extended_serverside_paging(
|
||||
null,
|
||||
"/api/device-mgt/v1.0/devices",
|
||||
@ -194,7 +220,6 @@ function loadDevices() {
|
||||
function () {
|
||||
$(".icon .text").res_text(0.2);
|
||||
$('#device-grid').removeClass('hidden');
|
||||
$("#loading-content").remove();
|
||||
}, {
|
||||
"placeholder" : "Search By Device Name",
|
||||
"searchKey" : "name"
|
||||
@ -210,46 +235,20 @@ function loadDevices() {
|
||||
*/
|
||||
//var assetContainer = "#ast-container";
|
||||
|
||||
function openCollapsedNav(){
|
||||
$('.wr-hidden-nav-toggle-btn').addClass('active');
|
||||
$('#hiddenNav').slideToggle('slideDown', function(){
|
||||
if($(this).css('display') == 'none'){
|
||||
$('.wr-hidden-nav-toggle-btn').removeClass('active');
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function initPage() {
|
||||
var currentUser = $("#device-listing").data("currentUser");
|
||||
var serviceURL = "/api/device-mgt/v1.0/devices";
|
||||
|
||||
invokerUtil.get(
|
||||
serviceURL,
|
||||
function (data) {
|
||||
if (data) {
|
||||
data = JSON.parse(data);
|
||||
if (data["count"] > 0) {
|
||||
$(".bulk-action-row").removeClass('hidden');
|
||||
loadDevices();
|
||||
} else {
|
||||
$("#loading-content").remove();
|
||||
$("#device-table").remove();
|
||||
$("#no-device-view").removeClass('hidden');
|
||||
$("#advanced-search-btn").addClass('hidden');
|
||||
$("#enroll-btn").addClass('hidden');
|
||||
}
|
||||
}
|
||||
}, function () {
|
||||
initPage();
|
||||
}
|
||||
);
|
||||
}
|
||||
//function openCollapsedNav(){
|
||||
// $('.wr-hidden-nav-toggle-btn').addClass('active');
|
||||
// $('#hiddenNav').slideToggle('slideDown', function(){
|
||||
// if($(this).css('display') == 'none'){
|
||||
// $('.wr-hidden-nav-toggle-btn').removeClass('active');
|
||||
// }
|
||||
// });
|
||||
//}
|
||||
|
||||
/*
|
||||
* DOM ready functions.
|
||||
*/
|
||||
$(document).ready(function () {
|
||||
initPage();
|
||||
loadDevices();
|
||||
|
||||
/* Adding selected class for selected devices */
|
||||
$(deviceCheckbox).each(function () {
|
||||
|
||||
@ -49,7 +49,9 @@ var androidOperationConstants = {
|
||||
"VPN_OPERATION": "vpn",
|
||||
"VPN_OPERATION_CODE": "VPN",
|
||||
"APPLICATION_OPERATION":"app-restriction",
|
||||
"APPLICATION_OPERATION_CODE":"APP-RESTRICTION"
|
||||
"APPLICATION_OPERATION_CODE":"APP-RESTRICTION",
|
||||
"KIOSK_APPS_CODE":"KIOSK_APPS",
|
||||
"KIOSK_APPS":"cosu-whitelisted-applications"
|
||||
};
|
||||
|
||||
// Constants to define iOS Operation Constants
|
||||
@ -520,6 +522,93 @@ validateStep["policy-profile"] = function () {
|
||||
validationStatusArray.push(validationStatus);
|
||||
|
||||
}
|
||||
if ($.inArray(androidOperationConstants["KIOSK_APPS_CODE"], configuredOperations) != -1) {
|
||||
//If COSU whitelisting applications configured
|
||||
operation = androidOperationConstants["KIOSK_APPS"];
|
||||
// Initializing continueToCheckNextInputs to true
|
||||
continueToCheckNextInputs = true;
|
||||
|
||||
var whitelistedApplicationsGridChildInputs = "div#cosu-whitelisted-applications .child-input";
|
||||
|
||||
if (continueToCheckNextInputs) {
|
||||
if ($(whitelistedApplicationsGridChildInputs).length == 0) {
|
||||
validationStatus = {
|
||||
"error": true,
|
||||
"subErrorMsg": "Applications are not provided in application whitelist list.",
|
||||
"erroneousFeature": operation
|
||||
};
|
||||
continueToCheckNextInputs = false;
|
||||
}
|
||||
else {
|
||||
childInputCount = 0;
|
||||
childInputArray = [];
|
||||
emptyChildInputCount = 0;
|
||||
duplicatesExist = false;
|
||||
// Looping through each child input
|
||||
$(whitelistedApplicationsGridChildInputs).each(function () {
|
||||
childInputCount++;
|
||||
if (childInputCount % 2 == 0) {
|
||||
// If child input is of second column
|
||||
childInput = $(this).val();
|
||||
childInputArray.push(childInput);
|
||||
// Updating emptyChildInputCount
|
||||
if (!childInput) {
|
||||
// If child input field is empty
|
||||
emptyChildInputCount++;
|
||||
}
|
||||
}
|
||||
});
|
||||
// Checking for duplicates
|
||||
initialChildInputArrayLength = childInputArray.length;
|
||||
if (emptyChildInputCount == 0 && initialChildInputArrayLength > 1) {
|
||||
for (m = 0; m < (initialChildInputArrayLength - 1); m++) {
|
||||
poppedChildInput = childInputArray.pop();
|
||||
for (n = 0; n < childInputArray.length; n++) {
|
||||
if (poppedChildInput == childInputArray[n]) {
|
||||
duplicatesExist = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (duplicatesExist) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
// Updating validationStatus
|
||||
if (emptyChildInputCount > 0) {
|
||||
// If empty child inputs are present
|
||||
validationStatus = {
|
||||
"error": true,
|
||||
"subErrorMsg": "One or more package names of " +
|
||||
"applications are empty.",
|
||||
"erroneousFeature": operation
|
||||
};
|
||||
continueToCheckNextInputs = false;
|
||||
} else if (duplicatesExist) {
|
||||
// If duplicate input is present
|
||||
validationStatus = {
|
||||
"error": true,
|
||||
"subErrorMsg": "Duplicate values exist with " +
|
||||
"for package names.",
|
||||
"erroneousFeature": operation
|
||||
};
|
||||
continueToCheckNextInputs = false;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
if (continueToCheckNextInputs) {
|
||||
validationStatus = {
|
||||
"error": false,
|
||||
"okFeature": operation
|
||||
};
|
||||
}
|
||||
|
||||
// Updating validationStatusArray with validationStatus
|
||||
validationStatusArray.push(validationStatus);
|
||||
|
||||
}
|
||||
}
|
||||
}if (policy["platform"] == platformTypeConstants["WINDOWS"]) {
|
||||
if (configuredOperations.length == 0) {
|
||||
|
||||
@ -77,14 +77,14 @@
|
||||
<span id="cosu-system-update-policy-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
|
||||
<span id="cosu-system-update-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
|
||||
</a>
|
||||
<a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-whitelist-applications', this)">
|
||||
<a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-whitelisted-applications', this)">
|
||||
<span class="wr-hidden-operations-icon fw-stack">
|
||||
<i class="fw fw-register fw-stack-2x"></i>
|
||||
</span>
|
||||
Whitelist Apps (COSU)
|
||||
<span id="cosu-whitelist-applications-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
|
||||
<span id="cosu-whitelist-applications-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
|
||||
<span id="cosu-whitelist-applications-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
|
||||
<span id="cosu-whitelisted-applications-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
|
||||
<span id="cosu-whitelisted-applications-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
|
||||
<span id="cosu-whitelisted-applications-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
|
||||
</a>
|
||||
</div>
|
||||
|
||||
@ -1333,14 +1333,14 @@
|
||||
</div>
|
||||
|
||||
<!-- cosu-whitelist-applications -->
|
||||
<div class="wr-hidden-operation" data-operation="cosu-whitelist-applications">
|
||||
<div class="panel panel-default operation-data" data-operation="cosu-whitelist-applications"
|
||||
<div class="wr-hidden-operation" data-operation="cosu-whitelisted-applications">
|
||||
<div class="panel panel-default operation-data" data-operation="cosu-whitelisted-applications"
|
||||
data-operation-code="KIOSK_APPS">
|
||||
<div id="cosu-whitelist-applications-heading" class="panel-heading" role="tab">
|
||||
<div id="cosu-whitelisted-applications-heading" class="panel-heading" role="tab">
|
||||
<h2 class="sub-title panel-title">
|
||||
Whitelist Applications (COSU)
|
||||
<label id="cosu-whitelist-applications-lbl" class="wr-input-control switch" data-toggle="collapse"
|
||||
data-target="#cosu-whitelist-applications-body">
|
||||
<label id="cosu-whitelisted-applications-lbl" class="wr-input-control switch" data-toggle="collapse"
|
||||
data-target="#cosu-whitelisted-applications-body">
|
||||
<input type="checkbox"/>
|
||||
<span class="helper"></span>
|
||||
<span class="text"></span>
|
||||
@ -1355,10 +1355,10 @@
|
||||
</h2>
|
||||
</div>
|
||||
|
||||
<div id="cosu-whitelist-applications-body" class="panel-collapse panel-body collapse" role="tabpanel"
|
||||
aria-labelledby="cosu-whitelist-applications-body">
|
||||
<div id="cosu-whitelisted-applications-body" class="panel-collapse panel-body collapse" role="tabpanel"
|
||||
aria-labelledby="cosu-whitelisted-applications-body">
|
||||
|
||||
<div id="cosu-whitelist-applications-feature-error-msg" class="alert alert-danger hidden" role="alert">
|
||||
<div id="cosu-whitelisted-applications-feature-error-msg" class="alert alert-danger hidden" role="alert">
|
||||
<i class="icon fw fw-error"></i><span></span>
|
||||
</div>
|
||||
|
||||
|
||||
@ -114,7 +114,9 @@ var androidOperationConstants = {
|
||||
"WIFI_OPERATION": "wifi",
|
||||
"WIFI_OPERATION_CODE": "WIFI",
|
||||
"APPLICATION_OPERATION":"app-restriction",
|
||||
"APPLICATION_OPERATION_CODE":"APP-RESTRICTION"
|
||||
"APPLICATION_OPERATION_CODE":"APP-RESTRICTION",
|
||||
"KIOSK_APPS_CODE":"KIOSK_APPS",
|
||||
"KIOSK_APPS":"cosu-whitelisted-applications"
|
||||
};
|
||||
|
||||
// Constants to define Android Operation Constants
|
||||
@ -491,6 +493,93 @@ validateStep["policy-profile"] = function () {
|
||||
validationStatusArray.push(validationStatus);
|
||||
|
||||
|
||||
}
|
||||
if ($.inArray(androidOperationConstants["KIOSK_APPS_CODE"], configuredOperations) != -1) {
|
||||
//If COSU whitelisting applications configured
|
||||
operation = androidOperationConstants["KIOSK_APPS"];
|
||||
// Initializing continueToCheckNextInputs to true
|
||||
continueToCheckNextInputs = true;
|
||||
|
||||
var whitelistedApplicationsGridChildInputs = "div#cosu-whitelisted-applications .child-input";
|
||||
|
||||
if (continueToCheckNextInputs) {
|
||||
if ($(whitelistedApplicationsGridChildInputs).length == 0) {
|
||||
validationStatus = {
|
||||
"error": true,
|
||||
"subErrorMsg": "Applications are not provided in application whitelist list.",
|
||||
"erroneousFeature": operation
|
||||
};
|
||||
continueToCheckNextInputs = false;
|
||||
}
|
||||
else {
|
||||
childInputCount = 0;
|
||||
childInputArray = [];
|
||||
emptyChildInputCount = 0;
|
||||
duplicatesExist = false;
|
||||
// Looping through each child input
|
||||
$(whitelistedApplicationsGridChildInputs).each(function () {
|
||||
childInputCount++;
|
||||
if (childInputCount % 2 == 0) {
|
||||
// If child input is of second column
|
||||
childInput = $(this).val();
|
||||
childInputArray.push(childInput);
|
||||
// Updating emptyChildInputCount
|
||||
if (!childInput) {
|
||||
// If child input field is empty
|
||||
emptyChildInputCount++;
|
||||
}
|
||||
}
|
||||
});
|
||||
// Checking for duplicates
|
||||
initialChildInputArrayLength = childInputArray.length;
|
||||
if (emptyChildInputCount == 0 && initialChildInputArrayLength > 1) {
|
||||
for (m = 0; m < (initialChildInputArrayLength - 1); m++) {
|
||||
poppedChildInput = childInputArray.pop();
|
||||
for (n = 0; n < childInputArray.length; n++) {
|
||||
if (poppedChildInput == childInputArray[n]) {
|
||||
duplicatesExist = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (duplicatesExist) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
// Updating validationStatus
|
||||
if (emptyChildInputCount > 0) {
|
||||
// If empty child inputs are present
|
||||
validationStatus = {
|
||||
"error": true,
|
||||
"subErrorMsg": "One or more package names of " +
|
||||
"applications are empty.",
|
||||
"erroneousFeature": operation
|
||||
};
|
||||
continueToCheckNextInputs = false;
|
||||
} else if (duplicatesExist) {
|
||||
// If duplicate input is present
|
||||
validationStatus = {
|
||||
"error": true,
|
||||
"subErrorMsg": "Duplicate values exist with " +
|
||||
"for package names.",
|
||||
"erroneousFeature": operation
|
||||
};
|
||||
continueToCheckNextInputs = false;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
if (continueToCheckNextInputs) {
|
||||
validationStatus = {
|
||||
"error": false,
|
||||
"okFeature": operation
|
||||
};
|
||||
}
|
||||
|
||||
// Updating validationStatusArray with validationStatus
|
||||
validationStatusArray.push(validationStatus);
|
||||
|
||||
}
|
||||
}
|
||||
} if (policy["platform"] == platformTypeConstants["WINDOWS"]) {
|
||||
|
||||
@ -57,17 +57,6 @@
|
||||
<span id="work-profile-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
|
||||
<span id="work-profile-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
|
||||
</a>
|
||||
<!--COSU-->
|
||||
<a href="javascript:void(0)" onclick="showAdvanceOperation('android-for-work-cosu', this)">
|
||||
<span class="wr-hidden-operation-icon fw-stack">
|
||||
<i class="fw fw-service fw-stack-2x"></i>
|
||||
</span>
|
||||
COSU Configuration
|
||||
<span id="android-for-work-cosu-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
|
||||
<span id="android-for-work-cosu-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
|
||||
<span id="android-for-work-cosu-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
|
||||
</a>
|
||||
<!--/COSU-->
|
||||
<a href="javascript:void(0)" onclick="showAdvanceOperation('app-restriction', this)">
|
||||
<span class="fw-stack fw-lg">
|
||||
<i class="fw fw-application fw-stack-1x"></i>
|
||||
@ -106,14 +95,14 @@
|
||||
<span id="cosu-system-update-policy-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
|
||||
<span id="cosu-system-update-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
|
||||
</a>
|
||||
<a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-whitelist-applications', this)">
|
||||
<a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-whitelisted-applications', this)">
|
||||
<span class="wr-hidden-operations-icon fw-stack">
|
||||
<i class="fw fw-register fw-stack-2x"></i>
|
||||
</span>
|
||||
Whitelist Apps (COSU)
|
||||
<span id="cosu-whitelist-applications-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
|
||||
<span id="cosu-whitelist-applications-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
|
||||
<span id="cosu-whitelist-applications-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
|
||||
<span id="cosu-whitelisted-applications-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
|
||||
<span id="cosu-whitelisted-applications-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
|
||||
<span id="cosu-whitelisted-applications-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
|
||||
</a>
|
||||
</div>
|
||||
|
||||
@ -1469,14 +1458,14 @@
|
||||
</div>
|
||||
|
||||
<!-- cosu-whitelist-applications -->
|
||||
<div class="wr-hidden-operation" data-operation="cosu-whitelist-applications">
|
||||
<div class="panel panel-default operation-data" data-operation="cosu-whitelist-applications"
|
||||
<div class="wr-hidden-operation" data-operation="cosu-whitelisted-applications">
|
||||
<div class="panel panel-default operation-data" data-operation="cosu-whitelisted-applications"
|
||||
data-operation-code="KIOSK_APPS">
|
||||
<div id="cosu-whitelist-applications-heading" class="panel-heading" role="tab">
|
||||
<div id="cosu-whitelisted-applications-heading" class="panel-heading" role="tab">
|
||||
<h2 class="sub-title panel-title">
|
||||
Whitelist Applications (COSU)
|
||||
<label id="cosu-whitelist-applications-lbl" class="wr-input-control switch" data-toggle="collapse"
|
||||
data-target="#cosu-whitelist-applications-body">
|
||||
<label id="cosu-whitelisted-applications-lbl" class="wr-input-control switch" data-toggle="collapse"
|
||||
data-target="#cosu-whitelisted-applications-body">
|
||||
<input type="checkbox"/>
|
||||
<span class="helper"></span>
|
||||
<span class="text"></span>
|
||||
@ -1491,10 +1480,10 @@
|
||||
</h2>
|
||||
</div>
|
||||
|
||||
<div id="cosu-whitelist-applications-body" class="panel-collapse panel-body collapse" role="tabpanel"
|
||||
aria-labelledby="cosu-whitelist-applications-body">
|
||||
<div id="cosu-whitelisted-applications-body" class="panel-collapse panel-body collapse" role="tabpanel"
|
||||
aria-labelledby="cosu-whitelisted-applications-body">
|
||||
|
||||
<div id="cosu-whitelist-applications-feature-error-msg" class="alert alert-danger hidden" role="alert">
|
||||
<div id="cosu-whitelisted-applications-feature-error-msg" class="alert alert-danger hidden" role="alert">
|
||||
<i class="icon fw fw-error"></i><span></span>
|
||||
</div>
|
||||
|
||||
|
||||
@ -1951,6 +1951,24 @@ var slideDownPaneAgainstValueSet = function (selectElement, paneID, valueSet) {
|
||||
);
|
||||
}
|
||||
};
|
||||
|
||||
var slideDownPaneAgainstValueSetForRadioButtons = function (selectElement, paneID, valueSet) {
|
||||
var selectedValueOnChange = selectElement.value;
|
||||
|
||||
var i, slideDownVotes = 0;
|
||||
for (i = 0; i < valueSet.length; i++) {
|
||||
if (selectedValueOnChange == valueSet[i]) {
|
||||
slideDownVotes++;
|
||||
}
|
||||
}
|
||||
|
||||
var paneSelector = "#" + paneID;
|
||||
if(slideDownVotes > 0) {
|
||||
$(paneSelector).removeClass("hidden");
|
||||
} else {
|
||||
$(paneSelector).addClass("hidden");
|
||||
}
|
||||
};
|
||||
// End of HTML embedded invoke methods
|
||||
|
||||
|
||||
|
||||
@ -73,14 +73,14 @@
|
||||
<span id="cosu-system-update-policy-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
|
||||
<span id="cosu-system-update-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
|
||||
</a>
|
||||
<a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-whitelist-applications', this)">
|
||||
<a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-whitelisted-applications', this)">
|
||||
<span class="wr-hidden-operations-icon fw-stack">
|
||||
<i class="fw fw-register fw-stack-2x"></i>
|
||||
</span>
|
||||
Whitelist Apps (COSU)
|
||||
<span id="cosu-whitelist-applications-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
|
||||
<span id="cosu-whitelist-applications-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
|
||||
<span id="cosu-whitelist-applications-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
|
||||
<span id="cosu-whitelisted-applications-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
|
||||
<span id="cosu-whitelisted-applications-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
|
||||
<span id="cosu-whitelisted-applications-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
|
||||
</a>
|
||||
</div>
|
||||
|
||||
@ -1395,14 +1395,14 @@
|
||||
</div>
|
||||
|
||||
<!-- cosu-whitelist-applications -->
|
||||
<div class="wr-hidden-operation" data-operation="cosu-whitelist-applications">
|
||||
<div class="panel panel-default operation-data" data-operation="cosu-whitelist-applications"
|
||||
<div class="wr-hidden-operation" data-operation="cosu-whitelisted-applications">
|
||||
<div class="panel panel-default operation-data" data-operation="cosu-whitelisted-applications"
|
||||
data-operation-code="KIOSK_APPS">
|
||||
<div id="cosu-whitelist-applications-heading" class="panel-heading" role="tab">
|
||||
<div id="cosu-whitelisted-applications-heading" class="panel-heading" role="tab">
|
||||
<h2 class="sub-title panel-title">
|
||||
Whitelist Applications (COSU)
|
||||
<label id="cosu-whitelist-applications-lbl" class="wr-input-control switch hidden" data-toggle="collapse"
|
||||
data-target="#cosu-whitelist-applications-body">
|
||||
<label id="cosu-whitelisted-applications-lbl" class="wr-input-control switch hidden" data-toggle="collapse"
|
||||
data-target="#cosu-whitelisted-applications-body">
|
||||
<input type="checkbox"/>
|
||||
<span class="helper"></span>
|
||||
<span class="text"></span>
|
||||
@ -1417,10 +1417,10 @@
|
||||
</h2>
|
||||
</div>
|
||||
|
||||
<div id="cosu-whitelist-applications-body" class="panel-collapse panel-body collapse" role="tabpanel"
|
||||
aria-labelledby="cosu-whitelist-applications-body">
|
||||
<div id="cosu-whitelisted-applications-body" class="panel-collapse panel-body collapse" role="tabpanel"
|
||||
aria-labelledby="cosu-whitelisted-applications-body">
|
||||
|
||||
<div id="cosu-whitelist-applications-feature-error-msg" class="alert alert-danger hidden" role="alert">
|
||||
<div id="cosu-whitelisted-applications-feature-error-msg" class="alert alert-danger hidden" role="alert">
|
||||
<i class="icon fw fw-error"></i><span></span>
|
||||
</div>
|
||||
|
||||
@ -1475,7 +1475,7 @@
|
||||
maxlength="100" data-default="" placeholder="[ Package Name ]" disabled/>
|
||||
</td>
|
||||
<td>
|
||||
<span class="list-group-item-actions">
|
||||
<span class="list-group-item-actions hidden">
|
||||
<a href="#cosu-whitelisted-applications-grid" class="grid-input-remove"
|
||||
data-click-event="remove-form">
|
||||
<span class="fw-stack helper" title="Remove Entry">
|
||||
|
||||
@ -82,11 +82,12 @@
|
||||
<!--<a href="{{appContext}}notification-listing" title="Failures of operations on the device side will be listed here">-->
|
||||
<a data-toggle="sidebar" data-target="#right-sidebar" data-container=".page-content"
|
||||
aria-expanded="false" rel="notifications-sidebar">
|
||||
<span class="icon fw-stack">
|
||||
<span id="notification-bubble" class="badge notifications hidden"></span>
|
||||
<span id="notifications-icon" class="icon fw-stack hidden">
|
||||
<i class="fw fw-notification fw-stack-1x"></i>
|
||||
</span>
|
||||
<span class="hidden-xs">Notifications</span>
|
||||
<span class="badge notifications" id="notification-bubble"></span>
|
||||
<span id="notifications-spacer" class="hidden"> </span>
|
||||
<span class="text-capitalize">Notifications</span>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
@ -94,12 +95,19 @@
|
||||
{{#zone "sidePanes"}}
|
||||
<!--suppress HtmlUnknownAttribute -->
|
||||
<div class="sidebar-wrapper" id="right-sidebar" is-authorized="{{permissions.LIST_NOTIFICATIONS}}"
|
||||
data-side="right" data-width="320" data-sidebar-fixed="true" data-fixed-offset="60" data-spy="affix"
|
||||
data-side="right" data-width="300" data-sidebar-fixed="true" data-fixed-offset="60" data-spy="affix"
|
||||
data-offset-top="80">
|
||||
<br>
|
||||
<ul class="sidebar-messages"></ul>
|
||||
<br>
|
||||
<div class="text-center"><a href="{{appContext}}notification-listing" class="btn btn-primary">Show All Notifications</a></div>
|
||||
<div class="text-center">
|
||||
<a href="{{appContext}}notification-listing" class="btn-operations btn-default">
|
||||
<span class="fw-stack">
|
||||
<i class="fw fw-ring fw-stroke fw-stack-2x"></i>
|
||||
<i class="fw fw-notification fw-stack-1x"></i>
|
||||
</span>
|
||||
View All Notifications
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
{{/zone}}
|
||||
{{#zone "bottomJs"}}
|
||||
|
||||
@ -80,14 +80,19 @@ function toggleEnrollment() {
|
||||
|
||||
var updateNotificationCountOnSuccess = function (data, textStatus, jqXHR) {
|
||||
var notificationBubble = "#notification-bubble";
|
||||
var notificationIcon = "#notifications-icon";
|
||||
var notificationSpacer = "#notifications-spacer";
|
||||
if (jqXHR.status == 200 && data) {
|
||||
var responsePayload = JSON.parse(data);
|
||||
var newNotificationsCount = responsePayload["count"];
|
||||
if (newNotificationsCount > 0) {
|
||||
$(notificationBubble).html(newNotificationsCount);
|
||||
$(notificationBubble).show();
|
||||
$(notificationBubble).html(newNotificationsCount + " NEW");
|
||||
$(notificationBubble).removeClass("hidden");
|
||||
$(notificationSpacer).removeClass("hidden");
|
||||
} else {
|
||||
$(notificationBubble).hide();
|
||||
$(notificationBubble).addClass("hidden");
|
||||
$(notificationSpacer).addClass("hidden");
|
||||
$(notificationIcon).removeClass("hidden");
|
||||
}
|
||||
}
|
||||
};
|
||||
@ -102,7 +107,7 @@ function loadNewNotificationsOnSideViewPanel() {
|
||||
if ($("#right-sidebar").attr("is-authorized") == "false") {
|
||||
$("#notification-bubble-wrapper").remove();
|
||||
} else {
|
||||
var serviceURL = emmAdminBasePath + "/notifications?status=NEW";
|
||||
var serviceURL = emmAdminBasePath + "/notifications?offset=0&limit=6&status=NEW";
|
||||
invokerUtil.get(serviceURL, updateNotificationCountOnSuccess, updateNotificationCountOnError);
|
||||
loadNewNotifications();
|
||||
}
|
||||
@ -117,7 +122,7 @@ function loadNewNotifications() {
|
||||
var currentUser = notifications.data("currentUser");
|
||||
|
||||
$.template("notification-listing", notifications.attr("src"), function (template) {
|
||||
var serviceURL = emmAdminBasePath + "/notifications?offset=0&limit=5&status=NEW";
|
||||
var serviceURL = emmAdminBasePath + "/notifications?offset=0&limit=6&status=NEW";
|
||||
invokerUtil.get(
|
||||
serviceURL,
|
||||
// on success
|
||||
@ -128,7 +133,6 @@ function loadNewNotifications() {
|
||||
if (responsePayload["notifications"]) {
|
||||
if (responsePayload.count > 0) {
|
||||
viewModel["notifications"] = responsePayload["notifications"];
|
||||
// viewModel["appContext"] = context;
|
||||
$(messageSideBar).html(template(viewModel));
|
||||
} else {
|
||||
$(messageSideBar).html(
|
||||
|
||||
@ -1,12 +1,15 @@
|
||||
<h4 class="message text-muted">
|
||||
Most Recent
|
||||
</h4>
|
||||
{{#each notifications}}
|
||||
<li class="message message-info" data-type="selectable" >
|
||||
<li class="message" data-type="selectable" >
|
||||
<h4>
|
||||
<i class="icon fw fw-info"></i>
|
||||
<a href="{{../appContext}}/device/{{deviceType}}?id={{deviceIdentifier}}#event_log_tab"
|
||||
<i class="icon fw fw-mobile text-muted"></i>
|
||||
<a href="device/{{deviceType}}?id={{deviceIdentifier}}"
|
||||
data-id="{{operationId}}"
|
||||
data-url="device/{{deviceType}}?id={{deviceIdentifier}}#event_log_tab"
|
||||
data-url="device/{{deviceType}}?id={{deviceIdentifier}}"
|
||||
class="new-notification text-capitalize" data-click-event="remove-form">
|
||||
{{deviceType}} {{deviceName}}
|
||||
Failure on {{deviceType}} {{deviceName}}
|
||||
</a>
|
||||
</h4>
|
||||
<p>{{description}}</p>
|
||||
|
||||
Binary file not shown.
@ -37,7 +37,7 @@ function setPopupMaxHeight() {
|
||||
* show popup function.
|
||||
*/
|
||||
function showPopup() {
|
||||
$(modalPopup).show();
|
||||
$(modalPopup).modal('show');
|
||||
setPopupMaxHeight();
|
||||
}
|
||||
|
||||
@ -47,7 +47,7 @@ function showPopup() {
|
||||
function hidePopup() {
|
||||
$(modalPopupContent).html("");
|
||||
$(modalPopupContent).removeClass("operation-data");
|
||||
$(modalPopup).hide();
|
||||
$(modalPopup).modal('hide');
|
||||
}
|
||||
|
||||
var updateNotificationCount = function (data, textStatus, jqXHR) {
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<artifactId>mobile-base-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>mobile-base-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>mobile-plugins</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>windows-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,13 +23,13 @@
|
||||
<parent>
|
||||
<artifactId>windows-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>org.wso2.carbon.device.mgt.mobile.windows.ui</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<name>WSO2 Carbon - Mobile Windows UI</name>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>windows-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>mobile-plugins</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,13 +23,13 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>androidsense-plugin-feature</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>org.wso2.carbon.device.mgt.iot.androidsense.feature</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>WSO2 Carbon - IoT Server Android Sense Feature</name>
|
||||
<url>http://wso2.org</url>
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>iot-plugins-feature</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>arduino-plugin-feature</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>iot-plugins-feature</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,13 +23,13 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>iot-analytics-feature</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>org.wso2.carbon.device.mgt.iot.analytics.feature</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>WSO2 Carbon - IoT Server Analytics Feature</name>
|
||||
<url>http://wso2.org</url>
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>iot-plugins-feature</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,14 +23,14 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>iot-base-plugin-feature</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>org.wso2.carbon.device.mgt.iot.adapter.feature</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<name>WSO2 Carbon - IoT Device Management Feature</name>
|
||||
<url>http://wso2.org</url>
|
||||
<description>This feature contains the adapter bundles required for IoT Server</description>
|
||||
|
||||
@ -23,14 +23,14 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>iot-base-plugin-feature</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>org.wso2.carbon.device.mgt.iot.feature</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<name>WSO2 Carbon - IoT Device Management Feature</name>
|
||||
<url>http://wso2.org</url>
|
||||
<description>This feature contains the core bundles required for IoT Server</description>
|
||||
|
||||
@ -22,13 +22,13 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>iot-plugins-feature</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>iot-base-plugin-feature</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>WSO2 Carbon - Device Management IoT Base Plugin Feature</name>
|
||||
<url>http://wso2.org</url>
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>iot-devicetypes-feature</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>iot-plugins-feature</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
|
||||
@ -22,13 +22,13 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>iot-plugins-feature</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>WSO2 Carbon - Device Management IoT Plugins Feature</name>
|
||||
<url>http://wso2.org</url>
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>raspberrypi-plugin-feature</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>iot-plugins-feature</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>virtual-fire-alarm-plugin-feature</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>iot-plugins-feature</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,14 +22,14 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>android-plugin-feature</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>org.wso2.carbon.device.mgt.mobile.android.feature</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<name>WSO2 Carbon - Android Device Management Feature</name>
|
||||
<url>http://wso2.org</url>
|
||||
<description>This feature contains the core bundles required for Android Device Management
|
||||
|
||||
@ -22,13 +22,13 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>mobile-plugins-feature</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>android-plugin-feature</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>WSO2 Carbon - Device Management Android Plugin Feature</name>
|
||||
<url>http://wso2.org</url>
|
||||
|
||||
@ -22,14 +22,14 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>mobile-base-plugin-feature</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>org.wso2.carbon.device.mgt.mobile.feature</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<name>WSO2 Carbon - Mobile Device Management Feature</name>
|
||||
<url>http://wso2.org</url>
|
||||
<description>This feature contains the core bundles required for Mobile Device Management functionality
|
||||
|
||||
@ -22,13 +22,13 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>mobile-plugins-feature</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>mobile-base-plugin-feature</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>WSO2 Carbon - Device Management EMM Base Plugin Feature</name>
|
||||
<url>http://wso2.org</url>
|
||||
|
||||
@ -22,13 +22,13 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>mobile-plugins-feature</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>WSO2 Carbon - Device Management EMM Plugins Feature</name>
|
||||
<url>http://wso2.org</url>
|
||||
|
||||
@ -22,14 +22,14 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>windows-plugin-feature</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>org.wso2.carbon.device.mgt.mobile.windows.feature</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<name>WSO2 Carbon - Windows Device Management Feature</name>
|
||||
<url>http://wso2.org</url>
|
||||
<description>This feature contains the core bundles required for Windows Device Management
|
||||
|
||||
@ -22,13 +22,13 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>mobile-plugins-feature</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>windows-plugin-feature</artifactId>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>WSO2 Carbon - Device Management Windows Plugin Feature</name>
|
||||
<url>http://wso2.org</url>
|
||||
|
||||
6
pom.xml
6
pom.xml
@ -23,7 +23,7 @@
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<version>2.2.1-SNAPSHOT</version>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<name>WSO2 Carbon - Device Management Plugins Parent</name>
|
||||
<url>http://wso2.org</url>
|
||||
<description>WSO2 Carbon - Device Management Plugins Parent</description>
|
||||
@ -1121,11 +1121,11 @@
|
||||
<javax.ws.rs.version>1.1.1</javax.ws.rs.version>
|
||||
|
||||
<!-- Carbon Device Management -->
|
||||
<carbon.devicemgt.version>1.2.1-SNAPSHOT</carbon.devicemgt.version>
|
||||
<carbon.devicemgt.version>1.2.2-SNAPSHOT</carbon.devicemgt.version>
|
||||
<carbon.devicemgt.version.range>[1.1.1, 2.0.0)</carbon.devicemgt.version.range>
|
||||
|
||||
<!-- Carbon Device Management Plugins -->
|
||||
<carbon.devicemgt.plugins.version>2.2.1-SNAPSHOT</carbon.devicemgt.plugins.version>
|
||||
<carbon.devicemgt.plugins.version>2.2.2-SNAPSHOT</carbon.devicemgt.plugins.version>
|
||||
|
||||
<!-- Carbon Commons -->
|
||||
<carbon.commons.version>4.4.8</carbon.commons.version>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user