Author: rjung
Date: Mon Jun 20 09:52:45 2011
New Revision: 1137568
URL: http://svn.apache.org/viewvc?rev=1137568&view=rev
Log:
Make tool-wrapper.sh consistent with catalina.sh.
Modified:
tomcat/trunk/bin/tool-wrapper.sh
Modified: tomcat/trunk/bin/tool-wrapper.sh
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/tool-wrapper.sh?rev=1137568&r1=1137567&r2=1137568&view=diff
==============================================================================
--- tomcat/trunk/bin/tool-wrapper.sh (original)
+++ tomcat/trunk/bin/tool-wrapper.sh Mon Jun 20 09:52:45 2011
@@ -20,27 +20,36 @@
#
# Environment Variable Prerequisites
#
-# CATALINA_HOME May point at your Catalina "build" directory.
+# CATALINA_HOME May point at your Catalina "build" directory.
#
-# TOOL_OPTS (Optional) Java runtime options used when the "start",
-# "stop", or "run" command is executed.
+# TOOL_OPTS (Optional) Java runtime options.
#
-# JAVA_HOME Must point at your Java Development Kit installation.
+# JAVA_HOME Must point at your Java Development Kit installation.
+# Using JRE_HOME instead works as well.
#
-# JAVA_OPTS (Optional) Java runtime options used when the "start",
-# "stop", or "run" command is executed.
+# JRE_HOME Must point at your Java Runtime installation.
+# Defaults to JAVA_HOME if empty. If JRE_HOME and JAVA_HOME
+# are both set, JRE_HOME is used.
+#
+# JAVA_OPTS (Optional) Java runtime options.
+#
+# JAVA_ENDORSED_DIRS (Optional) Lists of of colon separated directories
+# containing some jars in order to allow replacement of APIs
+# created outside of the JCP (i.e. DOM and SAX from W3C).
+# It can also be used to update the XML parser
implementation.
+# Defaults to $CATALINA_HOME/endorsed.
#
# $Id$
# -----------------------------------------------------------------------------
# OS specific support. $var _must_ be set to either true or false.
cygwin=false
-os400=false
darwin=false
+os400=false
case "`uname`" in
CYGWIN*) cygwin=true;;
-OS400*) os400=true;;
Darwin*) darwin=true;;
+OS400*) os400=true;;
esac
# resolve links - $0 may be a softlink
@@ -97,7 +106,7 @@ if $os400; then
# 2. owned by the PRIMARY group of the user
# this will not work if the user belongs in secondary groups
BASEDIR="$CATALINA_HOME"
- . "$CATALINA_HOME"/bin/setclasspath.sh
+ . "$CATALINA_HOME"/bin/setclasspath.sh
else
if [ -r "$CATALINA_HOME"/bin/setclasspath.sh ]; then
BASEDIR="$CATALINA_HOME"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
