equal
deleted
inserted
replaced
3 |
3 |
4 Support for setenv.sh in $CATALINA_BASE/conf. |
4 Support for setenv.sh in $CATALINA_BASE/conf. |
5 |
5 |
6 --- bin/catalina.sh |
6 --- bin/catalina.sh |
7 +++ bin/catalina.sh |
7 +++ bin/catalina.sh |
8 @@ -145,7 +146,13 @@ |
8 @@ -138,7 +139,13 @@ |
9 # but allow them to be specified in setenv.sh, in rare case when it is needed. |
9 # but allow them to be specified in setenv.sh, in rare case when it is needed. |
10 CLASSPATH= |
10 CLASSPATH= |
11 |
11 |
12 -if [ -r "$CATALINA_BASE/bin/setenv.sh" ]; then |
12 -if [ -r "$CATALINA_BASE/bin/setenv.sh" ]; then |
13 +# On Solaris we install Tomcat into two different locations |
13 +# On Solaris we install Tomcat into two different locations |
20 . "$CATALINA_BASE/bin/setenv.sh" |
20 . "$CATALINA_BASE/bin/setenv.sh" |
21 elif [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then |
21 elif [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then |
22 . "$CATALINA_HOME/bin/setenv.sh" |
22 . "$CATALINA_HOME/bin/setenv.sh" |
23 --- bin/tool-wrapper.sh |
23 --- bin/tool-wrapper.sh |
24 +++ bin/tool-wrapper.sh |
24 +++ bin/tool-wrapper.sh |
25 @@ -73,8 +75,16 @@ |
25 @@ -67,8 +69,16 @@ |
26 # but allow them to be specified in setenv.sh, in rare case when it is needed. |
26 # but allow them to be specified in setenv.sh, in rare case when it is needed. |
27 CLASSPATH= |
27 CLASSPATH= |
28 |
28 |
29 -if [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then |
29 -if [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then |
30 - . "$CATALINA_HOME/bin/setenv.sh" |
30 - . "$CATALINA_HOME/bin/setenv.sh" |