142N/A--- apache-tomcat-6.0.18-src/bin/catalina.sh.orig Fri Dec 5 06:54:48 2008

142N/A+++ apache-tomcat-6.0.18-src/bin/catalina.sh Fri Dec 5 07:06:15 2008

142N/A@@ -78,6 +78,7 @@

142N/A CYGWIN*) cygwin=true;;

142N/A OS400*) os400=true;;

142N/A Darwin*) darwin=true;;

142N/A+SunOS*) solaris=true;;

142N/A esac

142N/A

142N/A # resolve links - $0 may be a softlink

142N/A@@ -127,6 +128,11 @@

142N/A export QIBM_MULTI_THREADED=Y

142N/A fi

142N/A

142N/A+# For Solaris

142N/A+if $solaris; then

557N/A+ [ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/jdk/instances/jdk1.6.0

142N/A+fi

142N/A+

142N/A # Get standard Java environment variables

142N/A if $os400; then

142N/A # -r will Only work on the os400 if the files are:

142N/A--- apache-tomcat-6.0.18-src/bin/tool-wrapper.sh.orig Fri Dec 5 07:01:29 2008

142N/A+++ apache-tomcat-6.0.18-src/bin/tool-wrapper.sh Fri Dec 5 07:05:52 2008

142N/A@@ -35,8 +35,10 @@

142N/A

142N/A # OS specific support. $var _must_ be set to either true or false.

142N/A cygwin=false

142N/A+solaris=false

142N/A case "`uname`" in

142N/A CYGWIN*) cygwin=true;;

142N/A+SunOS*) solaris=true;;

142N/A esac

142N/A

142N/A # resolve links - $0 may be a softlink

142N/A@@ -66,6 +68,11 @@

142N/A [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`

142N/A fi

142N/A

142N/A+# For Solaris

142N/A+if $solaris; then

557N/A+ [ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/jdk/instances/jdk1.6.0

142N/A+fi

142N/A+

142N/A # Get standard Java environment variables

142N/A if [ -r "$CATALINA_HOME"/bin/setclasspath.sh ]; then

142N/A BASEDIR="$CATALINA_HOME"