Fixing Test failure

wso2 · Jun 17, 2019 · 4e61981 · 4e61981
1 parent 3feb2e7
commit 4e61981
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/...on/tests-integration/tests/src/test/resources/artifacts/CARBON/encryption/deployment.toml b/...on/tests-integration/tests/src/test/resources/artifacts/CARBON/encryption/deployment.toml
@@ -10,3 +10,31 @@ create_admin_account = true
 [encryption]
 type= "symmetric"
 key = "229E09ED15D5DBB6605FAEF188274946"
+
+
+[user_store]
+type = "database"
+
+[database.shared_db]
+type = "h2"
+url="jdbc:h2:./repository/database/WSO2SHARED_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000"
+username = "wso2carbon"
+password = "wso2carbon"
+[database.shared_db.pool_options]
+max_active = "50"
+max_wait = "60000"
+test_on_borrow = true
+validation_interval = "30000"
+default_auto_commit = true
+
+
+[keystore.tls]
+file_name = "wso2carbon.jks"
+type ="JKS"
+password ="wso2carbon"
+alias ="wso2carbon"
+key_password = "wso2carbon"
+[truststore]
+file_name = "client-truststore.jks"
+type = "JKS"
+password = "wso2carbon"
diff --git a/distribution/kernel/carbon-home/repository/resources/conf/default.json b/distribution/kernel/carbon-home/repository/resources/conf/default.json
@@ -153,7 +153,7 @@
   "tasks.server_username": "admin",
   "tasks.server_password": "admin",
   "tasks.resolver_class": "org.wso2.carbon.ntask.core.impl.RoundRobinTaskLocationResolver",
-  "server.base_path": "https://localhost:9443",
+  "server.base_path" : "${carbon.protocol}://${carbon.host}:${carbon.management.port}",
   "system.parameter": {
     "org.wso2.CipherTransformation": "RSA/ECB/OAEPwithSHA1andMGF1Padding"
   }