Update jakarta-{servletapi,tomcat} to version 3.2.3. The only real change

is a fix to a security problem allowing unauthorized access to protected
content.

7 files changed, 418 insertions, 345 deletions

diff --git a/www/jakarta-servletapi/Makefile b/www/jakarta-servletapi/Makefile
index 9220fccad96..bf6079c9f27 100644
--- a/www/jakarta-servletapi/Makefile
+++ b/www/jakarta-servletapi/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2001/06/21 13:12:25 abs Exp $
+# $NetBSD: Makefile,v 1.4 2001/08/11 22:05:22 jwise Exp $
 
-DISTNAME=	jakarta-servletapi-3.2-src
-PKGNAME=	jakarta-servletapi-3.2.1
+DISTNAME=	jakarta-servletapi-3.2.3-src
+PKGNAME=	jakarta-servletapi-3.2.3
 CATEGORIES=	www
-MASTER_SITES=	http://jakarta.apache.org/builds/jakarta-tomcat/release/v3.2.1/src/
+MASTER_SITES=	http://jakarta.apache.org/builds/jakarta-tomcat/release/v3.2.3/src/
 
 MAINTAINER=	jwise@netbsd.org
 HOMEPAGE=	http://jakarta.apache.org/
diff --git a/www/jakarta-servletapi/distinfo b/www/jakarta-servletapi/distinfo
index 5bfa8fab4fb..cf54983946a 100644
--- a/www/jakarta-servletapi/distinfo
+++ b/www/jakarta-servletapi/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/05/21 21:54:38 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/08/11 22:05:22 jwise Exp $
 
-SHA1 (jakarta-servletapi-3.2-src.tar.gz) = 2f5bff6565a8f0550294a7dc899a589883a80dbc
-Size (jakarta-servletapi-3.2-src.tar.gz) = 101001 bytes
+SHA1 (jakarta-servletapi-3.2.3-src.tar.gz) = a9369507fd6c9ec05a48ba5a1d16530ec90a5ca0
+Size (jakarta-servletapi-3.2.3-src.tar.gz) = 101172 bytes
diff --git a/www/jakarta-tomcat/Makefile b/www/jakarta-tomcat/Makefile
index 7ba3cfe57e9..4714305eea9 100644
--- a/www/jakarta-tomcat/Makefile
+++ b/www/jakarta-tomcat/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2001/06/21 13:12:27 abs Exp $
+# $NetBSD: Makefile,v 1.21 2001/08/11 22:05:23 jwise Exp $
 
 DISTNAME=	${PKGNAME}-src
-PKGNAME=	jakarta-tomcat-3.2.1
+PKGNAME=	jakarta-tomcat-3.2.3
 CATEGORIES=	www
-MASTER_SITES=	http://jakarta.apache.org/builds/jakarta-tomcat/release/v3.2.1/src/
+MASTER_SITES=	http://jakarta.apache.org/builds/jakarta-tomcat/release/v3.2.3/src/
 
 MAINTAINER=	jwise@netbsd.org
 HOMEPAGE=	http://jakarta.apache.org/
diff --git a/www/jakarta-tomcat/distinfo b/www/jakarta-tomcat/distinfo
index a2837d733e3..08485d45bff 100644
--- a/www/jakarta-tomcat/distinfo
+++ b/www/jakarta-tomcat/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.3 2001/06/21 13:12:27 abs Exp $
+$NetBSD: distinfo,v 1.4 2001/08/11 22:05:23 jwise Exp $
 
-SHA1 (jakarta-tomcat-3.2.1-src.tar.gz) = c28d97378dcc1c9a15d15cae404733674ae91c9c
-Size (jakarta-tomcat-3.2.1-src.tar.gz) = 920745 bytes
-SHA1 (patch-aa) = 9bb02eba6a7444a353046461411d31a77a9dca56
+SHA1 (jakarta-tomcat-3.2.3-src.tar.gz) = e113986a4f7f414d3adf127a1c9fbdc4c41c84fe
+Size (jakarta-tomcat-3.2.3-src.tar.gz) = 981958 bytes
+SHA1 (patch-aa) = b532decf4c4f205125f4114d8f763044541112c5
 SHA1 (patch-ab) = 759c6373af773d45931bba58e512e4be50dfdc9e
 SHA1 (patch-ac) = 3bdcc53f7f8649131d2d9f37c82f2d833f497281
+SHA1 (patch-ad) = 6bf096f144865af5b9f0fddfe913632d7ef893c1
diff --git a/www/jakarta-tomcat/patches/patch-aa b/www/jakarta-tomcat/patches/patch-aa
index 68fc9488cdd..05a5ea10b67 100644
--- a/www/jakarta-tomcat/patches/patch-aa
+++ b/www/jakarta-tomcat/patches/patch-aa
@@ -1,9 +1,7 @@
-$NetBSD: patch-aa,v 1.7 2001/06/21 13:12:27 abs Exp $
-
---- build.xml.orig	Tue Dec 12 22:51:36 2000
-+++ build.xml
-@@ -6,11 +6,11 @@
-   <property name="build.compiler" value="classic"/>
+--- build.xml.orig	Tue Jul 17 07:25:27 2001
++++ build.xml	Sat Aug 11 15:23:28 2001
+@@ -5,11 +5,11 @@
+   <property name="ant.home" value="../jakarta-ant"/>
    <property name="debug" value="on"/>
    <property name="j2ee.home" value="../../j2ee/build/unix"/>
 -  <property name="jaxp" value="../jaxp-1.0.1" />
@@ -17,7 +15,7 @@ $NetBSD: patch-aa,v 1.7 2001/06/21 13:12:27 abs Exp $
  
  
    <!-- ======================== Copy static files ========================= -->
-@@ -31,14 +31,19 @@
+@@ -30,14 +30,18 @@
  
      <!-- Copy executables and scripts -->
      <copy todir="${tomcat.build}/bin">
@@ -30,7 +28,6 @@ $NetBSD: patch-aa,v 1.7 2001/06/21 13:12:27 abs Exp $
      <!-- Copy configuation files -->
      <copy todir="${tomcat.build}/conf">
        <fileset dir="src/etc"/>
-+      <!-- <mapper type="glob" from="*.xml" to="*.xml.default"/> -->
      </copy>
 +    <move todir="${tomcat.build}/conf/">
 +      <fileset dir="${tomcat.build}/conf/" includes="jni_server.xml,server.xml,tomcat.policy,tomcat-users.xml,web.xml,workers.properties"/>
@@ -39,8 +36,8 @@ $NetBSD: patch-aa,v 1.7 2001/06/21 13:12:27 abs Exp $
      <copy tofile="${tomcat.build}/conf/build.xml"
              file="build.xml"/>
  
-@@ -49,14 +54,14 @@
-     <copy tofile="${tomcat.build}/LICENSE" file="LICENSE"/>
+@@ -50,14 +54,16 @@
+     <copy tofile="${tomcat.build}/KEYS" file="KEYS"/>
  
      <!-- Copy library JAR files -->
 -    <copy tofile="${tomcat.build}/lib/ant.jar"
@@ -51,61 +48,73 @@ $NetBSD: patch-aa,v 1.7 2001/06/21 13:12:27 abs Exp $
 -            file="${jaxp}/jaxp.jar"/>
 -    <copy tofile="${tomcat.build}/lib/parser.jar"
 -            file="${jaxp}/parser.jar"/>
-+    <!-- <copy tofile="${tomcat.build}/lib/ant.jar"
-+            file="${ant.home}/lib/java/ant.jar"/> -->
-+    <!-- <copy tofile="${tomcat.build}/lib/servlet.jar"
-+            file="${servlet.jar}"/> -->
-+    <!-- <copy tofile="${tomcat.build}/lib/jaxp.jar"
-+            file="${jaxp}/jaxp.jar"/> -->
-+    <!-- <copy tofile="${tomcat.build}/lib/parser.jar"
-+            file="${jaxp}/parser.jar"/> -->
++    <!--
++    	<copy tofile="${tomcat.build}/lib/ant.jar"
++       	      file="${ant.home}/lib/ant.jar"/>
++    	<copy tofile="${tomcat.build}/lib/servlet.jar"
++      	      file="${servlet.jar}"/>
++    	<copy tofile="${tomcat.build}/lib/jaxp.jar"
++      	      file="${jaxp}/jaxp.jar"/>
++    	<copy tofile="${tomcat.build}/lib/parser.jar"
++       	      file="${jaxp}/parser.jar"/>
++    -->
  
      <!-- Copy golden files for the tests webapp -->
      <copy todir="${tomcat.build}/lib/test/Golden">
-@@ -65,9 +70,9 @@
+@@ -66,9 +72,11 @@
  
      <!-- Fixups for line endings and executable permissions -->
      <fixcrlf srcdir="${tomcat.build}" includes="**/*.sh" cr="remove"/>
 -    <fixcrlf srcdir="${tomcat.build}" includes="**/*.bat" cr="add"/>
 -    <chmod perm="+x" file="${tomcat.build}/bin/ant"/>
 -    <chmod perm="+x" file="${tomcat.build}/bin/antRun"/>
-+    <!-- <fixcrlf srcdir="${tomcat.build}" includes="**/*.bat" cr="add"/> -->
-+    <!-- <chmod perm="+x" file="${tomcat.build}/bin/ant"/> -->
-+    <!-- <chmod perm="+x" file="${tomcat.build}/bin/antRun"/> -->
++    <!--
++    	<fixcrlf srcdir="${tomcat.build}" includes="**/*.bat" cr="add"/>
++    	<chmod perm="+x" file="${tomcat.build}/bin/ant"/>
++    	<chmod perm="+x" file="${tomcat.build}/bin/antRun"/>
++    -->
      <chmod perm="+x" file="${tomcat.build}/bin/jspc.sh"/>
      <chmod perm="+x" file="${tomcat.build}/bin/startup.sh"/>
      <chmod perm="+x" file="${tomcat.build}/bin/shutdown.sh"/>
-@@ -81,8 +86,10 @@
+@@ -82,8 +90,10 @@
    <target name="tomcat" depends="prepare">
  
      <!-- Determine availability of optional components -->
-+    <!-- No JSSE yet
++    <!-- no JSSE yet
      <available property="jsse.present" 
                 classname="com.sun.net.ssl.internal.ssl.Provider" />
 +    -->
      <available property="jdk12.present"
                 classname="java.security.PrivilegedAction" />
  
-@@ -104,8 +111,10 @@
+@@ -95,6 +105,8 @@
+            deprecation="off" >
+            <exclude name="**/Jdk12Interceptor.java" 
                      unless="jdk12.present"/>
-            <exclude name="**/AdaptiveClassLoader12.java" 
++           <exclude name="**/Jdk12Support.java" 
++                    unless="jdk12.present"/>
+            <exclude name="**/SetSecurityManager.java" 
+                     unless="jdk12.present"/>
+            <exclude name="**/EmbededTomcat.java" 
+@@ -107,6 +119,8 @@
                      unless="jdk12.present"/>
-+           <exclude name="**/EmbededTomcat.java" 
-+                    unless="jsse.present"/>
             <exclude name="**/SSLSocketFactory.java"
--                    unless="jsse.present" />
+                     unless="jsse.present" />
++           <exclude name="**/EmbededTomcat.java" 
 +                    unless="jsse.present"/>
      </javac>
  
      <!-- Copy the corresponding resource files -->
-@@ -202,8 +211,8 @@
+@@ -203,8 +217,10 @@
      </copy>
  
      <!-- Fixups for executable permissions -->
 -    <chmod perm="+x" file="${tomcat.dist}/bin/ant"/>
 -    <chmod perm="+x" file="${tomcat.dist}/bin/antRun"/>
-+    <!-- <chmod perm="+x" file="${tomcat.dist}/bin/ant"/> -->
-+    <!-- <chmod perm="+x" file="${tomcat.dist}/bin/antRun"/> -->
++    <!--
++    	<chmod perm="+x" file="${tomcat.dist}/bin/ant"/>
++    	<chmod perm="+x" file="${tomcat.dist}/bin/antRun"/>
++    -->
      <chmod perm="+x" file="${tomcat.dist}/bin/jspc.sh"/>
      <chmod perm="+x" file="${tomcat.dist}/bin/startup.sh"/>
      <chmod perm="+x" file="${tomcat.dist}/bin/shutdown.sh"/>
diff --git a/www/jakarta-tomcat/patches/patch-ad b/www/jakarta-tomcat/patches/patch-ad
new file mode 100644
index 00000000000..455cc2fbeb8
--- /dev/null
+++ b/www/jakarta-tomcat/patches/patch-ad
@@ -0,0 +1,40 @@
+--- src/share/org/apache/tomcat/facade/RequestDispatcherImpl.java.orig	Thu Dec 28 14:13:50 2000
++++ src/share/org/apache/tomcat/facade/RequestDispatcherImpl.java	Sat Aug 11 15:39:18 2001
+@@ -139,6 +139,7 @@
+     public void forward(ServletRequest request, ServletResponse response)
+ 	throws ServletException, IOException
+     {
++    /*
+ 	if( System.getSecurityManager() != null ) {
+ 	    final ServletRequest req = request;
+ 	    final ServletResponse res = response;
+@@ -159,8 +160,9 @@
+ 		throw (IOException)e;
+ 	    }
+ 	} else {
++	*/
+ 	    doForward(request,response);
+-	}
++	/*}*/
+     }
+ 
+     private void doForward(ServletRequest request, ServletResponse response)
+@@ -247,6 +249,7 @@
+     public void include(ServletRequest request, ServletResponse response)
+ 	throws ServletException, IOException
+     {
++	/*
+         if( System.getSecurityManager() != null ) {
+             final ServletRequest req = request;
+             final ServletResponse res = response;
+@@ -267,8 +270,9 @@
+                 throw (IOException)e;
+             }
+         } else {
++	*/
+ 	    doInclude(request,response);
+-	}
++	/*}*/
+     }
+ 
+     private void doInclude(ServletRequest request, ServletResponse response)
diff --git a/www/jakarta-tomcat/pkg/PLIST b/www/jakarta-tomcat/pkg/PLIST
index 40d66f8e3bd..01d691a93f9 100644
--- a/www/jakarta-tomcat/pkg/PLIST
+++ b/www/jakarta-tomcat/pkg/PLIST
@@ -1,347 +1,369 @@
-@comment $NetBSD: PLIST,v 1.8 2001/03/29 22:22:14 jwise Exp $
+@comment $NetBSD: PLIST,v 1.9 2001/08/11 22:05:24 jwise Exp $
 etc/rc.d/tomcat
-tomcat/webapps/admin.war
-tomcat/webapps/test.war
-tomcat/webapps/examples.war
-tomcat/webapps/ROOT.war
-tomcat/doc/appdev/sample/web/images/tomcat.gif
-tomcat/doc/appdev/sample/web/index.html
-tomcat/doc/appdev/sample/web/hello.jsp
-tomcat/doc/appdev/sample/etc/web.xml
-tomcat/doc/appdev/sample/src/Hello.java
-tomcat/doc/appdev/sample/build.xml
-tomcat/doc/appdev/sample/build.sh
-tomcat/doc/appdev/sample/build.bat
+tomcat/KEYS
+tomcat/LICENSE
+tomcat/RELEASE-NOTES
+tomcat/bin/jspc.sh
+tomcat/bin/shutdown.sh
+tomcat/bin/startup.sh
+tomcat/bin/tomcat.sh
+tomcat/conf/build.xml
+tomcat/conf/jni_server.xml
+tomcat/conf/jni_server.xml.default
+tomcat/conf/jni_workers.properties
+tomcat/conf/manifest.servlet
+tomcat/conf/mod_jk.conf
+tomcat/conf/obj.conf
+tomcat/conf/server.xml
+tomcat/conf/server.xml.default
+tomcat/conf/test-tomcat.xml
+tomcat/conf/tomcat-users.xml
+tomcat/conf/tomcat-users.xml.default
+tomcat/conf/tomcat.conf
+tomcat/conf/tomcat.policy
+tomcat/conf/tomcat.policy.default
+tomcat/conf/tomcat.properties
+tomcat/conf/uriworkermap.properties
+tomcat/conf/web.dtd
+tomcat/conf/web.xml
+tomcat/conf/web.xml.default
+tomcat/conf/workers.properties
+tomcat/conf/workers.properties.default
+tomcat/conf/wrapper.properties
+tomcat/doc/AJPv13.html
+tomcat/doc/JDBCRealm.howto
+tomcat/doc/NT-Service-howto.html
+tomcat/doc/Tomcat-Workers-HowTo.html
+tomcat/doc/Tomcat-on-NetWare-HowTo.html
+tomcat/doc/appdev/build.xml.txt
+tomcat/doc/appdev/contents.html
+tomcat/doc/appdev/deployment.html
+tomcat/doc/appdev/footer.html
+tomcat/doc/appdev/header.html
+tomcat/doc/appdev/index.html
 tomcat/doc/appdev/installation.html
 tomcat/doc/appdev/introduction.html
-tomcat/doc/appdev/index.html
-tomcat/doc/appdev/contents.html
-tomcat/doc/appdev/build.xml.txt
+tomcat/doc/appdev/processes.html
+tomcat/doc/appdev/sample/build.bat
+tomcat/doc/appdev/sample/build.sh
+tomcat/doc/appdev/sample/build.xml
+tomcat/doc/appdev/sample/etc/web.xml
+tomcat/doc/appdev/sample/src/Hello.java
+tomcat/doc/appdev/sample/web/hello.jsp
+tomcat/doc/appdev/sample/web/images/tomcat.gif
+tomcat/doc/appdev/sample/web/index.html
 tomcat/doc/appdev/source.html
-tomcat/doc/appdev/header.html
-tomcat/doc/appdev/footer.html
-tomcat/doc/appdev/deployment.html
 tomcat/doc/appdev/tomcat.gif
-tomcat/doc/appdev/processes.html
 tomcat/doc/appdev/web.xml.txt
-tomcat/doc/tomcat-ssl-howto.html
-tomcat/doc/tomcat-iis-howto.html
+tomcat/doc/faq
+tomcat/doc/in-process-howto.html
+tomcat/doc/index.html
+tomcat/doc/mod_jk-howto.html
 tomcat/doc/readme
-tomcat/doc/Tomcat-Workers-HowTo.html
 tomcat/doc/tomcat-apache-howto.html
-tomcat/doc/JDBCRealm.howto
+tomcat/doc/tomcat-iis-howto.html
+tomcat/doc/tomcat-localization-howto.html
 tomcat/doc/tomcat-netscape-howto.html
-tomcat/doc/uguide/images/tomcat.gif
+tomcat/doc/tomcat-ssl-howto.html
 tomcat/doc/uguide/images/banner.gif
+tomcat/doc/uguide/images/tomcat.gif
+tomcat/doc/uguide/style.css
+tomcat/doc/uguide/tomcat-security-unix.html
 tomcat/doc/uguide/tomcat-security.html
 tomcat/doc/uguide/tomcat_ug.html
-tomcat/doc/uguide/style.css
-tomcat/doc/faq
-tomcat/doc/in-process-howto.html
-tomcat/doc/index.html
-tomcat/doc/mod_jk-howto.html
-tomcat/doc/NT-Service-howto.html
-tomcat/conf/jni_workers.properties
-tomcat/conf/wrapper.properties
-tomcat/conf/tomcat.conf
-tomcat/conf/web.dtd
-tomcat/conf/obj.conf
-tomcat/conf/mod_jk.conf
-tomcat/conf/build.xml
-tomcat/conf/uriworkermap.properties
-tomcat/conf/manifest.servlet
-tomcat/conf/workers.properties.default
-tomcat/conf/jni_server.xml.default
-tomcat/conf/test-tomcat.xml
-tomcat/conf/server.xml.default
-tomcat/conf/tomcat.policy.default
-tomcat/conf/tomcat-users.xml.default
-tomcat/conf/web.xml.default
-tomcat/conf/tomcat.properties
-tomcat/lib/test/Golden/PrintWriterTest.txt
-tomcat/lib/test/Golden/parse.txt
+tomcat/lib/jasper.jar
 tomcat/lib/test/Golden/Err.txt
-tomcat/lib/test/Golden/index.txt
-tomcat/lib/test/Golden/implicitResponse.txt
-tomcat/lib/test/Golden/implicitException.txt
-tomcat/lib/test/Golden/implicitPageContext.txt
-tomcat/lib/test/Golden/implicitContext.txt
-tomcat/lib/test/Golden/implicitRequest.txt
-tomcat/lib/test/Golden/implicitSession.txt
 tomcat/lib/test/Golden/ForwardWithQuery.txt
-tomcat/lib/test/Golden/import.txt
-tomcat/lib/test/Golden/buffer.txt
-tomcat/lib/test/Golden/image1.gif
-tomcat/lib/test/Golden/implicitConfig.txt
-tomcat/lib/test/Golden/beanTest.txt
+tomcat/lib/test/Golden/HelloWorld.txt
+tomcat/lib/test/Golden/Include.txt
+tomcat/lib/test/Golden/IncludeFile.txt
+tomcat/lib/test/Golden/Mismatch1.txt
+tomcat/lib/test/Golden/Mismatch2.txt
 tomcat/lib/test/Golden/MustFail.txt
+tomcat/lib/test/Golden/PrintWriterTest.txt
+tomcat/lib/test/Golden/ServletParam.txt
+tomcat/lib/test/Golden/SimpleForward.txt
 tomcat/lib/test/Golden/SimpleInclude.txt
-tomcat/lib/test/Golden/welcome.txt
 tomcat/lib/test/Golden/beanSer.txt
-tomcat/lib/test/Golden/Include.txt
+tomcat/lib/test/Golden/beanTest.txt
+tomcat/lib/test/Golden/buffer.txt
 tomcat/lib/test/Golden/classTest.txt
-tomcat/lib/test/Golden/Mismatch2.txt
-tomcat/lib/test/Golden/Mismatch1.txt
+tomcat/lib/test/Golden/image1.gif
+tomcat/lib/test/Golden/implicitConfig.txt
+tomcat/lib/test/Golden/implicitContext.txt
+tomcat/lib/test/Golden/implicitException.txt
 tomcat/lib/test/Golden/implicitOut.txt
-tomcat/lib/test/Golden/movedwelcome.txt
 tomcat/lib/test/Golden/implicitPage.txt
-tomcat/lib/test/Golden/IncludeFile.txt
+tomcat/lib/test/Golden/implicitPageContext.txt
+tomcat/lib/test/Golden/implicitRequest.txt
+tomcat/lib/test/Golden/implicitResponse.txt
+tomcat/lib/test/Golden/implicitSession.txt
+tomcat/lib/test/Golden/import.txt
+tomcat/lib/test/Golden/index.txt
 tomcat/lib/test/Golden/jsptoservlet.txt
-tomcat/lib/test/Golden/servletParam2.txt
-tomcat/lib/test/Golden/servletParam1.txt
-tomcat/lib/test/Golden/SimpleForward.txt
-tomcat/lib/test/Golden/ServletParam.txt
-tomcat/lib/test/Golden/pageImport.txt
 tomcat/lib/test/Golden/movedindex.txt
-tomcat/lib/test/Golden/HelloWorld.txt
+tomcat/lib/test/Golden/movedwelcome.txt
+tomcat/lib/test/Golden/pageImport.txt
+tomcat/lib/test/Golden/parse.txt
+tomcat/lib/test/Golden/servletParam1.txt
+tomcat/lib/test/Golden/servletParam2.txt
+tomcat/lib/test/Golden/welcome.txt
 tomcat/lib/webserver.jar
-tomcat/lib/jasper.jar
-tomcat/bin/shutdown.sh
-tomcat/bin/startup.sh
-tomcat/bin/jspc.sh
-tomcat/bin/tomcat.sh
-tomcat/LICENSE
-tomcat/src/org/apache/tomcat/request/JDBCRealm.java
-tomcat/src/org/apache/tomcat/request/SessionInterceptor.java
-tomcat/src/org/apache/tomcat/request/JspInterceptor.java
-tomcat/src/org/apache/tomcat/request/LocalStrings.properties
-tomcat/src/org/apache/tomcat/request/AccessInterceptor.java
-tomcat/src/org/apache/tomcat/request/SimpleMapper1.java
-tomcat/src/org/apache/tomcat/request/AccountingInterceptor.java
-tomcat/src/org/apache/tomcat/request/StaticInterceptor.java
-tomcat/src/org/apache/tomcat/request/Jdk12Interceptor.java
-tomcat/src/org/apache/tomcat/request/InvokerInterceptor.java
-tomcat/src/org/apache/tomcat/request/SimpleRealm.java
-tomcat/src/org/apache/tomcat/util/xml/XmlMapper.java
-tomcat/src/org/apache/tomcat/util/xml/XmlAction.java
-tomcat/src/org/apache/tomcat/util/xml/PathMatch.java
-tomcat/src/org/apache/tomcat/util/xml/SaxContext.java
-tomcat/src/org/apache/tomcat/util/xml/XmlMatch.java
-tomcat/src/org/apache/tomcat/util/StringManager.java
-tomcat/src/org/apache/tomcat/util/SecurityTools.java
-tomcat/src/org/apache/tomcat/util/MessageString.java
-tomcat/src/org/apache/tomcat/util/LocalStrings_es.properties
-tomcat/src/org/apache/tomcat/util/pattern/WildcardPattern.java
-tomcat/src/org/apache/tomcat/util/pattern/PatternMatcher.java
-tomcat/src/org/apache/tomcat/util/pattern/Implication.java
-tomcat/src/org/apache/tomcat/util/pattern/URLPatternMatcher.java
-tomcat/src/org/apache/tomcat/util/pattern/ImplicationTable.java
-tomcat/src/org/apache/tomcat/util/LocalStrings.properties
-tomcat/src/org/apache/tomcat/util/Reaper.java
-tomcat/src/org/apache/tomcat/util/WARUtil.java
-tomcat/src/org/apache/tomcat/util/URLUtil.java
-tomcat/src/org/apache/tomcat/util/package.html
-tomcat/src/org/apache/tomcat/util/MimeMap.java
-tomcat/src/org/apache/tomcat/util/Queue.java
-tomcat/src/org/apache/tomcat/util/Ascii.java
-tomcat/src/org/apache/tomcat/util/LocaleToCharsetMap.java
-tomcat/src/org/apache/tomcat/util/SessionIdGenerator.java
-tomcat/src/org/apache/tomcat/util/ThreadPoolRunnable.java
-tomcat/src/org/apache/tomcat/util/RecycleBufferedInputStream.java
-tomcat/src/org/apache/tomcat/util/HexUtils.java
-tomcat/src/org/apache/tomcat/util/FileUtil.java
-tomcat/src/org/apache/tomcat/util/DateTool.java
-tomcat/src/org/apache/tomcat/util/BuffTool.java
-tomcat/src/org/apache/tomcat/util/DevNullOutputStream.java
-tomcat/src/org/apache/tomcat/util/EmptyEnumeration.java
-tomcat/src/org/apache/tomcat/util/ThreadPool.java
-tomcat/src/org/apache/tomcat/util/SimplePool.java
-tomcat/src/org/apache/tomcat/util/ByteBuffer.java
-tomcat/src/org/apache/tomcat/util/BufferListener.java
-tomcat/src/org/apache/tomcat/util/ArrayEnumerator.java
-tomcat/src/org/apache/tomcat/util/SimpleHashtable.java
-tomcat/src/org/apache/tomcat/util/MimeHeaderField.java
-tomcat/src/org/apache/tomcat/util/PrefixMapper.java
-tomcat/src/org/apache/tomcat/util/MessageChars.java
-tomcat/src/org/apache/tomcat/util/MessageBytes.java
-tomcat/src/org/apache/tomcat/util/SimplePrincipal.java
-tomcat/src/org/apache/tomcat/util/SessionUtil.java
-tomcat/src/org/apache/tomcat/util/RequestUtil.java
-tomcat/src/org/apache/tomcat/util/MimeHeaders.java
-tomcat/src/org/apache/tomcat/util/CookieTools.java
-tomcat/src/org/apache/tomcat/util/BufferEvent.java
-tomcat/src/org/apache/tomcat/facade/ServletOutputStreamFacade.java
-tomcat/src/org/apache/tomcat/facade/SessionContextImpl.java
-tomcat/src/org/apache/tomcat/facade/HttpSessionFacade.java
-tomcat/src/org/apache/tomcat/facade/ServletInputStreamFacade.java
-tomcat/src/org/apache/tomcat/facade/SimpleFacadeManager.java
-tomcat/src/org/apache/tomcat/facade/HttpServletRequestFacade.java
-tomcat/src/org/apache/tomcat/facade/HttpServletResponseFacade.java
-tomcat/src/org/apache/tomcat/facade/ServletContextFacade.java
-tomcat/src/org/apache/tomcat/facade/ServletConfigImpl.java
-tomcat/src/org/apache/tomcat/facade/RequestDispatcherImpl.java
-tomcat/src/org/apache/tomcat/facade/package.html
-tomcat/src/org/apache/tomcat/facade/ServletWriterFacade.java
-tomcat/src/org/apache/tomcat/context/LoadOnStartupInterceptor.java
+tomcat/src/org/apache/jasper/CommandLineContext.java
+tomcat/src/org/apache/jasper/Constants.java
+tomcat/src/org/apache/jasper/EmbededServletOptions.java
+tomcat/src/org/apache/jasper/JasperException.java
+tomcat/src/org/apache/jasper/JspC.java
+tomcat/src/org/apache/jasper/JspCompilationContext.java
+tomcat/src/org/apache/jasper/JspEngineContext.java
+tomcat/src/org/apache/jasper/Options.java
+tomcat/src/org/apache/jasper/compiler/BaseJspListener.java
+tomcat/src/org/apache/jasper/compiler/BeanEndGenerator.java
+tomcat/src/org/apache/jasper/compiler/BeanGenerator.java
+tomcat/src/org/apache/jasper/compiler/BeanRepository.java
+tomcat/src/org/apache/jasper/compiler/CharDataGenerator.java
+tomcat/src/org/apache/jasper/compiler/ClassDeclarationPhase.java
+tomcat/src/org/apache/jasper/compiler/ClassName.java
+tomcat/src/org/apache/jasper/compiler/CommandLineCompiler.java
+tomcat/src/org/apache/jasper/compiler/CommentGenerator.java
+tomcat/src/org/apache/jasper/compiler/CompileException.java
+tomcat/src/org/apache/jasper/compiler/Compiler.java
+tomcat/src/org/apache/jasper/compiler/CoreElement.java
+tomcat/src/org/apache/jasper/compiler/DeclarationGenerator.java
+tomcat/src/org/apache/jasper/compiler/DelegatingListener.java
+tomcat/src/org/apache/jasper/compiler/DestroyMethodPhase.java
+tomcat/src/org/apache/jasper/compiler/DumbParseEventListener.java
+tomcat/src/org/apache/jasper/compiler/EscapeUnicodeWriter.java
+tomcat/src/org/apache/jasper/compiler/ExpressionGenerator.java
+tomcat/src/org/apache/jasper/compiler/FileDeclarationPhase.java
+tomcat/src/org/apache/jasper/compiler/ForwardGenerator.java
+tomcat/src/org/apache/jasper/compiler/Generator.java
+tomcat/src/org/apache/jasper/compiler/GeneratorBase.java
+tomcat/src/org/apache/jasper/compiler/GetPropertyGenerator.java
+tomcat/src/org/apache/jasper/compiler/IncludeGenerator.java
+tomcat/src/org/apache/jasper/compiler/InfoGenerator.java
+tomcat/src/org/apache/jasper/compiler/InitMethodPhase.java
+tomcat/src/org/apache/jasper/compiler/JakartaCommentGenerator.java
+tomcat/src/org/apache/jasper/compiler/JavaCompiler.java
+tomcat/src/org/apache/jasper/compiler/JikesJavaCompiler.java
+tomcat/src/org/apache/jasper/compiler/JspCompiler.java
+tomcat/src/org/apache/jasper/compiler/JspParseEventListener.java
+tomcat/src/org/apache/jasper/compiler/JspReader.java
+tomcat/src/org/apache/jasper/compiler/JspUtil.java
+tomcat/src/org/apache/jasper/compiler/Mangler.java
+tomcat/src/org/apache/jasper/compiler/MappedCharDataGenerator.java
+tomcat/src/org/apache/jasper/compiler/Mark.java
+tomcat/src/org/apache/jasper/compiler/ParseEventListener.java
+tomcat/src/org/apache/jasper/compiler/ParseException.java
+tomcat/src/org/apache/jasper/compiler/Parser.java
+tomcat/src/org/apache/jasper/compiler/PluginGenerator.java
+tomcat/src/org/apache/jasper/compiler/ScriptletGenerator.java
+tomcat/src/org/apache/jasper/compiler/ServiceMethodPhase.java
+tomcat/src/org/apache/jasper/compiler/ServletWriter.java
+tomcat/src/org/apache/jasper/compiler/SetPropertyGenerator.java
+tomcat/src/org/apache/jasper/compiler/StaticInitializerPhase.java
+tomcat/src/org/apache/jasper/compiler/StoredCharDataGenerator.java
+tomcat/src/org/apache/jasper/compiler/SunJavaCompiler.java
+tomcat/src/org/apache/jasper/compiler/TagBeginGenerator.java
+tomcat/src/org/apache/jasper/compiler/TagCache.java
+tomcat/src/org/apache/jasper/compiler/TagEndGenerator.java
+tomcat/src/org/apache/jasper/compiler/TagGeneratorBase.java
+tomcat/src/org/apache/jasper/compiler/TagLibraries.java
+tomcat/src/org/apache/jasper/compiler/TagLibraryInfoImpl.java
+tomcat/src/org/apache/jasper/resources/messages.properties
+tomcat/src/org/apache/jasper/resources/messages_es.properties
+tomcat/src/org/apache/jasper/resources/messages_fr.properties
+tomcat/src/org/apache/jasper/resources/web-jsptaglib_1_1.dtd
+tomcat/src/org/apache/jasper/resources/web.dtd
+tomcat/src/org/apache/jasper/runtime/BodyContentImpl.java
+tomcat/src/org/apache/jasper/runtime/HttpJspBase.java
+tomcat/src/org/apache/jasper/runtime/JspFactoryImpl.java
+tomcat/src/org/apache/jasper/runtime/JspLoader.java
+tomcat/src/org/apache/jasper/runtime/JspRuntimeLibrary.java
+tomcat/src/org/apache/jasper/runtime/JspWriterImpl.java
+tomcat/src/org/apache/jasper/runtime/PageContextImpl.java
+tomcat/src/org/apache/jasper/servlet/JasperLoader.java
+tomcat/src/org/apache/jasper/servlet/JasperLoader12.java
+tomcat/src/org/apache/jasper/servlet/JspServlet.java
+tomcat/src/org/apache/jasper/servlet/ServletEngine.java
+tomcat/src/org/apache/jasper/servlet/TomcatServletEngine.java
+tomcat/src/org/apache/tomcat/adapter/AdapterHandler.java
+tomcat/src/org/apache/tomcat/adapter/HttpAdapter.java
 tomcat/src/org/apache/tomcat/context/AutoSetup.java
+tomcat/src/org/apache/tomcat/context/DefaultCMSetter.java
+tomcat/src/org/apache/tomcat/context/LoadOnStartupInterceptor.java
+tomcat/src/org/apache/tomcat/context/LoaderInterceptor.java
 tomcat/src/org/apache/tomcat/context/LogEvents.java
+tomcat/src/org/apache/tomcat/context/PolicyInterceptor.java
 tomcat/src/org/apache/tomcat/context/WebXmlReader.java
-tomcat/src/org/apache/tomcat/context/DefaultCMSetter.java
 tomcat/src/org/apache/tomcat/context/WorkDirInterceptor.java
-tomcat/src/org/apache/tomcat/context/PolicyInterceptor.java
-tomcat/src/org/apache/tomcat/context/LoaderInterceptor.java
-tomcat/src/org/apache/tomcat/protocol/WARManager.java
-tomcat/src/org/apache/tomcat/protocol/jar/Handler.java
-tomcat/src/org/apache/tomcat/protocol/war/Handler.java
-tomcat/src/org/apache/tomcat/protocol/WARConnection.java
-tomcat/src/org/apache/tomcat/core/RequestInterceptor.java
-tomcat/src/org/apache/tomcat/core/LocalStrings_es.properties
-tomcat/src/org/apache/tomcat/core/LocalStrings_se.properties
-tomcat/src/org/apache/tomcat/core/LocalStrings.properties
-tomcat/src/org/apache/tomcat/core/Context.java
-tomcat/src/org/apache/tomcat/core/Request.java
-tomcat/src/org/apache/tomcat/core/package.html
-tomcat/src/org/apache/tomcat/core/Handler.java
-tomcat/src/org/apache/tomcat/core/ContextManager.java
-tomcat/src/org/apache/tomcat/core/ServletWrapper.java
 tomcat/src/org/apache/tomcat/core/BaseInterceptor.java
-tomcat/src/org/apache/tomcat/core/ServerConnector.java
-tomcat/src/org/apache/tomcat/core/TomcatException.java
-tomcat/src/org/apache/tomcat/core/ResponseImpl.java
 tomcat/src/org/apache/tomcat/core/BufferedServletInputStream.java
+tomcat/src/org/apache/tomcat/core/BufferedServletOutputStream.java
 tomcat/src/org/apache/tomcat/core/Constants.java
 tomcat/src/org/apache/tomcat/core/Container.java
-tomcat/src/org/apache/tomcat/core/RequestImpl.java
+tomcat/src/org/apache/tomcat/core/Context.java
 tomcat/src/org/apache/tomcat/core/ContextInterceptor.java
-tomcat/src/org/apache/tomcat/core/BufferedServletOutputStream.java
+tomcat/src/org/apache/tomcat/core/ContextManager.java
 tomcat/src/org/apache/tomcat/core/FacadeManager.java
-tomcat/src/org/apache/tomcat/core/ServletLoader.java
+tomcat/src/org/apache/tomcat/core/Handler.java
+tomcat/src/org/apache/tomcat/core/LocalStrings.properties
+tomcat/src/org/apache/tomcat/core/LocalStrings_es.properties
+tomcat/src/org/apache/tomcat/core/LocalStrings_fr.properties
+tomcat/src/org/apache/tomcat/core/LocalStrings_se.properties
+tomcat/src/org/apache/tomcat/core/Request.java
+tomcat/src/org/apache/tomcat/core/RequestImpl.java
+tomcat/src/org/apache/tomcat/core/RequestInterceptor.java
 tomcat/src/org/apache/tomcat/core/Response.java
-tomcat/src/org/apache/tomcat/session/SessionSerializer.java
-tomcat/src/org/apache/tomcat/session/StandardSessionInterceptor.java
-tomcat/src/org/apache/tomcat/session/LocalStrings.properties
-tomcat/src/org/apache/tomcat/session/LocalStrings_es.properties
-tomcat/src/org/apache/tomcat/session/StandardSession.java
-tomcat/src/org/apache/tomcat/session/StandardManager.java
+tomcat/src/org/apache/tomcat/core/ResponseImpl.java
+tomcat/src/org/apache/tomcat/core/ServerConnector.java
+tomcat/src/org/apache/tomcat/core/ServletLoader.java
+tomcat/src/org/apache/tomcat/core/ServletWrapper.java
+tomcat/src/org/apache/tomcat/core/TomcatException.java
+tomcat/src/org/apache/tomcat/core/package.html
+tomcat/src/org/apache/tomcat/facade/HttpServletRequestFacade.java
+tomcat/src/org/apache/tomcat/facade/HttpServletResponseFacade.java
+tomcat/src/org/apache/tomcat/facade/HttpSessionFacade.java
+tomcat/src/org/apache/tomcat/facade/RequestDispatcherImpl.java
+tomcat/src/org/apache/tomcat/facade/RequestDispatcherImpl.java.orig
+tomcat/src/org/apache/tomcat/facade/ServletConfigImpl.java
+tomcat/src/org/apache/tomcat/facade/ServletContextFacade.java
+tomcat/src/org/apache/tomcat/facade/ServletInputStreamFacade.java
+tomcat/src/org/apache/tomcat/facade/ServletOutputStreamFacade.java
+tomcat/src/org/apache/tomcat/facade/ServletWriterFacade.java
+tomcat/src/org/apache/tomcat/facade/SessionContextImpl.java
+tomcat/src/org/apache/tomcat/facade/SimpleFacadeManager.java
+tomcat/src/org/apache/tomcat/facade/package.html
+tomcat/src/org/apache/tomcat/loader/AdaptiveClassLoader.java
+tomcat/src/org/apache/tomcat/loader/AdaptiveClassLoader12.java
+tomcat/src/org/apache/tomcat/loader/AdaptiveServletLoader.java
+tomcat/src/org/apache/tomcat/loader/ClassRepository.java
+tomcat/src/org/apache/tomcat/loader/SimpleFileFilter.java
+tomcat/src/org/apache/tomcat/logging/LogHelper.java
+tomcat/src/org/apache/tomcat/logging/Logger.java
+tomcat/src/org/apache/tomcat/logging/TomcatLogger.java
+tomcat/src/org/apache/tomcat/net/DefaultServerSocketFactory.java
+tomcat/src/org/apache/tomcat/net/SSLSocketFactory.java
+tomcat/src/org/apache/tomcat/net/ServerSocketFactory.java
+tomcat/src/org/apache/tomcat/protocol/WARConnection.java
+tomcat/src/org/apache/tomcat/protocol/WARManager.java
+tomcat/src/org/apache/tomcat/protocol/jar/Handler.java
+tomcat/src/org/apache/tomcat/protocol/war/Handler.java
+tomcat/src/org/apache/tomcat/request/AccessInterceptor.java
+tomcat/src/org/apache/tomcat/request/AccountingInterceptor.java
+tomcat/src/org/apache/tomcat/request/InvokerInterceptor.java
+tomcat/src/org/apache/tomcat/request/JDBCRealm.java
+tomcat/src/org/apache/tomcat/request/Jdk12Interceptor.java
+tomcat/src/org/apache/tomcat/request/JspInterceptor.java
+tomcat/src/org/apache/tomcat/request/LocalStrings.properties
+tomcat/src/org/apache/tomcat/request/SessionInterceptor.java
+tomcat/src/org/apache/tomcat/request/SimpleMapper1.java
+tomcat/src/org/apache/tomcat/request/SimpleRealm.java
+tomcat/src/org/apache/tomcat/request/StaticInterceptor.java
+tomcat/src/org/apache/tomcat/resources/LocalStrings.properties
+tomcat/src/org/apache/tomcat/resources/LocalStrings_en.properties
+tomcat/src/org/apache/tomcat/resources/LocalStrings_es.properties
+tomcat/src/org/apache/tomcat/resources/LocalStrings_fr.properties
+tomcat/src/org/apache/tomcat/resources/web.dtd
+tomcat/src/org/apache/tomcat/service/JNIEndpoint.java
 tomcat/src/org/apache/tomcat/service/JNIEndpointConnector.java
-tomcat/src/org/apache/tomcat/service/http/HttpRequestAdapter.java
-tomcat/src/org/apache/tomcat/service/http/HttpResponseAdapter.java
-tomcat/src/org/apache/tomcat/service/http/HttpConnectionHandler.java
-tomcat/src/org/apache/tomcat/service/http/package.html
+tomcat/src/org/apache/tomcat/service/LocalStrings.properties
+tomcat/src/org/apache/tomcat/service/LocalStrings_es.properties
+tomcat/src/org/apache/tomcat/service/LocalStrings_fr.properties
+tomcat/src/org/apache/tomcat/service/PoolTcpConnector.java
+tomcat/src/org/apache/tomcat/service/PoolTcpEndpoint.java
+tomcat/src/org/apache/tomcat/service/SimpleTcpConnector.java
+tomcat/src/org/apache/tomcat/service/SimpleTcpEndpoint.java
+tomcat/src/org/apache/tomcat/service/TcpConnection.java
+tomcat/src/org/apache/tomcat/service/TcpConnectionHandler.java
+tomcat/src/org/apache/tomcat/service/TcpEndpoint.java
+tomcat/src/org/apache/tomcat/service/TcpEndpointConnector.java
+tomcat/src/org/apache/tomcat/service/connector/Ajp12ConnectionHandler.java
+tomcat/src/org/apache/tomcat/service/connector/Ajp13ConnectionHandler.java
 tomcat/src/org/apache/tomcat/service/connector/Ajp13ConnectorRequest.java
 tomcat/src/org/apache/tomcat/service/connector/Ajp13ConnectorResponse.java
-tomcat/src/org/apache/tomcat/service/connector/Ajp13ConnectionHandler.java
-tomcat/src/org/apache/tomcat/service/connector/Ajp12ConnectionHandler.java
 tomcat/src/org/apache/tomcat/service/connector/JNIConnectionHandler.java
 tomcat/src/org/apache/tomcat/service/connector/MsgBuffer.java
-tomcat/src/org/apache/tomcat/service/connector/package.html
-tomcat/src/org/apache/tomcat/service/connector/TcpConnector.java
 tomcat/src/org/apache/tomcat/service/connector/MsgConnector.java
-tomcat/src/org/apache/tomcat/service/TcpEndpointConnector.java
-tomcat/src/org/apache/tomcat/service/TcpConnectionHandler.java
-tomcat/src/org/apache/tomcat/service/PoolTcpEndpoint.java
-tomcat/src/org/apache/tomcat/service/PoolTcpConnector.java
-tomcat/src/org/apache/tomcat/service/LocalStrings.properties
-tomcat/src/org/apache/tomcat/service/SimpleTcpEndpoint.java
-tomcat/src/org/apache/tomcat/service/LocalStrings_es.properties
-tomcat/src/org/apache/tomcat/service/TcpConnection.java
-tomcat/src/org/apache/tomcat/service/SimpleTcpConnector.java
-tomcat/src/org/apache/tomcat/service/TcpEndpoint.java
-tomcat/src/org/apache/tomcat/service/JNIEndpoint.java
+tomcat/src/org/apache/tomcat/service/connector/TcpConnector.java
+tomcat/src/org/apache/tomcat/service/connector/package.html
+tomcat/src/org/apache/tomcat/service/http/HttpConnectionHandler.java
+tomcat/src/org/apache/tomcat/service/http/HttpRequestAdapter.java
+tomcat/src/org/apache/tomcat/service/http/HttpResponseAdapter.java
+tomcat/src/org/apache/tomcat/service/http/package.html
 tomcat/src/org/apache/tomcat/service/package.html
-tomcat/src/org/apache/tomcat/loader/ClassRepository.java
-tomcat/src/org/apache/tomcat/loader/SimpleFileFilter.java
-tomcat/src/org/apache/tomcat/loader/AdaptiveServletLoader.java
-tomcat/src/org/apache/tomcat/loader/AdaptiveClassLoader12.java
-tomcat/src/org/apache/tomcat/loader/AdaptiveClassLoader.java
-tomcat/src/org/apache/tomcat/net/ServerSocketFactory.java
-tomcat/src/org/apache/tomcat/net/SSLSocketFactory.java
-tomcat/src/org/apache/tomcat/net/DefaultServerSocketFactory.java
-tomcat/src/org/apache/tomcat/resources/web.dtd
-tomcat/src/org/apache/tomcat/resources/LocalStrings.properties
-tomcat/src/org/apache/tomcat/resources/LocalStrings_en.properties
-tomcat/src/org/apache/tomcat/resources/LocalStrings_es.properties
+tomcat/src/org/apache/tomcat/session/LocalStrings.properties
+tomcat/src/org/apache/tomcat/session/LocalStrings_es.properties
+tomcat/src/org/apache/tomcat/session/SessionSerializer.java
+tomcat/src/org/apache/tomcat/session/StandardManager.java
+tomcat/src/org/apache/tomcat/session/StandardSession.java
+tomcat/src/org/apache/tomcat/session/StandardSessionInterceptor.java
+tomcat/src/org/apache/tomcat/startup/EmbededTomcat.java
+tomcat/src/org/apache/tomcat/startup/HostConfig.java
+tomcat/src/org/apache/tomcat/startup/Tomcat.java
+tomcat/src/org/apache/tomcat/task/ApacheConfig.java
 tomcat/src/org/apache/tomcat/task/Expand.java
 tomcat/src/org/apache/tomcat/task/GTest.java
+tomcat/src/org/apache/tomcat/task/IISConfig.java
 tomcat/src/org/apache/tomcat/task/NSConfig.java
 tomcat/src/org/apache/tomcat/task/StopTomcat.java
-tomcat/src/org/apache/tomcat/task/ApacheConfig.java
-tomcat/src/org/apache/tomcat/task/IISConfig.java
-tomcat/src/org/apache/tomcat/startup/Tomcat.java
-tomcat/src/org/apache/tomcat/startup/HostConfig.java
-tomcat/src/org/apache/tomcat/startup/EmbededTomcat.java
-tomcat/src/org/apache/tomcat/logging/LogHelper.java
-tomcat/src/org/apache/tomcat/logging/TomcatLogger.java
-tomcat/src/org/apache/tomcat/logging/Logger.java
-tomcat/src/org/apache/tomcat/adapter/HttpAdapter.java
-tomcat/src/org/apache/tomcat/adapter/AdapterHandler.java
-tomcat/src/org/apache/jasper/resources/messages.properties
-tomcat/src/org/apache/jasper/resources/messages_es.properties
-tomcat/src/org/apache/jasper/resources/web-jsptaglib_1_1.dtd
-tomcat/src/org/apache/jasper/resources/web.dtd
-tomcat/src/org/apache/jasper/servlet/TomcatServletEngine.java
-tomcat/src/org/apache/jasper/servlet/JspServlet.java
-tomcat/src/org/apache/jasper/servlet/ServletEngine.java
-tomcat/src/org/apache/jasper/servlet/JasperLoader12.java
-tomcat/src/org/apache/jasper/servlet/JasperLoader.java
-tomcat/src/org/apache/jasper/Constants.java
-tomcat/src/org/apache/jasper/EmbededServletOptions.java
-tomcat/src/org/apache/jasper/JspCompilationContext.java
-tomcat/src/org/apache/jasper/runtime/JspWriterImpl.java
-tomcat/src/org/apache/jasper/runtime/JspLoader.java
-tomcat/src/org/apache/jasper/runtime/HttpJspBase.java
-tomcat/src/org/apache/jasper/runtime/PageContextImpl.java
-tomcat/src/org/apache/jasper/runtime/JspRuntimeLibrary.java
-tomcat/src/org/apache/jasper/runtime/JspFactoryImpl.java
-tomcat/src/org/apache/jasper/runtime/BodyContentImpl.java
-tomcat/src/org/apache/jasper/compiler/TagLibraries.java
-tomcat/src/org/apache/jasper/compiler/JavaCompiler.java
-tomcat/src/org/apache/jasper/compiler/PluginGenerator.java
-tomcat/src/org/apache/jasper/compiler/ParseException.java
-tomcat/src/org/apache/jasper/compiler/ParseEventListener.java
-tomcat/src/org/apache/jasper/compiler/TagLibraryInfoImpl.java
-tomcat/src/org/apache/jasper/compiler/TagGeneratorBase.java
-tomcat/src/org/apache/jasper/compiler/TagEndGenerator.java
-tomcat/src/org/apache/jasper/compiler/BaseJspListener.java
-tomcat/src/org/apache/jasper/compiler/DumbParseEventListener.java
-tomcat/src/org/apache/jasper/compiler/SetPropertyGenerator.java
-tomcat/src/org/apache/jasper/compiler/GetPropertyGenerator.java
-tomcat/src/org/apache/jasper/compiler/DeclarationGenerator.java
-tomcat/src/org/apache/jasper/compiler/SunJavaCompiler.java
-tomcat/src/org/apache/jasper/compiler/FileDeclarationPhase.java
-tomcat/src/org/apache/jasper/compiler/TagBeginGenerator.java
-tomcat/src/org/apache/jasper/compiler/JakartaCommentGenerator.java
-tomcat/src/org/apache/jasper/compiler/JspParseEventListener.java
-tomcat/src/org/apache/jasper/compiler/EscapeUnicodeWriter.java
-tomcat/src/org/apache/jasper/compiler/Parser.java
-tomcat/src/org/apache/jasper/compiler/CoreElement.java
-tomcat/src/org/apache/jasper/compiler/TagCache.java
-tomcat/src/org/apache/jasper/compiler/Compiler.java
-tomcat/src/org/apache/jasper/compiler/JspCompiler.java
-tomcat/src/org/apache/jasper/compiler/Mangler.java
-tomcat/src/org/apache/jasper/compiler/JspUtil.java
-tomcat/src/org/apache/jasper/compiler/JikesJavaCompiler.java
-tomcat/src/org/apache/jasper/compiler/ClassDeclarationPhase.java
-tomcat/src/org/apache/jasper/compiler/JspReader.java
-tomcat/src/org/apache/jasper/compiler/Generator.java
-tomcat/src/org/apache/jasper/compiler/ClassName.java
-tomcat/src/org/apache/jasper/compiler/CharDataGenerator.java
-tomcat/src/org/apache/jasper/compiler/Mark.java
-tomcat/src/org/apache/jasper/compiler/StoredCharDataGenerator.java
-tomcat/src/org/apache/jasper/compiler/MappedCharDataGenerator.java
-tomcat/src/org/apache/jasper/compiler/BeanRepository.java
-tomcat/src/org/apache/jasper/compiler/DelegatingListener.java
-tomcat/src/org/apache/jasper/compiler/BeanEndGenerator.java
-tomcat/src/org/apache/jasper/compiler/ServiceMethodPhase.java
-tomcat/src/org/apache/jasper/compiler/DestroyMethodPhase.java
-tomcat/src/org/apache/jasper/compiler/ServletWriter.java
-tomcat/src/org/apache/jasper/compiler/GeneratorBase.java
-tomcat/src/org/apache/jasper/compiler/BeanGenerator.java
-tomcat/src/org/apache/jasper/compiler/ForwardGenerator.java
-tomcat/src/org/apache/jasper/compiler/CompileException.java
-tomcat/src/org/apache/jasper/compiler/CommentGenerator.java
-tomcat/src/org/apache/jasper/compiler/CommandLineCompiler.java
-tomcat/src/org/apache/jasper/compiler/StaticInitializerPhase.java
-tomcat/src/org/apache/jasper/compiler/IncludeGenerator.java
-tomcat/src/org/apache/jasper/compiler/InitMethodPhase.java
-tomcat/src/org/apache/jasper/compiler/InfoGenerator.java
-tomcat/src/org/apache/jasper/compiler/ExpressionGenerator.java
-tomcat/src/org/apache/jasper/compiler/ScriptletGenerator.java
-tomcat/src/org/apache/jasper/JasperException.java
-tomcat/src/org/apache/jasper/JspEngineContext.java
-tomcat/src/org/apache/jasper/JspC.java
-tomcat/src/org/apache/jasper/CommandLineContext.java
-tomcat/src/org/apache/jasper/Options.java
+tomcat/src/org/apache/tomcat/util/ArrayEnumerator.java
+tomcat/src/org/apache/tomcat/util/Ascii.java
+tomcat/src/org/apache/tomcat/util/BuffTool.java
+tomcat/src/org/apache/tomcat/util/BufferEvent.java
+tomcat/src/org/apache/tomcat/util/BufferListener.java
+tomcat/src/org/apache/tomcat/util/ByteBuffer.java
+tomcat/src/org/apache/tomcat/util/CookieTools.java
+tomcat/src/org/apache/tomcat/util/DateTool.java
+tomcat/src/org/apache/tomcat/util/DevNullOutputStream.java
+tomcat/src/org/apache/tomcat/util/EmptyEnumeration.java
+tomcat/src/org/apache/tomcat/util/FileUtil.java
+tomcat/src/org/apache/tomcat/util/HexUtils.java
+tomcat/src/org/apache/tomcat/util/LocalStrings.properties
+tomcat/src/org/apache/tomcat/util/LocalStrings_es.properties
+tomcat/src/org/apache/tomcat/util/LocalStrings_fr.properties
+tomcat/src/org/apache/tomcat/util/LocaleToCharsetMap.java
+tomcat/src/org/apache/tomcat/util/MessageBytes.java
+tomcat/src/org/apache/tomcat/util/MessageChars.java
+tomcat/src/org/apache/tomcat/util/MessageString.java
+tomcat/src/org/apache/tomcat/util/MimeHeaderField.java
+tomcat/src/org/apache/tomcat/util/MimeHeaders.java
+tomcat/src/org/apache/tomcat/util/MimeMap.java
+tomcat/src/org/apache/tomcat/util/PrefixMapper.java
+tomcat/src/org/apache/tomcat/util/Queue.java
+tomcat/src/org/apache/tomcat/util/Reaper.java
+tomcat/src/org/apache/tomcat/util/RecycleBufferedInputStream.java
+tomcat/src/org/apache/tomcat/util/RequestUtil.java
+tomcat/src/org/apache/tomcat/util/SecurityTools.java
+tomcat/src/org/apache/tomcat/util/SessionIdGenerator.java
+tomcat/src/org/apache/tomcat/util/SessionUtil.java
+tomcat/src/org/apache/tomcat/util/SimpleHashtable.java
+tomcat/src/org/apache/tomcat/util/SimplePool.java
+tomcat/src/org/apache/tomcat/util/SimplePrincipal.java
+tomcat/src/org/apache/tomcat/util/StringManager.java
+tomcat/src/org/apache/tomcat/util/ThreadPool.java
+tomcat/src/org/apache/tomcat/util/ThreadPoolRunnable.java
+tomcat/src/org/apache/tomcat/util/URLUtil.java
+tomcat/src/org/apache/tomcat/util/WARUtil.java
+tomcat/src/org/apache/tomcat/util/compat/Action.java
+tomcat/src/org/apache/tomcat/util/compat/Jdk11Compat.java
+tomcat/src/org/apache/tomcat/util/compat/Jdk12Support.java
+tomcat/src/org/apache/tomcat/util/compat/SimpleClassLoader.java
+tomcat/src/org/apache/tomcat/util/package.html
+tomcat/src/org/apache/tomcat/util/pattern/Implication.java
+tomcat/src/org/apache/tomcat/util/pattern/ImplicationTable.java
+tomcat/src/org/apache/tomcat/util/pattern/PatternMatcher.java
+tomcat/src/org/apache/tomcat/util/pattern/URLPatternMatcher.java
+tomcat/src/org/apache/tomcat/util/pattern/WildcardPattern.java
+tomcat/src/org/apache/tomcat/util/xml/PathMatch.java
+tomcat/src/org/apache/tomcat/util/xml/SaxContext.java
+tomcat/src/org/apache/tomcat/util/xml/XmlAction.java
+tomcat/src/org/apache/tomcat/util/xml/XmlMapper.java
+tomcat/src/org/apache/tomcat/util/xml/XmlMatch.java
+tomcat/webapps/ROOT.war
+tomcat/webapps/admin.war
+tomcat/webapps/examples.war
+tomcat/webapps/test.war
 @comment must explicitly remove webapp working files, but not any user files in webapps
 @unexec rm -rf tomcat/webapps/ROOT
 @unexec rm -rf tomcat/webapps/admin
@@ -356,6 +378,7 @@ tomcat/src/org/apache/jasper/Options.java
 @unexec rm -f /usr/pkg/tomcat/conf/uriworkermap.properties-auto
 @dirrm tomcat/src/org/apache/tomcat/util/xml
 @dirrm tomcat/src/org/apache/tomcat/util/pattern
+@dirrm tomcat/src/org/apache/tomcat/util/compat
 @dirrm tomcat/src/org/apache/tomcat/util
 @dirrm tomcat/src/org/apache/tomcat/task
 @dirrm tomcat/src/org/apache/tomcat/startup