You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2009/09/17 19:25:28 UTC
svn commit: r816293 - in /activemq/trunk/assembly/src/release/bin: activemq
activemq.bat linux-x86-32/wrapper.conf linux-x86-64/wrapper.conf
macosx/wrapper.conf win32/wrapper.conf
Author: gtully
Date: Thu Sep 17 17:25:27 2009
New Revision: 816293
URL: http://svn.apache.org/viewvc?rev=816293&view=rev
Log:
fix java.util.logging.config.file reference to jul logging.properties to disable
Modified:
activemq/trunk/assembly/src/release/bin/activemq
activemq/trunk/assembly/src/release/bin/activemq.bat
activemq/trunk/assembly/src/release/bin/linux-x86-32/wrapper.conf
activemq/trunk/assembly/src/release/bin/linux-x86-64/wrapper.conf
activemq/trunk/assembly/src/release/bin/macosx/wrapper.conf
activemq/trunk/assembly/src/release/bin/win32/wrapper.conf
Modified: activemq/trunk/assembly/src/release/bin/activemq
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/activemq?rev=816293&r1=816292&r2=816293&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/activemq (original)
+++ activemq/trunk/assembly/src/release/bin/activemq Thu Sep 17 17:25:27 2009
@@ -127,7 +127,7 @@
fi
if [ -z "$ACTIVEMQ_OPTS" ] ; then
- ACTIVEMQ_OPTS="-Xmx512M -Dorg.apache.activemq.UseDedicatedTaskRunner=true -Djava.util.logging.config.file=${ACTIVEMQ_BASE}/logging.properties"
+ ACTIVEMQ_OPTS="-Xmx512M -Dorg.apache.activemq.UseDedicatedTaskRunner=true -Djava.util.logging.config.file=logging.properties"
fi
if [ -z "$SUNJMX" ] ; then
Modified: activemq/trunk/assembly/src/release/bin/activemq.bat
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/activemq.bat?rev=816293&r1=816292&r2=816293&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/activemq.bat (original)
+++ activemq/trunk/assembly/src/release/bin/activemq.bat Thu Sep 17 17:25:27 2009
@@ -71,7 +71,7 @@
if "%ACTIVEMQ_BASE%" == "" set ACTIVEMQ_BASE=%ACTIVEMQ_HOME%
-if "%ACTIVEMQ_OPTS%" == "" set ACTIVEMQ_OPTS=-Xmx512M -Dorg.apache.activemq.UseDedicatedTaskRunner=true -Djava.util.logging.config.file=${ACTIVEMQ_BASE}\logging.properties
+if "%ACTIVEMQ_OPTS%" == "" set ACTIVEMQ_OPTS=-Xmx512M -Dorg.apache.activemq.UseDedicatedTaskRunner=true -Djava.util.logging.config.file=logging.properties
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
Modified: activemq/trunk/assembly/src/release/bin/linux-x86-32/wrapper.conf
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/linux-x86-32/wrapper.conf?rev=816293&r1=816292&r2=816293&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/linux-x86-32/wrapper.conf (original)
+++ activemq/trunk/assembly/src/release/bin/linux-x86-32/wrapper.conf Thu Sep 17 17:25:27 2009
@@ -51,7 +51,7 @@
wrapper.java.additional.6=-Djavax.net.ssl.trustStore=%ACTIVEMQ_BASE%/conf/broker.ts
wrapper.java.additional.7=-Dcom.sun.management.jmxremote
wrapper.java.additional.8=-Dorg.apache.activemq.UseDedicatedTaskRunner=true
-wrapper.java.additional.9=-Djava.util.logging.config.file=%ACTIVEMQ_BASE%/logging.properties
+wrapper.java.additional.9=-Djava.util.logging.config.file=logging.properties
# Uncomment to enable jmx
#wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616
Modified: activemq/trunk/assembly/src/release/bin/linux-x86-64/wrapper.conf
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/linux-x86-64/wrapper.conf?rev=816293&r1=816292&r2=816293&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/linux-x86-64/wrapper.conf (original)
+++ activemq/trunk/assembly/src/release/bin/linux-x86-64/wrapper.conf Thu Sep 17 17:25:27 2009
@@ -51,7 +51,7 @@
wrapper.java.additional.6=-Djavax.net.ssl.trustStore=%ACTIVEMQ_BASE%/conf/broker.ts
wrapper.java.additional.7=-Dcom.sun.management.jmxremote
wrapper.java.additional.8=-Dorg.apache.activemq.UseDedicatedTaskRunner=true
-wrapper.java.additional.9=-Djava.util.logging.config.file=%ACTIVEMQ_BASE%/logging.properties
+wrapper.java.additional.9=-Djava.util.logging.config.file=logging.properties
# Uncomment to enable jmx
#wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616
Modified: activemq/trunk/assembly/src/release/bin/macosx/wrapper.conf
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/macosx/wrapper.conf?rev=816293&r1=816292&r2=816293&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/macosx/wrapper.conf (original)
+++ activemq/trunk/assembly/src/release/bin/macosx/wrapper.conf Thu Sep 17 17:25:27 2009
@@ -51,7 +51,7 @@
wrapper.java.additional.6=-Djavax.net.ssl.trustStore=%ACTIVEMQ_BASE%/conf/broker.ts
wrapper.java.additional.7=-Dcom.sun.management.jmxremote
wrapper.java.additional.8=-Dorg.apache.activemq.UseDedicatedTaskRunner=true
-wrapper.java.additional.9=-Djava.util.logging.config.file=%ACTIVEMQ_BASE%/logging.properties
+wrapper.java.additional.9=-Djava.util.logging.config.file=logging.properties
# Uncomment to enable jmx
#wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616
Modified: activemq/trunk/assembly/src/release/bin/win32/wrapper.conf
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/win32/wrapper.conf?rev=816293&r1=816292&r2=816293&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/win32/wrapper.conf (original)
+++ activemq/trunk/assembly/src/release/bin/win32/wrapper.conf Thu Sep 17 17:25:27 2009
@@ -51,7 +51,7 @@
wrapper.java.additional.6=-Djavax.net.ssl.trustStore="%ACTIVEMQ_BASE%/conf/broker.ts"
wrapper.java.additional.7=-Dcom.sun.management.jmxremote
wrapper.java.additional.8=-Dorg.apache.activemq.UseDedicatedTaskRunner=true
-wrapper.java.additional.9=-Djava.util.logging.config.file=%ACTIVEMQ_BASE%/logging.properties
+wrapper.java.additional.9=-Djava.util.logging.config.file=logging.properties
# Uncomment to enable remote jmx
#wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616