829N/A--- apache-tomcat-6.0.35-src/bin/catalina.sh Mon Nov 28 02:22:44 2011

829N/A+++ apache-tomcat-6.0.35-src/bin/catalina.sh Mon Apr 16 08:42:47 2012

829N/A@@ -92,6 +92,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

829N/A@@ -120,8 +121,19 @@

829N/A # but allow them to be specified in setenv.sh, in rare case when it is needed.

829N/A CLASSPATH=

829N/A

829N/A-if [ -r "$CATALINA_BASE/bin/setenv.sh" ]; then

829N/A- . "$CATALINA_BASE/bin/setenv.sh"

829N/A+# On Solaris we want to allow running system Tomcat instance (where

829N/A+# setenv.sh file is located in /var/tomcat6/conf) in parallel to Tomcat

829N/A+# instances started by individual users. As it's expected that all will

829N/A+# use the same copy of catalina.sh some extra logic needs to be added

829N/A+# here:

829N/A+if [ "$CATALINA_BASE" = "/var/tomcat6" ]; then

829N/A+ SETENVDIR="conf"

829N/A+else

829N/A+ SETENVDIR="bin"

829N/A+fi

829N/A+

829N/A+if [ -r "$CATALINA_BASE/$SETENVDIR/setenv.sh" ]; then

829N/A+ . "$CATALINA_BASE/$SETENVDIR/setenv.sh"

829N/A elif [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then

829N/A . "$CATALINA_HOME/bin/setenv.sh"

829N/A fi

829N/A@@ -147,6 +159,11 @@

142N/A export QIBM_MULTI_THREADED=Y

142N/A fi

142N/A

142N/A+# For Solaris

142N/A+if $solaris; then

1668N/A+ [ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/jdk/instances/jdk1.7.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:

829N/A--- apache-tomcat-6.0.35-src/bin/tool-wrapper.sh Mon Nov 28 02:22:44 2011

829N/A+++ apache-tomcat-6.0.35-src/bin/tool-wrapper.sh Mon Apr 16 08:42:57 2012

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

829N/A@@ -60,10 +62,23 @@

829N/A # but allow them to be specified in setenv.sh, in rare case when it is needed.

829N/A CLASSPATH=

829N/A

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

829N/A- . "$CATALINA_HOME"/bin/setenv.sh

829N/A+# On Solaris we want to allow running system Tomcat instance (where

829N/A+# setenv.sh file is located in /var/tomcat6/conf) in parallel to Tomcat

829N/A+# instances started by individual users. As it's expected that all will

829N/A+# use the same copy of catalina.sh some extra logic needs to be added

829N/A+# here:

829N/A+if [ "$CATALINA_BASE" = "/var/tomcat6" ]; then

829N/A+ SETENVDIR="conf"

829N/A+else

829N/A+ SETENVDIR="bin"

829N/A fi

829N/A

829N/A+if [ -r "$CATALINA_BASE/$SETENVDIR/setenv.sh" ]; then

829N/A+ . "$CATALINA_BASE/$SETENVDIR/setenv.sh"

829N/A+elif [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then

829N/A+ . "$CATALINA_HOME/bin/setenv.sh"

829N/A+fi

829N/A+

829N/A # For Cygwin, ensure paths are in UNIX format before anything is touched

829N/A if $cygwin; then

829N/A [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`

829N/A@@ -71,6 +86,11 @@

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

142N/A fi

142N/A

142N/A+# For Solaris

142N/A+if $solaris; then

1668N/A+ [ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/jdk/instances/jdk1.7.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"