4132N/APatch origin: in-house

4132N/APatch status: Solaris-specific; not suitable for upstream

4132N/A

4132N/ASupport for setenv.sh in $CATALINA_BASE/conf.

4132N/ASet default Java version (can be overwritten e.g. via setenv.sh).

4132N/A

4132N/A--- bin/catalina.sh

4132N/A+++ bin/catalina.sh

4132N/A@@ -90,6 +90,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

4132N/A@@ -118,7 +119,13 @@

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

1926N/A+# On Solaris we install Tomcat into two different locations

1926N/A+# (CATALINA_HOME, CATALINA_BASE). CATALINA_HOME can be on read only

1926N/A+# location and CATALINA_BASE doesn't contain bin directory. Therefore we

1926N/A+# will look for setenv.sh file in CATALINA_BASE/conf directory first.

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

1926N/A+ . "$CATALINA_BASE/conf/setenv.sh"

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

1926N/A . "$CATALINA_BASE/bin/setenv.sh"

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

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

4132N/A@@ -145,6 +152,11 @@

142N/A export QIBM_MULTI_THREADED=Y

142N/A fi

142N/A

142N/A+# For Solaris

142N/A+if $solaris; then

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

4132N/A--- bin/tool-wrapper.sh

4132N/A+++ bin/tool-wrapper.sh

4132N/A@@ -33,8 +33,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

4132N/A@@ -58,8 +60,16 @@

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

1926N/A+# On Solaris we install Tomcat into two different locations

1926N/A+# (CATALINA_HOME, CATALINA_BASE). CATALINA_HOME can be on read only

1926N/A+# location and CATALINA_BASE doesn't contain bin directory. Therefore we

1926N/A+# will look for setenv.sh file in CATALINA_BASE/conf directory first.

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

1926N/A+ . "$CATALINA_BASE/conf/setenv.sh"

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

1926N/A+ . "$CATALINA_BASE/bin/setenv.sh"

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

1926N/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

4132N/A@@ -69,6 +79,11 @@

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

142N/A fi

142N/A

142N/A+# For Solaris

142N/A+if $solaris; then

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