Author: ritchiem
Date: Mon Apr 13 14:11:19 2009
New Revision: 764478
URL: http://svn.apache.org/viewvc?rev=764478&view=rev
Log:
QPID-1511: add scripts to generate example ssl stores, and add refrence in the
relevant exception message
Merged from branches/0.5-release : r757268
merged from trunk r757270
Added:
qpid/branches/0.5-fix/qpid/java/broker/bin/create-example-ssl-stores.bat
- copied unchanged from r757270,
qpid/trunk/qpid/java/broker/bin/create-example-ssl-stores.bat
qpid/branches/0.5-fix/qpid/java/broker/bin/create-example-ssl-stores.sh
- copied unchanged from r757270,
qpid/trunk/qpid/java/broker/bin/create-example-ssl-stores.sh
Modified:
qpid/branches/0.5-fix/qpid/ (props changed)
qpid/branches/0.5-fix/qpid/java/broker/bin/ (props changed)
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/management/
(props changed)
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/
(props changed)
Propchange: qpid/branches/0.5-fix/qpid/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 13 14:11:19 2009
@@ -1 +1 @@
-/qpid/trunk/qpid: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,754934,754958,755256,757258
+/qpid/trunk/qpid: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,754934,754958,755256,757258,757270
Propchange: qpid/branches/0.5-fix/qpid/java/broker/bin/
------------------------------------------------------------------------------
svn:mergeinfo = /qpid/branches/0.5-release/qpid/java/broker/bin:757268
Propchange:
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/management/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Apr 13 14:11:19 2009
@@ -0,0 +1 @@
+/qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/management:757268
Modified:
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java?rev=764478&r1=764477&r2=764478&view=diff
==============================================================================
---
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
(original)
+++
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
Mon Apr 13 14:11:19 2009
@@ -155,7 +155,9 @@
if (!ksf.exists())
{
- throw new FileNotFoundException("Cannot find JMX
management SSL keystore file " + ksf);
+ throw new FileNotFoundException("Cannot find JMX
management SSL keystore file " + ksf + "\n"
+ + "Check broker
configuration, or see create-example-ssl-stores script"
+ + "in the bin/ directory if
you need to generate an example store.");
}
if (!ksf.canRead())
{
Propchange:
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 13 14:11:19 2009
@@ -1 +1,2 @@
/qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:757257
+/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:757270
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
