split port into version 3 and 4

www/jakarta-tomcat/Makefile

@@ -1,47 +1,6 @@
-# $OpenBSD: Makefile,v 1.5 2001/11/20 10:14:56 reinhard Exp $
+# $OpenBSD: Makefile,v 1.6 2002/01/05 15:24:46 reinhard Exp $
 
-COMMENT=	"java servlet 2.2 and java server pages 1.1 server"
+     SUBDIR+= v3
+     SUBDIR+= v4
 
-V=		3.2.3
-DISTNAME=	jakarta-tomcat-${V}
-CATEGORIES=	www
-NEED_VERSION=	1.499
-MASTER_SITES=	http://jakarta.apache.org/builds/jakarta-tomcat/release/v${V}/bin/
-EXTRACT_SUFX=	.zip
-
-HOMEPAGE=	http://jakarta.apache.org/
-
-MAINTAINER=	Reinhard J. Sammer <reinhard@openbsd.org>
-
-JDK_VERSION=	1.2-blackdown
-JAVA_HOME=	${LOCALBASE}/jdk${JDK_VERSION}
-RUN_DEPENDS=	:jdk-blackdown-*:devel/jdk/${JDK_VERSION}
-
-# Apache Software License
-PERMIT_PACKAGE_CDROM=	Yes
-PERMIT_PACKAGE_FTP=	Yes
-PERMIT_DISTFILES_CDROM=	Yes
-PERMIT_DISTFILES_FTP=	Yes
-
-NO_BUILD=	Yes
-NO_REGRESS=	Yes
-
-WRKSRC=		${WRKDIR}/${DISTNAME}
-
-DIRS=	bin conf doc lib logs src webapps 
-CONFDIR=	/etc/tomcat
-TOMCATDIR=	/var/tomcat
-SUBST_VARS=	TOMCATDIR CONFDIR
-
-post-patch:
-	@perl -pi -e 's|JAVA_HOME|${JAVA_HOME}|g' ${WRKSRC}/conf/workers.properties
-	@perl -pi -e 's|TOMCATDIR|${TOMCATDIR}|g' ${WRKSRC}/bin/tomcat.sh
-	@perl -pi -e 's|PREFIX|${PREFIX}|g' ${WRKSRC}/bin/tomcat.sh
-
-do-install:
-	@${INSTALL_DATA_DIR} ${PREFIX}/tomcat
-	@${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/tomcat
-	@cd ${WRKDIST}/bin && chmod +x *.sh	# for .zip file
-	@cd ${WRKDIST} && tar cf - ${DIRS} | (cd ${PREFIX}/tomcat && tar -xf -)
-
-.include "bsd.port.mk"
+.include <bsd.port.subdir.mk>

www/jakarta-tomcat/distinfo

@@ -1,3 +0,0 @@
-MD5 (jakarta-tomcat-3.2.3.zip) = 00000ef43e59d1029fb60964bad5face
-RMD160 (jakarta-tomcat-3.2.3.zip) = cb21115fe53a2d23320bc0304b6d25a5b2c5ebdc
-SHA1 (jakarta-tomcat-3.2.3.zip) = 06e57f6ca519e5e6429a37d498c4f2a3aad8322f

www/jakarta-tomcat/patches/patch-bin_tomcat_sh

@@ -1,29 +0,0 @@
-$OpenBSD: patch-bin_tomcat_sh,v 1.1.1.1 2001/06/17 12:18:17 reinhard Exp $
---- bin/tomcat.sh.orig	Tue Dec 12 22:36:46 2000
-+++ bin/tomcat.sh	Fri May 18 16:43:03 2001
-@@ -31,12 +31,10 @@ if [ "$TOMCAT_HOME" = "" ] ; then
-     fi
-   done
-   
--  TOMCAT_HOME_1=`dirname "$PRG"`/..
--  echo "Guessing TOMCAT_HOME from tomcat.sh to ${TOMCAT_HOME_1}" 
--    if [ -d ${TOMCAT_HOME_1}/conf ] ; then 
--	TOMCAT_HOME=${TOMCAT_HOME_1}
--	echo "Setting TOMCAT_HOME to $TOMCAT_HOME"
--    fi
-+  if [ -d /etc/tomcat ] ; then 
-+    TOMCAT_HOME=TOMCATDIR
-+    echo "Setting TOMCAT_HOME to $TOMCAT_HOME"
-+  fi
- fi
- 
- 
-@@ -90,7 +88,7 @@ fi
- oldCP=$CLASSPATH
-  
- unset CLASSPATH
--for i in ${TOMCAT_HOME}/lib/* ; do
-+for i in PREFIX/tomcat/lib/* ; do
-   if [ "$CLASSPATH" != "" ]; then
-     CLASSPATH=${CLASSPATH}:$i
-   else

www/jakarta-tomcat/patches/patch-conf_workers_properties

@@ -1,28 +0,0 @@
-$OpenBSD: patch-conf_workers_properties,v 1.2 2001/06/18 09:48:24 reinhard Exp $
---- conf/workers.properties.orig	Tue Dec 12 22:36:26 2000
-+++ conf/workers.properties	Fri May 18 15:24:26 2001
-@@ -40,20 +40,20 @@
- # installed tomcat. This is where you have your conf, webapps and lib
- # directories.
- #
--workers.tomcat_home=c:\jakarta-tomcat
-+workers.tomcat_home=/var/tomcat
- 
- #
- # workers.java_home should point to your Java installation. Normally
- # you should have a bin and lib directories beneath it.
- #
--workers.java_home=c:\jdk1.2.2
-+workers.java_home=JAVA_HOME
- 
- #
- # You should configure your environment slash... ps=\ on NT and / on UNIX
- # and maybe something different elsewhere.
- #
--ps=\
--# ps=/
-+#ps=\
-+ps=/
- 
- #
- #------ ADVANCED MODE ------------------------------------------------

www/jakarta-tomcat/pkg/DEINSTALL

@@ -1,51 +0,0 @@
-#!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.1.1.1 2001/06/17 12:18:18 reinhard Exp $
-#
-# De-installation setup of jakarta-tomcat
-
-# exit on errors, use a sane path and install prefix
-#
-set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_DIR=${SYSCONFDIR}/tomcat
-WORKDIR=${TOMCATDIR}
-
-# Function: tell the user what they need to do to delete the port completely
-#
-do_notice()
-{
-    echo
-    echo "+---------------"
-    echo "| To completely deinstall the $1 package you need to perform"
-    echo "| these steps as root:"
-    echo "|"
-    echo "|       rm -rf ${CONFIG_DIR}"
-    echo "|       rm -rf ${WORKDIR}"
-    echo "|"
-    echo "| Do not do this if you plan on re-installing $1"
-    echo "| at some future time."
-    echo "+---------------"
-    echo
-}
-
-# Verify proper execution
-#
-if [ $# -ne 2 ]; then
-    echo "usage: $0 distname DEINSTALL" >&2
-    exit 1
-fi
-
-# Verify/process the command
-#
-case $2 in
-    DEINSTALL)
-	do_notice "$1"
-	;;
-    *)
-	echo "usage: $0 distname DEINSTALL" >&2
-	exit 1
-	;;
-esac
-
-exit 0

www/jakarta-tomcat/pkg/DESCR

@@ -1,7 +0,0 @@
-Tomcat is the Java Servlet / Java Server Page environment produced
-by the Apache Foundation's Jakarta Project.  Tomcat can be run as a
-standalone web server with Servlet and JSP support, or using Apache
-Server as it's web server via the mod_jserv Apache module (the
-www/jserv package).
-
-WWW: ${HOMEPAGE}

www/jakarta-tomcat/pkg/INSTALL

@@ -1,92 +0,0 @@
-#!/bin/sh
-# $OpenBSD: INSTALL,v 1.2 2001/07/07 13:12:19 reinhard Exp $
-#
-# Pre/post-installation setup of jakarta-tomcat
-
-# exit on errors, use a sane path and install prefix
-#
-set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_DIR=${CONFDIR}
-SAMPLE_CONFIG_DIR=$PREFIX/tomcat/conf
-CONF_FILES="build.xml jni_server.xml jni_workers.properties manifest.servlet mod_jk.conf obj.conf server.xml test-tomcat.xml tomcat-users.xml tomcat.conf tomcat.policy tomcat.properties uriworkermap.properties web.dtd web.xml workers.properties wrapper.properties"
-WORKDIR=${TOMCATDIR}
-SAMPLE_WEBAPPS_DIR=$PREFIX/tomcat/webapps
-WAR_FILES="ROOT.war admin.war examples.war test.war"
-
-# Function: install configuration files
-#
-do_install_conf()
-{
-    install -d -o root -g wheel ${CONFIG_DIR}
-    cd ${SAMPLE_CONFIG_DIR}
-    for i in ${CONF_FILES}; do 
-        install -o root -g wheel -m 0644 $i ${CONFIG_DIR} 
-    done
-    
-    install -d -o root -g wheel ${WORKDIR}
-    ln -sf ${CONFIG_DIR} ${WORKDIR}/conf
-    install -d -o root -g wheel ${WORKDIR}/logs
-    install -d -o root -g staff ${WORKDIR}/webapps
-    cd ${SAMPLE_WEBAPPS_DIR}
-    for i in ${WAR_FILES}; do 
-        install -o root -g wheel -m 0644 $i ${WORKDIR}/webapps
-    done
-    install -d -o root -g staff ${WORKDIR}/work
-
-    echo
-    echo "+---------------"
-    echo "| The $1 configuration files have been installed"
-    echo "| in ${CONFIG_DIR}."
-    echo "| Please view these files and change the configuration"
-    echo "| to meet your needs."
-    echo "|"
-    echo "| \$TOMCAT_HOME is ${WORKDIR}."
-    echo "+---------------"
-    echo
-}
-
-# Function: tell the user what they need to do to use the port just installed
-#
-do_notice_conf()
-{
-    echo
-    echo "+---------------"
-    echo "| The existing $1 configuration files in ${CONFIG_DIR}"
-    echo "| have NOT been changed. You may want to compare them to the current samples"
-    echo "| in ${SAMPLE_CONFIG_DIR}, and update your configuration files"
-    echo "| as needed."
-    echo "| The existing $1 log files in ${WORKDIR}/logs" 
-    echo "| have NOT been deleted."
-    echo "+---------------"
-    echo
-}
-
-# Verify proper execution
-#
-if [ $# -ne 2 ]; then
-    echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-    exit 1
-fi
-
-# Verify/process the command
-#
-case $2 in
-    PRE-INSTALL)
-	: nothing to pre-install for this port
-	;;
-    POST-INSTALL)
-	if [ ! -d ${CONFIG_DIR} ]; then
-	    do_install_conf "$1"
-	else
-	    do_notice_conf "$1"
-	fi
-	;;
-    *)
-	echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-	exit 1
-	;;
-esac
-
-exit 0

www/jakarta-tomcat/pkg/MESSAGE

@@ -1,12 +0,0 @@
-For detailed instructions on how to run Tomcat see:
-
-	${PREFIX}/tomcat/doc/uguide/tomcat_ug.html
-
-For more information on application development with Tomcat, see
-
-	${PREFIX}/tomcat/doc/appdev/index.html
-
-Note that tomcat may be started with the following command:
-
-	${PREFIX}/tomcat/bin/startup.sh
-

www/jakarta-tomcat/pkg/PLIST

@@ -1,410 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.2 2001/07/07 13:12:19 reinhard Exp $
-tomcat/LICENSE
-tomcat/bin/ant
-tomcat/bin/antRun
-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_workers.properties
-tomcat/conf/manifest.servlet
-tomcat/conf/mod_jk.conf
-tomcat/conf/obj.conf
-tomcat/conf/server.xml
-tomcat/conf/test-tomcat.xml
-tomcat/conf/tomcat-users.xml
-tomcat/conf/tomcat.conf
-tomcat/conf/tomcat.policy
-tomcat/conf/tomcat.properties
-tomcat/conf/uriworkermap.properties
-tomcat/conf/web.dtd
-tomcat/conf/web.xml
-tomcat/conf/workers.properties
-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/processes.html
-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/tomcat.gif
-tomcat/doc/appdev/web.xml.txt
-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-apache-howto.html
-tomcat/doc/tomcat-iis-howto.html
-tomcat/doc/tomcat-localization-howto.html
-tomcat/doc/tomcat-netscape-howto.html
-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/lib/ant.jar
-tomcat/lib/jasper.jar
-tomcat/lib/jaxp.jar
-tomcat/lib/parser.jar
-tomcat/lib/servlet.jar
-tomcat/lib/test/Golden/Err.txt
-tomcat/lib/test/Golden/ForwardWithQuery.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/beanSer.txt
-tomcat/lib/test/Golden/beanTest.txt
-tomcat/lib/test/Golden/buffer.txt
-tomcat/lib/test/Golden/classTest.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/implicitPage.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/movedindex.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/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/WorkDirInterceptor.java
-tomcat/src/org/apache/tomcat/core/BaseInterceptor.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/Context.java
-tomcat/src/org/apache/tomcat/core/ContextInterceptor.java
-tomcat/src/org/apache/tomcat/core/ContextManager.java
-tomcat/src/org/apache/tomcat/core/FacadeManager.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/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/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/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/JNIConnectionHandler.java
-tomcat/src/org/apache/tomcat/service/connector/MsgBuffer.java
-tomcat/src/org/apache/tomcat/service/connector/MsgConnector.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/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/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
-@dirrm tomcat/webapps
-@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
-@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
-@exec mkdir -p %D/tomcat/logs
-@dirrm tomcat/logs
-@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/conf
-@dirrm tomcat/bin
-@dirrm tomcat