activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject svn commit: r818535 - in /activemq/branches/activemq-5.3/assembly/src/release/bin: activemq-admin activemq-admin.bat
Date Thu, 24 Sep 2009 16:21:10 GMT
Author: dejanb
Date: Thu Sep 24 16:21:09 2009
New Revision: 818535

URL: http://svn.apache.org/viewvc?rev=818535&view=rev
Log:
merging http://fisheye6.atlassian.com/changelog/activemq/trunk?cs=818159

Modified:
    activemq/branches/activemq-5.3/assembly/src/release/bin/activemq-admin
    activemq/branches/activemq-5.3/assembly/src/release/bin/activemq-admin.bat

Modified: activemq/branches/activemq-5.3/assembly/src/release/bin/activemq-admin
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/assembly/src/release/bin/activemq-admin?rev=818535&r1=818534&r2=818535&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/assembly/src/release/bin/activemq-admin (original)
+++ activemq/branches/activemq-5.3/assembly/src/release/bin/activemq-admin Thu Sep 24 16:21:09
2009
@@ -129,6 +129,19 @@
 # Set default classpath
 ACTIVEMQ_CLASSPATH="${ACTIVEMQ_BASE}/conf;"$ACTIVEMQ_CLASSPATH
 
+if [ $1 = "start" ] ; then
+    if [ -z "$ACTIVEMQ_OPTS" ] ; then
+        ACTIVEMQ_OPTS="-Xmx512M -Dorg.apache.activemq.UseDedicatedTaskRunner=true -Djava.util.logging.config.file=logging.properties"
+    fi
+
+    if [ -z "$SUNJMX" ] ; then
+        #SUNJMX="-Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.authenticate=false
-Dcom.sun.management.jmxremote.ssl=false"
+        SUNJMX="-Dcom.sun.management.jmxremote"
+    fi
+
+    ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS $SUNJMX $SSL_OPTS"
+fi
+
 # Uncomment to enable YourKit profiling
 #ACTIVEMQ_DEBUG_OPTS="-agentlib:yjpagent"
 
@@ -136,7 +149,7 @@
 #ACTIVEMQ_DEBUG_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005"
 
 if [ -n "$CYGHOME" ]; then
-    exec "$JAVACMD" $ACTIVEMQ_DEBUG_OPTS -Dactivemq.classpath="${ACTIVEMQ_CLASSPATH}" -Dactivemq.home="${ACTIVEMQ_HOME}"
-Dactivemq.base="${ACTIVEMQ_BASE}" -Dcygwin.user.home="$CYGHOME" -jar "${ACTIVEMQ_HOME}/bin/run.jar"
$@
+    exec "$JAVACMD" $ACTIVEMQ_OPTS $ACTIVEMQ_DEBUG_OPTS -Dactivemq.classpath="${ACTIVEMQ_CLASSPATH}"
-Dactivemq.home="${ACTIVEMQ_HOME}" -Dactivemq.base="${ACTIVEMQ_BASE}" -Dcygwin.user.home="$CYGHOME"
-jar "${ACTIVEMQ_HOME}/bin/run.jar" $@
 else
-    exec "$JAVACMD" $ACTIVEMQ_DEBUG_OPTS -Dactivemq.classpath="${ACTIVEMQ_CLASSPATH}" -Dactivemq.home="${ACTIVEMQ_HOME}"
-Dactivemq.base="${ACTIVEMQ_BASE}" -jar "${ACTIVEMQ_HOME}/bin/run.jar" $@
+    exec "$JAVACMD" $ACTIVEMQ_OPTS $ACTIVEMQ_DEBUG_OPTS -Dactivemq.classpath="${ACTIVEMQ_CLASSPATH}"
-Dactivemq.home="${ACTIVEMQ_HOME}" -Dactivemq.base="${ACTIVEMQ_BASE}" -jar "${ACTIVEMQ_HOME}/bin/run.jar"
$@
 fi

Modified: activemq/branches/activemq-5.3/assembly/src/release/bin/activemq-admin.bat
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/assembly/src/release/bin/activemq-admin.bat?rev=818535&r1=818534&r2=818535&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/assembly/src/release/bin/activemq-admin.bat (original)
+++ activemq/branches/activemq-5.3/assembly/src/release/bin/activemq-admin.bat Thu Sep 24
16:21:09 2009
@@ -71,6 +71,16 @@
 
 if "%ACTIVEMQ_BASE%" == "" set ACTIVEMQ_BASE=%ACTIVEMQ_HOME%
 
+if /i not "%1" == "start" goto debugOpts
+
+
+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
+
+
+:debugOpts
 REM Uncomment to enable YourKit profiling
 REM SET ACTIVEMQ_DEBUG_OPTS="-agentlib:yjpagent"
 
@@ -80,7 +90,7 @@
 REM Setup ActiveMQ Classpath. Default is the conf directory.
 set ACTIVEMQ_CLASSPATH=%ACTIVEMQ_BASE%/conf;%ACTIVEMQ_CLASSPATH%
 
-"%_JAVACMD%" %ACTIVEMQ_DEBUG_OPTS% -Dactivemq.classpath="%ACTIVEMQ_CLASSPATH%" -Dactivemq.home="%ACTIVEMQ_HOME%"
-Dactivemq.base="%ACTIVEMQ_BASE%" -jar "%ACTIVEMQ_HOME%/bin/run.jar" %*
+"%_JAVACMD%" %SUNJMX% %ACTIVEMQ_DEBUG_OPTS% %ACTIVEMQ_OPTS% %SSL_OPTS% -Dactivemq.classpath="%ACTIVEMQ_CLASSPATH%"
-Dactivemq.home="%ACTIVEMQ_HOME%" -Dactivemq.base="%ACTIVEMQ_BASE%" -jar "%ACTIVEMQ_HOME%/bin/run.jar"
%*
 
 goto end
 



Mime
View raw message