|
1 Patch origin: in-house |
|
2 Patch status: Solaris-specific; not suitable for upstream |
|
3 |
|
4 Support for setenv.sh in $CATALINA_BASE/conf. |
|
5 |
|
6 --- bin/catalina.sh |
|
7 +++ bin/catalina.sh |
|
8 @@ -145,7 +146,13 @@ |
|
9 # but allow them to be specified in setenv.sh, in rare case when it is needed. |
|
10 CLASSPATH= |
|
11 |
|
12 -if [ -r "$CATALINA_BASE/bin/setenv.sh" ]; then |
|
13 +# On Solaris we install Tomcat into two different locations |
|
14 +# (CATALINA_HOME, CATALINA_BASE). CATALINA_HOME can be on read only |
|
15 +# location and CATALINA_BASE doesn't contain bin directory. Therefore we |
|
16 +# will look for setenv.sh file in CATALINA_BASE/conf directory first. |
|
17 +if [ -r "$CATALINA_BASE/conf/setenv.sh" ]; then |
|
18 + . "$CATALINA_BASE/conf/setenv.sh" |
|
19 +elif [ -r "$CATALINA_BASE/bin/setenv.sh" ]; then |
|
20 . "$CATALINA_BASE/bin/setenv.sh" |
|
21 elif [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then |
|
22 . "$CATALINA_HOME/bin/setenv.sh" |
|
23 --- bin/tool-wrapper.sh |
|
24 +++ bin/tool-wrapper.sh |
|
25 @@ -73,8 +75,16 @@ |
|
26 # but allow them to be specified in setenv.sh, in rare case when it is needed. |
|
27 CLASSPATH= |
|
28 |
|
29 -if [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then |
|
30 - . "$CATALINA_HOME/bin/setenv.sh" |
|
31 +# On Solaris we install Tomcat into two different locations |
|
32 +# (CATALINA_HOME, CATALINA_BASE). CATALINA_HOME can be on read only |
|
33 +# location and CATALINA_BASE doesn't contain bin directory. Therefore we |
|
34 +# will look for setenv.sh file in CATALINA_BASE/conf directory first. |
|
35 +if [ -r "$CATALINA_BASE/conf/setenv.sh" ]; then |
|
36 + . "$CATALINA_BASE/conf/setenv.sh" |
|
37 +elif [ -r "$CATALINA_BASE/bin/setenv.sh" ]; then |
|
38 + . "$CATALINA_BASE/bin/setenv.sh" |
|
39 +elif [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then |
|
40 + . "$CATALINA_HOME/bin/setenv.sh" |
|
41 fi |
|
42 |
|
43 # For Cygwin, ensure paths are in UNIX format before anything is touched |