author | Mike Sullivan <Mike.Sullivan@Oracle.COM> |
Tue, 23 Dec 2014 17:14:28 -0800 | |
changeset 3570 | a4cf6b4575fa |
parent 1387 | 6df6087cb5b9 |
child 4089 | 1788e52b3086 |
permissions | -rw-r--r-- |
1387
6df6087cb5b9
16945274 Upgrade Apache Tomcat to version 6.0.37
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
1 |
--- apache-tomcat-6.0.37-src/bin/catalina.sh Wed Jun 12 02:20:24 2013 |
6df6087cb5b9
16945274 Upgrade Apache Tomcat to version 6.0.37
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
2 |
+++ apache-tomcat-6.0.37-src/bin/catalina.sh Wed Jun 12 02:20:24 2013 |
6df6087cb5b9
16945274 Upgrade Apache Tomcat to version 6.0.37
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
3 |
@@ -287,6 +287,7 @@ |
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
4 |
-Dcatalina.base="$CATALINA_BASE" \ |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
5 |
-Dcatalina.home="$CATALINA_HOME" \ |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
6 |
-Djava.io.tmpdir="$CATALINA_TMPDIR" \ |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
7 |
+ -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \ |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
8 |
org.apache.catalina.startup.Bootstrap "$@" start |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
9 |
else |
1387
6df6087cb5b9
16945274 Upgrade Apache Tomcat to version 6.0.37
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
10 |
exec "$_RUNJDB" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ |
6df6087cb5b9
16945274 Upgrade Apache Tomcat to version 6.0.37
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
11 |
@@ -295,6 +296,7 @@ |
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
12 |
-Dcatalina.base="$CATALINA_BASE" \ |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
13 |
-Dcatalina.home="$CATALINA_HOME" \ |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
14 |
-Djava.io.tmpdir="$CATALINA_TMPDIR" \ |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
15 |
+ -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \ |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
16 |
org.apache.catalina.startup.Bootstrap "$@" start |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
17 |
fi |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
18 |
fi |
1387
6df6087cb5b9
16945274 Upgrade Apache Tomcat to version 6.0.37
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
19 |
@@ -314,6 +316,7 @@ |
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
20 |
-Dcatalina.base="$CATALINA_BASE" \ |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
21 |
-Dcatalina.home="$CATALINA_HOME" \ |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
22 |
-Djava.io.tmpdir="$CATALINA_TMPDIR" \ |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
23 |
+ -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \ |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
24 |
org.apache.catalina.startup.Bootstrap "$@" start |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
25 |
else |
1387
6df6087cb5b9
16945274 Upgrade Apache Tomcat to version 6.0.37
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
26 |
exec "$_RUNJAVA" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ |
6df6087cb5b9
16945274 Upgrade Apache Tomcat to version 6.0.37
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
27 |
@@ -321,6 +324,7 @@ |
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
28 |
-Dcatalina.base="$CATALINA_BASE" \ |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
29 |
-Dcatalina.home="$CATALINA_HOME" \ |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
30 |
-Djava.io.tmpdir="$CATALINA_TMPDIR" \ |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
31 |
+ -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \ |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
32 |
org.apache.catalina.startup.Bootstrap "$@" start |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
33 |
fi |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
34 |
|
1387
6df6087cb5b9
16945274 Upgrade Apache Tomcat to version 6.0.37
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
35 |
@@ -378,6 +382,7 @@ |
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
36 |
-Dcatalina.base="$CATALINA_BASE" \ |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
37 |
-Dcatalina.home="$CATALINA_HOME" \ |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
38 |
-Djava.io.tmpdir="$CATALINA_TMPDIR" \ |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
39 |
+ -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \ |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
40 |
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
|
41 |
>> "$CATALINA_OUT" 2>&1 & |
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
42 |
|
1387
6df6087cb5b9
16945274 Upgrade Apache Tomcat to version 6.0.37
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
43 |
@@ -387,6 +392,7 @@ |
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
44 |
-Dcatalina.base="$CATALINA_BASE" \ |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
45 |
-Dcatalina.home="$CATALINA_HOME" \ |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
46 |
-Djava.io.tmpdir="$CATALINA_TMPDIR" \ |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
47 |
+ -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \ |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
48 |
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
|
49 |
>> "$CATALINA_OUT" 2>&1 & |
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
50 |
|
1387
6df6087cb5b9
16945274 Upgrade Apache Tomcat to version 6.0.37
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
51 |
@@ -437,6 +443,7 @@ |
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
52 |
-Dcatalina.base="$CATALINA_BASE" \ |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
53 |
-Dcatalina.home="$CATALINA_HOME" \ |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
54 |
-Djava.io.tmpdir="$CATALINA_TMPDIR" \ |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
55 |
+ -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \ |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
56 |
org.apache.catalina.startup.Bootstrap "$@" stop |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
57 |
|
1387
6df6087cb5b9
16945274 Upgrade Apache Tomcat to version 6.0.37
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
58 |
if [ ! -z "$CATALINA_PID" ]; then |