svn commit: r1465634 - in /activemq/activemq-apollo/trunk: apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Run.scala apollo-website/src/documentation/user-manual.md

[ch...@apache.org]

Author: chirino
Date: Mon Apr  8 13:44:18 2013
New Revision: 1465634

URL: http://svn.apache.org/r1465634
Log:
Use SLF4J to log the fact that bouncy castle is in use.  Document the Java 7 SSL bug workaround.

Modified:
    activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Run.scala
    activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md

Modified: activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Run.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Run.scala?rev=1465634&r1=1465633&r2=1465634&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Run.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Run.scala Mon Apr  8 13:44:18 2013
@@ -92,20 +92,20 @@ class Run extends Action {
 
       def println(value:String) = session.getConsole.println(value)
 
+      // Load the configs and start the brokers up.
+      println("Loading configuration file '%s'.".format(conf))
+
       // Use bouncycastle if it's installed.
       try {
         var loader: ClassLoader = getClass.getClassLoader
         var clazz: Class[_] = loader.loadClass("org.bouncycastle.jce.provider.BouncyCastleProvider")
         val bouncycastle_provider = clazz.newInstance().asInstanceOf[Provider]
         Security.insertProviderAt(bouncycastle_provider, 2)
-        println("Loaded the Bouncy Castle security provider.")
+        Broker.info("Loaded the Bouncy Castle security provider.")
       } catch {
         case e:Throwable => // ignore, we can live without bouncycastle
       }
 
-      // Load the configs and start the brokers up.
-      println("Loading configuration file '%s'.".format(conf))
-
       val broker = new Broker()
 
       val validation_messages = ListBuffer[String]()

Modified: activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md?rev=1465634&r1=1465633&r2=1465634&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md (original)
+++ activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md Mon Apr  8 13:44:18 2013
@@ -703,6 +703,14 @@ A `bdb_store` element may be configured 
 
 ### Security
 
+### Working Around Java 7 SSL Bugs
+
+As noted by issue [APLO-287](https://issues.apache.org/jira/browse/APLO-287), 
+it seems some versions of Java 7 have problems with SSL sessions that need
+to use the Diffie-Hellman cypher suite.   If you run into this issue,
+just copy the Bouncy Castle [bcprov-jdk15on-148.jar](http://www.bouncycastle.org/download/bcprov-jdk15on-148.jar)
+to Apollo's lib directory and restart your broker.
+
 #### The SSL/TLS Transport
 
 ${project_name} supports SSL/TLS for transport level security to avoid 3rd