| author | Petr Sumbera <petr.sumbera@oracle.com> |
| Thu, 16 Apr 2015 01:36:32 -0700 | |
| branch | s11u2-sru |
| changeset 4146 | 097063f324c0 |
| parent 2726 | 2582b1cfd19c |
| permissions | -rw-r--r-- |
|
4146
097063f324c0
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2726
diff
changeset
|
1 |
Patch origin: in-house |
|
097063f324c0
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2726
diff
changeset
|
2 |
Patch status: Solaris-specific; not suitable for upstream |
|
097063f324c0
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2726
diff
changeset
|
3 |
|
|
097063f324c0
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2726
diff
changeset
|
4 |
Support for setenv.sh in $CATALINA_BASE/conf. |
|
097063f324c0
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2726
diff
changeset
|
5 |
Set default Java version (can be overwritten e.g. via setenv.sh). |
|
097063f324c0
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2726
diff
changeset
|
6 |
|
|
097063f324c0
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2726
diff
changeset
|
7 |
--- bin/catalina.sh |
|
097063f324c0
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2726
diff
changeset
|
8 |
+++ bin/catalina.sh |
|
097063f324c0
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2726
diff
changeset
|
9 |
@@ -90,6 +90,7 @@ |
|
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
10 |
CYGWIN*) cygwin=true;; |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
11 |
OS400*) os400=true;; |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
12 |
Darwin*) darwin=true;; |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
13 |
+SunOS*) solaris=true;; |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
14 |
esac |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
15 |
|
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
16 |
# resolve links - $0 may be a softlink |
|
4146
097063f324c0
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2726
diff
changeset
|
17 |
@@ -118,7 +119,13 @@ |
|
788
ab1a623335b6
7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents:
555
diff
changeset
|
18 |
# but allow them to be specified in setenv.sh, in rare case when it is needed. |
|
ab1a623335b6
7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents:
555
diff
changeset
|
19 |
CLASSPATH= |
|
ab1a623335b6
7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents:
555
diff
changeset
|
20 |
|
|
ab1a623335b6
7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents:
555
diff
changeset
|
21 |
-if [ -r "$CATALINA_BASE/bin/setenv.sh" ]; then |
|
2726
2582b1cfd19c
16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2602
diff
changeset
|
22 |
+# On Solaris we install Tomcat into two different locations |
|
2582b1cfd19c
16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2602
diff
changeset
|
23 |
+# (CATALINA_HOME, CATALINA_BASE). CATALINA_HOME can be on read only |
|
2582b1cfd19c
16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2602
diff
changeset
|
24 |
+# location and CATALINA_BASE doesn't contain bin directory. Therefore we |
|
2582b1cfd19c
16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2602
diff
changeset
|
25 |
+# will look for setenv.sh file in CATALINA_BASE/conf directory first. |
|
2582b1cfd19c
16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2602
diff
changeset
|
26 |
+if [ -r "$CATALINA_BASE/conf/setenv.sh" ]; then |
|
2582b1cfd19c
16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2602
diff
changeset
|
27 |
+ . "$CATALINA_BASE/conf/setenv.sh" |
|
2582b1cfd19c
16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2602
diff
changeset
|
28 |
+elif [ -r "$CATALINA_BASE/bin/setenv.sh" ]; then |
|
2582b1cfd19c
16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2602
diff
changeset
|
29 |
. "$CATALINA_BASE/bin/setenv.sh" |
|
788
ab1a623335b6
7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents:
555
diff
changeset
|
30 |
elif [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then |
|
ab1a623335b6
7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents:
555
diff
changeset
|
31 |
. "$CATALINA_HOME/bin/setenv.sh" |
|
4146
097063f324c0
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2726
diff
changeset
|
32 |
@@ -145,6 +152,11 @@ |
|
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
33 |
export QIBM_MULTI_THREADED=Y |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
34 |
fi |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
35 |
|
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
36 |
+# For Solaris |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
37 |
+if $solaris; then |
|
2602
5caab247ea3d
16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
788
diff
changeset
|
38 |
+ [ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/jdk/instances/jdk1.7.0 |
|
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
39 |
+fi |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
40 |
+ |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
41 |
# Get standard Java environment variables |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
42 |
if $os400; then |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
43 |
# -r will Only work on the os400 if the files are: |
|
4146
097063f324c0
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2726
diff
changeset
|
44 |
--- bin/tool-wrapper.sh |
|
097063f324c0
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2726
diff
changeset
|
45 |
+++ bin/tool-wrapper.sh |
|
097063f324c0
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2726
diff
changeset
|
46 |
@@ -33,8 +33,10 @@ |
|
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
47 |
|
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
48 |
# OS specific support. $var _must_ be set to either true or false. |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
49 |
cygwin=false |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
50 |
+solaris=false |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
51 |
case "`uname`" in |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
52 |
CYGWIN*) cygwin=true;; |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
53 |
+SunOS*) solaris=true;; |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
54 |
esac |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
55 |
|
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
56 |
# resolve links - $0 may be a softlink |
|
4146
097063f324c0
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2726
diff
changeset
|
57 |
@@ -58,8 +60,16 @@ |
|
788
ab1a623335b6
7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents:
555
diff
changeset
|
58 |
# but allow them to be specified in setenv.sh, in rare case when it is needed. |
|
ab1a623335b6
7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents:
555
diff
changeset
|
59 |
CLASSPATH= |
|
ab1a623335b6
7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents:
555
diff
changeset
|
60 |
|
|
ab1a623335b6
7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents:
555
diff
changeset
|
61 |
-if [ -r "$CATALINA_HOME"/bin/setenv.sh ]; then |
|
ab1a623335b6
7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents:
555
diff
changeset
|
62 |
- . "$CATALINA_HOME"/bin/setenv.sh |
|
2726
2582b1cfd19c
16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2602
diff
changeset
|
63 |
+# On Solaris we install Tomcat into two different locations |
|
2582b1cfd19c
16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2602
diff
changeset
|
64 |
+# (CATALINA_HOME, CATALINA_BASE). CATALINA_HOME can be on read only |
|
2582b1cfd19c
16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2602
diff
changeset
|
65 |
+# location and CATALINA_BASE doesn't contain bin directory. Therefore we |
|
2582b1cfd19c
16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2602
diff
changeset
|
66 |
+# will look for setenv.sh file in CATALINA_BASE/conf directory first. |
|
2582b1cfd19c
16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2602
diff
changeset
|
67 |
+if [ -r "$CATALINA_BASE/conf/setenv.sh" ]; then |
|
2582b1cfd19c
16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2602
diff
changeset
|
68 |
+ . "$CATALINA_BASE/conf/setenv.sh" |
|
2582b1cfd19c
16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2602
diff
changeset
|
69 |
+elif [ -r "$CATALINA_BASE/bin/setenv.sh" ]; then |
|
2582b1cfd19c
16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2602
diff
changeset
|
70 |
+ . "$CATALINA_BASE/bin/setenv.sh" |
|
2582b1cfd19c
16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2602
diff
changeset
|
71 |
+elif [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then |
|
2582b1cfd19c
16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2602
diff
changeset
|
72 |
+ . "$CATALINA_HOME/bin/setenv.sh" |
|
788
ab1a623335b6
7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents:
555
diff
changeset
|
73 |
fi |
|
ab1a623335b6
7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents:
555
diff
changeset
|
74 |
|
|
ab1a623335b6
7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents:
555
diff
changeset
|
75 |
# For Cygwin, ensure paths are in UNIX format before anything is touched |
|
4146
097063f324c0
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2726
diff
changeset
|
76 |
@@ -69,6 +79,11 @@ |
|
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
77 |
[ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"` |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
78 |
fi |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
79 |
|
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
80 |
+# For Solaris |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
81 |
+if $solaris; then |
|
2602
5caab247ea3d
16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
788
diff
changeset
|
82 |
+ [ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/jdk/instances/jdk1.7.0 |
|
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
83 |
+fi |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
84 |
+ |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
85 |
# Get standard Java environment variables |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
86 |
if [ -r "$CATALINA_HOME"/bin/setclasspath.sh ]; then |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
87 |
BASEDIR="$CATALINA_HOME" |