From 9192f8e65c4ba687ba214733268050b132377c7c Mon Sep 17 00:00:00 2001 From: GPrathap Date: Mon, 2 Jan 2017 14:34:38 +0530 Subject: [PATCH 01/13] updated designer.json --- .../distribution/src/ues/designer.json | 35 ++++++++++++------- .../jaggeryapps/portal/configs/designer.json | 33 +++++++++++------ 2 files changed, 45 insertions(+), 23 deletions(-) diff --git a/modules/analytics/distribution/src/ues/designer.json b/modules/analytics/distribution/src/ues/designer.json index b55701c9..9d15c49e 100644 --- a/modules/analytics/distribution/src/ues/designer.json +++ b/modules/analytics/distribution/src/ues/designer.json @@ -25,21 +25,32 @@ } }, "authorization": { - "activeMethod": "", + "activeMethod": "oauth", "methods": { "oauth": { "attributes": { - "idPServer": "%https.ip%/oauth2/token", - "dynamicClientProperties": { - "callbackUrl": "%https.ip%/portal", - "clientName": "portal", - "owner": "admin", - "applicationType": "JaggeryApp", - "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer", - "saasApp": false, - "dynamicClientRegistrationEndPoint": "%https.ip%/dynamic-client-web/register/", - "tokenScope": "Production" - } + "apimgt-gateway": false, + "oauthProvider": { + "appRegistration": { + "appType": "webapp", + "clientName": "portal", + "owner": "admin", + "password":"admin", + "dynamicClientAppRegistrationServiceURL": "https://localhost:9443/client-registration/v0.10/register", + "apiManagerClientAppRegistrationServiceURL": "%https.host%/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", + "saasApp":true + }, + "tokenServiceURL": "https://localhost:9443/oauth2/token" + }, + "adminUser":"admin@carbon.super", + "adminUserTenantId":"-1234", + "adminRole":"admin", + "scopes" : [ + "device:view" + ] } } } diff --git a/modules/core/distribution/src/repository/jaggeryapps/portal/configs/designer.json b/modules/core/distribution/src/repository/jaggeryapps/portal/configs/designer.json index 7fa6049a..f6c0c85a 100644 --- a/modules/core/distribution/src/repository/jaggeryapps/portal/configs/designer.json +++ b/modules/core/distribution/src/repository/jaggeryapps/portal/configs/designer.json @@ -34,17 +34,28 @@ "methods": { "oauth": { "attributes": { - "idPServer": "%https.host%/oauth2/token", - "dynamicClientProperties": { - "callbackUrl": "%https.host%/portal", - "clientName": "portal", - "owner": "admin", - "applicationType": "JaggeryApp", - "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer", - "saasApp": false, - "dynamicClientRegistrationEndPoint": "%https.host%/dynamic-client-web/register/", - "tokenScope": "Production" - } + "apimgt-gateway": false, + "oauthProvider": { + "appRegistration": { + "appType": "webapp", + "clientName": "portal", + "owner": "admin", + "password":"admin", + "dynamicClientAppRegistrationServiceURL": "https://localhost:9443/client-registration/v0.10/register", + "apiManagerClientAppRegistrationServiceURL": "%https.host%/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", + "saasApp":true + }, + "tokenServiceURL": "https://localhost:9443/oauth2/token" + }, + "adminUser":"admin@carbon.super", + "adminUserTenantId":"-1234", + "adminRole":"admin", + "scopes" : [ + "device:view" + ] } } } From f4bbb1517aced256dbc2db44dac90ba1cabed843 Mon Sep 17 00:00:00 2001 From: GPrathap Date: Mon, 2 Jan 2017 14:36:12 +0530 Subject: [PATCH 02/13] upgraded carbon dashboard server version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f262d73a..3795e5b7 100644 --- a/pom.xml +++ b/pom.xml @@ -1632,7 +1632,7 @@ 1.2.140.wso2v3 2.8.2.wso2v1 2.0.0.wso2v1 - 2.0.4 + 2.0.5-SNAPSHOT 2.1.4 [2.6.0,3.0.0) 2.3.4-spark From 24b6d4dc0e54e7a1729e4bf59c80d729faa07fa8 Mon Sep 17 00:00:00 2001 From: GPrathap Date: Mon, 2 Jan 2017 14:41:59 +0530 Subject: [PATCH 03/13] added org.wso2.carbon.apimgt.rest.api.dcr.feature --- modules/core/p2-profile-gen/pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/core/p2-profile-gen/pom.xml b/modules/core/p2-profile-gen/pom.xml index 098e4b81..66174763 100644 --- a/modules/core/p2-profile-gen/pom.xml +++ b/modules/core/p2-profile-gen/pom.xml @@ -588,6 +588,9 @@ org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.hostobjects.oidc.feature:${carbon.api.mgt.version} + + org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.rest.api.dcr.feature:${carbon.api.mgt.version} + @@ -995,6 +998,10 @@ org.wso2.carbon.apimgt.core.feature.group ${carbon.api.mgt.version} + + org.wso2.carbon.apimgt.rest.api.dcr.feature.group + ${carbon.api.mgt.version} + org.wso2.carbon.apimgt.gateway.feature.group From b22bfa88e68d519ca7728789a5e3af416cd6c6ef Mon Sep 17 00:00:00 2001 From: Ace Date: Mon, 2 Jan 2017 16:00:01 +0530 Subject: [PATCH 04/13] Bumping IS versions to latest ones --- modules/core/p2-profile-gen/carbon.product | 4 ++-- modules/core/p2-profile-gen/pom.xml | 11 ++--------- pom.xml | 14 +++++++------- 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/modules/core/p2-profile-gen/carbon.product b/modules/core/p2-profile-gen/carbon.product index 8f21334c..6b33bacc 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 098e4b81..23016193 100644 --- a/modules/core/p2-profile-gen/pom.xml +++ b/modules/core/p2-profile-gen/pom.xml @@ -345,10 +345,7 @@ 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.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 + org.wso2.carbon.identity.metadata.saml2:org.wso2.carbon.identity.sp.metadata.saml2.server.feature:${identity.metadata.saml2.version} @@ -784,13 +781,9 @@ true - - org.wso2.carbon.identity.inbound.metadata.saml2.server.feature.group - 0.1.1 - org.wso2.carbon.identity.sp.metadata.saml2.server.feature.group - 0.1.3 + ${identity.metadata.saml2.version} org.wso2.iot.core.styles.feature.group diff --git a/pom.xml b/pom.xml index f262d73a..7e1e0c70 100644 --- a/pom.xml +++ b/pom.xml @@ -1453,7 +1453,7 @@ - 4.4.10 + 4.4.11 [4.4.0, 4.5.0) 1.5.4 @@ -1496,23 +1496,23 @@ 5.2.0 - 5.6.89 + 5.7.0 [5.2.0, 6.0.0) 5.1.1 5.2.4 5.1.1 5.1.1 - 5.2.14 + 5.3.0 5.1.3 5.1.6 5.1.2 - 5.2.33 + 5.3.0 5.1.1 5.1.3 5.1.1 5.1.1 5.1.4 - 0.1.3 + 1.0.0 1.0.2 @@ -1537,8 +1537,8 @@ 3.0.5-SNAPSHOT - 6.1.2 - (5.0.0,7.0.0] + 6.1.20-SNAPSHOT + (6.0.0,7.0.0] 4.6.9 From 6866ee8f24c4ae1c244d4ce800b7423c57a60a51 Mon Sep 17 00:00:00 2001 From: Rasika Perera Date: Tue, 3 Jan 2017 12:25:08 +0530 Subject: [PATCH 05/13] 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 06/13] 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 07/13] 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 04128c7ee37ed13f702706eedbc661ee0046950a Mon Sep 17 00:00:00 2001 From: Ace Date: Wed, 4 Jan 2017 17:51:37 +0530 Subject: [PATCH 08/13] Making h2 db shareable between das and iot core --- .../distribution/datasource_config_change.xml | 12 ++ modules/analytics/distribution/ds_config.xml | 46 ++++++ modules/analytics/distribution/pom.xml | 26 ++++ .../distribution/src/assembly/bin.xml | 9 ++ modules/core/distribution/pom.xml | 42 ++--- .../core/distribution/src/assembly/bin.xml | 144 +++++++++--------- .../core/distribution/src/assembly/dist.xml | 2 +- .../conf/datasources/master-datasources.xml | 2 +- .../feature/connectedcup-feature/pom.xml | 2 +- .../src/samples/connectedcup/pom.xml | 8 +- .../connectedlap/feature/feature/pom.xml | 2 +- .../src/samples/connectedlap/pom.xml | 6 +- .../currentsensor/feature/feature/pom.xml | 2 +- .../src/samples/currentsensor/pom.xml | 16 +- .../digitaldisplay/feature/feature/pom.xml | 2 +- .../src/samples/digitaldisplay/pom.xml | 16 +- .../doormanager/feature/feature/pom.xml | 2 +- .../src/samples/doormanager/pom.xml | 12 +- .../droneanalyzer/feature/feature/pom.xml | 2 +- .../src/samples/droneanalyzer/pom.xml | 8 +- .../samples/firealarm/feature/feature/pom.xml | 2 +- .../src/samples/firealarm/pom.xml | 8 +- .../feature/feature/pom.xml | 2 +- .../src/samples/geolocationTracker/pom.xml | 8 +- .../samples/watertank/feature/feature/pom.xml | 2 +- .../src/samples/watertank/pom.xml | 8 +- .../pom.xml | 2 +- modules/core/p2-profile-gen/pom.xml | 72 ++++----- .../feature/feature/pom.xml | 2 +- .../resources/archetype-resources/pom.xml | 8 +- .../tests-common/web-ui-pages/pom.xml | 11 ++ pom.xml | 3 +- 32 files changed, 297 insertions(+), 192 deletions(-) create mode 100644 modules/analytics/distribution/datasource_config_change.xml create mode 100644 modules/analytics/distribution/ds_config.xml diff --git a/modules/analytics/distribution/datasource_config_change.xml b/modules/analytics/distribution/datasource_config_change.xml new file mode 100644 index 00000000..6b8dff04 --- /dev/null +++ b/modules/analytics/distribution/datasource_config_change.xml @@ -0,0 +1,12 @@ + + + + //datasources-configuration/datasources + + + + + //datasources-configuration + ds_config.xml + + \ No newline at end of file diff --git a/modules/analytics/distribution/ds_config.xml b/modules/analytics/distribution/ds_config.xml new file mode 100644 index 00000000..ae2cbae8 --- /dev/null +++ b/modules/analytics/distribution/ds_config.xml @@ -0,0 +1,46 @@ + + + + WSO2_CARBON_DB + The datasource used for registry and user manager + + jdbc/WSO2CarbonDB + + + + jdbc:h2:./repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000 + wso2carbon + wso2carbon + org.h2.Driver + 50 + 60000 + true + SELECT 1 + 30000 + false + + + + + WSO2_UM_DB + The datasource used for registry and user manager + + jdbc/WSO2UMDB + + + + jdbc:h2:../core/repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;AUTO_SERVER=TRUE + wso2carbon + wso2carbon + org.h2.Driver + 50 + 60000 + true + SELECT 1 + 30000 + false + + + + + \ No newline at end of file diff --git a/modules/analytics/distribution/pom.xml b/modules/analytics/distribution/pom.xml index d11e602d..35b8c570 100644 --- a/modules/analytics/distribution/pom.xml +++ b/modules/analytics/distribution/pom.xml @@ -80,6 +80,31 @@ + + com.google.code.maven-config-processor-plugin + config-processor-maven-plugin + 2.6 + + + change_datasource_config + package + + process + + + true + + + ${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/datasources/master-datasources.xml + ../../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/datasources/master-datasources.xml + datasource_config_change.xml + + + + + + + org.apache.maven.plugins maven-antrun-plugin @@ -117,6 +142,7 @@ + diff --git a/modules/analytics/distribution/src/assembly/bin.xml b/modules/analytics/distribution/src/assembly/bin.xml index 7f0aab89..2055b087 100644 --- a/modules/analytics/distribution/src/assembly/bin.xml +++ b/modules/analytics/distribution/src/assembly/bin.xml @@ -40,6 +40,7 @@ **/release-notes.html **/carbon.xml **/axis2/axis2.xml + **/master-datasources.xml **/log4j.properties **/wso2server.sh **/registry.xml @@ -824,5 +825,13 @@ true 644 + + + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/datasources/master-datasources.xml + + ${pom.artifactId}-${pom.version}/repository/conf/datasources + true + 644 + diff --git a/modules/core/distribution/pom.xml b/modules/core/distribution/pom.xml index 5b3608de..65480742 100644 --- a/modules/core/distribution/pom.xml +++ b/modules/core/distribution/pom.xml @@ -79,7 +79,7 @@ org.wso2.carbon wso2carbon-core - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} zip true target @@ -105,7 +105,7 @@ - + @@ -115,7 +115,7 @@ - + @@ -132,7 +132,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -158,7 +158,7 @@ - + @@ -168,7 +168,7 @@ - + @@ -186,7 +186,7 @@ - + @@ -196,7 +196,7 @@ - + @@ -214,7 +214,7 @@ - + @@ -225,7 +225,7 @@ - + @@ -243,7 +243,7 @@ - + @@ -253,7 +253,7 @@ - + @@ -281,7 +281,7 @@ - + @@ -299,7 +299,7 @@ d --> - + log4j.logger.net.sf.ehcache=ERROR @@ -314,7 +314,7 @@ d package - + @@ -331,8 +331,8 @@ d - - + + @@ -351,7 +351,7 @@ d prepare-package - + @@ -426,7 +426,7 @@ d - ${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/api-manager.xml + ${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/api-manager.xml @@ -445,7 +445,7 @@ d - ${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/api-store/site/conf/site.json + ${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/jaggeryapps/api-store/site/conf/site.json diff --git a/modules/core/distribution/src/assembly/bin.xml b/modules/core/distribution/src/assembly/bin.xml index fb643fda..86a47221 100644 --- a/modules/core/distribution/src/assembly/bin.xml +++ b/modules/core/distribution/src/assembly/bin.xml @@ -48,7 +48,7 @@ - target/wso2carbon-core-${carbon.kernel.version} + target/wso2carbon-core-${carbon.kernel.version.iotcore} ${pom.artifactId}-${pom.version} **/*.sh @@ -120,7 +120,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/runtimes + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/lib/runtimes ${pom.artifactId}-${pom.version}/lib/runtimes/ @@ -128,7 +128,7 @@ - target/wso2carbon-core-${carbon.kernel.version} + target/wso2carbon-core-${carbon.kernel.version.iotcore} ${pom.artifactId}-${pom.version} **/*.sh @@ -143,7 +143,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/ + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/multitenancy/ ${pom.artifactId}-${pom.version}/repository/conf/multitenancy @@ -157,7 +157,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/ + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/multitenancy/ ${pom.artifactId}-${pom.version}/repository/conf @@ -190,7 +190,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/modules + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/modules ${pom.artifactId}-${pom.version}/modules/ @@ -228,7 +228,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/security ${pom.artifactId}-${pom.version}/repository/conf/security @@ -254,7 +254,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/datasources + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/datasources ${pom.artifactId}-${pom.version}/repository/conf/datasources @@ -264,7 +264,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/device-types + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/device-types ${pom.artifactId}-${pom.version}/repository/conf/device-types @@ -288,7 +288,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/service-provider + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/service-provider ${pom.artifactId}-${pom.version}/dbscripts/service-provider @@ -298,7 +298,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/apimgt + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/apimgt ${pom.artifactId}-${pom.version}/dbscripts/apimgt */** @@ -306,14 +306,14 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/storage + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/storage ${pom.artifactId}-${pom.version}/dbscripts/storage */** - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/appmgt + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/appmgt ${pom.artifactId}-${pom.version}/dbscripts/appmgt */** @@ -323,7 +323,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/certMgt + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/certMgt ${pom.artifactId}-${pom.version}/dbscripts/certMgt @@ -332,7 +332,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/social + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/social ${pom.artifactId}-${pom.version}/dbscripts/social */** @@ -356,7 +356,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/modules + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/modules ${pom.artifactId}-${pom.version}/modules/ */** @@ -382,7 +382,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/modules + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/modules ${pom.artifactId}-${pom.version}/modules/ @@ -400,7 +400,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/cdm ${pom.artifactId}-${pom.version}/dbscripts/cdm @@ -408,13 +408,13 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/carbonapps + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/carbonapps ${pom.artifactId}-${pom.version}/repository/deployment/server/carbonapps - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/resources + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/resources ${pom.artifactId}-${pom.version}/repository/resources @@ -436,7 +436,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/webapps ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps @@ -450,7 +450,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/devicemgt/ + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/jaggeryapps/devicemgt/ ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/devicemgt @@ -458,7 +458,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/devicemgt-cdmf/ + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/jaggeryapps/devicemgt-cdmf/ ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/devicemgt @@ -466,7 +466,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/uuf-template-app/ + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/jaggeryapps/uuf-template-app/ ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/devicemgt @@ -475,7 +475,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/ + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/webapps/ ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/ @@ -491,7 +491,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/publisher/ + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/jaggeryapps/publisher/ ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/publisher @@ -505,7 +505,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/store/ + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/jaggeryapps/store/ ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/store @@ -521,7 +521,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/api-store/ + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/jaggeryapps/api-store/ ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/api-store @@ -552,7 +552,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/social/ + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/jaggeryapps/social/ ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/social @@ -577,7 +577,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/rxts + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/rxts ${pom.artifactId}-${pom.version}/repository/resources/rxts @@ -585,7 +585,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/identity ${pom.artifactId}-${pom.version}/repository/conf/identity @@ -606,7 +606,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/identity-providers + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/identity/identity-providers ${pom.artifactId}-${pom.version}/repository/conf/identity/identity-providers @@ -617,7 +617,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/service-providers + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/identity/service-providers ${pom.artifactId}-${pom.version}/repository/conf/identity/service-providers @@ -631,7 +631,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/metrics/ + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/metrics/ ${pom.artifactId}-${pom.version}/dbscripts/metrics @@ -643,7 +643,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/portal + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/jaggeryapps/portal ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/portal @@ -772,14 +772,14 @@ ${pom.artifactId}-${pom.version}/repository/conf/security - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/event-broker.xml ${pom.artifactId}-${pom.version}/repository/conf/ true 644 - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/registry-event-broker.xml + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/registry-event-broker.xml ${pom.artifactId}-${pom.version}/repository/conf/ true @@ -810,13 +810,13 @@ 644 - target/wso2carbon-core-${carbon.kernel.version}/bin/README.txt + target/wso2carbon-core-${carbon.kernel.version.iotcore}/bin/README.txt ${pom.artifactId}-${pom.version}/bin/ true 644 - target/wso2carbon-core-${carbon.kernel.version}/bin/version.txt + target/wso2carbon-core-${carbon.kernel.version.iotcore}/bin/version.txt ${pom.artifactId}-${pom.version}/bin/ true 644 @@ -824,7 +824,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/logging-config.xml + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/etc/logging-config.xml ${pom.artifactId}-${pom.version}/repository/conf/etc true @@ -839,13 +839,13 @@ 644 - target/wso2carbon-core-${carbon.kernel.version}/repository/conf/README + target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/README ${pom.artifactId}-${pom.version}/repository/conf/ true 644 - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/oidc-scope-config.xml + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/identity/oidc-scope-config.xml ${pom.artifactId}-${pom.version}/repository/conf/identity/ true 644 @@ -885,7 +885,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/governance.xml + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/governance.xml ${pom.artifactId}-${pom.version}/repository/conf 644 @@ -911,7 +911,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading.xml + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/tomcat/webapp-classloading.xml ${pom.artifactId}-${pom.version}/repository/conf/tomcat @@ -932,7 +932,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/certificate-config.xml + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/certificate-config.xml ${pom.artifactId}-${pom.version}/repository/conf true @@ -940,31 +940,31 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/metrics.properties + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/metrics.properties ${pom.artifactId}-${pom.version}/repository/conf/ false 644 - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/metrics.xml + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/metrics.xml ${pom.artifactId}-${pom.version}/repository/conf/ false 644 - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/datasources/metrics-datasources.xml + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/datasources/metrics-datasources.xml ${pom.artifactId}-${pom.version}/repository/conf/datasources/ 644 - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2METRICS_DB.h2.db + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/database/WSO2METRICS_DB.h2.db ${pom.artifactId}-${pom.version}/repository/database/ 644 - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/tasks-config.xml + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/etc/tasks-config.xml ${pom.artifactId}-${pom.version}/repository/conf/etc/ 644 @@ -994,7 +994,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/webapp-authenticator-config.xml + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/etc/webapp-authenticator-config.xml ${pom.artifactId}-${pom.version}/repository/conf/etc true @@ -1013,7 +1013,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/email-sender-config.xml + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/etc/email-sender-config.xml ${pom.artifactId}-${pom.version}/repository/conf/etc true @@ -1022,7 +1022,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading-environments.xml + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/tomcat/webapp-classloading-environments.xml ${pom.artifactId}-${pom.version}/repository/conf/tomcat @@ -1031,7 +1031,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/claim-config.xml + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/claim-config.xml ${pom.artifactId}-${pom.version}/repository/conf/ @@ -1041,7 +1041,7 @@ - target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2AM_DB.h2.db + target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/database/WSO2AM_DB.h2.db ${pom.artifactId}-${pom.version}/repository/database WSO2AM_DB.h2.db @@ -1050,7 +1050,7 @@ - target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2APPM_DB.h2.db + target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/database/WSO2APPM_DB.h2.db ${pom.artifactId}-${pom.version}/repository/database WSO2APPM_DB.h2.db @@ -1059,7 +1059,7 @@ - target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2DM_DB.h2.db + target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/database/WSO2DM_DB.h2.db ${pom.artifactId}-${pom.version}/repository/database WSO2DM_DB.h2.db @@ -1076,7 +1076,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/axis2/axis2_client.xml + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/axis2/axis2_client.xml ${pom.artifactId}-${pom.version}/repository/conf/axis2 @@ -1111,21 +1111,21 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/bin/ciphertool.sh + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/bin/ciphertool.sh ${pom.artifactId}-${pom.version}/bin 755 - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/bin/ciphertool.bat + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/bin/ciphertool.bat ${pom.artifactId}-${pom.version}/bin 644 - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/org.wso2.ciphertool-${cipher.tool.version}.jar + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/lib/org.wso2.ciphertool-${cipher.tool.version}.jar ${pom.artifactId}-${pom.version}/lib 644 @@ -1134,7 +1134,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/output-event-adapters.xml + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/output-event-adapters.xml ${pom.artifactId}-${pom.version}/repository/conf @@ -1143,7 +1143,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/input-event-adapters.xml + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/input-event-adapters.xml ${pom.artifactId}-${pom.version}/repository/conf @@ -1152,7 +1152,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/data-bridge/data-bridge-config.xml + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/data-bridge/data-bridge-config.xml ${pom.artifactId}-${pom.version}/repository/conf/data-bridge true 644 @@ -1163,7 +1163,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/data-bridge/data-agent-config.xml + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/data-bridge/data-agent-config.xml ${pom.artifactId}-${pom.version}/repository/conf/data-bridge @@ -1183,7 +1183,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/jwt.properties + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/etc/jwt.properties ${pom.artifactId}-${pom.version}/repository/conf/etc true @@ -1191,7 +1191,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/websocket-validation.xml + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/etc/websocket-validation.xml ${pom.artifactId}-${pom.version}/repository/conf/etc true @@ -1199,7 +1199,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/device-analytics-config.xml + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/etc/device-analytics-config.xml ${pom.artifactId}-${pom.version}/repository/conf/etc true @@ -1215,7 +1215,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/social.xml + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/social.xml ${pom.artifactId}-${pom.version}/repository/conf true 644 @@ -1233,7 +1233,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/remote-appmanager-config.xml + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/etc/remote-appmanager-config.xml ${pom.artifactId}-${pom.version}/repository/conf/etc true @@ -1242,7 +1242,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/carbonapps/org_wso2_carbon_analytics_cdmf-1.0.0.car + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/carbonapps/org_wso2_carbon_analytics_cdmf-1.0.0.car ${pom.artifactId}-${pom.version}/repository/deployment/server/carbonapps/ 644 diff --git a/modules/core/distribution/src/assembly/dist.xml b/modules/core/distribution/src/assembly/dist.xml index 1cc58910..b3e35d24 100644 --- a/modules/core/distribution/src/assembly/dist.xml +++ b/modules/core/distribution/src/assembly/dist.xml @@ -25,7 +25,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/components + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/components ${pom.artifactId}-${pom.version}/repository/components **/eclipse.ini diff --git a/modules/core/distribution/src/repository/conf/datasources/master-datasources.xml b/modules/core/distribution/src/repository/conf/datasources/master-datasources.xml index 7bb05430..d7d5a8b1 100755 --- a/modules/core/distribution/src/repository/conf/datasources/master-datasources.xml +++ b/modules/core/distribution/src/repository/conf/datasources/master-datasources.xml @@ -30,7 +30,7 @@ - jdbc:h2:repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE + jdbc:h2:repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;AUTO_SERVER=TRUE wso2carbon wso2carbon org.h2.Driver diff --git a/modules/core/distribution/src/samples/connectedcup/feature/connectedcup-feature/pom.xml b/modules/core/distribution/src/samples/connectedcup/feature/connectedcup-feature/pom.xml index b177023e..dab42ddf 100644 --- a/modules/core/distribution/src/samples/connectedcup/feature/connectedcup-feature/pom.xml +++ b/modules/core/distribution/src/samples/connectedcup/feature/connectedcup-feature/pom.xml @@ -168,7 +168,7 @@ - org.wso2.carbon.core.server:${carbon.kernel.version} + org.wso2.carbon.core.server:${carbon.kernel.version.iotcore} org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version} diff --git a/modules/core/distribution/src/samples/connectedcup/pom.xml b/modules/core/distribution/src/samples/connectedcup/pom.xml index 6f6f6caf..06d8d063 100644 --- a/modules/core/distribution/src/samples/connectedcup/pom.xml +++ b/modules/core/distribution/src/samples/connectedcup/pom.xml @@ -65,7 +65,7 @@ org.wso2.carbon org.wso2.carbon.logging - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.apache.log4j.wso2 @@ -143,7 +143,7 @@ org.wso2.carbon org.wso2.carbon.ndatasource.core - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.wso2.carbon.devicemgt-plugins @@ -208,7 +208,7 @@ org.wso2.carbon org.wso2.carbon.utils - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.bouncycastle.wso2 @@ -363,7 +363,7 @@ - 4.4.3 + 4.4.3 1.2.6-SNAPSHOT diff --git a/modules/core/distribution/src/samples/connectedlap/feature/feature/pom.xml b/modules/core/distribution/src/samples/connectedlap/feature/feature/pom.xml index cc0a9897..5b213945 100644 --- a/modules/core/distribution/src/samples/connectedlap/feature/feature/pom.xml +++ b/modules/core/distribution/src/samples/connectedlap/feature/feature/pom.xml @@ -207,7 +207,7 @@ - org.wso2.carbon.core.server:${carbon.kernel.version} + org.wso2.carbon.core.server:${carbon.kernel.version.iotcore} org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version} diff --git a/modules/core/distribution/src/samples/connectedlap/pom.xml b/modules/core/distribution/src/samples/connectedlap/pom.xml index 348a5d32..b56ec0b3 100644 --- a/modules/core/distribution/src/samples/connectedlap/pom.xml +++ b/modules/core/distribution/src/samples/connectedlap/pom.xml @@ -56,7 +56,7 @@ org.wso2.carbon org.wso2.carbon.logging - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.apache.log4j.wso2 @@ -131,7 +131,7 @@ org.wso2.carbon org.wso2.carbon.ndatasource.core - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.wso2.carbon.devicemgt-plugins @@ -196,7 +196,7 @@ org.wso2.carbon org.wso2.carbon.utils - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.bouncycastle.wso2 diff --git a/modules/core/distribution/src/samples/currentsensor/feature/feature/pom.xml b/modules/core/distribution/src/samples/currentsensor/feature/feature/pom.xml index 7ef7c651..299e1fd6 100644 --- a/modules/core/distribution/src/samples/currentsensor/feature/feature/pom.xml +++ b/modules/core/distribution/src/samples/currentsensor/feature/feature/pom.xml @@ -197,7 +197,7 @@ - org.wso2.carbon.core.server:${carbon.kernel.version} + org.wso2.carbon.core.server:${carbon.kernel.version.iotcore} org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version} diff --git a/modules/core/distribution/src/samples/currentsensor/pom.xml b/modules/core/distribution/src/samples/currentsensor/pom.xml index 5124b9f7..422afae8 100644 --- a/modules/core/distribution/src/samples/currentsensor/pom.xml +++ b/modules/core/distribution/src/samples/currentsensor/pom.xml @@ -82,7 +82,7 @@ org.wso2.carbon org.wso2.carbon.logging - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.apache.log4j.wso2 @@ -173,10 +173,10 @@ org.wso2.carbon org.wso2.carbon.ndatasource.core - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} system - ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.ndatasource.core_${carbon.kernel.version}.jar + ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.ndatasource.core_${carbon.kernel.version.iotcore}.jar @@ -245,7 +245,7 @@ org.wso2.carbon org.wso2.carbon.utils - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.bouncycastle.wso2 @@ -306,7 +306,7 @@ system - ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.utils_${carbon.kernel.version}.jar + ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.utils_${carbon.kernel.version.iotcore}.jar @@ -375,17 +375,17 @@ org.wso2.carbon org.wso2.carbon.user.api - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} system - ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.user.api_${carbon.kernel.version}.jar + ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.user.api_${carbon.kernel.version.iotcore}.jar - 4.4.3 + 4.4.3 1.2.3-SNAPSHOT diff --git a/modules/core/distribution/src/samples/digitaldisplay/feature/feature/pom.xml b/modules/core/distribution/src/samples/digitaldisplay/feature/feature/pom.xml index d606e7b9..699e3b0c 100644 --- a/modules/core/distribution/src/samples/digitaldisplay/feature/feature/pom.xml +++ b/modules/core/distribution/src/samples/digitaldisplay/feature/feature/pom.xml @@ -194,7 +194,7 @@ - org.wso2.carbon.core.server:${carbon.kernel.version} + org.wso2.carbon.core.server:${carbon.kernel.version.iotcore} org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version} diff --git a/modules/core/distribution/src/samples/digitaldisplay/pom.xml b/modules/core/distribution/src/samples/digitaldisplay/pom.xml index c7ff2152..45f48d07 100644 --- a/modules/core/distribution/src/samples/digitaldisplay/pom.xml +++ b/modules/core/distribution/src/samples/digitaldisplay/pom.xml @@ -81,7 +81,7 @@ org.wso2.carbon org.wso2.carbon.logging - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.apache.log4j.wso2 @@ -183,10 +183,10 @@ org.wso2.carbon org.wso2.carbon.ndatasource.core - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} system - ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.ndatasource.core_${carbon.kernel.version}.jar + ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.ndatasource.core_${carbon.kernel.version.iotcore}.jar @@ -255,7 +255,7 @@ org.wso2.carbon org.wso2.carbon.utils - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.bouncycastle.wso2 @@ -316,7 +316,7 @@ system - ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.utils_${carbon.kernel.version}.jar + ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.utils_${carbon.kernel.version.iotcore}.jar @@ -385,10 +385,10 @@ org.wso2.carbon org.wso2.carbon.user.api - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} system - ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.user.api_${carbon.kernel.version}.jar + ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.user.api_${carbon.kernel.version.iotcore}.jar @@ -460,7 +460,7 @@ - 4.4.3 + 4.4.3 1.2.3-SNAPSHOT diff --git a/modules/core/distribution/src/samples/doormanager/feature/feature/pom.xml b/modules/core/distribution/src/samples/doormanager/feature/feature/pom.xml index fa1a60c1..a3ae93da 100644 --- a/modules/core/distribution/src/samples/doormanager/feature/feature/pom.xml +++ b/modules/core/distribution/src/samples/doormanager/feature/feature/pom.xml @@ -193,7 +193,7 @@ - org.wso2.carbon.core.server:${carbon.kernel.version} + org.wso2.carbon.core.server:${carbon.kernel.version.iotcore} org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version} diff --git a/modules/core/distribution/src/samples/doormanager/pom.xml b/modules/core/distribution/src/samples/doormanager/pom.xml index b46bd46a..007e4480 100644 --- a/modules/core/distribution/src/samples/doormanager/pom.xml +++ b/modules/core/distribution/src/samples/doormanager/pom.xml @@ -56,7 +56,7 @@ org.wso2.carbon org.wso2.carbon.logging - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.apache.log4j.wso2 @@ -131,7 +131,7 @@ org.wso2.carbon org.wso2.carbon.ndatasource.core - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.wso2.carbon.devicemgt-plugins @@ -196,17 +196,17 @@ org.wso2.carbon org.wso2.carbon.user.core - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.wso2.carbon org.wso2.carbon.user.api - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.wso2.carbon org.wso2.carbon.utils - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.bouncycastle.wso2 @@ -394,7 +394,7 @@ 2.2.3-SNAPSHOT 4.4.8 - 4.4.3 + 4.4.3 1.5.3 4.1 diff --git a/modules/core/distribution/src/samples/droneanalyzer/feature/feature/pom.xml b/modules/core/distribution/src/samples/droneanalyzer/feature/feature/pom.xml index 356f0970..5d0e1293 100644 --- a/modules/core/distribution/src/samples/droneanalyzer/feature/feature/pom.xml +++ b/modules/core/distribution/src/samples/droneanalyzer/feature/feature/pom.xml @@ -193,7 +193,7 @@ - org.wso2.carbon.core.server:${carbon.kernel.version} + org.wso2.carbon.core.server:${carbon.kernel.version.iotcore} org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version} diff --git a/modules/core/distribution/src/samples/droneanalyzer/pom.xml b/modules/core/distribution/src/samples/droneanalyzer/pom.xml index 7187db4e..af561b75 100644 --- a/modules/core/distribution/src/samples/droneanalyzer/pom.xml +++ b/modules/core/distribution/src/samples/droneanalyzer/pom.xml @@ -56,7 +56,7 @@ org.wso2.carbon org.wso2.carbon.logging - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.apache.log4j.wso2 @@ -131,7 +131,7 @@ org.wso2.carbon org.wso2.carbon.ndatasource.core - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.wso2.carbon.devicemgt-plugins @@ -196,7 +196,7 @@ org.wso2.carbon org.wso2.carbon.utils - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.bouncycastle.wso2 @@ -384,7 +384,7 @@ 2.2.3-SNAPSHOT 4.4.8 - 4.4.3 + 4.4.3 1.5.3 4.1 diff --git a/modules/core/distribution/src/samples/firealarm/feature/feature/pom.xml b/modules/core/distribution/src/samples/firealarm/feature/feature/pom.xml index 86dc13f9..4383c168 100644 --- a/modules/core/distribution/src/samples/firealarm/feature/feature/pom.xml +++ b/modules/core/distribution/src/samples/firealarm/feature/feature/pom.xml @@ -193,7 +193,7 @@ - org.wso2.carbon.core.server:${carbon.kernel.version} + org.wso2.carbon.core.server:${carbon.kernel.version.iotcore} org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version} diff --git a/modules/core/distribution/src/samples/firealarm/pom.xml b/modules/core/distribution/src/samples/firealarm/pom.xml index 5ebd8fae..37a7e2d2 100644 --- a/modules/core/distribution/src/samples/firealarm/pom.xml +++ b/modules/core/distribution/src/samples/firealarm/pom.xml @@ -56,7 +56,7 @@ org.wso2.carbon org.wso2.carbon.logging - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.apache.log4j.wso2 @@ -131,7 +131,7 @@ org.wso2.carbon org.wso2.carbon.ndatasource.core - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.wso2.carbon.devicemgt-plugins @@ -196,7 +196,7 @@ org.wso2.carbon org.wso2.carbon.utils - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.bouncycastle.wso2 @@ -384,7 +384,7 @@ 2.2.3-SNAPSHOT 4.4.8 - 4.4.3 + 4.4.3 1.5.3 4.1 diff --git a/modules/core/distribution/src/samples/geolocationTracker/feature/feature/pom.xml b/modules/core/distribution/src/samples/geolocationTracker/feature/feature/pom.xml index 99b8ef43..e3fbfbcf 100644 --- a/modules/core/distribution/src/samples/geolocationTracker/feature/feature/pom.xml +++ b/modules/core/distribution/src/samples/geolocationTracker/feature/feature/pom.xml @@ -194,7 +194,7 @@ - org.wso2.carbon.core.server:${carbon.kernel.version} + org.wso2.carbon.core.server:${carbon.kernel.version.iotcore} org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version} diff --git a/modules/core/distribution/src/samples/geolocationTracker/pom.xml b/modules/core/distribution/src/samples/geolocationTracker/pom.xml index 2d8c805e..b65111c4 100644 --- a/modules/core/distribution/src/samples/geolocationTracker/pom.xml +++ b/modules/core/distribution/src/samples/geolocationTracker/pom.xml @@ -56,7 +56,7 @@ org.wso2.carbon org.wso2.carbon.logging - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.apache.log4j.wso2 @@ -131,7 +131,7 @@ org.wso2.carbon org.wso2.carbon.ndatasource.core - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.wso2.carbon.devicemgt-plugins @@ -196,7 +196,7 @@ org.wso2.carbon org.wso2.carbon.utils - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.bouncycastle.wso2 @@ -384,7 +384,7 @@ 2.2.3-SNAPSHOT 4.4.8 - 4.4.3 + 4.4.3 1.5.3 4.1 diff --git a/modules/core/distribution/src/samples/watertank/feature/feature/pom.xml b/modules/core/distribution/src/samples/watertank/feature/feature/pom.xml index 349ac994..07bf986e 100644 --- a/modules/core/distribution/src/samples/watertank/feature/feature/pom.xml +++ b/modules/core/distribution/src/samples/watertank/feature/feature/pom.xml @@ -193,7 +193,7 @@ - org.wso2.carbon.core.server:${carbon.kernel.version} + org.wso2.carbon.core.server:${carbon.kernel.version.iotcore} org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version} diff --git a/modules/core/distribution/src/samples/watertank/pom.xml b/modules/core/distribution/src/samples/watertank/pom.xml index 67453059..2dba6c58 100644 --- a/modules/core/distribution/src/samples/watertank/pom.xml +++ b/modules/core/distribution/src/samples/watertank/pom.xml @@ -57,7 +57,7 @@ org.wso2.carbon org.wso2.carbon.logging - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.apache.log4j.wso2 @@ -132,7 +132,7 @@ org.wso2.carbon org.wso2.carbon.ndatasource.core - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.wso2.carbon.devicemgt-plugins @@ -197,7 +197,7 @@ org.wso2.carbon org.wso2.carbon.utils - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.bouncycastle.wso2 @@ -375,7 +375,7 @@ 2.2.3-SNAPSHOT 4.4.8 - 4.4.3 + 4.4.3 1.5.3 4.1 diff --git a/modules/core/iot-extensions/features/mb-extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml b/modules/core/iot-extensions/features/mb-extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml index bdc7e9c9..d91612cf 100644 --- a/modules/core/iot-extensions/features/mb-extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml +++ b/modules/core/iot-extensions/features/mb-extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml @@ -68,7 +68,7 @@ - org.wso2.carbon.core.server:${carbon.kernel.version} + org.wso2.carbon.core.server:${carbon.kernel.version.iotcore} diff --git a/modules/core/p2-profile-gen/pom.xml b/modules/core/p2-profile-gen/pom.xml index 23016193..99e5f00c 100644 --- a/modules/core/p2-profile-gen/pom.xml +++ b/modules/core/p2-profile-gen/pom.xml @@ -49,7 +49,7 @@ org.wso2.carbon wso2carbon-core - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} zip true target @@ -511,13 +511,13 @@ - org.wso2.carbon:org.wso2.carbon.core.feature:${carbon.kernel.version} + org.wso2.carbon:org.wso2.carbon.core.feature:${carbon.kernel.version.iotcore} - org.wso2.carbon:org.wso2.carbon.core.runtime.feature:${carbon.kernel.version} + org.wso2.carbon:org.wso2.carbon.core.runtime.feature:${carbon.kernel.version.iotcore} - org.wso2.carbon:org.wso2.carbon.core.ui.feature:${carbon.kernel.version} + org.wso2.carbon:org.wso2.carbon.core.ui.feature:${carbon.kernel.version.iotcore} @@ -712,7 +712,7 @@ file:${basedir}/target/p2-repo file:${basedir}/target/p2-repo - file:${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components + file:${basedir}/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/components http-gateway @@ -728,7 +728,7 @@ file:${basedir}/target/p2-repo file:${basedir}/target/p2-repo - file:${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components + file:${basedir}/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/components device-key-manager @@ -744,7 +744,7 @@ file:${basedir}/target/p2-repo file:${basedir}/target/p2-repo - file:${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components + file:${basedir}/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/components devicetype-publisher @@ -760,7 +760,7 @@ file:${basedir}/target/p2-repo file:${basedir}/target/p2-repo - file:${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components + file:${basedir}/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/components devicetype-worker @@ -776,7 +776,7 @@ file:${basedir}/target/p2-repo file:${basedir}/target/p2-repo - ${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components + ${basedir}/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/components true @@ -1277,15 +1277,15 @@ org.wso2.carbon.core.feature.group - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.wso2.carbon.core.runtime.feature.group - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.wso2.carbon.core.ui.feature.group - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} @@ -1473,7 +1473,7 @@ file:${basedir}/target/p2-repo file:${basedir}/target/p2-repo - ${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components + ${basedir}/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/components true @@ -1513,15 +1513,15 @@ org.wso2.carbon.core.common.feature.group - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.wso2.carbon.core.server.feature.group - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.wso2.carbon.core.runtime.feature.group - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.wso2.carbon.ntask.core.feature.group @@ -1843,7 +1843,7 @@ file:${basedir}/target/p2-repo file:${basedir}/target/p2-repo - ${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components + ${basedir}/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/components true @@ -1885,7 +1885,7 @@ org.wso2.carbon.core.feature.group - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.apache.axis2.transport.mail.feature.group @@ -1938,7 +1938,7 @@ org.wso2.carbon.core.common.feature.group - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.wso2.carbon.identity.application.mgt.server.feature.group @@ -1946,11 +1946,11 @@ org.wso2.carbon.core.server.feature.group - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.wso2.carbon.core.runtime.feature.group - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.wso2.carbon.ntask.core.feature.group @@ -2289,7 +2289,7 @@ file:${basedir}/target/p2-repo file:${basedir}/target/p2-repo - ${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components + ${basedir}/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/components true @@ -2424,7 +2424,7 @@ org.wso2.carbon.core.feature.group - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.apache.axis2.transport.mail.feature.group @@ -2444,7 +2444,7 @@ org.wso2.carbon.core.common.feature.group - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.wso2.carbon.user.mgt.feature.group @@ -2456,19 +2456,19 @@ org.wso2.carbon.core.server.feature.group - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.wso2.carbon.core.runtime.feature.group - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.wso2.carbon.core.feature.group - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.wso2.carbon.core.ui.feature.group - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.wso2.carbon.as.runtimes.cxf.feature.group @@ -2881,7 +2881,7 @@ file:${basedir}/target/p2-repo file:${basedir}/target/p2-repo - ${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components + ${basedir}/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/components true @@ -3007,7 +3007,7 @@ org.wso2.carbon.core.feature.group - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.apache.axis2.transport.mail.feature.group @@ -3027,7 +3027,7 @@ org.wso2.carbon.core.common.feature.group - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.wso2.carbon.user.mgt.feature.group @@ -3039,19 +3039,19 @@ org.wso2.carbon.core.server.feature.group - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.wso2.carbon.core.runtime.feature.group - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.wso2.carbon.core.feature.group - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.wso2.carbon.core.ui.feature.group - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.wso2.carbon.as.runtimes.cxf.feature.group @@ -3443,7 +3443,7 @@ package - + diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/pom.xml b/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/pom.xml index b3bcd521..775f45e7 100644 --- a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/pom.xml +++ b/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/pom.xml @@ -193,7 +193,7 @@ - org.wso2.carbon.core.server:${carbon.kernel.version} + org.wso2.carbon.core.server:${carbon.kernel.version.iotcore} org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version} diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/pom.xml b/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/pom.xml index 7bc3825d..bb8dba8c 100644 --- a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/pom.xml +++ b/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/pom.xml @@ -56,7 +56,7 @@ org.wso2.carbon org.wso2.carbon.logging - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.apache.log4j.wso2 @@ -131,7 +131,7 @@ org.wso2.carbon org.wso2.carbon.ndatasource.core - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.wso2.carbon.devicemgt-plugins @@ -196,7 +196,7 @@ org.wso2.carbon org.wso2.carbon.utils - ${carbon.kernel.version} + ${carbon.kernel.version.iotcore} org.bouncycastle.wso2 @@ -380,7 +380,7 @@ 1.1.0-SNAPSHOT 1.0.6-ALPHA - 4.4.3 + 4.4.3 1.2.3-SNAPSHOT 1.1.0.SNAPSHOT 1.5.3 diff --git a/modules/integration/tests-common/web-ui-pages/pom.xml b/modules/integration/tests-common/web-ui-pages/pom.xml index 818cf2a5..9d76f822 100644 --- a/modules/integration/tests-common/web-ui-pages/pom.xml +++ b/modules/integration/tests-common/web-ui-pages/pom.xml @@ -96,6 +96,17 @@ + + org.seleniumhq.selenium + selenium-java + + + org.seleniumhq.selenium + selenium-android-driver + + + compile + org.testng testng diff --git a/pom.xml b/pom.xml index 7e1e0c70..31bc99cb 100644 --- a/pom.xml +++ b/pom.xml @@ -1453,7 +1453,8 @@ - 4.4.11 + 4.4.11 + 4.4.10 [4.4.0, 4.5.0) 1.5.4 From 70c656b5d4154e1e9dca50c89dcef69a3ac2baa8 Mon Sep 17 00:00:00 2001 From: Ace Date: Wed, 4 Jan 2017 18:18:29 +0530 Subject: [PATCH 09/13] 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 10/13] 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 11/13] 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 12/13] 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 From 7cfa3970ed5f9abbcd43917afb0283df1a3c6b01 Mon Sep 17 00:00:00 2001 From: Ace Date: Fri, 6 Jan 2017 13:34:36 +0530 Subject: [PATCH 13/13] Adding auto_server_port --- modules/analytics/distribution/ds_config.xml | 2 +- .../src/repository/conf/datasources/master-datasources.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/analytics/distribution/ds_config.xml b/modules/analytics/distribution/ds_config.xml index ae2cbae8..90800a3c 100644 --- a/modules/analytics/distribution/ds_config.xml +++ b/modules/analytics/distribution/ds_config.xml @@ -29,7 +29,7 @@ - jdbc:h2:../core/repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;AUTO_SERVER=TRUE + jdbc:h2:../core/repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;AUTO_SERVER=TRUE;AUTO_SERVER_PORT=9090 wso2carbon wso2carbon org.h2.Driver diff --git a/modules/core/distribution/src/repository/conf/datasources/master-datasources.xml b/modules/core/distribution/src/repository/conf/datasources/master-datasources.xml index d7d5a8b1..24495944 100755 --- a/modules/core/distribution/src/repository/conf/datasources/master-datasources.xml +++ b/modules/core/distribution/src/repository/conf/datasources/master-datasources.xml @@ -30,7 +30,7 @@ - jdbc:h2:repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;AUTO_SERVER=TRUE + jdbc:h2:repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;AUTO_SERVER=TRUE;AUTO_SERVER_PORT=9090 wso2carbon wso2carbon org.h2.Driver