community
/
product-iots
10
0
Fork 4
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merging with master

Browse Source
merge-requests/1/head
Ace 8 years ago
parent 04128c7ee3 15d3a124b0
commit eaea7ff37f
20 changed files with 108 additions and 49 deletions
Show Stats Download Patch File Download Diff File

2
modules/analytics/distribution/pom.xml
Unescape View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-analytics-parent</artifactId> <artifactId>wso2iot-analytics-parent</artifactId>
<version>3.0.1-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

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

@ -7,16 +7,21 @@
"ignoreProviders": ["rt"] "ignoreProviders": ["rt"]
}, },
"authentication": { "authentication": {
"activeMethod": "basic", "activeMethod": "sso",
"methods": { "methods": {
"sso": { "sso": {
"attributes": { "attributes": {
"issuer": "portal", "issuer": "analyticsportal",
"identityProviderURL": "https://localhost:9443/samlsso", "identityProviderURL": "https://localhost:9443/samlsso",
"responseSigningEnabled": "false", "responseSigningEnabled": true,
"acs": "https://localhost:9444/portal/acs", "validateAssertionValidityPeriod": true,
"validateAudienceRestriction": true,
"assertionSigningEnabled": true,
"acs": "https://localhost:9445/portal/acs",
"identityAlias": "wso2carbon", "identityAlias": "wso2carbon",
"useTenantKey": false "defaultNameIDPolicy": "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified",
"useTenantKey": false,
"isPassive": false
} }
}, },
"basic": { "basic": {
@ -25,21 +30,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": "analyticsportal",
"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://localhost:9443/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://localhost:9445/portal",
"saasApp":true
},
"tokenServiceURL": "https://localhost:9443/oauth2/token"
},
"adminUser":"admin@carbon.super",
"adminUserTenantId":"-1234",
"adminRole":"admin",
"scopes" : [
"device:view"
]
} }
} }
} }
@ -54,6 +70,15 @@
"cacheSizeBytes": "1073741824", "cacheSizeBytes": "1073741824",
"defaultDashboardRedirect": false, "defaultDashboardRedirect": false,
"isCreateGadgetEnable": true, "isCreateGadgetEnable": true,
"isSecureVaultEnabled" : false,
"assets": {
"gadget": {
"fileSizeLimit": 5
},
"layout": {
"fileSizeLimit": 1
}
},
"oauth": { "oauth": {
"username": "admin", "username": "admin",
"password": "admin" "password": "admin"
@ -66,4 +91,4 @@
"queryParameters" : { "queryParameters" : {
"passBetweenPages" : ["shared"] "passBetweenPages" : ["shared"]
} }
} }

2
modules/analytics/p2-profile-gen/pom.xml
Unescape View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-analytics-parent</artifactId> <artifactId>wso2iot-analytics-parent</artifactId>
<version>3.0.1-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
modules/analytics/pom.xml
Unescape View File

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-parent</artifactId> <artifactId>wso2iot-parent</artifactId>
<version>3.0.1-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

2
modules/broker/distribution/pom.xml
Unescape View File

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-broker-parent</artifactId> <artifactId>wso2iot-broker-parent</artifactId>
<version>3.0.1-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
modules/broker/p2-profile/pom.xml
Unescape View File

@ -20,7 +20,7 @@
<parent> <parent>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-broker-parent</artifactId> <artifactId>wso2iot-broker-parent</artifactId>
<version>3.0.1-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
modules/broker/pom.xml
Unescape View File

@ -23,7 +23,7 @@
<parent> <parent>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-parent</artifactId> <artifactId>wso2iot-parent</artifactId>
<version>3.0.1-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

2
modules/core/distribution/pom.xml
Unescape View File

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-core-parent</artifactId> <artifactId>wso2iot-core-parent</artifactId>
<version>3.0.1-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

16
modules/core/distribution/src/repository/conf/identity/sso-idp-config.xml
Unescape View File

@ -100,5 +100,21 @@
<Recipient>https://localhost:9443/oauth2/token</Recipient> <Recipient>https://localhost:9443/oauth2/token</Recipient>
</RecipientList> </RecipientList>
</ServiceProvider> </ServiceProvider>
<ServiceProvider>
<Issuer>analyticsportal</Issuer>
<AssertionConsumerServiceURLs>
<AssertionConsumerServiceURL>https://localhost:9445/portal/acs</AssertionConsumerServiceURL>
</AssertionConsumerServiceURLs>
<DefaultAssertionConsumerServiceURL>https://localhost:9445/portal/acs</DefaultAssertionConsumerServiceURL>
<SignResponse>true</SignResponse>
<EnableAudienceRestriction>true</EnableAudienceRestriction>
<EnableRecipients>true</EnableRecipients>
<AudiencesList>
<Audience>https://localhost:9443/oauth2/token</Audience>
</AudiencesList>
<RecipientList>
<Recipient>https://localhost:9443/oauth2/token</Recipient>
</RecipientList>
</ServiceProvider>
</ServiceProviders> </ServiceProviders>
</SSOIdentityProviderConfig> </SSOIdentityProviderConfig>

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"
]
} }
} }
} }

2
modules/core/features/org.wso2.iot.core.styles.feature/pom.xml
Unescape View File

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-core-features</artifactId> <artifactId>wso2iot-core-features</artifactId>
<version>3.0.1-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
modules/core/features/pom.xml
Unescape View File

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-core-parent</artifactId> <artifactId>wso2iot-core-parent</artifactId>
<version>3.0.1-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
modules/core/iotserver-ui/pom.xml
Unescape View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-core-parent</artifactId> <artifactId>wso2iot-core-parent</artifactId>
<version>3.0.1-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

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

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-core-parent</artifactId> <artifactId>wso2iot-core-parent</artifactId>
<version>3.0.1-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
@ -585,6 +585,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 -->
@ -988,6 +991,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
modules/core/pom.xml
Unescape View File

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-parent</artifactId> <artifactId>wso2iot-parent</artifactId>
<version>3.0.1-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

4
modules/core/tools/cdmf-devicetype-archetype/pom.xml
Unescape View File

@ -20,13 +20,13 @@
<parent> <parent>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-core-tools</artifactId> <artifactId>wso2iot-core-tools</artifactId>
<version>3.0.1-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>iot-devicetype-archetype</artifactId> <artifactId>iot-devicetype-archetype</artifactId>
<version>3.0.1-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
<name>WSO2 IoT - Device Type Archetype</name> <name>WSO2 IoT - Device Type Archetype</name>
<description>WSO2 IoT Device Type Archetype</description> <description>WSO2 IoT Device Type Archetype</description>
<packaging>maven-archetype</packaging> <packaging>maven-archetype</packaging>

2
modules/core/tools/pom.xml
Unescape View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-core-parent</artifactId> <artifactId>wso2iot-core-parent</artifactId>
<version>3.0.1-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
modules/distribution/pom.xml
Unescape View File

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-parent</artifactId> <artifactId>wso2iot-parent</artifactId>
<version>3.0.1-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

2
modules/distribution/src/resources/plugins/plugins-deployer.xml
Unescape View File

@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.iot.devicemgt-plugins</groupId> <groupId>org.wso2.iot.devicemgt-plugins</groupId>
<artifactId>iot-devicetype-feature-installation</artifactId> <artifactId>iot-devicetype-feature-installation</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Creating custom distribution</name> <name>Creating custom distribution</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>

6
pom.xml
Unescape View File

@ -23,7 +23,7 @@
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-parent</artifactId> <artifactId>wso2iot-parent</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>3.0.1-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
<name>WSO2 IoT - Parent</name> <name>WSO2 IoT - Parent</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>
<description>WSO2 IoT Server</description> <description>WSO2 IoT Server</description>
@ -1532,7 +1532,7 @@
<carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range> <carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range>
<!-- IOT Device Management --> <!-- IOT Device Management -->
<product.iot.version>3.0.1-SNAPSHOT</product.iot.version> <product.iot.version>3.0.0-SNAPSHOT</product.iot.version>
<!-- Carbon Device Management Plugins--> <!-- Carbon Device Management Plugins-->
<carbon.device.mgt.plugin.version>3.0.5-SNAPSHOT</carbon.device.mgt.plugin.version> <carbon.device.mgt.plugin.version>3.0.5-SNAPSHOT</carbon.device.mgt.plugin.version>
@ -1633,7 +1633,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