Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/tomcat/patches/tomcat_strict_servlet.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Wed, 29 Aug 2012 11:05:56 -0700
changeset 957 255465c5756f
parent 142 6f1cb90a0ef3
child 1387 6df6087cb5b9
permissions -rw-r--r--
Close of build 04.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     1
 
--- apache-tomcat-6.0.20-src/bin/catalina.sh.orig	2009-03-30 14:34:02.000000000 -0700
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     2
 
+++ apache-tomcat-6.0.20-src/bin/catalina.sh	2009-03-30 14:40:38.000000000 -0700
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     3
 
@@ -233,6 +233,7 @@
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
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    10
 
       exec "$_RUNJDB" $JAVA_OPTS "$LOGGING_CONFIG" $CATALINA_OPTS \
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    11
 
@@ -241,6 +242,7 @@
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
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    19
 
@@ -258,6 +260,7 @@
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
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    26
 
     exec "$_RUNJAVA" $JAVA_OPTS "$LOGGING_CONFIG" $CATALINA_OPTS \
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    27
 
@@ -265,6 +268,7 @@
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
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    35
 
@@ -282,6 +286,7 @@
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 \
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    41
 
       >> "$CATALINA_BASE"/logs/catalina.out 2>&1 &
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    42
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    43
 
@@ -294,6 +299,7 @@
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 \
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    49
 
       >> "$CATALINA_BASE"/logs/catalina.out 2>&1 &
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    50
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    51
 
@@ -316,6 +322,7 @@
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
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    58
 
   if [ $FORCE -eq 1 ]; then
upstream/oracle/userland-gate