arshana790
/
device-mgt-plugins-fork
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
revert-dabc3590
Megala 8 years ago
parent 48ab67c824 f43ba554d5
commit 1893fe63d4
8 changed files with 42 additions and 10 deletions
Show Stats Download Patch File Download Diff File

8
components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/gen/agent/sense/android/iot/carbon/wso2/org/wso2_senseagent/BuildConfig.java
Unescape View File

@ -0,0 +1,8 @@
/*___Generated_by_IDEA___*/
package agent.sense.android.iot.carbon.wso2.org.wso2_senseagent;
/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */
public final class BuildConfig {
public final static boolean DEBUG = Boolean.parseBoolean(null);
}

7
components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/gen/agent/sense/android/iot/carbon/wso2/org/wso2_senseagent/Manifest.java
Unescape View File

@ -0,0 +1,7 @@
/*___Generated_by_IDEA___*/
package agent.sense.android.iot.carbon.wso2.org.wso2_senseagent;
/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */
public final class Manifest {
}

7
components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/gen/agent/sense/android/iot/carbon/wso2/org/wso2_senseagent/R.java
Unescape View File

@ -0,0 +1,7 @@
/*___Generated_by_IDEA___*/
package agent.sense.android.iot.carbon.wso2.org.wso2_senseagent;
/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */
public final class R {
}

2
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
Unescape View File

@ -19,7 +19,7 @@
"owner": "admin@carbon.super",
"dynamicClientAppRegistrationServiceURL": "%https.ip%/dynamic-client-web/register",
"apiManagerClientAppRegistrationServiceURL": "%https.ip%/api-application-registration/register/tenants",
"grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer",
"grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer urn:ietf:params:oauth:grant-type:jwt-bearer",
"tokenScope": "admin",
"callbackUrl": "%https.ip%/api/device-mgt/v1.0"
},

11
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
Unescape View File

@ -478,6 +478,8 @@ var operationModule = function () {
var ppp = {};
var ipSec = {};
var ikev2 = {};
var pulseSecure = {};
if (operationData["vpnType"] == "PPTP") {
ppp = {
"authName": operationData["pptpAuthName"],
@ -523,6 +525,12 @@ var operationModule = function () {
"serverCertificateIssuerCommonName" : operationData["ikev2ServerCertificateIssuerCommonName"],
"serverCertificateCommonName" : operationData["ikev2ServerCertificateCommonName"]
};
} else if (operationData["vpnType"] == "PulseSecure") {
pulseSecure = {
"remoteAddress" : operationData["pulsesecureRemoteAddress"],
"userName" : operationData["pulsesecureName"],
"sharedSecret" : operationData["pulsesecureSharedSecret"]
};
}
var domainsAlways = new Array();
@ -553,7 +561,8 @@ var operationModule = function () {
"vpnType" : operationData["vpnType"],
"ppp": ppp,
"ipSec": ipSec,
"ikEv2": ikev2
"ikEv2": ikev2,
"pulseSecure" : pulseSecure
}
};
break;

9
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/js/policy-create.js
Unescape View File

@ -1,5 +1,4 @@
/*
* Copyright (c) 2015, 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
@ -626,7 +625,8 @@ validateStep["policy-profile"] = function () {
}
}
}if (policy["platform"] == platformTypeConstants["WINDOWS"]) {
}
if (policy["platform"] == platformTypeConstants["WINDOWS"]) {
if (configuredOperations.length == 0) {
// updating validationStatus
validationStatus = {
@ -724,7 +724,8 @@ validateStep["policy-profile"] = function () {
}
}
} else if (policy["platform"] == platformTypeConstants["IOS"]) {
}
else if (policy["platform"] == platformTypeConstants["IOS"]) {
if (configuredOperations.length == 0) {
// updating validationStatus
validationStatus = {
@ -1273,7 +1274,7 @@ validateStep["policy-profile"] = function () {
}
if ($.inArray(iosOperationConstants["VPN_OPERATION_CODE"], configuredOperations) != -1) {
// if WIFI is configured
// if VPN is configured
operation = iosOperationConstants["VPN_OPERATION"];
// initializing continueToCheckNextInputs to true
continueToCheckNextInputs = true;

2
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/conf/config.json
Unescape View File

@ -17,7 +17,7 @@
"owner": "admin@carbon.super",
"dynamicClientAppRegistrationServiceURL": "%https.ip%/dynamic-client-web/register",
"apiManagerClientAppRegistrationServiceURL": "%https.ip%/api-application-registration/register/tenants",
"grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer",
"grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer urn:ietf:params:oauth:grant-type:jwt-bearer",
"tokenScope": "admin",
"callbackUrl": "%https.ip%/api/device-mgt/v1.0"
},

6
pom.xml
Unescape View File

@ -1219,10 +1219,10 @@
<carbon.deployment.version>4.7.0</carbon.deployment.version>
<!-- Carbon Identity -->
<carbon.identity.framework.version>5.2.0</carbon.identity.framework.version>
<identity.inbound.auth.oauth.version>5.1.2</identity.inbound.auth.oauth.version>
<carbon.identity.framework.version>5.2.1</carbon.identity.framework.version>
<identity.inbound.auth.oauth.version>5.1.3</identity.inbound.auth.oauth.version>
<identity.inbound.auth.saml.version>5.1.1</identity.inbound.auth.saml.version>
<carbon.identity.version.range>[5.0.7, 6.0.0)</carbon.identity.version.range>
<carbon.identity.version.range>[5.2.1, 6.0.0)</carbon.identity.version.range>
<!-- Carbon Multi-tenancy -->
<carbon.multitenancy.version>4.6.0</carbon.multitenancy.version>

Write Preview
Loading…
Cancel
Save