summaryrefslogtreecommitdiff
path: root/qpid/java/broker/etc/config.xml
diff options
context:
space:
mode:
authorAndrew Donald Kennedy <grkvlt@apache.org>2010-12-06 16:05:46 +0000
committerAndrew Donald Kennedy <grkvlt@apache.org>2010-12-06 16:05:46 +0000
commit80ba5c5efdc23e3922b8f8f5152ceeaefa6951b6 (patch)
tree2eb2141eb77d43701e718b5b5ab1cbd07401015f /qpid/java/broker/etc/config.xml
parent1d44d6e7a3369fb7773ba50d02c3baa8955da382 (diff)
downloadqpid-python-grkvlt-network-20101013.tar.gz
Attempt one at merge from r1021441:HEADgrkvlt-network-20101013
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/grkvlt-network-20101013@1042697 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker/etc/config.xml')
-rw-r--r--qpid/java/broker/etc/config.xml7
1 files changed, 4 insertions, 3 deletions
diff --git a/qpid/java/broker/etc/config.xml b/qpid/java/broker/etc/config.xml
index 87101678c0..d9677c9cf6 100644
--- a/qpid/java/broker/etc/config.xml
+++ b/qpid/java/broker/etc/config.xml
@@ -53,9 +53,10 @@
<enabled>true</enabled>
<jmxport>8999</jmxport>
<ssl>
- <enabled>true</enabled>
- <!-- Update below path to your keystore location, eg ${conf}/qpid.keystore -->
- <keyStorePath>${prefix}/../test-profiles/test_resources/ssl/keystore.jks</keyStorePath>
+ <enabled>false</enabled>
+ <!-- Update below path to your keystore location, or run the bin/create-example-ssl-stores(.sh|.bat)
+ script from within the etc/ folder to generate an example store with self-signed cert -->
+ <keyStorePath>${conf}/qpid.keystore</keyStorePath>
<keyStorePassword>password</keyStorePassword>
</ssl>
</management>