| author | Petr Sumbera <petr.sumbera@oracle.com> |
| Tue, 07 Apr 2015 05:51:44 -0700 | |
| changeset 4089 | 1788e52b3086 |
| parent 1387 | 6df6087cb5b9 |
| child 5535 | ae5bc52953a4 |
| permissions | -rw-r--r-- |
|
4089
1788e52b3086
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
1387
diff
changeset
|
1 |
Patch origin: in-house |
|
1788e52b3086
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
1387
diff
changeset
|
2 |
Patch status: Solaris-specific; not suitable for upstream |
|
1788e52b3086
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
1387
diff
changeset
|
3 |
|
|
1788e52b3086
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
1387
diff
changeset
|
4 |
Starts Tomcat in desired mode. See: |
|
1788e52b3086
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
1387
diff
changeset
|
5 |
https://tomcat.apache.org/tomcat-6.0-doc/config/systemprops.html |
|
1788e52b3086
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
1387
diff
changeset
|
6 |
|
|
1788e52b3086
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
1387
diff
changeset
|
7 |
--- bin/catalina.sh |
|
1788e52b3086
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
1387
diff
changeset
|
8 |
+++ bin/catalina.sh |
|
1788e52b3086
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
1387
diff
changeset
|
9 |
@@ -285,6 +285,7 @@ |
|
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
10 |
-Dcatalina.base="$CATALINA_BASE" \ |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
11 |
-Dcatalina.home="$CATALINA_HOME" \ |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
12 |
-Djava.io.tmpdir="$CATALINA_TMPDIR" \ |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
13 |
+ -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \ |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
14 |
org.apache.catalina.startup.Bootstrap "$@" start |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
15 |
else |
|
1387
6df6087cb5b9
16945274 Upgrade Apache Tomcat to version 6.0.37
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
16 |
exec "$_RUNJDB" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ |
|
4089
1788e52b3086
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
1387
diff
changeset
|
17 |
@@ -293,6 +294,7 @@ |
|
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
18 |
-Dcatalina.base="$CATALINA_BASE" \ |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
19 |
-Dcatalina.home="$CATALINA_HOME" \ |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
20 |
-Djava.io.tmpdir="$CATALINA_TMPDIR" \ |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
21 |
+ -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \ |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
22 |
org.apache.catalina.startup.Bootstrap "$@" start |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
23 |
fi |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
24 |
fi |
|
4089
1788e52b3086
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
1387
diff
changeset
|
25 |
@@ -312,6 +314,7 @@ |
|
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
26 |
-Dcatalina.base="$CATALINA_BASE" \ |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
27 |
-Dcatalina.home="$CATALINA_HOME" \ |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
28 |
-Djava.io.tmpdir="$CATALINA_TMPDIR" \ |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
29 |
+ -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \ |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
30 |
org.apache.catalina.startup.Bootstrap "$@" start |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
31 |
else |
|
1387
6df6087cb5b9
16945274 Upgrade Apache Tomcat to version 6.0.37
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
32 |
exec "$_RUNJAVA" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ |
|
4089
1788e52b3086
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
1387
diff
changeset
|
33 |
@@ -319,6 +322,7 @@ |
|
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
34 |
-Dcatalina.base="$CATALINA_BASE" \ |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
35 |
-Dcatalina.home="$CATALINA_HOME" \ |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
36 |
-Djava.io.tmpdir="$CATALINA_TMPDIR" \ |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
37 |
+ -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \ |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
38 |
org.apache.catalina.startup.Bootstrap "$@" start |
|
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 |
|
|
4089
1788e52b3086
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
1387
diff
changeset
|
41 |
@@ -376,6 +380,7 @@ |
|
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
42 |
-Dcatalina.base="$CATALINA_BASE" \ |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
43 |
-Dcatalina.home="$CATALINA_HOME" \ |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
44 |
-Djava.io.tmpdir="$CATALINA_TMPDIR" \ |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
45 |
+ -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \ |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
46 |
org.apache.catalina.startup.Bootstrap "$@" start \ |
|
1387
6df6087cb5b9
16945274 Upgrade Apache Tomcat to version 6.0.37
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
47 |
>> "$CATALINA_OUT" 2>&1 & |
|
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
48 |
|
|
4089
1788e52b3086
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
1387
diff
changeset
|
49 |
@@ -385,6 +390,7 @@ |
|
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
50 |
-Dcatalina.base="$CATALINA_BASE" \ |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
51 |
-Dcatalina.home="$CATALINA_HOME" \ |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
52 |
-Djava.io.tmpdir="$CATALINA_TMPDIR" \ |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
53 |
+ -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \ |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
54 |
org.apache.catalina.startup.Bootstrap "$@" start \ |
|
1387
6df6087cb5b9
16945274 Upgrade Apache Tomcat to version 6.0.37
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
55 |
>> "$CATALINA_OUT" 2>&1 & |
|
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
56 |
|
|
4089
1788e52b3086
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
1387
diff
changeset
|
57 |
@@ -435,6 +441,7 @@ |
|
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
58 |
-Dcatalina.base="$CATALINA_BASE" \ |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
59 |
-Dcatalina.home="$CATALINA_HOME" \ |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
60 |
-Djava.io.tmpdir="$CATALINA_TMPDIR" \ |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
61 |
+ -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \ |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
62 |
org.apache.catalina.startup.Bootstrap "$@" stop |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
63 |
|
|
1387
6df6087cb5b9
16945274 Upgrade Apache Tomcat to version 6.0.37
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
64 |
if [ ! -z "$CATALINA_PID" ]; then |