Author: robbie
Date: Sun Nov 14 17:37:17 2010
New Revision: 1035026
URL: http://svn.apache.org/viewvc?rev=1035026&view=rev
Log:
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.
Modified:
qpid/trunk/qpid/java/broker/etc/config.xml
qpid/trunk/qpid/java/systests/etc/config-systests-settings.xml
Modified: qpid/trunk/qpid/java/broker/etc/config.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/etc/config.xml?rev=1035026&r1=1035025&r2=1035026&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/etc/config.xml (original)
+++ qpid/trunk/qpid/java/broker/etc/config.xml Sun Nov 14 17:37:17 2010
@@ -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>
Modified: qpid/trunk/qpid/java/systests/etc/config-systests-settings.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/etc/config-systests-settings.xml?rev=1035026&r1=1035025&r2=1035026&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/etc/config-systests-settings.xml (original)
+++ qpid/trunk/qpid/java/systests/etc/config-systests-settings.xml Sun Nov 14
17:37:17 2010
@@ -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>
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
