activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject svn commit: r1088989 - /activemq/trunk/assembly/src/release/bin/activemq
Date Tue, 05 Apr 2011 11:42:09 GMT
Author: dejanb
Date: Tue Apr  5 11:42:08 2011
New Revision: 1088989

URL: http://svn.apache.org/viewvc?rev=1088989&view=rev
Log:
setting ACTIVEMQ_OPTS after loading configs

Modified:
    activemq/trunk/assembly/src/release/bin/activemq

Modified: activemq/trunk/assembly/src/release/bin/activemq
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/activemq?rev=1088989&r1=1088988&r2=1088989&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/activemq (original)
+++ activemq/trunk/assembly/src/release/bin/activemq Tue Apr  5 11:42:08 2011
@@ -121,10 +121,6 @@ if [ -z "$ACTIVEMQ_OPTS_MEMORY" ] ; then
     ACTIVEMQ_OPTS_MEMORY="-Xms256M -Xmx256M"
 fi
 
-if [ -z "$ACTIVEMQ_OPTS" ] ; then
-    ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS_MEMORY -Dorg.apache.activemq.UseDedicatedTaskRunner=true
-Djava.util.logging.config.file=logging.properties"
-fi
-
 # Uncomment to enable audit logging
 #ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS -Dorg.apache.activemq.audit=true"
 
@@ -214,6 +210,10 @@ if [ "$CONFIG_LOAD" != "yes" ];then
    fi
 fi
 
+if [ -z "$ACTIVEMQ_OPTS" ] ; then
+    ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS_MEMORY -Dorg.apache.activemq.UseDedicatedTaskRunner=true
-Djava.util.logging.config.file=logging.properties"
+fi
+
 # create configuration if requested
 if [ "$1" = "setup" ];then
    if [ -z "$2" ];then



Mime
View raw message