mirror of
https://repository.entgra.net/community/device-mgt-plugins.git
synced 2025-09-16 23:42:15 +00:00
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
This commit is contained in:
Nirothipan
commit
40a28f965f
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>iot-analytics</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>iot-analytics</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>iot-analytics</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>iot-analytics</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>analytics</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-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>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>androidsense-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<artifactId>androidsense-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>androidsense-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -41,10 +41,15 @@
|
||||
</div>
|
||||
<a class="details-view-toggle-button" data-toggle="tooltip" title="Stored Data"
|
||||
href="{{@app.context}}/device/{{../../device.type}}/analytics?deviceId={{../../device.deviceIdentifier}}&deviceName={{../../device.name}}&graphType={{@key}}&sensor={{this}}">
|
||||
<span class="fw-stack">
|
||||
<i class="fw fw-circle-outline fw-stack-2x "></i>
|
||||
<i class="fw fw-statistics fw-stack-1x "></i>
|
||||
</span>
|
||||
<span class="fw-stack">
|
||||
<i class="fw fw-circle-outline fw-stack-2x"></i>
|
||||
<i class="fw fw-statistics fw-stack-1x"></i>
|
||||
<span class="fw-stack fw-move-right fw-move-bottom">
|
||||
<i class="fw fw-circle fw-stack-2x fw-stroke"></i>
|
||||
<i class="fw fw-clock fw-stack-1x fw-inverse"></i>
|
||||
</span>
|
||||
</span>
|
||||
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
||||
* Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
||||
*
|
||||
* WSO2 Inc. licenses this file to you under the Apache License,
|
||||
* Version 2.0 (the "License"); you may not use this file except
|
||||
@ -78,6 +78,8 @@ var graphMap = {};
|
||||
|
||||
var palette = new Rickshaw.Color.Palette({scheme: "munin"});
|
||||
|
||||
var elemTop;
|
||||
|
||||
$(window).load(function () {
|
||||
|
||||
graphMap["battery"]=lineGraph("battery", batteryData);
|
||||
@ -321,7 +323,7 @@ function maximizeGraph(graph, width,height){
|
||||
height: height*2
|
||||
|
||||
});
|
||||
graph.render();
|
||||
graph.update();
|
||||
}
|
||||
|
||||
function minimizeGraph(graph){
|
||||
@ -329,7 +331,7 @@ function minimizeGraph(graph){
|
||||
width: 366,
|
||||
height: 300
|
||||
});
|
||||
graph.render();
|
||||
graph.update();
|
||||
}
|
||||
|
||||
//maximize minimize functionality
|
||||
@ -339,17 +341,30 @@ $(".fw-expand").click(function(e) {
|
||||
var height = $(".chartWrapper").height();
|
||||
|
||||
if($(this).hasClass("default-view")){
|
||||
elemTop = $('#'+innerGraph.element.id).parents('.graph')[0].offsetTop;
|
||||
$(this).removeClass("default-view");
|
||||
$(this).removeClass("fw-expand");
|
||||
$(this).addClass("fw-contract");
|
||||
maximizeGraph(innerGraph,width,height);
|
||||
$(this).parent().parent().addClass("max");
|
||||
$(this).closest(".graph").siblings().addClass("max_hide");
|
||||
$(this).closest(".graph").parent().siblings().addClass("max_hide");
|
||||
}else{
|
||||
|
||||
$(this).addClass("default-view");
|
||||
$(this).addClass("fw-expand");
|
||||
$(this).removeClass("fw-contract");
|
||||
minimizeGraph(innerGraph);
|
||||
$(this).parent().parent().removeClass("max");
|
||||
$(this).closest(".graph").siblings().removeClass("max_hide");
|
||||
$(this).closest(".graph").parent().siblings().removeClass("max_hide");
|
||||
focusToArea()
|
||||
}
|
||||
});
|
||||
|
||||
//graph focusing function
|
||||
function focusToArea(){
|
||||
var container = $("body");
|
||||
container.animate({
|
||||
scrollTop: elemTop
|
||||
});
|
||||
}
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
"scopes" : [
|
||||
"perm:android-sense:enroll"
|
||||
],
|
||||
"analyticsView" : "DAS"
|
||||
"analyticsView" : "DAS",
|
||||
"analyticsEnabled": false
|
||||
}
|
||||
}
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>device-types</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>arduino-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>arduino-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<artifactId>arduino-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>device-types</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-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>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>raspberrypi-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>raspberrypi-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<artifactId>raspberrypi-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>device-types</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-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>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-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>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-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>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-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>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-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>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>device-types</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>appm-connector</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>appm-connector</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>extensions</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>cdmf-transport-adapters</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>cdmf-transport-adapters</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>cdmf-transport-adapters</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>cdmf-transport-adapters</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>cdmf-transport-adapters</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>cdmf-transport-adapters</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>cdmf-transport-adapters</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>cdmf-transport-adapters</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>cdmf-transport-adapters</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>extensions</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>mb-extensions</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -104,7 +104,7 @@ public class DeviceAccessBasedMQTTAuthorizer implements IAuthorizer {
|
||||
try {
|
||||
String topics[] = topic.split("/");
|
||||
String tenantDomainFromTopic = topics[0];
|
||||
if ("+".equals(tenantDomainFromTopic)) {
|
||||
if (ALL_TENANT_DOMAIN.equals(tenantDomainFromTopic)) {
|
||||
if (MultitenantConstants.SUPER_TENANT_DOMAIN_NAME.equals(authorizationSubject.getTenantDomain())
|
||||
&& isUserAuthorized(authorizationSubject, DEFAULT_ADMIN_PERMISSION, UI_EXECUTE)) {
|
||||
return true;
|
||||
@ -133,8 +133,8 @@ public class DeviceAccessBasedMQTTAuthorizer implements IAuthorizer {
|
||||
return false;
|
||||
} catch (FeignException e) {
|
||||
oAuthRequestInterceptor.resetApiApplicationKey();
|
||||
if (e.getMessage().contains(GATEWAY_ERROR_CODE) || e.status() == 404) {
|
||||
log.error("Failed to connect to the device authorization service.");
|
||||
if (e.getMessage().contains(GATEWAY_ERROR_CODE) || e.status() == 404 || e.status() == 403) {
|
||||
log.error("Failed to connect to the device authorization service, Retrying....");
|
||||
} else {
|
||||
log.error(e.getMessage(), e);
|
||||
}
|
||||
@ -181,8 +181,9 @@ public class DeviceAccessBasedMQTTAuthorizer implements IAuthorizer {
|
||||
}
|
||||
} catch (FeignException e) {
|
||||
oAuthRequestInterceptor.resetApiApplicationKey();
|
||||
if (e.getMessage().contains(GATEWAY_ERROR_CODE)) {
|
||||
log.error("Failed to connect to the device authorization service.", e);
|
||||
//This is to avoid failure where it tries to call authorization service before the api is published
|
||||
if (e.getMessage().contains(GATEWAY_ERROR_CODE) || e.status() == 404 || e.status() == 403) {
|
||||
log.error("Failed to connect to the device authorization service, Retrying....");
|
||||
} else {
|
||||
log.error(e.getMessage(), e);
|
||||
}
|
||||
|
||||
@ -64,7 +64,7 @@ public class OAuthRequestInterceptor implements RequestInterceptor {
|
||||
private ApiApplicationRegistrationService apiApplicationRegistrationService;
|
||||
private TokenIssuerService tokenIssuerService;
|
||||
private static Log log = LogFactory.getLog(OAuthRequestInterceptor.class);
|
||||
private ApiApplicationKey apiApplicationKey;
|
||||
private volatile ApiApplicationKey apiApplicationKey;
|
||||
|
||||
/**
|
||||
* Creates an interceptor that authenticates all requests.
|
||||
@ -124,6 +124,7 @@ public class OAuthRequestInterceptor implements RequestInterceptor {
|
||||
}
|
||||
|
||||
public void resetApiApplicationKey() {
|
||||
tokenInfo = null;
|
||||
apiApplicationKey = null;
|
||||
tokenIssuerService = null;
|
||||
}
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>extensions</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-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>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>pull-notification-listeners</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>extensions</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>siddhi-extensions</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>siddhi-extensions</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>extensions</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>android-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>android-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,13 +23,13 @@
|
||||
<parent>
|
||||
<artifactId>android-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>org.wso2.carbon.device.mgt.mobile.android.ui</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<name>WSO2 Carbon - Mobile Android UI</name>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
|
||||
@ -1264,9 +1264,9 @@
|
||||
<select id="runtime-permission-policy-permission-type"
|
||||
class="form-control operationDataKeys"
|
||||
data-key="defaultPermissionType">
|
||||
<option value="1">PROMPT USER</option>
|
||||
<option value="2">AUTO GRANT</option>
|
||||
<option value="3">AUTO DENY</option>
|
||||
<option value="0">PROMPT USER</option>
|
||||
<option value="1">AUTO GRANT</option>
|
||||
<option value="2">AUTO DENY</option>
|
||||
</select>
|
||||
|
||||
<div class="wr-input-control">
|
||||
@ -1332,9 +1332,9 @@
|
||||
<select id="runtime-permission-policy-permission-type"
|
||||
class="form-control operationDataKeys"
|
||||
data-child-key="permissionType" data-default="0">
|
||||
<option value="1">PROMPT USER</option>
|
||||
<option value="2" selected="selected">AUTO GRANT</option>
|
||||
<option value="3">AUTO DENY</option>
|
||||
<option value="0">PROMPT USER</option>
|
||||
<option value="1" selected="selected">AUTO GRANT</option>
|
||||
<option value="2">AUTO DENY</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>
|
||||
|
||||
@ -1552,9 +1552,9 @@
|
||||
<select id="runtime-permission-policy-permission-type"
|
||||
class="form-control operationDataKeys"
|
||||
data-key="defaultPermissionType" disabled>
|
||||
<option value="1">PROMPT USER</option>
|
||||
<option value="2">AUTO GRANT</option>
|
||||
<option value="3">AUTO DENY</option>
|
||||
<option value="0">PROMPT USER</option>
|
||||
<option value="1">AUTO GRANT</option>
|
||||
<option value="2">AUTO DENY</option>
|
||||
</select>
|
||||
<div class="wr-input-control">
|
||||
<label class="wr-input-label" for="runtime-permission-applications">
|
||||
@ -1611,9 +1611,9 @@
|
||||
<select id="runtime-permission-policy-permission-type"
|
||||
class="form-control operationDataKeys"
|
||||
data-child-key="permissionType">
|
||||
<option value="1">PROMPT USER</option>
|
||||
<option value="2">AUTO GRANT</option>
|
||||
<option value="3">AUTO DENY</option>
|
||||
<option value="0">PROMPT USER</option>
|
||||
<option value="1">AUTO GRANT</option>
|
||||
<option value="2">AUTO DENY</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>
|
||||
|
||||
@ -1441,9 +1441,9 @@
|
||||
<select id="runtime-permission-policy-permission-type"
|
||||
class="form-control operationDataKeys"
|
||||
data-key="defaultPermissionType" data-default="0">
|
||||
<option value="1" selected="selected">PROMPT USER</option>
|
||||
<option value="2">AUTO GRANT</option>
|
||||
<option value="3">AUTO DENY</option>
|
||||
<option value="0" selected="selected">PROMPT USER</option>
|
||||
<option value="1">AUTO GRANT</option>
|
||||
<option value="2">AUTO DENY</option>
|
||||
</select>
|
||||
|
||||
<div class="wr-input-control">
|
||||
@ -1509,9 +1509,9 @@
|
||||
<select id="runtime-permission-policy-permission-type"
|
||||
class="form-control operationDataKeys"
|
||||
data-child-key="permissionType" data-default="0">
|
||||
<option value="1">PROMPT USER</option>
|
||||
<option value="2" selected="selected">AUTO GRANT</option>
|
||||
<option value="3">AUTO DENY</option>
|
||||
<option value="0">PROMPT USER</option>
|
||||
<option value="1" selected="selected">AUTO GRANT</option>
|
||||
<option value="2">AUTO DENY</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>android-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>mobile-plugins</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-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>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>windows-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,13 +23,13 @@
|
||||
<parent>
|
||||
<artifactId>windows-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>org.wso2.carbon.device.mgt.mobile.windows.ui</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-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>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>mobile-plugins</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>analytics-feature</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,13 +23,13 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>analytics-feature</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>org.wso2.carbon.device.mgt.iot.analytics.feature</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>WSO2 Carbon - IoT Server Analytics Feature</name>
|
||||
<url>http://wso2.org</url>
|
||||
|
||||
@ -23,13 +23,13 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>analytics-feature</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>org.wso2.carbon.iot.device.statistics.dashboard.feature</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>WSO2 Carbon - IoT Server Analytics Feature</name>
|
||||
<url>http://wso2.org</url>
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>analytics-feature</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-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>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-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>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>WSO2 Carbon - IoT Server Android Sense Analytics Feature</name>
|
||||
<url>http://wso2.org</url>
|
||||
|
||||
@ -23,13 +23,13 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>androidsense-plugin-feature</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>org.wso2.carbon.device.mgt.iot.androidsense.backend.feature</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>WSO2 Carbon - IoT Server Android Sense Backend Feature</name>
|
||||
<url>http://wso2.org</url>
|
||||
|
||||
@ -23,13 +23,13 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>androidsense-plugin-feature</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>org.wso2.carbon.device.mgt.iot.androidsense.ui.feature</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>WSO2 Carbon - IoT Server Android Sense UI Feature</name>
|
||||
<url>http://wso2.org</url>
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>device-types-feature</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-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>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-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>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-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>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>device-types-feature</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,13 +22,13 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>device-types-feature</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-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>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>raspberrypi-plugin-feature</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>raspberrypi-plugin-feature</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>device-types-feature</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-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>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-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>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-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>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>device-types-feature</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>extensions-feature</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -20,13 +20,13 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>extensions-feature</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<artifactId>org.wso2.carbon.appmgt.mdm.osgiconnector.feature</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<name>WSO2 Carbon - App management MDM OSGI Connector</name>
|
||||
<url>http://wso2.org</url>
|
||||
<description>This feature contains the core bundles required for APP management OSGI MDM connection
|
||||
@ -36,7 +36,7 @@
|
||||
<dependency>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>org.wso2.carbon.appmgt.mdm.osgiconnector</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>org.apache.ws.commons.axiom</groupId>
|
||||
|
||||
@ -20,13 +20,13 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>extensions-feature</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<artifactId>org.wso2.carbon.appmgt.mdm.restconnector.feature</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<name>WSO2 Carbon - App management MDM REST Connector</name>
|
||||
<url>http://wso2.org</url>
|
||||
<description>This feature contains the core bundles required for APP management MDM REST connection
|
||||
@ -36,7 +36,7 @@
|
||||
<dependency>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>org.wso2.carbon.appmgt.mdm.restconnector</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>org.apache.ws.commons.axiom</groupId>
|
||||
|
||||
@ -23,14 +23,14 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>extensions-feature</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>org.wso2.carbon.device.mgt.adapter.feature</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<name>WSO2 Carbon - Device Management Adapters Feature</name>
|
||||
<url>http://wso2.org</url>
|
||||
<description>This feature contains the adapter bundles required for IoT Server</description>
|
||||
|
||||
@ -3,14 +3,14 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>extensions-feature</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>org.wso2.carbon.device.mgt.notification.listener.feature</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<name>WSO2 Carbon - Notification Listener</name>
|
||||
<url>http://wso2.org</url>
|
||||
<description>This feature contains the core bundles required iot core listeners</description>
|
||||
|
||||
@ -20,13 +20,13 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>extensions-feature</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<artifactId>org.wso2.extension.siddhi.execution.json.feature</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<name>WSO2 Siddhi Execution Extension - Json Feature</name>
|
||||
<url>http://wso2.org</url>
|
||||
<description>This feature contains Siddhi extension feature for changing a json string to individual properties.</description>
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>extensions-feature</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,13 +22,13 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>extensions-feature</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>WSO2 Carbon - Device Management Extensions</name>
|
||||
<url>http://wso2.org</url>
|
||||
|
||||
@ -22,14 +22,14 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>android-plugin-feature</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-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>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-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>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>android-plugin-feature</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>WSO2 Carbon - Device Management Android Plugin Feature</name>
|
||||
<url>http://wso2.org</url>
|
||||
|
||||
@ -22,13 +22,13 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>mobile-plugins-feature</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-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>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-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>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-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>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>windows-plugin-feature</artifactId>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>WSO2 Carbon - Device Management Windows Plugin Feature</name>
|
||||
<url>http://wso2.org</url>
|
||||
|
||||
4
pom.xml
4
pom.xml
@ -23,7 +23,7 @@
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<version>4.0.11-SNAPSHOT</version>
|
||||
<version>4.0.12-SNAPSHOT</version>
|
||||
<name>WSO2 Carbon - Device Management Plugins Parent</name>
|
||||
<url>http://wso2.org</url>
|
||||
<description>WSO2 Carbon - Device Management Plugins Parent</description>
|
||||
@ -1153,7 +1153,7 @@
|
||||
<carbon.appmgt.version>1.2.25</carbon.appmgt.version>
|
||||
|
||||
<!-- Carbon Device Management Plugins -->
|
||||
<carbon.devicemgt.plugins.version>4.0.11-SNAPSHOT</carbon.devicemgt.plugins.version>
|
||||
<carbon.devicemgt.plugins.version>4.0.12-SNAPSHOT</carbon.devicemgt.plugins.version>
|
||||
|
||||
<!-- Carbon Commons -->
|
||||
<carbon.commons.version>4.4.8</carbon.commons.version>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user