svn commit: r1295486 - in /qpid/trunk/qpid: doc/book/src/ java/broker/bin/ java/broker/etc/ java/broker/src/main/java/org/apache/qpid/server/management/

[kw...@apache.org]

Author: kwall
Date: Thu Mar  1 09:39:31 2012
New Revision: 1295486

URL: http://svn.apache.org/viewvc?rev=1295486&view=rev
Log:
QPID-2159: Remove create-example-ssl-stores script from Java Broker.

Removed create-example-ssl-stores(.bat|.sh). Removed references to script from code, config and docbook.

Removed:
    qpid/trunk/qpid/java/broker/bin/create-example-ssl-stores.bat
    qpid/trunk/qpid/java/broker/bin/create-example-ssl-stores.sh
Modified:
    qpid/trunk/qpid/doc/book/src/Management-Console-Security.xml
    qpid/trunk/qpid/java/broker/etc/config.xml
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java

Modified: qpid/trunk/qpid/doc/book/src/Management-Console-Security.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Management-Console-Security.xml?rev=1295486&r1=1295485&r2=1295486&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Management-Console-Security.xml (original)
+++ qpid/trunk/qpid/doc/book/src/Management-Console-Security.xml Thu Mar  1 09:39:31 2012
@@ -57,8 +57,7 @@
             The broker configuration must be updated before the broker will
             start. This can be done either by disabling the SSL support,
             utilizing a purchased SSL certificate to create a keystore of
-            your own, or using the example 'create-example-ssl-stores' script
-            in the brokers bin/ directory to generate a self-signed keystore.
+            your own, or generating a self-signed keystore.
           </para><para>
             The broker must be configured with a keystore containing the
             private and public keys associated with its SSL certificate. This
@@ -76,7 +75,7 @@
     &lt;ssl&gt;
         &lt;enabled&gt;true&lt;/enabled&gt;
         &lt;!-- Update below path to your keystore location, eg ${conf}/qpid.keystore  --&gt;
-        &lt;keyStorePath&gt;${prefix}/../test_resources/ssl/keystore.jks&lt;/keyStorePath&gt;
+        &lt;keyStorePath&gt;${conf}/qpid.keystore&lt;/keyStorePath&gt;
         &lt;keyStorePassword&gt;password&lt;/keyStorePassword&gt;
     &lt;/ssl&gt;
 &lt;/management&gt;

Modified: qpid/trunk/qpid/java/broker/etc/config.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/etc/config.xml?rev=1295486&r1=1295485&r2=1295486&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/etc/config.xml (original)
+++ qpid/trunk/qpid/java/broker/etc/config.xml Thu Mar  1 09:39:31 2012
@@ -53,8 +53,7 @@
         </jmxport>
         <ssl>
             <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 -->
+            <!-- Update below path to your keystore location. -->
             <keyStorePath>${conf}/qpid.keystore</keyStorePath>
             <keyStorePassword>password</keyStorePassword>
         </ssl>

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java?rev=1295486&r1=1295485&r2=1295486&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java Thu Mar  1 09:39:31 2012
@@ -157,9 +157,7 @@ public class JMXManagedObjectRegistry im
 
                 if (!ksf.exists())
                 {
-                    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.");
+                    throw new FileNotFoundException("Cannot find JMX management SSL keystore file: " + ksf);
                 }
                 if (!ksf.canRead())
                 {



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org