You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2006/09/22 22:32:14 UTC
svn commit: r449077 - in
/incubator/activemq/branches/activemq-4.0/assembly/src/release/bin:
activemq activemq.bat
Author: chirino
Date: Fri Sep 22 13:32:13 2006
New Revision: 449077
URL: http://svn.apache.org/viewvc?view=rev&rev=449077
Log:
http://issues.apache.org/activemq/browse/AMQ-938
Modified:
incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/activemq
incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/activemq.bat
Modified: incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/activemq
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/activemq?view=diff&rev=449077&r1=449076&r2=449077
==============================================================================
--- incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/activemq (original)
+++ incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/activemq Fri Sep 22 13:32:13 2006
@@ -126,8 +126,11 @@
ACTIVEMQ_OPTS="-Xmx512M -Dorg.apache.activemq.UseDedicatedTaskRunner=true -Dderby.system.home=../data -Dderby.storage.fileSyncTransactionLog=true"
fi
-#SUNJMX="-Dcom.sun.management.jmxremote.port=1616 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"
-SUNJMX="-Dcom.sun.management.jmxremote"
+if [ -z "$SUNJMX" ] ; then
+ #SUNJMX="-Dcom.sun.management.jmxremote.port=1616 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"
+ SUNJMX="-Dcom.sun.management.jmxremote"
+fi
+
ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS $SUNJMX"
# Uncomment to enable YourKit profiling
#ACTIVEMQ_DEBUG_OPTS="-Xrunyjpagent"
@@ -137,9 +140,9 @@
#ACTIVEMQ_TASK="start"
if [ -n "$CYGHOME" ]; then
- exec "$JAVACMD" $ACTIVEMQ_DEBUG_OPTS $ACTIVEMQ_OPTS -classpath "" -Dactivemq.home="${ACTIVEMQ_HOME}" -Dcygwin.user.home="$CYGHOME" -jar "${ACTIVEMQ_HOME}/bin/run.jar" $ACTIVEMQ_TASK $@
+ exec "$JAVACMD" $ACTIVEMQ_DEBUG_OPTS $ACTIVEMQ_OPTS -classpath "${ACTIVEMQ_CLASSPATH}" -Dactivemq.home="${ACTIVEMQ_HOME}" -Dcygwin.user.home="$CYGHOME" -jar "${ACTIVEMQ_HOME}/bin/run.jar" $ACTIVEMQ_TASK $@
else
- exec "$JAVACMD" $ACTIVEMQ_DEBUG_OPTS $ACTIVEMQ_OPTS -classpath "" -Dactivemq.home="${ACTIVEMQ_HOME}" -jar "${ACTIVEMQ_HOME}/bin/run.jar" $ACTIVEMQ_TASK $@
+ exec "$JAVACMD" $ACTIVEMQ_DEBUG_OPTS $ACTIVEMQ_OPTS -classpath "${ACTIVEMQ_CLASSPATH}" -Dactivemq.home="${ACTIVEMQ_HOME}" -jar "${ACTIVEMQ_HOME}/bin/run.jar" $ACTIVEMQ_TASK $@
fi
Modified: incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/activemq.bat
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/activemq.bat?view=diff&rev=449077&r1=449076&r2=449077
==============================================================================
--- incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/activemq.bat (original)
+++ incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/activemq.bat Fri Sep 22 13:32:13 2006
@@ -87,7 +87,7 @@
if "%ACTIVEMQ_OPTS%" == "" set ACTIVEMQ_OPTS=-Xmx512M -Dorg.apache.activemq.UseDedicatedTaskRunner=true -Dderby.system.home="..\data" -Dderby.storage.fileSyncTransactionLog=true -Dcom.sun.management.jmxremote
-set SUNJMX=
+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
REM Uncomment to enable YourKit profiling
@@ -99,7 +99,7 @@
set LOCALCLASSPATH=%ACTIVEMQ_HOME%\conf;%LOCALCLASSPATH%
set ACTIVEMQ_TASK="start"
-"%_JAVACMD%" %SUNJMX% %ACTIVEMQ_DEBUG_OPTS% %ACTIVEMQ_OPTS% -Dactivemq.home="%ACTIVEMQ_HOME%" -jar "%ACTIVEMQ_HOME%/bin/run.jar" %ACTIVEMQ_TASK% %ACTIVEMQ_CMD_LINE_ARGS%
+"%_JAVACMD%" %SUNJMX% %ACTIVEMQ_DEBUG_OPTS% %ACTIVEMQ_OPTS% -classpath %ACTIVEMQ_CLASSPATH% -Dactivemq.home="%ACTIVEMQ_HOME%" -jar "%ACTIVEMQ_HOME%/bin/run.jar" %ACTIVEMQ_TASK% %ACTIVEMQ_CMD_LINE_ARGS%
goto end