diff --git a/modules/distribution/src/repository/resources/conf/deployment.toml b/modules/distribution/src/repository/resources/conf/deployment.toml index 25123dd682c..aedf83d64c2 100644 --- a/modules/distribution/src/repository/resources/conf/deployment.toml +++ b/modules/distribution/src/repository/resources/conf/deployment.toml @@ -13,19 +13,19 @@ type = "database_unique_id" [database.identity_db] type = "h2" -url = "jdbc:h2:./repository/database/WSO2IDENTITY_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" +url = "jdbc:h2:./repository/database/WSO2IDENTITY_DB;COLLATION=en_US;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" username = "wso2carbon" password = "wso2carbon" [database.shared_db] type = "h2" -url = "jdbc:h2:./repository/database/WSO2SHARED_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" +url = "jdbc:h2:./repository/database/WSO2SHARED_DB;COLLATION=en_US;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" username = "wso2carbon" password = "wso2carbon" [datasource.AgentIdentity] id = "AgentIdentity" -url = "jdbc:h2:./repository/database/WSO2AGENTIDENTITY_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" +url = "jdbc:h2:./repository/database/WSO2AGENTIDENTITY_DB;COLLATION=en_US;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" username = "wso2carbon" password = "wso2carbon" driver = "org.h2.Driver" diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/case_insensitive_user_false.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/case_insensitive_user_false.toml index c19e6e2be6b..5ac5e76e720 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/case_insensitive_user_false.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/case_insensitive_user_false.toml @@ -15,13 +15,13 @@ use_case_sensitive_username_for_cache_keys = "false" [database.identity_db] type = "h2" -url = "jdbc:h2:./repository/database/WSO2IDENTITY_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" +url = "jdbc:h2:./repository/database/WSO2IDENTITY_DB;COLLATION=en_US;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" username = "wso2carbon" password = "wso2carbon" [database.shared_db] type = "h2" -url = "jdbc:h2:./repository/database/WSO2SHARED_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" +url = "jdbc:h2:./repository/database/WSO2SHARED_DB;COLLATION=en_US;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" username = "wso2carbon" password = "wso2carbon" diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/organizationDiscovery/email_as_username.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/organizationDiscovery/email_as_username.toml index 497c77ea0ab..4ee8c953ddd 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/organizationDiscovery/email_as_username.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/organizationDiscovery/email_as_username.toml @@ -14,13 +14,13 @@ type = "database_unique_id" [database.identity_db] type = "h2" -url = "jdbc:h2:./repository/database/WSO2IDENTITY_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" +url = "jdbc:h2:./repository/database/WSO2IDENTITY_DB;COLLATION=en_US;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" username = "wso2carbon" password = "wso2carbon" [database.shared_db] type = "h2" -url = "jdbc:h2:./repository/database/WSO2SHARED_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" +url = "jdbc:h2:./repository/database/WSO2SHARED_DB;COLLATION=en_US;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" username = "wso2carbon" password = "wso2carbon" diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/provisioning/db_separation_config.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/provisioning/db_separation_config.toml index 8bcb05054f9..e6409b38085 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/provisioning/db_separation_config.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/provisioning/db_separation_config.toml @@ -37,7 +37,7 @@ password = "wso2carbon" [datasource.CONSENT_DB] id = "CONSENT_DB" -url = "jdbc:h2:./repository/database/CONSENT_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" +url = "jdbc:h2:./repository/database/CONSENT_DB;COLLATION=en_US;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" username = "wso2carbon" password = "wso2carbon" driver = "org.h2.Driver" diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/provisioning/default_configs_with_h2_db.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/provisioning/default_configs_with_h2_db.toml index d3b52fcf999..bbd5b2cb556 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/provisioning/default_configs_with_h2_db.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/provisioning/default_configs_with_h2_db.toml @@ -14,19 +14,19 @@ type = "database_unique_id" [database.identity_db] type = "h2" -url = "jdbc:h2:./repository/database/WSO2IDENTITY_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" +url = "jdbc:h2:./repository/database/WSO2IDENTITY_DB;COLLATION=en_US;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" username = "wso2carbon" password = "wso2carbon" [database.shared_db] type = "h2" -url = "jdbc:h2:./repository/database/WSO2SHARED_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" +url = "jdbc:h2:./repository/database/WSO2SHARED_DB;COLLATION=en_US;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" username = "wso2carbon" password = "wso2carbon" [datasource.AgentIdentity] id = "AgentIdentity" -url = "jdbc:h2:./repository/database/WSO2AGENTIDENTITY_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" +url = "jdbc:h2:./repository/database/WSO2AGENTIDENTITY_DB;COLLATION=en_US;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" username = "wso2carbon" password = "wso2carbon" driver = "org.h2.Driver" diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml_keystore_rotation.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml_keystore_rotation.toml index 6eb5d44ff3a..bc6199a5d01 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml_keystore_rotation.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml_keystore_rotation.toml @@ -14,19 +14,19 @@ type = "database_unique_id" [database.identity_db] type = "h2" -url = "jdbc:h2:./repository/database/WSO2IDENTITY_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" +url = "jdbc:h2:./repository/database/WSO2IDENTITY_DB;COLLATION=en_US;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" username = "wso2carbon" password = "wso2carbon" [database.shared_db] type = "h2" -url = "jdbc:h2:./repository/database/WSO2SHARED_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" +url = "jdbc:h2:./repository/database/WSO2SHARED_DB;COLLATION=en_US;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" username = "wso2carbon" password = "wso2carbon" [datasource.AgentIdentity] id = "AgentIdentity" -url = "jdbc:h2:./repository/database/WSO2AGENTIDENTITY_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" +url = "jdbc:h2:./repository/database/WSO2AGENTIDENTITY_DB;COLLATION=en_US;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" username = "wso2carbon" password = "wso2carbon" driver = "org.h2.Driver" diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/scriptEngine/nashorn_script_engine_config.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/scriptEngine/nashorn_script_engine_config.toml index 7326055196d..3a786ba0b39 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/scriptEngine/nashorn_script_engine_config.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/scriptEngine/nashorn_script_engine_config.toml @@ -14,13 +14,13 @@ type = "database_unique_id" [database.identity_db] type = "h2" -url = "jdbc:h2:./repository/database/WSO2IDENTITY_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" +url = "jdbc:h2:./repository/database/WSO2IDENTITY_DB;COLLATION=en_US;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" username = "wso2carbon" password = "wso2carbon" [database.shared_db] type = "h2" -url = "jdbc:h2:./repository/database/WSO2SHARED_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" +url = "jdbc:h2:./repository/database/WSO2SHARED_DB;COLLATION=en_US;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" username = "wso2carbon" password = "wso2carbon" diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/scriptEngine/openjdknashorn_script_engine_config.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/scriptEngine/openjdknashorn_script_engine_config.toml index e08875c1879..89e41f1b4ce 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/scriptEngine/openjdknashorn_script_engine_config.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/scriptEngine/openjdknashorn_script_engine_config.toml @@ -14,13 +14,13 @@ type = "database_unique_id" [database.identity_db] type = "h2" -url = "jdbc:h2:./repository/database/WSO2IDENTITY_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" +url = "jdbc:h2:./repository/database/WSO2IDENTITY_DB;COLLATION=en_US;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" username = "wso2carbon" password = "wso2carbon" [database.shared_db] type = "h2" -url = "jdbc:h2:./repository/database/WSO2SHARED_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" +url = "jdbc:h2:./repository/database/WSO2SHARED_DB;COLLATION=en_US;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" username = "wso2carbon" password = "wso2carbon" diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/ldap_user_mgt_config.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/ldap_user_mgt_config.toml index 809f9943990..4816a6f89dd 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/ldap_user_mgt_config.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/ldap_user_mgt_config.toml @@ -18,13 +18,13 @@ base_dn = "dc=wso2,dc=org" [database.identity_db] type = "h2" -url = "jdbc:h2:./repository/database/WSO2IDENTITY_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" +url = "jdbc:h2:./repository/database/WSO2IDENTITY_DB;COLLATION=en_US;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" username = "wso2carbon" password = "wso2carbon" [database.shared_db] type = "h2" -url = "jdbc:h2:./repository/database/WSO2SHARED_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" +url = "jdbc:h2:./repository/database/WSO2SHARED_DB;COLLATION=en_US;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" username = "wso2carbon" password = "wso2carbon" diff --git a/oidc-fapi-conformance-tests/config/deployment-fapi-config.toml b/oidc-fapi-conformance-tests/config/deployment-fapi-config.toml index 494e9154f89..9756fe65046 100644 --- a/oidc-fapi-conformance-tests/config/deployment-fapi-config.toml +++ b/oidc-fapi-conformance-tests/config/deployment-fapi-config.toml @@ -13,19 +13,19 @@ type = "database_unique_id" [database.identity_db] type = "h2" -url = "jdbc:h2:./repository/database/WSO2IDENTITY_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" +url = "jdbc:h2:./repository/database/WSO2IDENTITY_DB;COLLATION=en_US;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" username = "wso2carbon" password = "wso2carbon" [database.shared_db] type = "h2" -url = "jdbc:h2:./repository/database/WSO2SHARED_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" +url = "jdbc:h2:./repository/database/WSO2SHARED_DB;COLLATION=en_US;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" username = "wso2carbon" password = "wso2carbon" [datasource.AgentIdentity] id = "AgentIdentity" -url = "jdbc:h2:./repository/database/WSO2AGENTIDENTITY_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" +url = "jdbc:h2:./repository/database/WSO2AGENTIDENTITY_DB;COLLATION=en_US;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" username = "wso2carbon" password = "wso2carbon" driver = "org.h2.Driver"