summaryrefslogtreecommitdiff
path: root/java/systests
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2010-11-14 17:37:17 +0000
committerRobert Gemmell <robbie@apache.org>2010-11-14 17:37:17 +0000
commit9b04402d400ba8e30fae6f4779133f0e38128326 (patch)
treec0cc8483e0eb83f3bf766073661f547bca0d4680 /java/systests
parent36f73c195fbe40c8c8a9afae66d56f871070164c (diff)
downloadqpid-python-9b04402d400ba8e30fae6f4779133f0e38128326.tar.gz
QPID-2942: disable management SSL by default, update config.xml to use keystore path from example keystore creation script and move systest keystore config to the systest config override file.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1035026 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/systests')
-rw-r--r--java/systests/etc/config-systests-settings.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/java/systests/etc/config-systests-settings.xml b/java/systests/etc/config-systests-settings.xml
index a7f538aec1..751ff133cb 100644
--- a/java/systests/etc/config-systests-settings.xml
+++ b/java/systests/etc/config-systests-settings.xml
@@ -24,6 +24,8 @@
<enabled>false</enabled>
<ssl>
<enabled>false</enabled>
+ <keyStorePath>${QPID_HOME}/../test-profiles/test_resources/ssl/keystore.jks</keyStorePath>
+ <keyStorePassword>password</keyStorePassword>
</ssl>
</management>
<virtualhosts>${QPID_HOME}/etc/virtualhosts-systests.xml</virtualhosts>