pahansith
/
product-iots
forked from community/product-iots
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/wso2/product-iot-server

Browse Source
application-manager-new
charitha 8 years ago
parent 7a21ca4a44 69fafb4150
commit f48e03dec1
4 changed files with 53 additions and 24 deletions
Show Stats Download Patch File Download Diff File

35
modules/analytics/distribution/src/ues/designer.json
Unescape View File

@ -25,21 +25,32 @@
} }
}, },
"authorization": { "authorization": {
"activeMethod": "", "activeMethod": "oauth",
"methods": { "methods": {
"oauth": { "oauth": {
"attributes": { "attributes": {
"idPServer": "%https.ip%/oauth2/token", "apimgt-gateway": false,
"dynamicClientProperties": { "oauthProvider": {
"callbackUrl": "%https.ip%/portal", "appRegistration": {
"clientName": "portal", "appType": "webapp",
"owner": "admin", "clientName": "portal",
"applicationType": "JaggeryApp", "owner": "admin",
"grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer", "password":"admin",
"saasApp": false, "dynamicClientAppRegistrationServiceURL": "https://localhost:9443/client-registration/v0.10/register",
"dynamicClientRegistrationEndPoint": "%https.ip%/dynamic-client-web/register/", "apiManagerClientAppRegistrationServiceURL": "%https.host%/api-application-registration/register/tenants",
"tokenScope": "Production" "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer urn:ietf:params:oauth:grant-type:jwt-bearer",
} "tokenScope": "admin",
"callbackUrl": "%https.host%/portal",
"saasApp":true
},
"tokenServiceURL": "https://localhost:9443/oauth2/token"
},
"adminUser":"admin@carbon.super",
"adminUserTenantId":"-1234",
"adminRole":"admin",
"scopes" : [
"device:view"
]
} }
} }
} }

33
modules/core/distribution/src/repository/jaggeryapps/portal/configs/designer.json
Unescape View File

@ -34,17 +34,28 @@
"methods": { "methods": {
"oauth": { "oauth": {
"attributes": { "attributes": {
"idPServer": "%https.host%/oauth2/token", "apimgt-gateway": false,
"dynamicClientProperties": { "oauthProvider": {
"callbackUrl": "%https.host%/portal", "appRegistration": {
"clientName": "portal", "appType": "webapp",
"owner": "admin", "clientName": "portal",
"applicationType": "JaggeryApp", "owner": "admin",
"grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer", "password":"admin",
"saasApp": false, "dynamicClientAppRegistrationServiceURL": "https://localhost:9443/client-registration/v0.10/register",
"dynamicClientRegistrationEndPoint": "%https.host%/dynamic-client-web/register/", "apiManagerClientAppRegistrationServiceURL": "%https.host%/api-application-registration/register/tenants",
"tokenScope": "Production" "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer urn:ietf:params:oauth:grant-type:jwt-bearer",
} "tokenScope": "admin",
"callbackUrl": "%https.host%/portal",
"saasApp":true
},
"tokenServiceURL": "https://localhost:9443/oauth2/token"
},
"adminUser":"admin@carbon.super",
"adminUserTenantId":"-1234",
"adminRole":"admin",
"scopes" : [
"device:view"
]
} }
} }
} }

7
modules/core/p2-profile-gen/pom.xml
Unescape View File

@ -588,6 +588,9 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.hostobjects.oidc.feature:${carbon.api.mgt.version} org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.hostobjects.oidc.feature:${carbon.api.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.rest.api.dcr.feature:${carbon.api.mgt.version}
</featureArtifactDef>
<!-- End of API Management Features --> <!-- End of API Management Features -->
<!-- TCP Transport --> <!-- TCP Transport -->
@ -995,6 +998,10 @@
<id>org.wso2.carbon.apimgt.core.feature.group</id> <id>org.wso2.carbon.apimgt.core.feature.group</id>
<version>${carbon.api.mgt.version}</version> <version>${carbon.api.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.apimgt.rest.api.dcr.feature.group</id>
<version>${carbon.api.mgt.version}</version>
</feature>
<!-- API Manager Publisher and Store Features --> <!-- API Manager Publisher and Store Features -->
<feature> <feature>
<id>org.wso2.carbon.apimgt.gateway.feature.group</id> <id>org.wso2.carbon.apimgt.gateway.feature.group</id>

2
pom.xml
Unescape View File

@ -1632,7 +1632,7 @@
<orbit.version.h2>1.2.140.wso2v3</orbit.version.h2> <orbit.version.h2>1.2.140.wso2v3</orbit.version.h2>
<orbit.version.joda-time>2.8.2.wso2v1</orbit.version.joda-time> <orbit.version.joda-time>2.8.2.wso2v1</orbit.version.joda-time>
<orbit.version.json>2.0.0.wso2v1</orbit.version.json> <orbit.version.json>2.0.0.wso2v1</orbit.version.json>
<carbon.dashboard.version>2.0.4</carbon.dashboard.version> <carbon.dashboard.version>2.0.5-SNAPSHOT</carbon.dashboard.version>
<carbon.event-processing.version>2.1.4</carbon.event-processing.version> <carbon.event-processing.version>2.1.4</carbon.event-processing.version>
<imp.pkg.version.javax.servlet>[2.6.0,3.0.0)</imp.pkg.version.javax.servlet> <imp.pkg.version.javax.servlet>[2.6.0,3.0.0)</imp.pkg.version.javax.servlet>
<akka.version>2.3.4-spark</akka.version> <akka.version>2.3.4-spark</akka.version>

Write Preview
Loading…
Cancel
Save