From 6866ee8f24c4ae1c244d4ce800b7423c57a60a51 Mon Sep 17 00:00:00 2001 From: Rasika Perera Date: Tue, 3 Jan 2017 12:25:08 +0530 Subject: [PATCH 1/2] Fixing IoTS version issue --- modules/analytics/distribution/pom.xml | 2 +- modules/analytics/p2-profile-gen/pom.xml | 2 +- modules/analytics/pom.xml | 2 +- modules/broker/distribution/pom.xml | 2 +- modules/broker/p2-profile/pom.xml | 2 +- modules/broker/pom.xml | 2 +- modules/core/distribution/pom.xml | 2 +- .../core/features/org.wso2.iot.core.styles.feature/pom.xml | 2 +- modules/core/features/pom.xml | 2 +- modules/core/iotserver-ui/pom.xml | 2 +- modules/core/p2-profile-gen/pom.xml | 2 +- modules/core/pom.xml | 2 +- modules/core/tools/cdmf-devicetype-archetype/pom.xml | 4 ++-- modules/core/tools/pom.xml | 2 +- modules/distribution/pom.xml | 2 +- pom.xml | 4 ++-- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/modules/analytics/distribution/pom.xml b/modules/analytics/distribution/pom.xml index d11e602d..07df5aa6 100644 --- a/modules/analytics/distribution/pom.xml +++ b/modules/analytics/distribution/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-analytics-parent - 3.0.1-SNAPSHOT + 3.0.0-SNAPSHOT ../pom.xml diff --git a/modules/analytics/p2-profile-gen/pom.xml b/modules/analytics/p2-profile-gen/pom.xml index f7eee6fa..13836fa9 100644 --- a/modules/analytics/p2-profile-gen/pom.xml +++ b/modules/analytics/p2-profile-gen/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-analytics-parent - 3.0.1-SNAPSHOT + 3.0.0-SNAPSHOT ../pom.xml diff --git a/modules/analytics/pom.xml b/modules/analytics/pom.xml index 9e40aca5..12445503 100644 --- a/modules/analytics/pom.xml +++ b/modules/analytics/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-parent - 3.0.1-SNAPSHOT + 3.0.0-SNAPSHOT ../../pom.xml diff --git a/modules/broker/distribution/pom.xml b/modules/broker/distribution/pom.xml index 494a3c93..2f00ff18 100644 --- a/modules/broker/distribution/pom.xml +++ b/modules/broker/distribution/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-broker-parent - 3.0.1-SNAPSHOT + 3.0.0-SNAPSHOT ../pom.xml diff --git a/modules/broker/p2-profile/pom.xml b/modules/broker/p2-profile/pom.xml index 25d629de..135a9bd8 100644 --- a/modules/broker/p2-profile/pom.xml +++ b/modules/broker/p2-profile/pom.xml @@ -20,7 +20,7 @@ org.wso2.iot wso2iot-broker-parent - 3.0.1-SNAPSHOT + 3.0.0-SNAPSHOT ../pom.xml diff --git a/modules/broker/pom.xml b/modules/broker/pom.xml index b63c86ca..f36f3104 100644 --- a/modules/broker/pom.xml +++ b/modules/broker/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent - 3.0.1-SNAPSHOT + 3.0.0-SNAPSHOT ../../pom.xml diff --git a/modules/core/distribution/pom.xml b/modules/core/distribution/pom.xml index 5b3608de..fbcecc64 100644 --- a/modules/core/distribution/pom.xml +++ b/modules/core/distribution/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-core-parent - 3.0.1-SNAPSHOT + 3.0.0-SNAPSHOT ../pom.xml diff --git a/modules/core/features/org.wso2.iot.core.styles.feature/pom.xml b/modules/core/features/org.wso2.iot.core.styles.feature/pom.xml index 20f33d01..6180edb3 100644 --- a/modules/core/features/org.wso2.iot.core.styles.feature/pom.xml +++ b/modules/core/features/org.wso2.iot.core.styles.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-core-features - 3.0.1-SNAPSHOT + 3.0.0-SNAPSHOT ../pom.xml diff --git a/modules/core/features/pom.xml b/modules/core/features/pom.xml index 180c9f68..c7b1c8f2 100644 --- a/modules/core/features/pom.xml +++ b/modules/core/features/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-core-parent - 3.0.1-SNAPSHOT + 3.0.0-SNAPSHOT ../pom.xml diff --git a/modules/core/iotserver-ui/pom.xml b/modules/core/iotserver-ui/pom.xml index a9fe5f02..d469e34e 100644 --- a/modules/core/iotserver-ui/pom.xml +++ b/modules/core/iotserver-ui/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-core-parent - 3.0.1-SNAPSHOT + 3.0.0-SNAPSHOT ../pom.xml diff --git a/modules/core/p2-profile-gen/pom.xml b/modules/core/p2-profile-gen/pom.xml index 098e4b81..b19951c0 100644 --- a/modules/core/p2-profile-gen/pom.xml +++ b/modules/core/p2-profile-gen/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-core-parent - 3.0.1-SNAPSHOT + 3.0.0-SNAPSHOT ../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 6bf0ecf1..8e5da14d 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-parent - 3.0.1-SNAPSHOT + 3.0.0-SNAPSHOT ../../pom.xml diff --git a/modules/core/tools/cdmf-devicetype-archetype/pom.xml b/modules/core/tools/cdmf-devicetype-archetype/pom.xml index d9079662..2d07c182 100644 --- a/modules/core/tools/cdmf-devicetype-archetype/pom.xml +++ b/modules/core/tools/cdmf-devicetype-archetype/pom.xml @@ -20,13 +20,13 @@ org.wso2.iot wso2iot-core-tools - 3.0.1-SNAPSHOT + 3.0.0-SNAPSHOT ../pom.xml 4.0.0 iot-devicetype-archetype - 3.0.1-SNAPSHOT + 3.0.0-SNAPSHOT WSO2 IoT - Device Type Archetype WSO2 IoT Device Type Archetype maven-archetype diff --git a/modules/core/tools/pom.xml b/modules/core/tools/pom.xml index 3e38f92b..51fa219d 100644 --- a/modules/core/tools/pom.xml +++ b/modules/core/tools/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-core-parent - 3.0.1-SNAPSHOT + 3.0.0-SNAPSHOT ../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index b7c3bc05..5b4e8a18 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-parent - 3.0.1-SNAPSHOT + 3.0.0-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index f262d73a..6f0c4611 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent pom - 3.0.1-SNAPSHOT + 3.0.0-SNAPSHOT WSO2 IoT - Parent http://wso2.org WSO2 IoT Server @@ -1531,7 +1531,7 @@ [2.0.0, 3.0.0) - 3.0.1-SNAPSHOT + 3.0.0-SNAPSHOT 3.0.5-SNAPSHOT From 970bb352601a94e2e0c1b134a48316aeae28bb36 Mon Sep 17 00:00:00 2001 From: sinthuja Date: Tue, 3 Jan 2017 13:35:08 +0530 Subject: [PATCH 2/2] Adding sso by default for analytics portal application. --- .../distribution/src/ues/designer.json | 32 +++++++++++++------ .../conf/identity/sso-idp-config.xml | 16 ++++++++++ 2 files changed, 39 insertions(+), 9 deletions(-) diff --git a/modules/analytics/distribution/src/ues/designer.json b/modules/analytics/distribution/src/ues/designer.json index 9d15c49e..116aeb3c 100644 --- a/modules/analytics/distribution/src/ues/designer.json +++ b/modules/analytics/distribution/src/ues/designer.json @@ -7,16 +7,21 @@ "ignoreProviders": ["rt"] }, "authentication": { - "activeMethod": "basic", + "activeMethod": "sso", "methods": { "sso": { "attributes": { - "issuer": "portal", + "issuer": "analyticsportal", "identityProviderURL": "https://localhost:9443/samlsso", - "responseSigningEnabled": "false", - "acs": "https://localhost:9444/portal/acs", + "responseSigningEnabled": true, + "validateAssertionValidityPeriod": true, + "validateAudienceRestriction": true, + "assertionSigningEnabled": true, + "acs": "https://localhost:9445/portal/acs", "identityAlias": "wso2carbon", - "useTenantKey": false + "defaultNameIDPolicy": "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified", + "useTenantKey": false, + "isPassive": false } }, "basic": { @@ -33,14 +38,14 @@ "oauthProvider": { "appRegistration": { "appType": "webapp", - "clientName": "portal", + "clientName": "analyticsportal", "owner": "admin", "password":"admin", "dynamicClientAppRegistrationServiceURL": "https://localhost:9443/client-registration/v0.10/register", - "apiManagerClientAppRegistrationServiceURL": "%https.host%/api-application-registration/register/tenants", + "apiManagerClientAppRegistrationServiceURL": "https://localhost:9443/api-application-registration/register/tenants", "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", + "callbackUrl": "https://localhost:9445/portal", "saasApp":true }, "tokenServiceURL": "https://localhost:9443/oauth2/token" @@ -65,6 +70,15 @@ "cacheSizeBytes": "1073741824", "defaultDashboardRedirect": false, "isCreateGadgetEnable": true, + "isSecureVaultEnabled" : false, + "assets": { + "gadget": { + "fileSizeLimit": 5 + }, + "layout": { + "fileSizeLimit": 1 + } + }, "oauth": { "username": "admin", "password": "admin" @@ -77,4 +91,4 @@ "queryParameters" : { "passBetweenPages" : ["shared"] } -} +} \ No newline at end of file diff --git a/modules/core/distribution/src/repository/conf/identity/sso-idp-config.xml b/modules/core/distribution/src/repository/conf/identity/sso-idp-config.xml index 21adc90b..fb00571f 100755 --- a/modules/core/distribution/src/repository/conf/identity/sso-idp-config.xml +++ b/modules/core/distribution/src/repository/conf/identity/sso-idp-config.xml @@ -100,5 +100,21 @@ https://localhost:9443/oauth2/token + + analyticsportal + + https://localhost:9445/portal/acs + + https://localhost:9445/portal/acs + true + true + true + + https://localhost:9443/oauth2/token + + + https://localhost:9443/oauth2/token + + \ No newline at end of file