Author: rjung
Date: Sun Jul 22 11:31:13 2007
New Revision: 558523
URL: http://svn.apache.org/viewvc?view=rev&rev=558523
Log:
BZ 42951: Port r454193 (BZ 36976) from TC 5.5.x:
Don't use CATALINA_OPTS when stopping Tomcat.
Modified:
tomcat/tc6.0.x/trunk/bin/catalina.bat
tomcat/tc6.0.x/trunk/bin/catalina.sh
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/bin/catalina.bat
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/catalina.bat?view=diff&rev=558523&r1=558522&r2=558523
==============================================================================
--- tomcat/tc6.0.x/trunk/bin/catalina.bat (original)
+++ tomcat/tc6.0.x/trunk/bin/catalina.bat Sun Jul 22 11:31:13 2007
@@ -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
@@ -188,6 +188,7 @@
:doStop
shift
set ACTION=stop
+set CATALINA_OPTS=
goto execCmd
:doVersion
Modified: tomcat/tc6.0.x/trunk/bin/catalina.sh
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/catalina.sh?view=diff&rev=558523&r1=558522&r2=558523
==============================================================================
--- tomcat/tc6.0.x/trunk/bin/catalina.sh (original)
+++ tomcat/tc6.0.x/trunk/bin/catalina.sh Sun Jul 22 11:31:13 2007
@@ -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
@@ -292,7 +292,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/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?view=diff&rev=558523&r1=558522&r2=558523
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Jul 22 11:31:13 2007
@@ -10,10 +10,25 @@
<author email="[EMAIL PROTECTED]">Remy Maucherat</author>
<author email="[EMAIL PROTECTED]">Yoav Shapira</author>
<author email="[EMAIL PROTECTED]">Filip Hanik</author>
+ <author email="[EMAIL PROTECTED]">Rainer Jung</author>
<title>Changelog</title>
</properties>
<body>
+<section name="Tomcat 6.0.15 (remm)">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ <bug>42951</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.
+ Port of r454193 (<bug>36976</bug>) from Tomcat 5.5.x. (markt,rjung)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
<section name="Tomcat 6.0.14 (remm)">
<subsection name="General">
<changelog>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
