Author: robbie
Date: Sun Nov 14 17:55:41 2010
New Revision: 1035032
URL: http://svn.apache.org/viewvc?rev=1035032&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.
merged from trunk r1035026
Modified:
qpid/branches/0.8-release-candidates/qpid/java/ (props changed)
qpid/branches/0.8-release-candidates/qpid/java/broker/ (props changed)
qpid/branches/0.8-release-candidates/qpid/java/broker/etc/config.xml
qpid/branches/0.8-release-candidates/qpid/java/systests/etc/config-systests-settings.xml
Propchange: qpid/branches/0.8-release-candidates/qpid/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 14 17:55:41 2010
@@ -3,3 +3,4 @@
/qpid/branches/java-broker-0-10/qpid/java:795950-829653
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/trunk/qpid:796646-796653
+/qpid/trunk/qpid/java:1035026
Propchange: qpid/branches/0.8-release-candidates/qpid/java/broker/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 14 17:55:41 2010
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/broker:795950-829653
/qpid/branches/java-network-refactor/qpid/java/broker:805429-821809
/qpid/branches/jmx_mc_gsoc09/qpid/java/broker:787599
-/qpid/trunk/qpid/java/broker:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315,749340,749572,753219-753220,753253,754934,754958,755256,757258,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
+/qpid/trunk/qpid/java/broker:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315,749340,749572,753219-753220,753253,754934,754958,755256,757258,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790,1035026
Modified: qpid/branches/0.8-release-candidates/qpid/java/broker/etc/config.xml
URL:
http://svn.apache.org/viewvc/qpid/branches/0.8-release-candidates/qpid/java/broker/etc/config.xml?rev=1035032&r1=1035031&r2=1035032&view=diff
==============================================================================
--- qpid/branches/0.8-release-candidates/qpid/java/broker/etc/config.xml
(original)
+++ qpid/branches/0.8-release-candidates/qpid/java/broker/etc/config.xml Sun
Nov 14 17:55:41 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/branches/0.8-release-candidates/qpid/java/systests/etc/config-systests-settings.xml
URL:
http://svn.apache.org/viewvc/qpid/branches/0.8-release-candidates/qpid/java/systests/etc/config-systests-settings.xml?rev=1035032&r1=1035031&r2=1035032&view=diff
==============================================================================
---
qpid/branches/0.8-release-candidates/qpid/java/systests/etc/config-systests-settings.xml
(original)
+++
qpid/branches/0.8-release-candidates/qpid/java/systests/etc/config-systests-settings.xml
Sun Nov 14 17:55:41 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:[email protected]
