From 6866ee8f24c4ae1c244d4ce800b7423c57a60a51 Mon Sep 17 00:00:00 2001 From: Rasika Perera Date: Tue, 3 Jan 2017 12:25:08 +0530 Subject: [PATCH 1/7] 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/7] 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 From 15d3a124b0e7ed941e9baba1f67e3558341e8cdb Mon Sep 17 00:00:00 2001 From: charitha Date: Wed, 4 Jan 2017 10:14:13 +0530 Subject: [PATCH 3/7] Increment plugin deployer version --- modules/distribution/src/resources/plugins/plugins-deployer.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/distribution/src/resources/plugins/plugins-deployer.xml b/modules/distribution/src/resources/plugins/plugins-deployer.xml index 805117f5..c22b90df 100644 --- a/modules/distribution/src/resources/plugins/plugins-deployer.xml +++ b/modules/distribution/src/resources/plugins/plugins-deployer.xml @@ -27,7 +27,7 @@ 4.0.0 org.wso2.iot.devicemgt-plugins iot-devicetype-feature-installation - 1.0.0-SNAPSHOT + 3.0.0-SNAPSHOT pom Creating custom distribution http://wso2.org From 70c656b5d4154e1e9dca50c89dcef69a3ac2baa8 Mon Sep 17 00:00:00 2001 From: Ace Date: Wed, 4 Jan 2017 18:18:29 +0530 Subject: [PATCH 4/7] reverting commit related to identity version bump --- modules/core/p2-profile-gen/carbon.product | 4 ++-- modules/core/p2-profile-gen/pom.xml | 11 +++++++++-- pom.xml | 14 +++++++------- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/modules/core/p2-profile-gen/carbon.product b/modules/core/p2-profile-gen/carbon.product index 6b33bacc..8f21334c 100644 --- a/modules/core/p2-profile-gen/carbon.product +++ b/modules/core/p2-profile-gen/carbon.product @@ -1,7 +1,7 @@ - + @@ -13,7 +13,7 @@ - + diff --git a/modules/core/p2-profile-gen/pom.xml b/modules/core/p2-profile-gen/pom.xml index 0e9b4487..49d6ba81 100644 --- a/modules/core/p2-profile-gen/pom.xml +++ b/modules/core/p2-profile-gen/pom.xml @@ -345,7 +345,10 @@ org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.mutualssl.feature:${identity.carbon.auth.mutual.ssl.version} - org.wso2.carbon.identity.metadata.saml2:org.wso2.carbon.identity.sp.metadata.saml2.server.feature:${identity.metadata.saml2.version} + org.wso2.carbon.identity.metadata.saml2:org.wso2.carbon.identity.inbound.metadata.saml2.server.feature:0.1.1 + + + org.wso2.carbon.identity.metadata.saml2:org.wso2.carbon.identity.sp.metadata.saml2.server.feature:0.1.3 @@ -784,9 +787,13 @@ true + + org.wso2.carbon.identity.inbound.metadata.saml2.server.feature.group + 0.1.1 + org.wso2.carbon.identity.sp.metadata.saml2.server.feature.group - ${identity.metadata.saml2.version} + 0.1.3 org.wso2.iot.core.styles.feature.group diff --git a/pom.xml b/pom.xml index aad4b3c7..cb465bd1 100644 --- a/pom.xml +++ b/pom.xml @@ -1453,8 +1453,8 @@ - 4.4.11 4.4.10 + 4.4.10 [4.4.0, 4.5.0) 1.5.4 @@ -1497,23 +1497,23 @@ 5.2.0 - 5.7.0 + 5.6.89 [5.2.0, 6.0.0) 5.1.1 5.2.4 5.1.1 5.1.1 - 5.3.0 + 5.2.14 5.1.3 5.1.6 5.1.2 - 5.3.0 + 5.2.33 5.1.1 5.1.3 5.1.1 5.1.1 5.1.4 - 1.0.0 + 0.1.3 1.0.2 @@ -1538,8 +1538,8 @@ 3.0.5-SNAPSHOT - 6.1.20-SNAPSHOT - (6.0.0,7.0.0] + 6.1.2 + (5.0.0,7.0.0] 4.6.9 From d93d9dd0a6a14789852f2ca466f835ef967d82ef Mon Sep 17 00:00:00 2001 From: Rasika Perera Date: Wed, 4 Jan 2017 19:20:16 +0530 Subject: [PATCH 5/7] Fixing https://wso2.org/jira/browse/IOTS-356 --- .../repository/conf/identity/service-providers/API_STORE.xml | 2 +- .../repository/conf/identity/service-providers/devicemgt.xml | 2 +- .../src/repository/conf/identity/service-providers/portal.xml | 2 +- .../repository/conf/identity/service-providers/publisher.xml | 2 +- .../src/repository/conf/identity/service-providers/store.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/core/distribution/src/repository/conf/identity/service-providers/API_STORE.xml b/modules/core/distribution/src/repository/conf/identity/service-providers/API_STORE.xml index d77e49a3..4ae3fdaf 100644 --- a/modules/core/distribution/src/repository/conf/identity/service-providers/API_STORE.xml +++ b/modules/core/distribution/src/repository/conf/identity/service-providers/API_STORE.xml @@ -44,7 +44,7 @@ true - true + false diff --git a/modules/core/distribution/src/repository/conf/identity/service-providers/devicemgt.xml b/modules/core/distribution/src/repository/conf/identity/service-providers/devicemgt.xml index 2c7c52d9..156eb6e1 100644 --- a/modules/core/distribution/src/repository/conf/identity/service-providers/devicemgt.xml +++ b/modules/core/distribution/src/repository/conf/identity/service-providers/devicemgt.xml @@ -44,7 +44,7 @@ true - true + false diff --git a/modules/core/distribution/src/repository/conf/identity/service-providers/portal.xml b/modules/core/distribution/src/repository/conf/identity/service-providers/portal.xml index 3cd65666..7f84e5ab 100644 --- a/modules/core/distribution/src/repository/conf/identity/service-providers/portal.xml +++ b/modules/core/distribution/src/repository/conf/identity/service-providers/portal.xml @@ -44,7 +44,7 @@ true - true + false diff --git a/modules/core/distribution/src/repository/conf/identity/service-providers/publisher.xml b/modules/core/distribution/src/repository/conf/identity/service-providers/publisher.xml index 33a4736d..503833ce 100644 --- a/modules/core/distribution/src/repository/conf/identity/service-providers/publisher.xml +++ b/modules/core/distribution/src/repository/conf/identity/service-providers/publisher.xml @@ -44,7 +44,7 @@ true - true + false diff --git a/modules/core/distribution/src/repository/conf/identity/service-providers/store.xml b/modules/core/distribution/src/repository/conf/identity/service-providers/store.xml index 9503a87d..27bb258e 100644 --- a/modules/core/distribution/src/repository/conf/identity/service-providers/store.xml +++ b/modules/core/distribution/src/repository/conf/identity/service-providers/store.xml @@ -44,7 +44,7 @@ true - true + false From 2e13e834c565792333134e68feeb63fe06dc41c4 Mon Sep 17 00:00:00 2001 From: GPrathap Date: Thu, 5 Jan 2017 12:36:31 +0530 Subject: [PATCH 6/7] fixed: IOTS-204 --- modules/core/distribution/pom.xml | 6 +----- .../core/distribution/src/repository/conf/log4j.properties | 3 ++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/modules/core/distribution/pom.xml b/modules/core/distribution/pom.xml index fbcecc64..1e1397af 100644 --- a/modules/core/distribution/pom.xml +++ b/modules/core/distribution/pom.xml @@ -288,7 +288,7 @@ - - log4j.logger.net.sf.ehcache=ERROR - - diff --git a/modules/core/distribution/src/repository/conf/log4j.properties b/modules/core/distribution/src/repository/conf/log4j.properties index 8acd2f7f..2a47e957 100644 --- a/modules/core/distribution/src/repository/conf/log4j.properties +++ b/modules/core/distribution/src/repository/conf/log4j.properties @@ -240,4 +240,5 @@ log4j.logger.org.wso2.carbon.event.receiver.core.EventReceiverDeployer=WARN log4j.logger.org.wso2.carbon.analytics.spark.core.SparkScriptCAppDeployer=WARN log4j.logger.org.wso2.carbon.analytics.eventsink.AnalyticsEventStoreDeployer=WARN log4j.logger.org.wso2.carbon.event.processor.core.EventProcessorDeployer=WARN -log4j.logger.org.wso2.carbon.core.services.util.CarbonAuthenticationUtil=WARN \ No newline at end of file +log4j.logger.org.wso2.carbon.core.services.util.CarbonAuthenticationUtil=WARN +log4j.logger.net.sf.ehcache=ERROR \ No newline at end of file From acb4593b9a8a8b3dcee9e4b23b21e987f19f2d05 Mon Sep 17 00:00:00 2001 From: GPrathap Date: Thu, 5 Jan 2017 14:19:46 +0530 Subject: [PATCH 7/7] fixed: https://wso2.org/jira/browse/IOTS-344 --- modules/analytics/distribution/src/repository/conf/carbon.xml | 2 -- modules/core/distribution/src/repository/conf/carbon.xml | 4 ---- 2 files changed, 6 deletions(-) diff --git a/modules/analytics/distribution/src/repository/conf/carbon.xml b/modules/analytics/distribution/src/repository/conf/carbon.xml index 60199811..f2e3ab82 100644 --- a/modules/analytics/distribution/src/repository/conf/carbon.xml +++ b/modules/analytics/distribution/src/repository/conf/carbon.xml @@ -75,10 +75,8 @@ Ex : .* means this server can act any role --> - ${default.server.role} ${cep.server.role} ${das.server.role} - ${cdmf.platform.role} ${geodashboard.role} diff --git a/modules/core/distribution/src/repository/conf/carbon.xml b/modules/core/distribution/src/repository/conf/carbon.xml index fafaf53c..9e856b84 100644 --- a/modules/core/distribution/src/repository/conf/carbon.xml +++ b/modules/core/distribution/src/repository/conf/carbon.xml @@ -77,12 +77,8 @@ --> ${default.server.role} - ${das.server.role} - ${cep.server.role} ${cdmf.analytics.role} - IoTServer CDMFPlatform - GeoDashboard