activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r666655 - in /activemq/trunk/assembly/src/release: bin/activemq bin/activemq-admin bin/activemq-admin.bat bin/activemq.bat conf/activemq.xml
Date Wed, 11 Jun 2008 13:24:01 GMT
Author: chirino
Date: Wed Jun 11 06:24:01 2008
New Revision: 666655

URL: http://svn.apache.org/viewvc?rev=666655&view=rev
Log:
Use the new SslContext config element to configure ssl instead of the system properties.

Modified:
    activemq/trunk/assembly/src/release/bin/activemq
    activemq/trunk/assembly/src/release/bin/activemq-admin
    activemq/trunk/assembly/src/release/bin/activemq-admin.bat
    activemq/trunk/assembly/src/release/bin/activemq.bat
    activemq/trunk/assembly/src/release/conf/activemq.xml

Modified: activemq/trunk/assembly/src/release/bin/activemq
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/activemq?rev=666655&r1=666654&r2=666655&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/activemq (original)
+++ activemq/trunk/assembly/src/release/bin/activemq Wed Jun 11 06:24:01 2008
@@ -135,10 +135,6 @@
   SUNJMX="-Dcom.sun.management.jmxremote"
 fi
 
-if [ -z "$SSL_OPTS" ] ; then
-  SSL_OPTS="-Djavax.net.ssl.keyStorePassword=password -Djavax.net.ssl.trustStorePassword=password
-Djavax.net.ssl.keyStore=${ACTIVEMQ_BASE}/conf/broker.ks -Djavax.net.ssl.trustStore=${ACTIVEMQ_BASE}/conf/broker.ts"
-fi
-
 ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS $SUNJMX $SSL_OPTS"
 
 # Set default classpath

Modified: activemq/trunk/assembly/src/release/bin/activemq-admin
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/activemq-admin?rev=666655&r1=666654&r2=666655&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/activemq-admin (original)
+++ activemq/trunk/assembly/src/release/bin/activemq-admin Wed Jun 11 06:24:01 2008
@@ -135,10 +135,6 @@
   SUNJMX="-Dcom.sun.management.jmxremote"
 fi
 
-if [ -z "$SSL_OPTS" ] ; then
-  SSL_OPTS="-Djavax.net.ssl.keyStorePassword=password -Djavax.net.ssl.trustStorePassword=password
-Djavax.net.ssl.keyStore=${ACTIVEMQ_BASE}/conf/broker.ks -Djavax.net.ssl.trustStore=${ACTIVEMQ_BASE}/conf/broker.ts"
-fi
-
 ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS $SUNJMX $SSL_OPTS"
 
 # Set default classpath

Modified: activemq/trunk/assembly/src/release/bin/activemq-admin.bat
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/activemq-admin.bat?rev=666655&r1=666654&r2=666655&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/activemq-admin.bat (original)
+++ activemq/trunk/assembly/src/release/bin/activemq-admin.bat Wed Jun 11 06:24:01 2008
@@ -76,8 +76,6 @@
 if "%SUNJMX%" == "" set SUNJMX=-Dcom.sun.management.jmxremote
 REM set SUNJMX=-Dcom.sun.management.jmxremote.port=1616 -Dcom.sun.management.jmxremote.authenticate=false
-Dcom.sun.management.jmxremote.ssl=false
 
-if "%SSL_OPTS%" == "" set SSL_OPTS=-Djavax.net.ssl.keyStorePassword=password -Djavax.net.ssl.trustStorePassword=password
-Djavax.net.ssl.keyStore="%ACTIVEMQ_BASE%/conf/broker.ks" -Djavax.net.ssl.trustStore="%ACTIVEMQ_BASE%/conf/broker.ts"
-
 REM Uncomment to enable YourKit profiling
 REM SET ACTIVEMQ_DEBUG_OPTS="-agentlib:yjpagent"
 

Modified: activemq/trunk/assembly/src/release/bin/activemq.bat
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/activemq.bat?rev=666655&r1=666654&r2=666655&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/activemq.bat (original)
+++ activemq/trunk/assembly/src/release/bin/activemq.bat Wed Jun 11 06:24:01 2008
@@ -76,8 +76,6 @@
 if "%SUNJMX%" == "" set SUNJMX=-Dcom.sun.management.jmxremote
 REM set SUNJMX=-Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.authenticate=false
-Dcom.sun.management.jmxremote.ssl=false
 
-if "%SSL_OPTS%" == "" set SSL_OPTS=-Djavax.net.ssl.keyStorePassword=password -Djavax.net.ssl.trustStorePassword=password
-Djavax.net.ssl.keyStore="%ACTIVEMQ_BASE%/conf/broker.ks" -Djavax.net.ssl.trustStore="%ACTIVEMQ_BASE%/conf/broker.ts"
-
 REM Uncomment to enable YourKit profiling
 REM SET ACTIVEMQ_DEBUG_OPTS="-agentlib:yjpagent"
 

Modified: activemq/trunk/assembly/src/release/conf/activemq.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/conf/activemq.xml?rev=666655&r1=666654&r2=666655&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/conf/activemq.xml (original)
+++ activemq/trunk/assembly/src/release/conf/activemq.xml Wed Jun 11 06:24:01 2008
@@ -77,6 +77,10 @@
         </persistenceAdapter>
         -->
 
+        <sslContext>
+            <sslContext keyStore="file:${activemq.base}/conf/dummy.keystore" keyStorePassword="password"
trustStore="file:${activemq.base}/conf/broker.ts" trustStorePassword="password"/>
+        </sslContext>
+        
         <!--  The maximum about of space the broker will use before slowing down producers
-->
         <systemUsage>
             <systemUsage>



Mime
View raw message