Update jakarta-tomcat to version 3.2.1.

Changes in the package since version 3.1.1 (the last pkgsrc version):
=====================================================================

  * tomcat is now always installed under ${PREFIX}/tomcat.  Making
    ${TOMCAT_HOME} configurable added much complexity for not real
    gain.

    It had been my intention to aim for a hier(7) like install for
    tomcat with this version, but at this point there are way to many
    hard-coded relative paths (relative to tomcat.home) in tomcat,
    and in addition, all of the (quite good, really) documentation
    assumes the standard install paths.

    Note that the previous default value of ${TOMCAT_HOME} was
    ${PREFIX}/jakarta/tomcat.

  * an rc.subr compatible (but not requiring) startup script is now installed
    as ${PREFIX}/etc/rc.d/tomcat.

  * if Sun's JSSE (Java Secure Socket Extensions) is in ${CLASSPATH} when
    the pkg is built, tomcat will be built with support for SSL in the
    standalone server mode.  This soft dependency will be replaced by a
    hard dependency as soon as I get a chance to import a JSSE package
    (soon).

  * likewise, I will import an ap-jk package for the new apache connector
    (mod_jk) soon.  ap-jserv continues to be usable for this purpose.

Changes in tomcat itself since version 3.1.1:
=============================================

New in tomcat-3.2.1:
--------------------
Tomcat 3.2.1 is a maintenance and bug fix release, based on the Tomcat 3.2
(final) code base.  The following changes are included:

- Disallowed requesting JSP pages under the WEB-INF directory
  (/WEB-INF/dummy.jsp).  Previously, only requests for static files
  were being disallowed.

- The JDBCRealm request interceptor will now log the description of any
  JDBC exception that occurs, to aid in debugging.

SECURITY VULNERABILITIES FIXED IN TOMCAT 3.2.1
(note that these fixes were also made to the tomcat-3.1 branch in tomcat 3.1.1)

Protection of Resources in /WEB-INF and /META-INF Directories

The servlet specification prohibits servlet containers from serving resources
in the /WEB-INF and /META-INF directories of a web application archive directly
to clients.  In Tomcat 3.2, this means that URLs like:

   http://localhost:8080/examples/WEB-INF/web.xml

will return an error message, rather than the contents of your deployment
descriptor.  However, there is a vulnerability in Tomcat 3.2 that exposes
this information if the client requests a URL like this instead:

       http://localhost:8080/examples//WEB-INF/web.xml

(note the double slash before "WEB-INF").  This vulnerability has been
corrected in Tomcat 3.2.1.

Show Source Vulnerability

The example application delivered with Tomcat 3.2 included a mechanism to
display the source code for the JSP page examples.  This mechanism could
be used to bypass the restrictions on displaying sensitive information in
the WEB-INF and META-INF directories.  This vulnerability has been removed.

New in tomcat-3.2:
------------------
Tomcat 3.2 is mainly a performance tune-up release, although a few new
features have been added.

- Support for mod_jk, which is a replacement to the elderly mod_jserv, has
  had several bugs fixed and has received much more testing.  It is now
  recommended that all users use mod_jk instead of mod_jserv.

- Support JAXP-based XML parser independence.

- New and often requested "how-to" documents covering the following topics:
     - Configuring workers.properties
     - IIS and Netscape configuration
     - Running tomcat inside an IIS or Netscape process
     - Running Tomcat as a Windows NT service
     - Configuring a JDBC realm
     - Configuring mod_jk

- First round of policy-based security support intended for running untrusted
  code inside of Tomcat.  Interested users should test this support and post
  feedback to the Tomcat users mailing list.

- SSL support for standalone Tomcat. (Preliminary support first appeared in
  3.1, but the support in 3.2 has received more testing and documentation
  support).

- Thread reuse is now enabled by default. The thread pool support code was part
  of 3.1, but not enabled since it was new.

- Support for plug-able session managers.  Unfortunately, no how-to documents
  that support this functionality exist (yet). For the adventurous, be aware
  that the interface that allows administrators to plug session managers is
  the normal Interceptor interface.

- An almost total rewrite of the HTTP request handling now results in improved
  performance when running Tomcat stand-alone.

- Significantly reduced garbage collection.

- The code underwent a refactoring effort resulting in improved readability.

- And of course, hundreds of miscellaneous improvements and fixes.

11 files changed, 631 insertions, 528 deletions

diff --git a/www/jakarta-tomcat/Makefile b/www/jakarta-tomcat/Makefile
index 4b8ce7bc592..7d8f4099e38 100644
--- a/www/jakarta-tomcat/Makefile
+++ b/www/jakarta-tomcat/Makefile
@@ -1,45 +1,42 @@
-# $NetBSD: Makefile,v 1.14 2001/02/25 04:18:23 hubertf Exp $
+# $NetBSD: Makefile,v 1.15 2001/03/28 02:46:07 jwise Exp $
 
-DISTNAME=	jakarta-tomcat.src
-PKGNAME=	jakarta-tomcat-3.1.1
+DISTNAME=	${PKGNAME}-src
+PKGNAME=	jakarta-tomcat-3.2.1
 CATEGORIES=	www
-MASTER_SITES=	http://jakarta.apache.org/builds/tomcat/release/v3.1.1/src/
-DISTFILES=	jakarta-tomcat-3.1.1-src.tar.gz jakarta-tools.tar.gz jakarta-ant.tar.gz
+MASTER_SITES=	http://jakarta.apache.org/builds/tomcat/release/v3.2.1/src/
 
 MAINTAINER=	jwise@netbsd.org
 HOMEPAGE=	http://jakarta.apache.org/
 COMMENT=	the Apache Project's Java Servlet 2.2 and JSP 1.1 server
 
-DIST_SUBDIR=	jakarta-3.1.1
+DEPENDS+=	jakarta-servletapi:../../www/jakarta-servletapi
 
 USE_JAVA=	yes
+WRKSRC=		${WRKDIR}/${DISTNAME}
 
-WRKSRC=		${WRKDIR}/jakarta-tomcat-3.1.1-src
+CLASSPATH:=	${LOCALBASE}/lib/java/servlet.jar:${LOCALBASE}/lib/jaxp.jar:${LOCALBASE}/lib/parser.jar:${CLASSPATH}
+MAKEFILE=	build.xml
+MAKE_FLAGS+=	-Dpkgsrc.prefix=${PREFIX}
+MAKE_ENV+=	JAVA_HOME=${JAVA_HOME} CLASSPATH=${CLASSPATH}
+ALL_TARGET=	main
+INSTALL_TARGET=	dist
 
-JAKARTA_HOME=	${PREFIX}/jakarta
-MAKE_ENV+=	JAVA_HOME=${JAVA_HOME}
+DEINSTALL_FILE=		${PKGDIR}/DEINSTALL
+INSTALL_FILE=		${WRKDIR}/INSTALL
 
-MESSAGE_SUBST+=	TOMCAT_HOME=${JAKARTA_HOME}
+post-build:
+	${SED}	-e "s|@PREFIX@|${PREFIX}|g"				\
+		${FILESDIR}/tomcat.sh > ${WRKDIR}/tomcat.sh
 
-post-patch:
-	${SED} -e s,@JAKARTA_HOME@,${JAKARTA_HOME},g \
-		< ${WRKSRC}/build.xml > ${WRKSRC}/build.tmp
-	${MV} ${WRKSRC}/build.tmp ${WRKSRC}/build.xml
-	${SED} -e s,@LOCALBASE@,${LOCALBASE},g \
-		< ${WRKSRC}/src/share/org/apache/tomcat/task/ApacheConfig.java \
-		> ${WRKSRC}/src/share/org/apache/tomcat/task/ApacheConfig.java.tmp
-	${MV} ${WRKSRC}/src/share/org/apache/tomcat/task/ApacheConfig.java.tmp \
-		${WRKSRC}/src/share/org/apache/tomcat/task/ApacheConfig.java
+pre-install:
+	${SED}	-e "s|@CAT@|${CAT}|g"					\
+		-e "s|@CHMOD@|${CHMOD}|g"				\
+		-e "s|@CP@|${CP}|g"					\
+		${PKGDIR}/INSTALL > ${INSTALL_FILE}
 
-do-build:
-	cd ${WRKSRC}/../jakarta-ant && ${SH} bootstrap.sh
-	cd ${WRKSRC} && ${SH} ./build.sh
-
-do-install:
-	${INSTALL_DATA_DIR} ${JAKARTA_HOME}/tomcat
-	cd ${WRKSRC} && ${SH} ./build.sh dist
-	${CHMOD} +x ${JAKARTA_HOME}/tomcat/bin/*.sh
-	${RM} ${JAKARTA_HOME}/tomcat/bin/*.bat
-	${RM} ${JAKARTA_HOME}/tomcat/bin/tomcat.sh.orig
+post-install:
+	${INSTALL_SCRIPT} ${WRKDIR}/tomcat.sh ${PREFIX}/etc/rc.d/tomcat
+	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../mk/bsd.pkg.mk"
+MAKE_PROGRAM=	${LOCALBASE}/bin/ant
diff --git a/www/jakarta-tomcat/files/md5 b/www/jakarta-tomcat/files/md5
index 24ac8ea15bf..1d2ca79f529 100644
--- a/www/jakarta-tomcat/files/md5
+++ b/www/jakarta-tomcat/files/md5
@@ -1,5 +1,3 @@
-$NetBSD: md5,v 1.4 2000/12/13 03:49:30 jwise Exp $
+$NetBSD: md5,v 1.5 2001/03/28 02:46:08 jwise Exp $
 
-MD5 (jakarta-3.1.1/jakarta-tomcat-3.1.1-src.tar.gz) = 1c1091acc6fc3116d0ffbc5d8bac34de
-MD5 (jakarta-3.1.1/jakarta-tools.tar.gz) = c9a7d3860b862e8b66200d2cc573ba0b
-MD5 (jakarta-3.1.1/jakarta-ant.tar.gz) = f3c6f2df40562b36eed067a8b6580526
+SHA1 (jakarta-tomcat-3.2.1-src.tar.gz) = c28d97378dcc1c9a15d15cae404733674ae91c9c
diff --git a/www/jakarta-tomcat/files/patch-sum b/www/jakarta-tomcat/files/patch-sum
index 4744ece12fb..0b5c29db470 100644
--- a/www/jakarta-tomcat/files/patch-sum
+++ b/www/jakarta-tomcat/files/patch-sum
@@ -1,5 +1,3 @@
-$NetBSD: patch-sum,v 1.5 2000/12/13 03:49:30 jwise Exp $
+$NetBSD: patch-sum,v 1.6 2001/03/28 02:46:08 jwise Exp $
 
-MD5 (patch-aa) = 8965bfb0403833d22e92c963ebb78674
-MD5 (patch-ab) = c53b218d07d676bd8a5a8b351f5467c1
-MD5 (patch-ac) = 4dc7fd9b8fe64cd3726ae64b0fc32411
+SHA1 (patch-aa) = 2e81b9a95672822158825e25b6ed5207a88456b9
diff --git a/www/jakarta-tomcat/files/tomcat.sh b/www/jakarta-tomcat/files/tomcat.sh
new file mode 100644
index 00000000000..edd74dd4dd1
--- /dev/null
+++ b/www/jakarta-tomcat/files/tomcat.sh
@@ -0,0 +1,44 @@
+#! /bin/sh
+#
+# $NetBSD: tomcat.sh,v 1.1 2001/03/28 02:46:08 jwise Exp $
+#
+# PROVIDE: tomcat
+# REQUIRE: DAEMON
+
+PREFIX=@PREFIX@
+
+if [ -z "${JAVA_HOME}" ]
+then
+	JAVA_HOME=${PREFIX}/java
+	export JAVA_HOME
+fi
+
+CLASSPATH=${PREFIX}/lib/java/servlet.jar:${PREFIX}/lib/java/jaxp.jar:${PREFIX}/lib/java/parser.jar:${CLASSPATH}
+export CLASSPATH
+
+name="tomcat"
+command="${PREFIX}/tomcat/bin/tomcat.sh"
+
+cmd=${1:-start}
+
+if [ -x ${command} ]
+then
+	case ${cmd} in
+	start|stop)
+		echo "Starting ${name}."
+		(cd ${PREFIX}/tomcat && ${command} ${cmd})
+		;;
+
+	restart)
+		( $0 stop )
+		sleep 5
+		$0 start
+		;;
+
+	*)
+		echo 1>&2 "Usage: $0 [restart|start|stop]"
+		exit 1
+		;;
+	esac
+fi
+exit 0
diff --git a/www/jakarta-tomcat/patches/patch-aa b/www/jakarta-tomcat/patches/patch-aa
index a86be3ed5f5..26a9d1c0167 100644
--- a/www/jakarta-tomcat/patches/patch-aa
+++ b/www/jakarta-tomcat/patches/patch-aa
@@ -1,12 +1,87 @@
-$NetBSD: patch-aa,v 1.4 2000/12/13 03:49:30 jwise Exp $
---- build.xml.orig	Tue Dec 12 14:50:46 2000
-+++ build.xml	Tue Dec 12 18:53:17 2000
-@@ -6,7 +6,7 @@
-     <property name="ant.home" value="../jakarta-ant" />
-     <property name="build.compiler" value="classic"/>
-     <property name="tomcat.build" value="../build/tomcat"/>
--    <property name="tomcat.home" value="../dist/tomcat"/>
-+    <property name="tomcat.home" value="@JAKARTA_HOME@/tomcat"/>
-   </target>
- 
-   <!-- ==================== Copy static files ==================== -->
+$NetBSD: patch-aa,v 1.5 2001/03/28 02:46:08 jwise Exp $
+--- build.xml.orig	Tue Dec 12 14:51:36 2000
++++ build.xml	Tue Mar 27 17:17:22 2001
+@@ -6,11 +6,11 @@
+   <property name="build.compiler" value="classic"/>
+   <property name="debug" value="on"/>
+   <property name="j2ee.home" value="../../j2ee/build/unix"/>
+-  <property name="jaxp" value="../jaxp-1.0.1" />
++  <property name="jaxp" value="${pkgsrc.prefix}/lib/java" />
+   <property name="optimize" value="true" />
+-  <property name="servlet.jar" value="../jakarta-servletapi/lib/servlet.jar"/>
++  <property name="servlet.jar" value="${pkgsrc.prefix}/lib/java/servlet.jar"/>
+   <property name="tomcat.build" value="../build/tomcat"/>
+-  <property name="tomcat.dist" value="../dist/tomcat"/>
++  <property name="tomcat.dist" value="${pkgsrc.prefix}/tomcat"/>
+ 
+ 
+   <!-- ======================== Copy static files ========================= -->
+@@ -31,14 +31,19 @@
+ 
+     <!-- Copy executables and scripts -->
+     <copy todir="${tomcat.build}/bin">
+-      <fileset dir="${ant.home}/bin" includes="ant*"/>
+-      <fileset dir="src/shell"/>
++      <!-- <fileset dir="${ant.home}/bin" includes="ant*"/> -->
++      <fileset dir="src/shell" excludes="*.bat"/>
+     </copy>
+ 
+     <!-- 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"/>
++      <mapper type="glob" from="*" to="*.default"/>
++    </move>
+     <copy tofile="${tomcat.build}/conf/build.xml"
+             file="build.xml"/>
+ 
+@@ -49,14 +54,14 @@
+     <copy tofile="${tomcat.build}/LICENSE" file="LICENSE"/>
+ 
+     <!-- Copy library JAR files -->
+-    <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 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 golden files for the tests webapp -->
+     <copy todir="${tomcat.build}/lib/test/Golden">
+@@ -65,9 +70,9 @@
+ 
+     <!-- 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"/> -->
+     <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"/>
+@@ -202,8 +207,8 @@
+     </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/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-ab b/www/jakarta-tomcat/patches/patch-ab
deleted file mode 100644
index 078beb171d8..00000000000
--- a/www/jakarta-tomcat/patches/patch-ab
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2001/02/28 10:26:03 wiz Exp $
---- src/share/org/apache/tomcat/task/ApacheConfig.java.orig	Tue Dec 12 14:51:28 2000
-+++ src/share/org/apache/tomcat/task/ApacheConfig.java	Tue Dec 12 18:58:28 2000
-@@ -97,7 +97,7 @@
- 	    } else {
- 		// XXX XXX change it to mod_jserv_${os.name}.so, put all so in tomcat
- 		// home
--		pw.println("LoadModule jserv_module libexec/mod_jserv.so");
-+		pw.println("LoadModule jserv_module @LOCALBASE@/lib/httpd/mod_jserv.so");
- 	    }
- 
- 	    pw.println("ApJServManual on");
-@@ -105,13 +105,15 @@
- 	    pw.println("ApJServSecretKey DISABLED");
- 	    pw.println("ApJServMountCopy on");
- 	    pw.println("ApJServLogLevel notice");
-+	    pw.println("ApJServLogFile /var/log/httpd/jserv/mod_jserv.log");
-+
- 	    pw.println();
- 	    
- 	    // XXX read it from ContextManager
- 	    pw.println("ApJServDefaultPort 8007");
- 
- 	    pw.println();
--	    pw.println("AddType test/jsp .jsp");
-+	    pw.println("AddType text/jsp .jsp");
- 	    pw.println("AddHandler jserv-servlet .jsp");
- 
- 	    
diff --git a/www/jakarta-tomcat/patches/patch-ac b/www/jakarta-tomcat/patches/patch-ac
deleted file mode 100644
index 0ca1a35e9ef..00000000000
--- a/www/jakarta-tomcat/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2000/09/03 13:38:50 wiz Exp $
---- src/shell/tomcat.sh.orig	Wed May 31 15:43:29 2000
-+++ src/shell/tomcat.sh	Wed May 31 15:43:58 2000
-@@ -107,7 +107,8 @@
- fi
- 
- if [ "$oldCP" != "" ]; then
--    CLASSPATH=${CLASSPATH}:${oldCP}
-+#    CLASSPATH=${CLASSPATH}:${oldCP}
-+    CLASSPATH=${oldCP}:${CLASSPATH}
- fi
- 
- export CLASSPATH
diff --git a/www/jakarta-tomcat/pkg/DEINSTALL b/www/jakarta-tomcat/pkg/DEINSTALL
new file mode 100644
index 00000000000..763b7359fc4
--- /dev/null
+++ b/www/jakarta-tomcat/pkg/DEINSTALL
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# $NetBSD: DEINSTALL,v 1.1 2001/03/28 02:46:09 jwise Exp $
+#
+
+PKGNAME=$1
+STAGE=$2
+
+case ${STAGE} in
+DEINSTALL)
+	;;
+POST-DEINSTALL)
+	cat << EOF
+===========================================================================
+The configuration and log files for ${PKGNAME} have not been
+removed.  If you will not be using ${PKGNAME} any longer, you
+may wish to completely remove the ${PKG_PREFIX}/tomcat directory.
+===========================================================================
+EOF
+	;;
+*)
+	echo "Unexpected argument: $2"
+	exit 1
+	;;
+esac
+exit 0
diff --git a/www/jakarta-tomcat/pkg/INSTALL b/www/jakarta-tomcat/pkg/INSTALL
new file mode 100644
index 00000000000..1fe8a07713b
--- /dev/null
+++ b/www/jakarta-tomcat/pkg/INSTALL
@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+# $NetBSD: INSTALL,v 1.1 2001/03/28 02:46:09 jwise Exp $
+
+PKGNAME=$1
+STAGE=$2
+
+CHMOD="@CHMOD@"
+CP="@CP@"
+
+SERVERROOT=${PKG_PREFIX}/tomcat/conf
+SAMPLECONFDIR=${SERVERROOT}
+CONFDIR=${SERVERROOT}
+CONFFILES="server.xml web.xml tomcat-users.xml jni_server.xml tomcat.policy"
+
+case ${STAGE} in
+PRE-INSTALL)
+	;;
+
+POST-INSTALL)
+	echo "Installing configuration files:"
+	for file in ${CONFFILES}
+	do
+		FILE=${CONFDIR}/${file}
+		SAMPLEFILE=${SAMPLECONFDIR}/${file}.default
+		if [ -f ${FILE} ]
+		then
+			echo "    ${FILE} already exists"
+		else
+			echo "    ${FILE}"
+			${CP} ${SAMPLEFILE} ${FILE}
+			${CHMOD} 644 ${FILE}
+		fi
+	done
+	;;
+
+*)
+	echo "Unexpected argument: ${STAGE}"
+	exit 1
+	;;
+esac
+exit 0
diff --git a/www/jakarta-tomcat/pkg/MESSAGE b/www/jakarta-tomcat/pkg/MESSAGE
index 0467bd3d91f..12e6cca7905 100644
--- a/www/jakarta-tomcat/pkg/MESSAGE
+++ b/www/jakarta-tomcat/pkg/MESSAGE
@@ -1,15 +1,15 @@
 ======================================================================
-$NetBSD: MESSAGE,v 1.5 2001/01/29 11:34:46 wiz Exp $
+$NetBSD: MESSAGE,v 1.6 2001/03/28 02:46:09 jwise Exp $
 
 For detailed instructions on how to run Tomcat, either as a
 standalone server or in conjunction with Apache (using the
 www/ap-jserv package), see:
 
-	${TOMCAT_HOME}/doc/uguide/tomcat_ug.html
+	${PREFIX}/tomcat/doc/uguide/tomcat_ug.html
 
 For more information on application development with Tomcat, see
 
-	${TOMCAT_HOME}/doc/appdev/index.html
+	${PREFIX}/tomcat/doc/appdev/index.html
 
 Note also that in order for Tomcat to start up, ${JAVA_HOME}
 must point to your JVM installation.
diff --git a/www/jakarta-tomcat/pkg/PLIST b/www/jakarta-tomcat/pkg/PLIST
index ca2d1afec98..b5950768cc4 100644
--- a/www/jakarta-tomcat/pkg/PLIST
+++ b/www/jakarta-tomcat/pkg/PLIST
@@ -1,434 +1,399 @@
-@comment $NetBSD: PLIST,v 1.6 2001/03/06 13:33:41 abs Exp $
-jakarta/tomcat/LICENSE
-jakarta/tomcat/bin/ant
-jakarta/tomcat/bin/antRun
-jakarta/tomcat/bin/jspc.sh
-jakarta/tomcat/bin/shutdown.sh
-jakarta/tomcat/bin/startup.sh
-jakarta/tomcat/bin/tomcat.sh
-jakarta/tomcat/conf/build.xml
-jakarta/tomcat/conf/jni_server.xml
-jakarta/tomcat/conf/jni_workers.properties
-jakarta/tomcat/conf/manifest.servlet
-jakarta/tomcat/conf/obj.conf
-jakarta/tomcat/conf/server.dtd
-jakarta/tomcat/conf/server.xml
-jakarta/tomcat/conf/test-tomcat.xml
-jakarta/tomcat/conf/tomcat-users.xml
-jakarta/tomcat/conf/tomcat.conf
-jakarta/tomcat/conf/tomcat.properties
-jakarta/tomcat/conf/uriworkermap.properties
-jakarta/tomcat/conf/web.dtd
-jakarta/tomcat/conf/web.xml
-jakarta/tomcat/conf/workers.properties
-jakarta/tomcat/doc/appdev/build.xml.txt
-jakarta/tomcat/doc/appdev/contents.html
-jakarta/tomcat/doc/appdev/deployment.html
-jakarta/tomcat/doc/appdev/footer.html
-jakarta/tomcat/doc/appdev/header.html
-jakarta/tomcat/doc/appdev/index.html
-jakarta/tomcat/doc/appdev/installation.html
-jakarta/tomcat/doc/appdev/introduction.html
-jakarta/tomcat/doc/appdev/processes.html
-jakarta/tomcat/doc/appdev/sample/build
-jakarta/tomcat/doc/appdev/sample/build.bat
-jakarta/tomcat/doc/appdev/sample/build.xml
-jakarta/tomcat/doc/appdev/sample/etc/web.xml
-jakarta/tomcat/doc/appdev/sample/src/Hello.java
-jakarta/tomcat/doc/appdev/sample/web/hello.jsp
-jakarta/tomcat/doc/appdev/sample/web/images/tomcat.gif
-jakarta/tomcat/doc/appdev/sample/web/index.html
-jakarta/tomcat/doc/appdev/source.html
-jakarta/tomcat/doc/appdev/tomcat.gif
-jakarta/tomcat/doc/appdev/web.xml.txt
-jakarta/tomcat/doc/faq
-jakarta/tomcat/doc/readme
-jakarta/tomcat/doc/uguide/images/banner.gif
-jakarta/tomcat/doc/uguide/style.css
-jakarta/tomcat/doc/uguide/tomcat_ug.html
-jakarta/tomcat/lib/ant.jar
-jakarta/tomcat/lib/jasper.jar
-jakarta/tomcat/lib/servlet.jar
-jakarta/tomcat/lib/test/Golden/Err.txt
-jakarta/tomcat/lib/test/Golden/ForwardWithQuery.txt
-jakarta/tomcat/lib/test/Golden/HelloWorld.txt
-jakarta/tomcat/lib/test/Golden/Include.txt
-jakarta/tomcat/lib/test/Golden/IncludeFile.txt
-jakarta/tomcat/lib/test/Golden/Mismatch1.txt
-jakarta/tomcat/lib/test/Golden/Mismatch2.txt
-jakarta/tomcat/lib/test/Golden/MustFail.txt
-jakarta/tomcat/lib/test/Golden/PrintWriterTest.txt
-jakarta/tomcat/lib/test/Golden/ServletParam.txt
-jakarta/tomcat/lib/test/Golden/SimpleForward.txt
-jakarta/tomcat/lib/test/Golden/SimpleInclude.txt
-jakarta/tomcat/lib/test/Golden/beanSer.txt
-jakarta/tomcat/lib/test/Golden/beanTest.txt
-jakarta/tomcat/lib/test/Golden/buffer.txt
-jakarta/tomcat/lib/test/Golden/classTest.txt
-jakarta/tomcat/lib/test/Golden/image1.gif
-jakarta/tomcat/lib/test/Golden/implicitConfig.txt
-jakarta/tomcat/lib/test/Golden/implicitContext.txt
-jakarta/tomcat/lib/test/Golden/implicitException.txt
-jakarta/tomcat/lib/test/Golden/implicitOut.txt
-jakarta/tomcat/lib/test/Golden/implicitPage.txt
-jakarta/tomcat/lib/test/Golden/implicitPageContext.txt
-jakarta/tomcat/lib/test/Golden/implicitRequest.txt
-jakarta/tomcat/lib/test/Golden/implicitResponse.txt
-jakarta/tomcat/lib/test/Golden/implicitSession.txt
-jakarta/tomcat/lib/test/Golden/import.txt
-jakarta/tomcat/lib/test/Golden/index.txt
-jakarta/tomcat/lib/test/Golden/jsptoservlet.txt
-jakarta/tomcat/lib/test/Golden/pageImport.txt
-jakarta/tomcat/lib/test/Golden/parse.txt
-jakarta/tomcat/lib/test/Golden/servletParam1.txt
-jakarta/tomcat/lib/test/Golden/servletParam2.txt
-jakarta/tomcat/lib/test/Golden/welcome.txt
-jakarta/tomcat/lib/webserver.jar
-jakarta/tomcat/lib/xml.jar
-jakarta/tomcat/src/javax/servlet/GenericServlet.java
-jakarta/tomcat/src/javax/servlet/LocalStrings.properties
-jakarta/tomcat/src/javax/servlet/RequestDispatcher.java
-jakarta/tomcat/src/javax/servlet/Servlet.java
-jakarta/tomcat/src/javax/servlet/ServletConfig.java
-jakarta/tomcat/src/javax/servlet/ServletContext.java
-jakarta/tomcat/src/javax/servlet/ServletException.java
-jakarta/tomcat/src/javax/servlet/ServletInputStream.java
-jakarta/tomcat/src/javax/servlet/ServletOutputStream.java
-jakarta/tomcat/src/javax/servlet/ServletRequest.java
-jakarta/tomcat/src/javax/servlet/ServletResponse.java
-jakarta/tomcat/src/javax/servlet/SingleThreadModel.java
-jakarta/tomcat/src/javax/servlet/UnavailableException.java
-jakarta/tomcat/src/javax/servlet/http/Cookie.java
-jakarta/tomcat/src/javax/servlet/http/HttpServlet.java
-jakarta/tomcat/src/javax/servlet/http/HttpServletRequest.java
-jakarta/tomcat/src/javax/servlet/http/HttpServletResponse.java
-jakarta/tomcat/src/javax/servlet/http/HttpSession.java
-jakarta/tomcat/src/javax/servlet/http/HttpSessionBindingEvent.java
-jakarta/tomcat/src/javax/servlet/http/HttpSessionBindingListener.java
-jakarta/tomcat/src/javax/servlet/http/HttpSessionContext.java
-jakarta/tomcat/src/javax/servlet/http/HttpUtils.java
-jakarta/tomcat/src/javax/servlet/http/LocalStrings.properties
-jakarta/tomcat/src/javax/servlet/http/LocalStrings_es.properties
-jakarta/tomcat/src/javax/servlet/jsp/HttpJspPage.java
-jakarta/tomcat/src/javax/servlet/jsp/JspEngineInfo.java
-jakarta/tomcat/src/javax/servlet/jsp/JspException.java
-jakarta/tomcat/src/javax/servlet/jsp/JspFactory.java
-jakarta/tomcat/src/javax/servlet/jsp/JspPage.java
-jakarta/tomcat/src/javax/servlet/jsp/JspTagException.java
-jakarta/tomcat/src/javax/servlet/jsp/JspWriter.java
-jakarta/tomcat/src/javax/servlet/jsp/PageContext.java
-jakarta/tomcat/src/javax/servlet/jsp/tagext/BodyContent.java
-jakarta/tomcat/src/javax/servlet/jsp/tagext/BodyTag.java
-jakarta/tomcat/src/javax/servlet/jsp/tagext/BodyTagSupport.java
-jakarta/tomcat/src/javax/servlet/jsp/tagext/Tag.java
-jakarta/tomcat/src/javax/servlet/jsp/tagext/TagAttributeInfo.java
-jakarta/tomcat/src/javax/servlet/jsp/tagext/TagData.java
-jakarta/tomcat/src/javax/servlet/jsp/tagext/TagExtraInfo.java
-jakarta/tomcat/src/javax/servlet/jsp/tagext/TagInfo.java
-jakarta/tomcat/src/javax/servlet/jsp/tagext/TagLibraryInfo.java
-jakarta/tomcat/src/javax/servlet/jsp/tagext/TagSupport.java
-jakarta/tomcat/src/javax/servlet/jsp/tagext/VariableInfo.java
-jakarta/tomcat/src/org/apache/jasper/CommandLineContext.java
-jakarta/tomcat/src/org/apache/jasper/Constants.java
-jakarta/tomcat/src/org/apache/jasper/EmbededServletOptions.java
-jakarta/tomcat/src/org/apache/jasper/JasperException.java
-jakarta/tomcat/src/org/apache/jasper/JspC.java
-jakarta/tomcat/src/org/apache/jasper/JspCompilationContext.java
-jakarta/tomcat/src/org/apache/jasper/JspEngineContext.java
-jakarta/tomcat/src/org/apache/jasper/Options.java
-jakarta/tomcat/src/org/apache/jasper/compiler/BaseJspListener.java
-jakarta/tomcat/src/org/apache/jasper/compiler/BeanEndGenerator.java
-jakarta/tomcat/src/org/apache/jasper/compiler/BeanGenerator.java
-jakarta/tomcat/src/org/apache/jasper/compiler/BeanRepository.java
-jakarta/tomcat/src/org/apache/jasper/compiler/CharDataGenerator.java
-jakarta/tomcat/src/org/apache/jasper/compiler/ClassDeclarationPhase.java
-jakarta/tomcat/src/org/apache/jasper/compiler/ClassName.java
-jakarta/tomcat/src/org/apache/jasper/compiler/CommandLineCompiler.java
-jakarta/tomcat/src/org/apache/jasper/compiler/CommentGenerator.java
-jakarta/tomcat/src/org/apache/jasper/compiler/Compiler.java
-jakarta/tomcat/src/org/apache/jasper/compiler/CoreElement.java
-jakarta/tomcat/src/org/apache/jasper/compiler/DeclarationGenerator.java
-jakarta/tomcat/src/org/apache/jasper/compiler/DelegatingListener.java
-jakarta/tomcat/src/org/apache/jasper/compiler/DestroyMethodPhase.java
-jakarta/tomcat/src/org/apache/jasper/compiler/DumbParseEventListener.java
-jakarta/tomcat/src/org/apache/jasper/compiler/EscapeUnicodeWriter.java
-jakarta/tomcat/src/org/apache/jasper/compiler/ExpressionGenerator.java
-jakarta/tomcat/src/org/apache/jasper/compiler/FileDeclarationPhase.java
-jakarta/tomcat/src/org/apache/jasper/compiler/ForwardGenerator.java
-jakarta/tomcat/src/org/apache/jasper/compiler/Generator.java
-jakarta/tomcat/src/org/apache/jasper/compiler/GeneratorBase.java
-jakarta/tomcat/src/org/apache/jasper/compiler/GetPropertyGenerator.java
-jakarta/tomcat/src/org/apache/jasper/compiler/IncludeGenerator.java
-jakarta/tomcat/src/org/apache/jasper/compiler/InfoGenerator.java
-jakarta/tomcat/src/org/apache/jasper/compiler/InitMethodPhase.java
-jakarta/tomcat/src/org/apache/jasper/compiler/JakartaCommentGenerator.java
-jakarta/tomcat/src/org/apache/jasper/compiler/JavaCompiler.java
-jakarta/tomcat/src/org/apache/jasper/compiler/JikesJavaCompiler.java
-jakarta/tomcat/src/org/apache/jasper/compiler/JspCompiler.java
-jakarta/tomcat/src/org/apache/jasper/compiler/JspParseEventListener.java
-jakarta/tomcat/src/org/apache/jasper/compiler/JspReader.java
-jakarta/tomcat/src/org/apache/jasper/compiler/JspUtil.java
-jakarta/tomcat/src/org/apache/jasper/compiler/Mangler.java
-jakarta/tomcat/src/org/apache/jasper/compiler/MappedCharDataGenerator.java
-jakarta/tomcat/src/org/apache/jasper/compiler/Mark.java
-jakarta/tomcat/src/org/apache/jasper/compiler/ParseEventListener.java
-jakarta/tomcat/src/org/apache/jasper/compiler/ParseException.java
-jakarta/tomcat/src/org/apache/jasper/compiler/Parser.java
-jakarta/tomcat/src/org/apache/jasper/compiler/PluginGenerator.java
-jakarta/tomcat/src/org/apache/jasper/compiler/ScriptletGenerator.java
-jakarta/tomcat/src/org/apache/jasper/compiler/ServiceMethodPhase.java
-jakarta/tomcat/src/org/apache/jasper/compiler/ServletWriter.java
-jakarta/tomcat/src/org/apache/jasper/compiler/SetPropertyGenerator.java
-jakarta/tomcat/src/org/apache/jasper/compiler/StaticInitializerPhase.java
-jakarta/tomcat/src/org/apache/jasper/compiler/StoredCharDataGenerator.java
-jakarta/tomcat/src/org/apache/jasper/compiler/SunJavaCompiler.java
-jakarta/tomcat/src/org/apache/jasper/compiler/TagBeginGenerator.java
-jakarta/tomcat/src/org/apache/jasper/compiler/TagCache.java
-jakarta/tomcat/src/org/apache/jasper/compiler/TagEndGenerator.java
-jakarta/tomcat/src/org/apache/jasper/compiler/TagGeneratorBase.java
-jakarta/tomcat/src/org/apache/jasper/compiler/TagLibraries.java
-jakarta/tomcat/src/org/apache/jasper/compiler/TagLibraryInfoImpl.java
-jakarta/tomcat/src/org/apache/jasper/resources/messages.properties
-jakarta/tomcat/src/org/apache/jasper/resources/messages_es.properties
-jakarta/tomcat/src/org/apache/jasper/resources/web-jsptaglib_1_1.dtd
-jakarta/tomcat/src/org/apache/jasper/runtime/BodyContentImpl.java
-jakarta/tomcat/src/org/apache/jasper/runtime/HttpJspBase.java
-jakarta/tomcat/src/org/apache/jasper/runtime/JspFactoryImpl.java
-jakarta/tomcat/src/org/apache/jasper/runtime/JspLoader.java
-jakarta/tomcat/src/org/apache/jasper/runtime/JspRuntimeLibrary.java
-jakarta/tomcat/src/org/apache/jasper/runtime/JspServlet.java
-jakarta/tomcat/src/org/apache/jasper/runtime/JspWriterImpl.java
-jakarta/tomcat/src/org/apache/jasper/runtime/PageContextImpl.java
-jakarta/tomcat/src/org/apache/jasper/runtime/ServletEngine.java
-jakarta/tomcat/src/org/apache/jasper/runtime/TomcatServletEngine.java
-jakarta/tomcat/src/org/apache/tomcat/catalina/Adapter.java
-jakarta/tomcat/src/org/apache/tomcat/catalina/Container.java
-jakarta/tomcat/src/org/apache/tomcat/catalina/Context.java
-jakarta/tomcat/src/org/apache/tomcat/catalina/ContextConfig.java
-jakarta/tomcat/src/org/apache/tomcat/catalina/Engine.java
-jakarta/tomcat/src/org/apache/tomcat/catalina/Host.java
-jakarta/tomcat/src/org/apache/tomcat/catalina/Interceptor.java
-jakarta/tomcat/src/org/apache/tomcat/catalina/Lifecycle.java
-jakarta/tomcat/src/org/apache/tomcat/catalina/LifecycleException.java
-jakarta/tomcat/src/org/apache/tomcat/catalina/Loader.java
-jakarta/tomcat/src/org/apache/tomcat/catalina/Logger.java
-jakarta/tomcat/src/org/apache/tomcat/catalina/Manager.java
-jakarta/tomcat/src/org/apache/tomcat/catalina/Realm.java
-jakarta/tomcat/src/org/apache/tomcat/catalina/Request.java
-jakarta/tomcat/src/org/apache/tomcat/catalina/Resources.java
-jakarta/tomcat/src/org/apache/tomcat/catalina/Response.java
-jakarta/tomcat/src/org/apache/tomcat/catalina/Session.java
-jakarta/tomcat/src/org/apache/tomcat/catalina/Store.java
-jakarta/tomcat/src/org/apache/tomcat/catalina/Wrapper.java
-jakarta/tomcat/src/org/apache/tomcat/catalina/WrapperConfig.java
-jakarta/tomcat/src/org/apache/tomcat/catalina/WrapperParam.java
-jakarta/tomcat/src/org/apache/tomcat/catalina/WrapperRole.java
-jakarta/tomcat/src/org/apache/tomcat/context/AutoSetup.java
-jakarta/tomcat/src/org/apache/tomcat/context/DefaultCMSetter.java
-jakarta/tomcat/src/org/apache/tomcat/context/LoadOnStartupInterceptor.java
-jakarta/tomcat/src/org/apache/tomcat/context/LocalStrings.properties
-jakarta/tomcat/src/org/apache/tomcat/context/LocalStrings_es.properties
-jakarta/tomcat/src/org/apache/tomcat/context/LogEvents.java
-jakarta/tomcat/src/org/apache/tomcat/context/WebXmlReader.java
-jakarta/tomcat/src/org/apache/tomcat/context/WorkDirInterceptor.java
-jakarta/tomcat/src/org/apache/tomcat/core/BaseInterceptor.java
-jakarta/tomcat/src/org/apache/tomcat/core/BufferedServletInputStream.java
-jakarta/tomcat/src/org/apache/tomcat/core/BufferedServletOutputStream.java
-jakarta/tomcat/src/org/apache/tomcat/core/Constants.java
-jakarta/tomcat/src/org/apache/tomcat/core/Container.java
-jakarta/tomcat/src/org/apache/tomcat/core/Context.java
-jakarta/tomcat/src/org/apache/tomcat/core/ContextInterceptor.java
-jakarta/tomcat/src/org/apache/tomcat/core/ContextManager.java
-jakarta/tomcat/src/org/apache/tomcat/core/HttpServletRequestFacade.java
-jakarta/tomcat/src/org/apache/tomcat/core/HttpServletResponseFacade.java
-jakarta/tomcat/src/org/apache/tomcat/core/LocalStrings.properties
-jakarta/tomcat/src/org/apache/tomcat/core/LocalStrings_es.properties
-jakarta/tomcat/src/org/apache/tomcat/core/Request.java
-jakarta/tomcat/src/org/apache/tomcat/core/RequestDispatcherImpl.java
-jakarta/tomcat/src/org/apache/tomcat/core/RequestImpl.java
-jakarta/tomcat/src/org/apache/tomcat/core/RequestInterceptor.java
-jakarta/tomcat/src/org/apache/tomcat/core/RequestSecurityProvider.java
-jakarta/tomcat/src/org/apache/tomcat/core/Response.java
-jakarta/tomcat/src/org/apache/tomcat/core/ResponseImpl.java
-jakarta/tomcat/src/org/apache/tomcat/core/ServerConnector.java
-jakarta/tomcat/src/org/apache/tomcat/core/ServletConfigImpl.java
-jakarta/tomcat/src/org/apache/tomcat/core/ServletContextFacade.java
-jakarta/tomcat/src/org/apache/tomcat/core/ServletLoader.java
-jakarta/tomcat/src/org/apache/tomcat/core/ServletWrapper.java
-jakarta/tomcat/src/org/apache/tomcat/core/SessionContextImpl.java
-jakarta/tomcat/src/org/apache/tomcat/core/SessionManager.java
-jakarta/tomcat/src/org/apache/tomcat/core/SimpleRequestSecurityProviderImpl.java
-jakarta/tomcat/src/org/apache/tomcat/core/TomcatException.java
-jakarta/tomcat/src/org/apache/tomcat/core/package.html
-jakarta/tomcat/src/org/apache/tomcat/loader/AdaptiveClassLoader.java
-jakarta/tomcat/src/org/apache/tomcat/loader/AdaptiveServletLoader.java
-jakarta/tomcat/src/org/apache/tomcat/loader/NetworkClassLoader.java
-jakarta/tomcat/src/org/apache/tomcat/loader/ServletClassLoaderImpl.java
-jakarta/tomcat/src/org/apache/tomcat/loader/SimpleFileFilter.java
-jakarta/tomcat/src/org/apache/tomcat/loader/URLResourceReader.java
-jakarta/tomcat/src/org/apache/tomcat/logging/Logger.java
-jakarta/tomcat/src/org/apache/tomcat/logging/TomcatLogger.java
-jakarta/tomcat/src/org/apache/tomcat/net/DefaultServerSocketFactory.java
-jakarta/tomcat/src/org/apache/tomcat/net/ServerSocketFactory.java
-jakarta/tomcat/src/org/apache/tomcat/protocol/WARConnection.java
-jakarta/tomcat/src/org/apache/tomcat/protocol/WARManager.java
-jakarta/tomcat/src/org/apache/tomcat/protocol/jar/Handler.java
-jakarta/tomcat/src/org/apache/tomcat/protocol/war/Handler.java
-jakarta/tomcat/src/org/apache/tomcat/request/FixHeaders.java
-jakarta/tomcat/src/org/apache/tomcat/request/SecurityCheck.java
-jakarta/tomcat/src/org/apache/tomcat/request/SessionInterceptor.java
-jakarta/tomcat/src/org/apache/tomcat/request/SimpleMapper.java
-jakarta/tomcat/src/org/apache/tomcat/service/Ajp11ConnectionHandler.java
-jakarta/tomcat/src/org/apache/tomcat/service/JNIEndpoint.java
-jakarta/tomcat/src/org/apache/tomcat/service/JNIEndpointConnector.java
-jakarta/tomcat/src/org/apache/tomcat/service/LocalStrings.properties
-jakarta/tomcat/src/org/apache/tomcat/service/LocalStrings_es.properties
-jakarta/tomcat/src/org/apache/tomcat/service/PoolTcpConnector.java
-jakarta/tomcat/src/org/apache/tomcat/service/PoolTcpEndpoint.java
-jakarta/tomcat/src/org/apache/tomcat/service/SimpleTcpConnector.java
-jakarta/tomcat/src/org/apache/tomcat/service/SimpleTcpEndpoint.java
-jakarta/tomcat/src/org/apache/tomcat/service/TODO
-jakarta/tomcat/src/org/apache/tomcat/service/TcpConnection.java
-jakarta/tomcat/src/org/apache/tomcat/service/TcpConnectionHandler.java
-jakarta/tomcat/src/org/apache/tomcat/service/TcpEndpoint.java
-jakarta/tomcat/src/org/apache/tomcat/service/TcpEndpointConnector.java
-jakarta/tomcat/src/org/apache/tomcat/service/connector/Ajp12ConnectionHandler.java
-jakarta/tomcat/src/org/apache/tomcat/service/connector/Ajp23ConnectionHandler.java
-jakarta/tomcat/src/org/apache/tomcat/service/connector/ConnectorRequest.java
-jakarta/tomcat/src/org/apache/tomcat/service/connector/ConnectorResponse.java
-jakarta/tomcat/src/org/apache/tomcat/service/connector/ConnectorServletIS.java
-jakarta/tomcat/src/org/apache/tomcat/service/connector/ConnectorServletOS.java
-jakarta/tomcat/src/org/apache/tomcat/service/connector/DoorConnectionHandler.java
-jakarta/tomcat/src/org/apache/tomcat/service/connector/JNIConnectionHandler.java
-jakarta/tomcat/src/org/apache/tomcat/service/connector/MsgBuffer.java
-jakarta/tomcat/src/org/apache/tomcat/service/connector/MsgConnector.java
-jakarta/tomcat/src/org/apache/tomcat/service/connector/package.html
-jakarta/tomcat/src/org/apache/tomcat/service/http/Constants.java
-jakarta/tomcat/src/org/apache/tomcat/service/http/HttpConnectionHandler.java
-jakarta/tomcat/src/org/apache/tomcat/service/http/HttpRequestAdapter.java
-jakarta/tomcat/src/org/apache/tomcat/service/http/HttpResponseAdapter.java
-jakarta/tomcat/src/org/apache/tomcat/service/http/package.html
-jakarta/tomcat/src/org/apache/tomcat/service/package.html
-jakarta/tomcat/src/org/apache/tomcat/servlets/AuthServlet.java
-jakarta/tomcat/src/org/apache/tomcat/servlets/DefaultErrorPage.java
-jakarta/tomcat/src/org/apache/tomcat/servlets/DefaultServlet.java
-jakarta/tomcat/src/org/apache/tomcat/servlets/InvokerServlet.java
-jakarta/tomcat/src/org/apache/tomcat/servlets/JSecurityCheck.java
-jakarta/tomcat/src/org/apache/tomcat/servlets/NoInvokerServlet.java
-jakarta/tomcat/src/org/apache/tomcat/servlets/WarFileServlet.java
-jakarta/tomcat/src/org/apache/tomcat/session/ApplicationSession.java
-jakarta/tomcat/src/org/apache/tomcat/session/LocalStrings.properties
-jakarta/tomcat/src/org/apache/tomcat/session/LocalStrings_es.properties
-jakarta/tomcat/src/org/apache/tomcat/session/ManagerBase.java
-jakarta/tomcat/src/org/apache/tomcat/session/Reaper.java
-jakarta/tomcat/src/org/apache/tomcat/session/ServerSession.java
-jakarta/tomcat/src/org/apache/tomcat/session/ServerSessionManager.java
-jakarta/tomcat/src/org/apache/tomcat/session/StandardManager.java
-jakarta/tomcat/src/org/apache/tomcat/session/StandardSession.java
-jakarta/tomcat/src/org/apache/tomcat/session/StandardSessionManager.java
-jakarta/tomcat/src/org/apache/tomcat/startup/LocalStrings.properties
-jakarta/tomcat/src/org/apache/tomcat/startup/LocalStrings_es.properties
-jakarta/tomcat/src/org/apache/tomcat/startup/SimpleStartup.java
-jakarta/tomcat/src/org/apache/tomcat/startup/Tomcat.java
-jakarta/tomcat/src/org/apache/tomcat/task/ApacheConfig.java
-jakarta/tomcat/src/org/apache/tomcat/task/ApacheConfig.java.orig
-jakarta/tomcat/src/org/apache/tomcat/task/Expand.java
-jakarta/tomcat/src/org/apache/tomcat/task/GTest.java
-jakarta/tomcat/src/org/apache/tomcat/util/ArrayEnumerator.java
-jakarta/tomcat/src/org/apache/tomcat/util/Ascii.java
-jakarta/tomcat/src/org/apache/tomcat/util/BuffTool.java
-jakarta/tomcat/src/org/apache/tomcat/util/CookieTools.java
-jakarta/tomcat/src/org/apache/tomcat/util/CookieUtils.java
-jakarta/tomcat/src/org/apache/tomcat/util/DevNullOutputStream.java
-jakarta/tomcat/src/org/apache/tomcat/util/FileUtil.java
-jakarta/tomcat/src/org/apache/tomcat/util/HexUtils.java
-jakarta/tomcat/src/org/apache/tomcat/util/HttpDate.java
-jakarta/tomcat/src/org/apache/tomcat/util/LocalStrings.properties
-jakarta/tomcat/src/org/apache/tomcat/util/LocalStrings_es.properties
-jakarta/tomcat/src/org/apache/tomcat/util/LocaleToCharsetMap.java
-jakarta/tomcat/src/org/apache/tomcat/util/MessageBytes.java
-jakarta/tomcat/src/org/apache/tomcat/util/MessageString.java
-jakarta/tomcat/src/org/apache/tomcat/util/MimeHeaderField.java
-jakarta/tomcat/src/org/apache/tomcat/util/MimeHeaders.java
-jakarta/tomcat/src/org/apache/tomcat/util/MimeMap.java
-jakarta/tomcat/src/org/apache/tomcat/util/Queue.java
-jakarta/tomcat/src/org/apache/tomcat/util/RequestUtil.java
-jakarta/tomcat/src/org/apache/tomcat/util/SessionIdGenerator.java
-jakarta/tomcat/src/org/apache/tomcat/util/SessionUtil.java
-jakarta/tomcat/src/org/apache/tomcat/util/StringManager.java
-jakarta/tomcat/src/org/apache/tomcat/util/ThreadPool.java
-jakarta/tomcat/src/org/apache/tomcat/util/URLUtil.java
-jakarta/tomcat/src/org/apache/tomcat/util/WARUtil.java
-jakarta/tomcat/src/org/apache/tomcat/util/package.html
-jakarta/tomcat/src/org/apache/tomcat/util/pattern/Implication.java
-jakarta/tomcat/src/org/apache/tomcat/util/pattern/ImplicationTable.java
-jakarta/tomcat/src/org/apache/tomcat/util/pattern/PatternMatcher.java
-jakarta/tomcat/src/org/apache/tomcat/util/pattern/URLPatternMatcher.java
-jakarta/tomcat/src/org/apache/tomcat/util/pattern/WildcardPattern.java
-jakarta/tomcat/src/org/apache/tomcat/util/xml/PathMatch.java
-jakarta/tomcat/src/org/apache/tomcat/util/xml/SaxContext.java
-jakarta/tomcat/src/org/apache/tomcat/util/xml/XmlAction.java
-jakarta/tomcat/src/org/apache/tomcat/util/xml/XmlMapper.java
-jakarta/tomcat/src/org/apache/tomcat/util/xml/XmlMatch.java
-jakarta/tomcat/webapps/ROOT.war
-jakarta/tomcat/webapps/examples.war
-jakarta/tomcat/webapps/test.war
-@comment these are automatically created at run time
-@unexec rm -rf %D/jakarta/tomcat/work
-@unexec rm -rf %D/jakarta/tomcat/logs
-@unexec rm -f %D/jakarta/tomcat/conf/tomcat-apache.conf
-@comment the war files get expanded at runtime -- they're not there at install
-@comment time, so they don't get registered, but they're there after you've run
-@comment once.
-@unexec rm -rf %D/jakarta/tomcat/webapps/ROOT
-@unexec rm -rf %D/jakarta/tomcat/webapps/examples
-@unexec rm -rf %D/jakarta/tomcat/webapps/test
-@dirrm jakarta/tomcat/src/org/apache/tomcat/util/xml
-@dirrm jakarta/tomcat/src/org/apache/tomcat/util/pattern
-@dirrm jakarta/tomcat/src/org/apache/tomcat/util
-@dirrm jakarta/tomcat/src/org/apache/tomcat/task
-@dirrm jakarta/tomcat/src/org/apache/tomcat/startup
-@dirrm jakarta/tomcat/src/org/apache/tomcat/session
-@dirrm jakarta/tomcat/src/org/apache/tomcat/servlets
-@dirrm jakarta/tomcat/src/org/apache/tomcat/service/http
-@dirrm jakarta/tomcat/src/org/apache/tomcat/service/connector
-@dirrm jakarta/tomcat/src/org/apache/tomcat/service
-@dirrm jakarta/tomcat/src/org/apache/tomcat/request
-@dirrm jakarta/tomcat/src/org/apache/tomcat/protocol/war
-@dirrm jakarta/tomcat/src/org/apache/tomcat/protocol/jar
-@dirrm jakarta/tomcat/src/org/apache/tomcat/protocol
-@dirrm jakarta/tomcat/src/org/apache/tomcat/net
-@dirrm jakarta/tomcat/src/org/apache/tomcat/logging
-@dirrm jakarta/tomcat/src/org/apache/tomcat/loader
-@dirrm jakarta/tomcat/src/org/apache/tomcat/core
-@dirrm jakarta/tomcat/src/org/apache/tomcat/context
-@dirrm jakarta/tomcat/src/org/apache/tomcat/catalina
-@dirrm jakarta/tomcat/src/org/apache/tomcat
-@dirrm jakarta/tomcat/src/org/apache/jasper/runtime
-@dirrm jakarta/tomcat/src/org/apache/jasper/resources
-@dirrm jakarta/tomcat/src/org/apache/jasper/compiler
-@dirrm jakarta/tomcat/src/org/apache/jasper
-@dirrm jakarta/tomcat/src/org/apache
-@dirrm jakarta/tomcat/src/org
-@dirrm jakarta/tomcat/src/javax/servlet/jsp/tagext
-@dirrm jakarta/tomcat/src/javax/servlet/jsp
-@dirrm jakarta/tomcat/src/javax/servlet/http
-@dirrm jakarta/tomcat/src/javax/servlet
-@dirrm jakarta/tomcat/src/javax
-@dirrm jakarta/tomcat/src
-@dirrm jakarta/tomcat/lib/test/Golden
-@dirrm jakarta/tomcat/lib/test
-@dirrm jakarta/tomcat/lib
-@dirrm jakarta/tomcat/doc/uguide/images
-@dirrm jakarta/tomcat/doc/uguide
-@dirrm jakarta/tomcat/doc/appdev/sample/web/images
-@dirrm jakarta/tomcat/doc/appdev/sample/web
-@dirrm jakarta/tomcat/doc/appdev/sample/src
-@dirrm jakarta/tomcat/doc/appdev/sample/etc
-@dirrm jakarta/tomcat/doc/appdev/sample
-@dirrm jakarta/tomcat/doc/appdev
-@dirrm jakarta/tomcat/doc
-@dirrm jakarta/tomcat/conf
-@dirrm jakarta/tomcat/bin
-@dirrm jakarta/tomcat
-@dirrm jakarta
+@comment $NetBSD: PLIST,v 1.7 2001/03/28 02:46:09 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/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/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/readme
+tomcat/doc/Tomcat-Workers-HowTo.html
+tomcat/doc/tomcat-apache-howto.html
+tomcat/doc/JDBCRealm.howto
+tomcat/doc/tomcat-netscape-howto.html
+tomcat/doc/uguide/images/tomcat.gif
+tomcat/doc/uguide/images/banner.gif
+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/workers.properties
+tomcat/conf/build.xml
+tomcat/conf/uriworkermap.properties
+tomcat/conf/manifest.servlet
+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/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/MustFail.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/classTest.txt
+tomcat/lib/test/Golden/Mismatch2.txt
+tomcat/lib/test/Golden/Mismatch1.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/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/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/tomcat/context/AutoSetup.java
+tomcat/src/org/apache/tomcat/context/LogEvents.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/Constants.java
+tomcat/src/org/apache/tomcat/core/Container.java
+tomcat/src/org/apache/tomcat/core/RequestImpl.java
+tomcat/src/org/apache/tomcat/core/ContextInterceptor.java
+tomcat/src/org/apache/tomcat/core/BufferedServletOutputStream.java
+tomcat/src/org/apache/tomcat/core/FacadeManager.java
+tomcat/src/org/apache/tomcat/core/ServletLoader.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/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/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/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/task/Expand.java
+tomcat/src/org/apache/tomcat/task/GTest.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
+@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
+@unexec rm -rf tomcat/webapps/examples
+@unexec rm -rf tomcat/webapps/test
+@comment must explicitly remove tomcat working stash
+@unexec rm -rf tomcat/work
+@dirrm tomcat/src/org/apache/tomcat/util/xml
+@dirrm tomcat/src/org/apache/tomcat/util/pattern
+@dirrm tomcat/src/org/apache/tomcat/util
+@dirrm tomcat/src/org/apache/tomcat/task
+@dirrm tomcat/src/org/apache/tomcat/startup
+@dirrm tomcat/src/org/apache/tomcat/session
+@dirrm tomcat/src/org/apache/tomcat/service/http
+@dirrm tomcat/src/org/apache/tomcat/service/connector
+@dirrm tomcat/src/org/apache/tomcat/service
+@dirrm tomcat/src/org/apache/tomcat/resources
+@dirrm tomcat/src/org/apache/tomcat/request
+@dirrm tomcat/src/org/apache/tomcat/protocol/war
+@dirrm tomcat/src/org/apache/tomcat/protocol/jar
+@dirrm tomcat/src/org/apache/tomcat/protocol
+@dirrm tomcat/src/org/apache/tomcat/net
+@dirrm tomcat/src/org/apache/tomcat/logging
+@dirrm tomcat/src/org/apache/tomcat/loader
+@dirrm tomcat/src/org/apache/tomcat/facade
+@dirrm tomcat/src/org/apache/tomcat/core
+@dirrm tomcat/src/org/apache/tomcat/context
+@dirrm tomcat/src/org/apache/tomcat/adapter
+@dirrm tomcat/src/org/apache/tomcat
+@dirrm tomcat/src/org/apache/jasper/servlet
+@dirrm tomcat/src/org/apache/jasper/runtime
+@dirrm tomcat/src/org/apache/jasper/resources
+@dirrm tomcat/src/org/apache/jasper/compiler
+@dirrm tomcat/src/org/apache/jasper
+@dirrm tomcat/src/org/apache
+@dirrm tomcat/src/org
+@dirrm tomcat/src
+@dirrm tomcat/lib/test/Golden
+@dirrm tomcat/lib/test
+@dirrm tomcat/lib
+@dirrm tomcat/doc/uguide/images
+@dirrm tomcat/doc/uguide
+@dirrm tomcat/doc/appdev/sample/web/images
+@dirrm tomcat/doc/appdev/sample/web
+@dirrm tomcat/doc/appdev/sample/src
+@dirrm tomcat/doc/appdev/sample/etc
+@dirrm tomcat/doc/appdev/sample
+@dirrm tomcat/doc/appdev
+@dirrm tomcat/doc
+@dirrm tomcat/bin
+@comment leave around directories where the user may have their own files:
+@comment	 tomcat/webapps
+@comment	 tomcat/logs
+@comment	 tomcat/conf
+@comment	 tomcat