| author | Petr Sumbera <petr.sumbera@oracle.com> |
| Mon, 25 Jul 2016 02:06:45 -0700 | |
| branch | s11u3-sru |
| changeset 6483 | ee6fa154236b |
| parent 5319 | cfb66c73d0f2 |
| permissions | -rw-r--r-- |
|
5319
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
1 |
Patch origin: in-house |
|
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
2 |
Patch status: Solaris-specific; not suitable for upstream |
|
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
3 |
|
|
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
4 |
Support for setenv.sh in $CATALINA_BASE/conf. |
|
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
5 |
|
|
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
6 |
--- bin/catalina.sh |
|
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
7 |
+++ bin/catalina.sh |
|
6483
ee6fa154236b
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
5319
diff
changeset
|
8 |
@@ -138,7 +139,13 @@ |
|
5319
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
9 |
# but allow them to be specified in setenv.sh, in rare case when it is needed. |
|
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
10 |
CLASSPATH= |
|
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
11 |
|
|
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
12 |
-if [ -r "$CATALINA_BASE/bin/setenv.sh" ]; then |
|
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
13 |
+# On Solaris we install Tomcat into two different locations |
|
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
14 |
+# (CATALINA_HOME, CATALINA_BASE). CATALINA_HOME can be on read only |
|
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
15 |
+# location and CATALINA_BASE doesn't contain bin directory. Therefore we |
|
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
16 |
+# will look for setenv.sh file in CATALINA_BASE/conf directory first. |
|
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
17 |
+if [ -r "$CATALINA_BASE/conf/setenv.sh" ]; then |
|
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
18 |
+ . "$CATALINA_BASE/conf/setenv.sh" |
|
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
19 |
+elif [ -r "$CATALINA_BASE/bin/setenv.sh" ]; then |
|
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
20 |
. "$CATALINA_BASE/bin/setenv.sh" |
|
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
21 |
elif [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then |
|
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
22 |
. "$CATALINA_HOME/bin/setenv.sh" |
|
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
23 |
--- bin/tool-wrapper.sh |
|
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
24 |
+++ bin/tool-wrapper.sh |
|
6483
ee6fa154236b
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
5319
diff
changeset
|
25 |
@@ -67,8 +69,16 @@ |
|
5319
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
26 |
# but allow them to be specified in setenv.sh, in rare case when it is needed. |
|
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
27 |
CLASSPATH= |
|
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
28 |
|
|
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
29 |
-if [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then |
|
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
30 |
- . "$CATALINA_HOME/bin/setenv.sh" |
|
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
31 |
+# On Solaris we install Tomcat into two different locations |
|
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
32 |
+# (CATALINA_HOME, CATALINA_BASE). CATALINA_HOME can be on read only |
|
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
33 |
+# location and CATALINA_BASE doesn't contain bin directory. Therefore we |
|
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
34 |
+# will look for setenv.sh file in CATALINA_BASE/conf directory first. |
|
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
35 |
+if [ -r "$CATALINA_BASE/conf/setenv.sh" ]; then |
|
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
36 |
+ . "$CATALINA_BASE/conf/setenv.sh" |
|
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
37 |
+elif [ -r "$CATALINA_BASE/bin/setenv.sh" ]; then |
|
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
38 |
+ . "$CATALINA_BASE/bin/setenv.sh" |
|
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
39 |
+elif [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then |
|
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
40 |
+ . "$CATALINA_HOME/bin/setenv.sh" |
|
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
41 |
fi |
|
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
42 |
|
|
cfb66c73d0f2
22239597 setenv.sh support in conf/ was left during update to version 8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
43 |
# For Cygwin, ensure paths are in UNIX format before anything is touched |