Author: aco
Date: Mon Jun 12 20:31:10 2006
New Revision: 413795
URL: http://svn.apache.org/viewvc?rev=413795&view=rev
Log:
- Backported some fix to the command line scripts.
- Also supporeted bstat --help for AMQ-702
Modified:
incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/activemq
incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/activemq.bat
incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/browse
incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/browse.bat
incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/bstat
incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/bstat.bat
incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/list
incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/list.bat
incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/query
incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/query.bat
incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/shutdown
incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/shutdown.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?rev=413795&r1=413794&r2=413795&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/activemq
(original)
+++ incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/activemq
Mon Jun 12 20:31:10 2006
@@ -130,7 +130,7 @@
fi
#SUNJMX="-Dcom.sun.management.jmxremote.port=1616
-Dcom.sun.management.jmxremote.authenticate=false
-Dcom.sun.management.jmxremote.ssl=false"
-SUNJMX=""
+SUNJMX="-Dcom.sun.management.jmxremote"
ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS $SUNJMX"
# Uncomment to enable YourKit profiling
#ACTIVEMQ_DEBUG_OPTS="-Xrunyjpagent"
@@ -140,8 +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 ""
-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 ""
-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?rev=413795&r1=413794&r2=413795&view=diff
==============================================================================
---
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
Mon Jun 12 20:31:10 2006
@@ -88,7 +88,7 @@
:runAnt
-if "%ACTIVEMQ_OPTS%" == "" set ACTIVEMQ_OPTS=-Xmx512M
-Dorg.apache.activemq.UseDedicatedTaskRunner=true -Dderby.system.home="..\data"
-Dderby.storage.fileSyncTransactionLog=true
+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=
REM set SUNJMX=-Dcom.sun.management.jmxremote.port=1616
-Dcom.sun.management.jmxremote.authenticate=false
-Dcom.sun.management.jmxremote.ssl=false
@@ -102,7 +102,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%
-Dactivemq.home="%ACTIVEMQ_HOME%" -jar "%ACTIVEMQ_HOME%/bin/run.jar"
%ACTIVEMQ_TASK% %ACTIVEMQ_CMD_LINE_ARGS%
goto end
@@ -116,4 +116,5 @@
:mainEnd
if exist "%HOME%\activemqrc_post.bat" call "%HOME%\activemqrc_post.bat"
+
Modified:
incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/browse
URL:
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/browse?rev=413795&r1=413794&r2=413795&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/browse
(original)
+++ incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/browse
Mon Jun 12 20:31:10 2006
@@ -135,8 +135,9 @@
ACTIVEMQ_TASK="browse"
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 ""
-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 ""
-Dactivemq.home="${ACTIVEMQ_HOME}" -jar "${ACTIVEMQ_HOME}/bin/run.jar"
$ACTIVEMQ_TASK $@
fi
+
Modified:
incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/browse.bat
URL:
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/browse.bat?rev=413795&r1=413794&r2=413795&view=diff
==============================================================================
---
incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/browse.bat
(original)
+++
incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/browse.bat
Mon Jun 12 20:31:10 2006
@@ -97,7 +97,7 @@
set LOCALCLASSPATH=%ACTIVEMQ_HOME%\conf;%LOCALCLASSPATH%
set ACTIVEMQ_TASK="browse"
-"%_JAVACMD%" %ACTIVEMQ_DEBUG_OPTS% %ACTIVEMQ_OPTS%
-Djava.ext.dirs="%JAVA_EXT_DIRS%" -classpath "%LOCALCLASSPATH%" -jar
%ACTIVEMQ_HOME%/bin/run.jar %ACTIVEMQ_TASK% %ACTIVEMQ_CMD_LINE_ARGS%
+"%_JAVACMD%" %ACTIVEMQ_DEBUG_OPTS% %ACTIVEMQ_OPTS%
-Djava.ext.dirs="%JAVA_EXT_DIRS%" -classpath "%LOCALCLASSPATH%" -jar
"%ACTIVEMQ_HOME%/bin/run.jar" %ACTIVEMQ_TASK% %ACTIVEMQ_CMD_LINE_ARGS%
goto end
@@ -112,4 +112,5 @@
:mainEnd
if exist "%HOME%\activemqrc_post.bat" call "%HOME%\activemqrc_post.bat"
+
Modified:
incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/bstat
URL:
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/bstat?rev=413795&r1=413794&r2=413795&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/bstat
(original)
+++ incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/bstat Mon
Jun 12 20:31:10 2006
@@ -136,7 +136,14 @@
ACTIVEMQ_TASK="query"
BROKER_NAME=$1
-if [ -z "$BROKER_NAME" ] ; then
+if [ "$BROKER_NAME" = "--help" -o "$BROKER_NAME" = "-h" -o "$BROKER_NAME" =
"-?" ] ; then
+ echo
+ echo Performs a predefined query that displays useful statistics regarding
the specified broker.
+ echo If no broker name is specified, it will try and select from all
registered brokers.
+ echo Usage: bstat [brokerName] [--jmxurl url]
+ echo
+ exit 0
+elif [ -z "$BROKER_NAME" ] ; then
BROKER_NAME="*"
fi
shift
@@ -151,8 +158,9 @@
QUERY_PARAM="--objname Type=*,BrokerName=${BROKER_NAME}
-xQTopic=ActiveMQ.Advisory.* --view
Type,BrokerName,Destination,ConnectorName,EnqueueCount,DequeueCount,TotalEnqueueCount,TotalDequeueCount,Messages,TotalMessages,ConsumerCount,TotalConsumerCount,DispatchQueueSize"
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 $QUERY_PARAM $ACTIVEMQ_CMD_LINE_ARGS
+ exec "$JAVACMD" $ACTIVEMQ_DEBUG_OPTS $ACTIVEMQ_OPTS -classpath ""
-Dactivemq.home="${ACTIVEMQ_HOME}" -Dcygwin.user.home="$CYGHOME" -jar
"${ACTIVEMQ_HOME}/bin/run.jar" $ACTIVEMQ_TASK $QUERY_PARAM
$ACTIVEMQ_CMD_LINE_ARGS
else
- exec "$JAVACMD" $ACTIVEMQ_DEBUG_OPTS $ACTIVEMQ_OPTS -classpath ""
-Dactivemq.home="${ACTIVEMQ_HOME}" -jar ${ACTIVEMQ_HOME}/bin/run.jar
$ACTIVEMQ_TASK $QUERY_PARAM $ACTIVEMQ_CMD_LINE_ARGS
+ exec "$JAVACMD" $ACTIVEMQ_DEBUG_OPTS $ACTIVEMQ_OPTS -classpath ""
-Dactivemq.home="${ACTIVEMQ_HOME}" -jar "${ACTIVEMQ_HOME}/bin/run.jar"
$ACTIVEMQ_TASK $QUERY_PARAM $ACTIVEMQ_CMD_LINE_ARGS
fi
+
Modified:
incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/bstat.bat
URL:
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/bstat.bat?rev=413795&r1=413794&r2=413795&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/bstat.bat
(original)
+++ incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/bstat.bat
Mon Jun 12 20:31:10 2006
@@ -30,7 +30,11 @@
rem Assume first parameter is broker name
set BROKER_NAME=%1
+if "%BROKER_NAME%" == "--help" goto dispHelp
+if "%BROKER_NAME%" == "-h" goto dispHelp
+if "%BROKER_NAME%" == "-?" goto dispHelp
if "%BROKER_NAME%" == "" set BROKER_NAME=*
+
shift
rem Slurp the command line arguments. This loop allows for an unlimited number
@@ -109,11 +113,19 @@
rem and display the specified attributes
set QUERY_PARAM=--objname "Type=*,BrokerName=%BROKER_NAME%"
"-xQTopic=ActiveMQ.Advisory.*" --view
"Type,BrokerName,Destination,ConnectorName,EnqueueCount,DequeueCount,TotalEnqueueCount,TotalDequeueCount,Messages,TotalMessages,ConsumerCount,TotalConsumerCount,DispatchQueueSize"
-"%_JAVACMD%" %ACTIVEMQ_DEBUG_OPTS% %ACTIVEMQ_OPTS%
-Djava.ext.dirs="%JAVA_EXT_DIRS%" -classpath "%LOCALCLASSPATH%" -jar
%ACTIVEMQ_HOME%/bin/run.jar %ACTIVEMQ_TASK% %QUERY_PARAM%
%ACTIVEMQ_CMD_LINE_ARGS%
-
+"%_JAVACMD%" %ACTIVEMQ_DEBUG_OPTS% %ACTIVEMQ_OPTS%
-Djava.ext.dirs="%JAVA_EXT_DIRS%" -classpath "%LOCALCLASSPATH%" -jar
"%ACTIVEMQ_HOME%/bin/run.jar" %ACTIVEMQ_TASK% %QUERY_PARAM%
%ACTIVEMQ_CMD_LINE_ARGS%
goto end
+:dispHelp
+
+echo.
+echo Performs a predefined query that displays useful statistics regarding the
specified broker.
+echo If no broker name is specified, it will try and select from all
registered brokers.
+echo Usage: bstat [brokerName] [--jmxurl url]
+echo.
+
+goto end
:end
set LOCALCLASSPATH=
@@ -124,4 +136,5 @@
:mainEnd
if exist "%HOME%\activemqrc_post.bat" call "%HOME%\activemqrc_post.bat"
+
Modified: incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/list
URL:
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/list?rev=413795&r1=413794&r2=413795&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/list
(original)
+++ incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/list Mon
Jun 12 20:31:10 2006
@@ -135,8 +135,9 @@
ACTIVEMQ_TASK="list"
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 ""
-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 ""
-Dactivemq.home="${ACTIVEMQ_HOME}" -jar "${ACTIVEMQ_HOME}/bin/run.jar"
$ACTIVEMQ_TASK $@
fi
+
Modified:
incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/list.bat
URL:
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/list.bat?rev=413795&r1=413794&r2=413795&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/list.bat
(original)
+++ incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/list.bat
Mon Jun 12 20:31:10 2006
@@ -97,7 +97,7 @@
set LOCALCLASSPATH=%ACTIVEMQ_HOME%\conf;%LOCALCLASSPATH%
set ACTIVEMQ_TASK="list"
-"%_JAVACMD%" %ACTIVEMQ_DEBUG_OPTS% %ACTIVEMQ_OPTS%
-Djava.ext.dirs="%JAVA_EXT_DIRS%" -classpath "%LOCALCLASSPATH%" -jar
%ACTIVEMQ_HOME%/bin/run.jar %ACTIVEMQ_TASK% %ACTIVEMQ_CMD_LINE_ARGS%
+"%_JAVACMD%" %ACTIVEMQ_DEBUG_OPTS% %ACTIVEMQ_OPTS%
-Djava.ext.dirs="%JAVA_EXT_DIRS%" -classpath "%LOCALCLASSPATH%" -jar
"%ACTIVEMQ_HOME%/bin/run.jar" %ACTIVEMQ_TASK% %ACTIVEMQ_CMD_LINE_ARGS%
goto end
@@ -112,4 +112,5 @@
:mainEnd
if exist "%HOME%\activemqrc_post.bat" call "%HOME%\activemqrc_post.bat"
+
Modified:
incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/query
URL:
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/query?rev=413795&r1=413794&r2=413795&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/query
(original)
+++ incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/query Mon
Jun 12 20:31:10 2006
@@ -135,8 +135,9 @@
ACTIVEMQ_TASK="query"
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 ""
-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 ""
-Dactivemq.home="${ACTIVEMQ_HOME}" -jar "${ACTIVEMQ_HOME}/bin/run.jar"
$ACTIVEMQ_TASK $@
fi
+
Modified:
incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/query.bat
URL:
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/query.bat?rev=413795&r1=413794&r2=413795&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/query.bat
(original)
+++ incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/query.bat
Mon Jun 12 20:31:10 2006
@@ -97,7 +97,7 @@
set LOCALCLASSPATH=%ACTIVEMQ_HOME%\conf;%LOCALCLASSPATH%
set ACTIVEMQ_TASK="query"
-"%_JAVACMD%" %ACTIVEMQ_DEBUG_OPTS% %ACTIVEMQ_OPTS%
-Djava.ext.dirs="%JAVA_EXT_DIRS%" -classpath "%LOCALCLASSPATH%" -jar
%ACTIVEMQ_HOME%/bin/run.jar %ACTIVEMQ_TASK% %ACTIVEMQ_CMD_LINE_ARGS%
+"%_JAVACMD%" %ACTIVEMQ_DEBUG_OPTS% %ACTIVEMQ_OPTS%
-Djava.ext.dirs="%JAVA_EXT_DIRS%" -classpath "%LOCALCLASSPATH%" -jar
"%ACTIVEMQ_HOME%/bin/run.jar" %ACTIVEMQ_TASK% %ACTIVEMQ_CMD_LINE_ARGS%
goto end
@@ -112,4 +112,5 @@
:mainEnd
if exist "%HOME%\activemqrc_post.bat" call "%HOME%\activemqrc_post.bat"
+
Modified:
incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/shutdown
URL:
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/shutdown?rev=413795&r1=413794&r2=413795&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/shutdown
(original)
+++ incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/shutdown
Mon Jun 12 20:31:10 2006
@@ -135,8 +135,9 @@
ACTIVEMQ_TASK="stop"
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 ""
-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 ""
-Dactivemq.home="${ACTIVEMQ_HOME}" -jar "${ACTIVEMQ_HOME}/bin/run.jar"
$ACTIVEMQ_TASK $@
fi
+
Modified:
incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/shutdown.bat
URL:
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/shutdown.bat?rev=413795&r1=413794&r2=413795&view=diff
==============================================================================
---
incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/shutdown.bat
(original)
+++
incubator/activemq/branches/activemq-4.0/assembly/src/release/bin/shutdown.bat
Mon Jun 12 20:31:10 2006
@@ -97,7 +97,7 @@
set LOCALCLASSPATH=%ACTIVEMQ_HOME%\conf;%LOCALCLASSPATH%
set ACTIVEMQ_TASK="stop"
-"%_JAVACMD%" %ACTIVEMQ_DEBUG_OPTS% %ACTIVEMQ_OPTS%
-Djava.ext.dirs="%JAVA_EXT_DIRS%" -classpath "%LOCALCLASSPATH%" -jar
%ACTIVEMQ_HOME%/bin/run.jar %ACTIVEMQ_TASK% %ACTIVEMQ_CMD_LINE_ARGS%
+"%_JAVACMD%" %ACTIVEMQ_DEBUG_OPTS% %ACTIVEMQ_OPTS%
-Djava.ext.dirs="%JAVA_EXT_DIRS%" -classpath "%LOCALCLASSPATH%" -jar
"%ACTIVEMQ_HOME%/bin/run.jar" %ACTIVEMQ_TASK% %ACTIVEMQ_CMD_LINE_ARGS%
goto end
@@ -112,4 +112,5 @@
:mainEnd
if exist "%HOME%\activemqrc_post.bat" call "%HOME%\activemqrc_post.bat"
+
