equal
deleted
inserted
replaced
4 Support for setenv.sh in $CATALINA_BASE/conf. |
4 Support for setenv.sh in $CATALINA_BASE/conf. |
5 Set default Java version (can be overwritten e.g. via setenv.sh). |
5 Set default Java version (can be overwritten e.g. via setenv.sh). |
6 |
6 |
7 --- bin/catalina.sh |
7 --- bin/catalina.sh |
8 +++ bin/catalina.sh |
8 +++ bin/catalina.sh |
9 @@ -90,6 +90,7 @@ |
9 @@ -101,6 +101,7 @@ |
10 CYGWIN*) cygwin=true;; |
|
11 OS400*) os400=true;; |
10 OS400*) os400=true;; |
12 Darwin*) darwin=true;; |
11 Darwin*) darwin=true;; |
|
12 HP-UX*) hpux=true;; |
13 +SunOS*) solaris=true;; |
13 +SunOS*) solaris=true;; |
14 esac |
14 esac |
15 |
15 |
16 # resolve links - $0 may be a softlink |
16 # resolve links - $0 may be a softlink |
17 @@ -118,7 +119,13 @@ |
17 @@ -129,7 +130,13 @@ |
18 # but allow them to be specified in setenv.sh, in rare case when it is needed. |
18 # but allow them to be specified in setenv.sh, in rare case when it is needed. |
19 CLASSPATH= |
19 CLASSPATH= |
20 |
20 |
21 -if [ -r "$CATALINA_BASE/bin/setenv.sh" ]; then |
21 -if [ -r "$CATALINA_BASE/bin/setenv.sh" ]; then |
22 +# On Solaris we install Tomcat into two different locations |
22 +# On Solaris we install Tomcat into two different locations |
27 + . "$CATALINA_BASE/conf/setenv.sh" |
27 + . "$CATALINA_BASE/conf/setenv.sh" |
28 +elif [ -r "$CATALINA_BASE/bin/setenv.sh" ]; then |
28 +elif [ -r "$CATALINA_BASE/bin/setenv.sh" ]; then |
29 . "$CATALINA_BASE/bin/setenv.sh" |
29 . "$CATALINA_BASE/bin/setenv.sh" |
30 elif [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then |
30 elif [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then |
31 . "$CATALINA_HOME/bin/setenv.sh" |
31 . "$CATALINA_HOME/bin/setenv.sh" |
32 @@ -145,6 +152,11 @@ |
32 @@ -156,6 +163,11 @@ |
33 export QIBM_MULTI_THREADED=Y |
33 export QIBM_MULTI_THREADED=Y |
34 fi |
34 fi |
35 |
35 |
36 +# For Solaris |
36 +# For Solaris |
37 +if $solaris; then |
37 +if $solaris; then |