The attached patches are for catalina.sh under both the jakarta-tomcat-4 and
jakarta-catalina modules. They re-synch changes made to one and not the
other, and add a default for CATALINA_PID.
Tomcat 4
(http://cvs.apache.org/viewcvs.cgi/jakarta-tomcat-4.0/catalina/src/bin/catal
ina.sh):
- adds Costin's -force patch from Tomcat 5 CVS
- removed "exec" from stop so that force runs
after an attempt to shutdown
- adds CATALINA_PID default
Tomcat 5
(http://cvs.apache.org/viewcvs.cgi/jakarta-tomcat-catalina/catalina/src/bin/
catalina.sh):
- adds Robert Upshall's patch for OS/400
- removed "exec" from stop so that force runs
after an attempt to shutdown
- adds CATALINA_PID default
- changed $@ <command> to <command> $@ to match Tomcat 5 Bootstrap.main()
[String command = args[0];]
http://cvs.apache.org/viewcvs.cgi/jakarta-tomcat-catalina/catalina/src/share
/org/apache/catalina/startup/Bootstrap.java
Bug(lets):
- Tomcat 4 likes to ignore the command and display a usage
message for unknown options. Causes problem with -force.
- If shutdown port == zero, shutdown request should not try
to connect. Problem with both versions.
I'm not subscribed to tomcat-dev@, so please cc: me on any replies.
--- Noel
|