Author: markt
Date: Sun Oct 8 12:12:06 2006
New Revision: 454193
URL: http://svn.apache.org/viewvc?view=rev&rev=454193
Log:
Fix bug 36976. Differentiate between options for start/run and those for stop.
JAVA_OPTS applies to all 3. CATALINA_OPTS only to start/run.
Modified:
tomcat/container/tc5.5.x/catalina/src/bin/catalina.bat
tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified: tomcat/container/tc5.5.x/catalina/src/bin/catalina.bat
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/bin/catalina.bat?view=diff&rev=454193&r1=454192&r2=454193
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/bin/catalina.bat (original)
+++ tomcat/container/tc5.5.x/catalina/src/bin/catalina.bat Sun Oct 8 12:12:06
2006
@@ -12,7 +12,7 @@
rem the same directory that CATALINA_HOME points to.
rem
rem CATALINA_OPTS (Optional) Java runtime options used when the "start",
-rem "stop", or "run" command is executed.
+rem or "run" command is executed.
rem
rem CATALINA_TMPDIR (Optional) Directory path location of temporary directory
rem the JVM should use (java.io.tmpdir). Defaults to
@@ -170,6 +170,7 @@
:doStop
shift
set ACTION=stop
+set CATALINA_OPTS=
goto execCmd
:doVersion
Modified: tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh?view=diff&rev=454193&r1=454192&r2=454193
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh (original)
+++ tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh Sun Oct 8 12:12:06
2006
@@ -11,7 +11,7 @@
# the same directory that CATALINA_HOME points to.
#
# CATALINA_OPTS (Optional) Java runtime options used when the "start",
-# "stop", or "run" command is executed.
+# or "run" command is executed.
#
# CATALINA_TMPDIR (Optional) Directory path location of temporary directory
# the JVM should use (java.io.tmpdir). Defaults to
@@ -277,7 +277,7 @@
FORCE=1
fi
- "$_RUNJAVA" $JAVA_OPTS $CATALINA_OPTS \
+ "$_RUNJAVA" $JAVA_OPTS \
-Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
-Dcatalina.base="$CATALINA_BASE" \
-Dcatalina.home="$CATALINA_HOME" \
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=454193&r1=454192&r2=454193
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Oct 8 12:12:06 2006
@@ -39,6 +39,13 @@
David Gagon. (markt)
</fix>
<fix>
+ <bug>36976</bug>: Don't use CATALINA_OPTS when stopping Tomcat. This
+ allows options for starting and stopping to be set on JAVA_OPTS and
+ options for starting only to be set on CATALINA_OPTS. Without this
+ fix, some startup options (eg the port for remote JMX) would cause
+ stop to fail. Based on a fix suggested by Michael Vorburger. (markt)
+ </fix>
+ <fix>
<bug>40528</bug>: Add missing message localisations as provided by
Ben Clifford. (markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
