Apache Tomcat 6.x is the current focus of development. It builds upon the

improvements made in Tomcat 5.5.x and implements the Servlet 2.5 and JSP 2.1
specifications. In addition to that, it includes the following improvements:

* Memory usage optimizations
* Advanced IO capabilities
* Refactored clustering

While we're here make a number of improvements based on the old 5.5.x pkg:
- Use MASTER_SITE_APACHE
- Default to running as an unprived user
- Use a more standard rc.d script
- Cleaner pkg_delete operation based on standard files/dirs that change

5 files changed, 852 insertions, 0 deletions

diff --git a/www/apache-tomcat6/DESCR b/www/apache-tomcat6/DESCR
new file mode 100644
index 00000000000..71c9a10542a
--- /dev/null
+++ b/www/apache-tomcat6/DESCR
@@ -0,0 +1,19 @@
+Apache Tomcat is an implementation of the Java Servlet and JavaServer Pages
+technologies. The Java Servlet and JavaServer Pages specifications are
+developed under the Java Community Process.
+
+Apache Tomcat is developed in an open and participatory environment and
+released under the Apache Software License. Apache Tomcat is intended to
+be a collaboration of the best-of-breed developers from around the world.
+We invite you to participate in this open development project.
+
+Apache Tomcat powers numerous large-scale, mission-critical web applications
+across a diverse range of industries and organizations.
+
+Apache Tomcat 6.x is the current focus of development. It builds upon the
+improvements made in Tomcat 5.5.x and implements the Servlet 2.5 and JSP 2.1
+specifications. In addition to that, it includes the following improvements:
+
+* Memory usage optimizations
+* Advanced IO capabilities
+* Refactored clustering
diff --git a/www/apache-tomcat6/Makefile b/www/apache-tomcat6/Makefile
new file mode 100644
index 00000000000..3c4b012edd2
--- /dev/null
+++ b/www/apache-tomcat6/Makefile
@@ -0,0 +1,103 @@
+# $NetBSD: Makefile,v 1.1.1.1 2009/02/14 12:02:08 adrianp Exp $
+#
+
+DISTNAME=	apache-tomcat-${TOMCAT_VER}
+CATEGORIES=	www
+MASTER_SITES=	${MASTER_SITE_APACHE:=tomcat/tomcat-6/v${TOMCAT_VER}/bin/}
+
+MAINTAINER=	adrianp@NetBSD.org
+HOMEPAGE=	http://tomcat.apache.org/
+COMMENT=	Implementation of Java Servlet and JavaServer Pages technologies
+
+CONFLICTS+=	jakarta-tomcat55-[0-9]*
+CONFLICTS+=	jakarta-tomcat-[0-9]*
+
+NO_BUILD=	yes
+USE_LANGUAGES=	# none
+USE_JAVA=	run
+USE_JAVA2=	1.5
+USE_TOOLS+=	pax
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+.include "../../mk/bsd.prefs.mk"
+
+TOMCAT_VER=		6.0.18
+TOMCAT_HOME=		${PREFIX}/share/tomcat
+EGDIR=			${PREFIX}/share/examples/tomcat
+DOCDIR=			${PREFIX}/share/doc/tomcat
+RCD_SCRIPTS=		tomcat
+TOMCAT_USER?=		tomcat
+TOMCAT_GROUP?=		tomcat
+PKG_GROUPS=		${TOMCAT_GROUP}
+PKG_USERS=		${TOMCAT_USER}:${TOMCAT_GROUP}
+PKG_GROUPS_VARS+=	TOMCAT_GROUP
+PKG_USERS_VARS+=	TOMCAT_USER
+PKG_HOME.tomcat=	${TOMCAT_HOME}
+PKG_SHELL.tomcat=	${SH}
+PKG_SYSCONFDIR.tomcat=	${TOMCAT_HOME}/conf
+OWN_DIRS+=		${PKG_SYSCONFDIR.tomcat}
+FILES_SUBST+=		JAVA_HOME=${PKG_JAVA_HOME} TOMCAT_HOME=${TOMCAT_HOME} \
+			TOMCAT_USER=${TOMCAT_USER} TOMCAT_GROUP=${TOMCAT_GROUP}
+
+PRIVATE_EGFILES=	server.xml tomcat-users.xml
+PUBLIC_EGFILES=		catalina.policy catalina.properties \
+			context.xml logging.properties web.xml
+DOCFILES=		LICENSE NOTICE RELEASE-NOTES RUNNING.txt
+WORK_DIRS=		work temp logs
+
+.for f in ${PRIVATE_EGFILES}
+CONF_FILES_PERMS+=	${EGDIR}/${f} ${PKG_SYSCONFDIR.tomcat}/${f} \
+			${TOMCAT_USER} ${TOMCAT_GROUP} 0640
+.endfor
+
+.for f in ${PUBLIC_EGFILES}
+CONF_FILES_PERMS+=	${EGDIR}/${f} ${PKG_SYSCONFDIR.tomcat}/${f} \
+			${TOMCAT_USER} ${TOMCAT_GROUP} 0644
+.endfor
+
+.for d in ${WORK_DIRS}
+OWN_DIRS_PERMS+=	${TOMCAT_HOME}/${d} ${TOMCAT_USER} ${TOMCAT_GROUP} 0755
+.endfor
+
+INSTALLATION_DIRS+=	${TOMCAT_HOME} ${EGDIR} ${DOCDIR}
+
+do-install:
+.	for d in ${WORK_DIRS}
+		${RM} -rf ${WRKSRC}/${d}
+.	endfor
+
+.	for f in ${DOCFILES}
+		${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}/${f}
+		${RM} -f ${WRKSRC}/${f}
+.	endfor
+
+.	for f in ${PRIVATE_EGFILES}
+		${INSTALL_DATA} ${WRKSRC}/conf/${f} ${DESTDIR}${EGDIR}/${f}
+		${RM} -f ${WRKSRC}/conf/${f}
+.	endfor
+
+.	for f in ${PUBLIC_EGFILES}
+		${INSTALL_DATA} ${WRKSRC}/conf/${f} ${DESTDIR}${EGDIR}/${f}
+		${RM} -f ${WRKSRC}/conf/${f}
+.	endfor
+
+	${FIND} ${WRKSRC} -name \*.exe -type f -print | ${XARGS} ${RM} -f
+	${FIND} ${WRKSRC} -name \*.bat -type f -print | ${XARGS} ${RM} -f
+
+	cd ${WRKSRC} && ${PAX} -rw -pm . ${DESTDIR}${TOMCAT_HOME}
+
+	${FIND} ${DESTDIR}${TOMCAT_HOME} -type d -print | \
+		${XARGS} ${CHMOD} ${PKGDIRMODE}
+	${FIND} ${DESTDIR}${TOMCAT_HOME} -type f -print | \
+		${XARGS} ${CHMOD} ${SHAREMODE}
+	${FIND} ${DESTDIR}${TOMCAT_HOME} -type f -name \*.sh -print | \
+		${XARGS} ${CHMOD} ${BINMODE}
+
+	${CHOWN} -R ${TOMCAT_USER}:${TOMCAT_GROUP} \
+		${DESTDIR}${TOMCAT_HOME}/webapps
+	${CHOWN} ${TOMCAT_USER}:${TOMCAT_GROUP} \
+		${DESTDIR}${TOMCAT_HOME}/conf
+
+.include "../../mk/java-vm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/apache-tomcat6/PLIST b/www/apache-tomcat6/PLIST
new file mode 100644
index 00000000000..501ef1ef001
--- /dev/null
+++ b/www/apache-tomcat6/PLIST
@@ -0,0 +1,655 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2009/02/14 12:02:09 adrianp Exp $
+share/doc/tomcat/LICENSE
+share/doc/tomcat/NOTICE
+share/doc/tomcat/RELEASE-NOTES
+share/doc/tomcat/RUNNING.txt
+share/examples/rc.d/tomcat
+share/examples/tomcat/catalina.policy
+share/examples/tomcat/catalina.properties
+share/examples/tomcat/context.xml
+share/examples/tomcat/logging.properties
+share/examples/tomcat/server.xml
+share/examples/tomcat/tomcat-users.xml
+share/examples/tomcat/web.xml
+share/tomcat/bin/bootstrap.jar
+share/tomcat/bin/catalina-tasks.xml
+share/tomcat/bin/catalina.sh
+share/tomcat/bin/commons-daemon.jar
+share/tomcat/bin/digest.sh
+share/tomcat/bin/jsvc.tar.gz
+share/tomcat/bin/setclasspath.sh
+share/tomcat/bin/shutdown.sh
+share/tomcat/bin/startup.sh
+share/tomcat/bin/tomcat-juli.jar
+share/tomcat/bin/tomcat-native.tar.gz
+share/tomcat/bin/tool-wrapper.sh
+share/tomcat/bin/version.sh
+share/tomcat/lib/annotations-api.jar
+share/tomcat/lib/catalina-ant.jar
+share/tomcat/lib/catalina-ha.jar
+share/tomcat/lib/catalina-tribes.jar
+share/tomcat/lib/catalina.jar
+share/tomcat/lib/el-api.jar
+share/tomcat/lib/jasper-el.jar
+share/tomcat/lib/jasper-jdt.jar
+share/tomcat/lib/jasper.jar
+share/tomcat/lib/jsp-api.jar
+share/tomcat/lib/servlet-api.jar
+share/tomcat/lib/tomcat-coyote.jar
+share/tomcat/lib/tomcat-dbcp.jar
+share/tomcat/lib/tomcat-i18n-es.jar
+share/tomcat/lib/tomcat-i18n-fr.jar
+share/tomcat/lib/tomcat-i18n-ja.jar
+share/tomcat/webapps/ROOT/RELEASE-NOTES.txt
+share/tomcat/webapps/ROOT/WEB-INF/web.xml
+share/tomcat/webapps/ROOT/asf-logo-wide.gif
+share/tomcat/webapps/ROOT/build.xml
+share/tomcat/webapps/ROOT/favicon.ico
+share/tomcat/webapps/ROOT/index.html
+share/tomcat/webapps/ROOT/index.jsp
+share/tomcat/webapps/ROOT/tomcat-power.gif
+share/tomcat/webapps/ROOT/tomcat.gif
+share/tomcat/webapps/ROOT/tomcat.svg
+share/tomcat/webapps/docs/BUILDING.txt
+share/tomcat/webapps/docs/NOTICE
+share/tomcat/webapps/docs/RELEASE-NOTES.txt
+share/tomcat/webapps/docs/RUNNING.txt
+share/tomcat/webapps/docs/WEB-INF/web.xml
+share/tomcat/webapps/docs/aio.html
+share/tomcat/webapps/docs/api/index.html
+share/tomcat/webapps/docs/appdev/build.xml.txt
+share/tomcat/webapps/docs/appdev/deployment.html
+share/tomcat/webapps/docs/appdev/index.html
+share/tomcat/webapps/docs/appdev/installation.html
+share/tomcat/webapps/docs/appdev/introduction.html
+share/tomcat/webapps/docs/appdev/printer/deployment.html
+share/tomcat/webapps/docs/appdev/printer/docs/appdev/build.xml.txt
+share/tomcat/webapps/docs/appdev/printer/docs/appdev/web.xml.txt
+share/tomcat/webapps/docs/appdev/printer/index.html
+share/tomcat/webapps/docs/appdev/printer/installation.html
+share/tomcat/webapps/docs/appdev/printer/introduction.html
+share/tomcat/webapps/docs/appdev/printer/processes.html
+share/tomcat/webapps/docs/appdev/printer/source.html
+share/tomcat/webapps/docs/appdev/processes.html
+share/tomcat/webapps/docs/appdev/sample/build.xml
+share/tomcat/webapps/docs/appdev/sample/docs/README.txt
+share/tomcat/webapps/docs/appdev/sample/index.html
+share/tomcat/webapps/docs/appdev/sample/sample.war
+share/tomcat/webapps/docs/appdev/sample/src/mypackage/Hello.java
+share/tomcat/webapps/docs/appdev/sample/web/WEB-INF/web.xml
+share/tomcat/webapps/docs/appdev/sample/web/hello.jsp
+share/tomcat/webapps/docs/appdev/sample/web/images/tomcat.gif
+share/tomcat/webapps/docs/appdev/sample/web/index.html
+share/tomcat/webapps/docs/appdev/source.html
+share/tomcat/webapps/docs/appdev/web.xml.txt
+share/tomcat/webapps/docs/apr.html
+share/tomcat/webapps/docs/architecture/index.html
+share/tomcat/webapps/docs/architecture/overview.html
+share/tomcat/webapps/docs/architecture/printer/index.html
+share/tomcat/webapps/docs/architecture/printer/overview.html
+share/tomcat/webapps/docs/architecture/printer/requestProcess.html
+share/tomcat/webapps/docs/architecture/printer/startup.html
+share/tomcat/webapps/docs/architecture/requestProcess.html
+share/tomcat/webapps/docs/architecture/requestProcess/requestProcess.pdf
+share/tomcat/webapps/docs/architecture/requestProcess/roseModel.mdl
+share/tomcat/webapps/docs/architecture/startup.html
+share/tomcat/webapps/docs/architecture/startup/serverStartup.pdf
+share/tomcat/webapps/docs/architecture/startup/serverStartup.txt
+share/tomcat/webapps/docs/balancer-howto.html
+share/tomcat/webapps/docs/building.html
+share/tomcat/webapps/docs/cgi-howto.html
+share/tomcat/webapps/docs/changelog.html
+share/tomcat/webapps/docs/class-loader-howto.html
+share/tomcat/webapps/docs/cluster-howto.html
+share/tomcat/webapps/docs/config/ajp.html
+share/tomcat/webapps/docs/config/cluster-channel.html
+share/tomcat/webapps/docs/config/cluster-deployer.html
+share/tomcat/webapps/docs/config/cluster-interceptor.html
+share/tomcat/webapps/docs/config/cluster-listener.html
+share/tomcat/webapps/docs/config/cluster-manager.html
+share/tomcat/webapps/docs/config/cluster-membership.html
+share/tomcat/webapps/docs/config/cluster-receiver.html
+share/tomcat/webapps/docs/config/cluster-sender.html
+share/tomcat/webapps/docs/config/cluster-valve.html
+share/tomcat/webapps/docs/config/cluster.html
+share/tomcat/webapps/docs/config/context.html
+share/tomcat/webapps/docs/config/engine.html
+share/tomcat/webapps/docs/config/executor.html
+share/tomcat/webapps/docs/config/globalresources.html
+share/tomcat/webapps/docs/config/host.html
+share/tomcat/webapps/docs/config/http.html
+share/tomcat/webapps/docs/config/index.html
+share/tomcat/webapps/docs/config/loader.html
+share/tomcat/webapps/docs/config/manager.html
+share/tomcat/webapps/docs/config/printer/ajp.html
+share/tomcat/webapps/docs/config/printer/cluster-channel.html
+share/tomcat/webapps/docs/config/printer/cluster-deployer.html
+share/tomcat/webapps/docs/config/printer/cluster-interceptor.html
+share/tomcat/webapps/docs/config/printer/cluster-listener.html
+share/tomcat/webapps/docs/config/printer/cluster-manager.html
+share/tomcat/webapps/docs/config/printer/cluster-membership.html
+share/tomcat/webapps/docs/config/printer/cluster-receiver.html
+share/tomcat/webapps/docs/config/printer/cluster-sender.html
+share/tomcat/webapps/docs/config/printer/cluster-valve.html
+share/tomcat/webapps/docs/config/printer/cluster.html
+share/tomcat/webapps/docs/config/printer/context.html
+share/tomcat/webapps/docs/config/printer/engine.html
+share/tomcat/webapps/docs/config/printer/executor.html
+share/tomcat/webapps/docs/config/printer/globalresources.html
+share/tomcat/webapps/docs/config/printer/host.html
+share/tomcat/webapps/docs/config/printer/http.html
+share/tomcat/webapps/docs/config/printer/index.html
+share/tomcat/webapps/docs/config/printer/loader.html
+share/tomcat/webapps/docs/config/printer/manager.html
+share/tomcat/webapps/docs/config/printer/realm.html
+share/tomcat/webapps/docs/config/printer/resources.html
+share/tomcat/webapps/docs/config/printer/server.html
+share/tomcat/webapps/docs/config/printer/service.html
+share/tomcat/webapps/docs/config/printer/systemprops.html
+share/tomcat/webapps/docs/config/printer/valve.html
+share/tomcat/webapps/docs/config/realm.html
+share/tomcat/webapps/docs/config/resources.html
+share/tomcat/webapps/docs/config/server.html
+share/tomcat/webapps/docs/config/service.html
+share/tomcat/webapps/docs/config/systemprops.html
+share/tomcat/webapps/docs/config/valve.html
+share/tomcat/webapps/docs/connectors.html
+share/tomcat/webapps/docs/default-servlet.html
+share/tomcat/webapps/docs/deployer-howto.html
+share/tomcat/webapps/docs/developers.html
+share/tomcat/webapps/docs/extras.html
+share/tomcat/webapps/docs/funcspecs/fs-admin-apps.html
+share/tomcat/webapps/docs/funcspecs/fs-admin-objects.html
+share/tomcat/webapps/docs/funcspecs/fs-admin-opers.html
+share/tomcat/webapps/docs/funcspecs/fs-default.html
+share/tomcat/webapps/docs/funcspecs/fs-invoker.html
+share/tomcat/webapps/docs/funcspecs/fs-jdbc-realm.html
+share/tomcat/webapps/docs/funcspecs/fs-jndi-realm.html
+share/tomcat/webapps/docs/funcspecs/fs-memory-realm.html
+share/tomcat/webapps/docs/funcspecs/index.html
+share/tomcat/webapps/docs/funcspecs/mbean-names.html
+share/tomcat/webapps/docs/funcspecs/printer/fs-admin-apps.html
+share/tomcat/webapps/docs/funcspecs/printer/fs-admin-objects.html
+share/tomcat/webapps/docs/funcspecs/printer/fs-admin-opers.html
+share/tomcat/webapps/docs/funcspecs/printer/fs-default.html
+share/tomcat/webapps/docs/funcspecs/printer/fs-invoker.html
+share/tomcat/webapps/docs/funcspecs/printer/fs-jdbc-realm.html
+share/tomcat/webapps/docs/funcspecs/printer/fs-jndi-realm.html
+share/tomcat/webapps/docs/funcspecs/printer/fs-memory-realm.html
+share/tomcat/webapps/docs/funcspecs/printer/index.html
+share/tomcat/webapps/docs/funcspecs/printer/mbean-names.html
+share/tomcat/webapps/docs/html-manager-howto.html
+share/tomcat/webapps/docs/images/add.gif
+share/tomcat/webapps/docs/images/asf-logo.gif
+share/tomcat/webapps/docs/images/code.gif
+share/tomcat/webapps/docs/images/design.gif
+share/tomcat/webapps/docs/images/docs.gif
+share/tomcat/webapps/docs/images/fix.gif
+share/tomcat/webapps/docs/images/printer.gif
+share/tomcat/webapps/docs/images/tomcat.gif
+share/tomcat/webapps/docs/images/tomcat.svg
+share/tomcat/webapps/docs/images/update.gif
+share/tomcat/webapps/docs/images/void.gif
+share/tomcat/webapps/docs/index.html
+share/tomcat/webapps/docs/introduction.html
+share/tomcat/webapps/docs/jasper-howto.html
+share/tomcat/webapps/docs/jndi-datasource-examples-howto.html
+share/tomcat/webapps/docs/jndi-resources-howto.html
+share/tomcat/webapps/docs/logging.html
+share/tomcat/webapps/docs/manager-howto.html
+share/tomcat/webapps/docs/maven-jars.html
+share/tomcat/webapps/docs/mbeans-descriptor-howto.html
+share/tomcat/webapps/docs/monitoring.html
+share/tomcat/webapps/docs/printer/BUILDING.txt
+share/tomcat/webapps/docs/printer/NOTICE
+share/tomcat/webapps/docs/printer/RUNNING.txt
+share/tomcat/webapps/docs/printer/aio.html
+share/tomcat/webapps/docs/printer/apr.html
+share/tomcat/webapps/docs/printer/balancer-howto.html
+share/tomcat/webapps/docs/printer/building.html
+share/tomcat/webapps/docs/printer/cgi-howto.html
+share/tomcat/webapps/docs/printer/changelog.html
+share/tomcat/webapps/docs/printer/class-loader-howto.html
+share/tomcat/webapps/docs/printer/cluster-howto.html
+share/tomcat/webapps/docs/printer/connectors.html
+share/tomcat/webapps/docs/printer/default-servlet.html
+share/tomcat/webapps/docs/printer/deployer-howto.html
+share/tomcat/webapps/docs/printer/developers.html
+share/tomcat/webapps/docs/printer/extras.html
+share/tomcat/webapps/docs/printer/html-manager-howto.html
+share/tomcat/webapps/docs/printer/index.html
+share/tomcat/webapps/docs/printer/introduction.html
+share/tomcat/webapps/docs/printer/jasper-howto.html
+share/tomcat/webapps/docs/printer/jndi-datasource-examples-howto.html
+share/tomcat/webapps/docs/printer/jndi-resources-howto.html
+share/tomcat/webapps/docs/printer/logging.html
+share/tomcat/webapps/docs/printer/manager-howto.html
+share/tomcat/webapps/docs/printer/maven-jars.html
+share/tomcat/webapps/docs/printer/mbeans-descriptor-howto.html
+share/tomcat/webapps/docs/printer/monitoring.html
+share/tomcat/webapps/docs/printer/proxy-howto.html
+share/tomcat/webapps/docs/printer/realm-howto.html
+share/tomcat/webapps/docs/printer/security-manager-howto.html
+share/tomcat/webapps/docs/printer/setup.html
+share/tomcat/webapps/docs/printer/ssi-howto.html
+share/tomcat/webapps/docs/printer/ssl-howto.html
+share/tomcat/webapps/docs/printer/virtual-hosting-howto.html
+share/tomcat/webapps/docs/printer/windows-service-howto.html
+share/tomcat/webapps/docs/proxy-howto.html
+share/tomcat/webapps/docs/realm-howto.html
+share/tomcat/webapps/docs/security-manager-howto.html
+share/tomcat/webapps/docs/setup.html
+share/tomcat/webapps/docs/ssi-howto.html
+share/tomcat/webapps/docs/ssl-howto.html
+share/tomcat/webapps/docs/tribes/faq.html
+share/tomcat/webapps/docs/tribes/introduction.html
+share/tomcat/webapps/docs/tribes/setup.html
+share/tomcat/webapps/docs/virtual-hosting-howto.html
+share/tomcat/webapps/docs/windows-service-howto.html
+share/tomcat/webapps/examples/WEB-INF/classes/CookieExample.class
+share/tomcat/webapps/examples/WEB-INF/classes/CookieExample.java
+share/tomcat/webapps/examples/WEB-INF/classes/HelloWorldExample.class
+share/tomcat/webapps/examples/WEB-INF/classes/HelloWorldExample.java
+share/tomcat/webapps/examples/WEB-INF/classes/LocalStrings.properties
+share/tomcat/webapps/examples/WEB-INF/classes/LocalStrings_en.properties
+share/tomcat/webapps/examples/WEB-INF/classes/LocalStrings_es.properties
+share/tomcat/webapps/examples/WEB-INF/classes/LocalStrings_fr.properties
+share/tomcat/webapps/examples/WEB-INF/classes/LocalStrings_pt.properties
+share/tomcat/webapps/examples/WEB-INF/classes/RequestHeaderExample.class
+share/tomcat/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
+share/tomcat/webapps/examples/WEB-INF/classes/RequestInfoExample.class
+share/tomcat/webapps/examples/WEB-INF/classes/RequestInfoExample.java
+share/tomcat/webapps/examples/WEB-INF/classes/RequestParamExample.class
+share/tomcat/webapps/examples/WEB-INF/classes/RequestParamExample.java
+share/tomcat/webapps/examples/WEB-INF/classes/SessionExample.class
+share/tomcat/webapps/examples/WEB-INF/classes/SessionExample.java
+share/tomcat/webapps/examples/WEB-INF/classes/cal/Entries.class
+share/tomcat/webapps/examples/WEB-INF/classes/cal/Entries.java
+share/tomcat/webapps/examples/WEB-INF/classes/cal/Entry.class
+share/tomcat/webapps/examples/WEB-INF/classes/cal/Entry.java
+share/tomcat/webapps/examples/WEB-INF/classes/cal/JspCalendar.class
+share/tomcat/webapps/examples/WEB-INF/classes/cal/JspCalendar.java
+share/tomcat/webapps/examples/WEB-INF/classes/cal/TableBean.class
+share/tomcat/webapps/examples/WEB-INF/classes/cal/TableBean.java
+share/tomcat/webapps/examples/WEB-INF/classes/chat/ChatServlet$MessageSender.class
+share/tomcat/webapps/examples/WEB-INF/classes/chat/ChatServlet.class
+share/tomcat/webapps/examples/WEB-INF/classes/chat/ChatServlet.java
+share/tomcat/webapps/examples/WEB-INF/classes/checkbox/CheckTest.class
+share/tomcat/webapps/examples/WEB-INF/classes/checkbox/CheckTest.java
+share/tomcat/webapps/examples/WEB-INF/classes/colors/ColorGameBean.class
+share/tomcat/webapps/examples/WEB-INF/classes/colors/ColorGameBean.java
+share/tomcat/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.class
+share/tomcat/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
+share/tomcat/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.class
+share/tomcat/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java
+share/tomcat/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.class
+share/tomcat/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
+share/tomcat/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.class
+share/tomcat/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
+share/tomcat/webapps/examples/WEB-INF/classes/dates/JspCalendar.class
+share/tomcat/webapps/examples/WEB-INF/classes/dates/JspCalendar.java
+share/tomcat/webapps/examples/WEB-INF/classes/error/Smart.class
+share/tomcat/webapps/examples/WEB-INF/classes/error/Smart.java
+share/tomcat/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.class
+share/tomcat/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java
+share/tomcat/webapps/examples/WEB-INF/classes/examples/FooTag.class
+share/tomcat/webapps/examples/WEB-INF/classes/examples/FooTag.java
+share/tomcat/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.class
+share/tomcat/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.java
+share/tomcat/webapps/examples/WEB-INF/classes/examples/LogTag.class
+share/tomcat/webapps/examples/WEB-INF/classes/examples/LogTag.java
+share/tomcat/webapps/examples/WEB-INF/classes/examples/ShowSource.class
+share/tomcat/webapps/examples/WEB-INF/classes/examples/ShowSource.java
+share/tomcat/webapps/examples/WEB-INF/classes/filters/ExampleFilter.class
+share/tomcat/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java
+share/tomcat/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.class
+share/tomcat/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.java
+share/tomcat/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.class
+share/tomcat/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java
+share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.class
+share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.java
+share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.class
+share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.java
+share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.class
+share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.java
+share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.class
+share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.java
+share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.class
+share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java
+share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/HelloWorldSimpleTag.class
+share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/HelloWorldSimpleTag.java
+share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.class
+share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java
+share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.class
+share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java
+share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.class
+share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.java
+share/tomcat/webapps/examples/WEB-INF/classes/listeners/ContextListener.class
+share/tomcat/webapps/examples/WEB-INF/classes/listeners/ContextListener.java
+share/tomcat/webapps/examples/WEB-INF/classes/listeners/SessionListener.class
+share/tomcat/webapps/examples/WEB-INF/classes/listeners/SessionListener.java
+share/tomcat/webapps/examples/WEB-INF/classes/num/NumberGuessBean.class
+share/tomcat/webapps/examples/WEB-INF/classes/num/NumberGuessBean.java
+share/tomcat/webapps/examples/WEB-INF/classes/servletToJsp.class
+share/tomcat/webapps/examples/WEB-INF/classes/servletToJsp.java
+share/tomcat/webapps/examples/WEB-INF/classes/sessions/DummyCart.class
+share/tomcat/webapps/examples/WEB-INF/classes/sessions/DummyCart.java
+share/tomcat/webapps/examples/WEB-INF/classes/util/HTMLFilter.class
+share/tomcat/webapps/examples/WEB-INF/classes/util/HTMLFilter.java
+share/tomcat/webapps/examples/WEB-INF/classes/validators/DebugValidator.class
+share/tomcat/webapps/examples/WEB-INF/classes/validators/DebugValidator.java
+share/tomcat/webapps/examples/WEB-INF/jsp/applet/Clock2.java
+share/tomcat/webapps/examples/WEB-INF/jsp/debug-taglib.tld
+share/tomcat/webapps/examples/WEB-INF/jsp/example-taglib.tld
+share/tomcat/webapps/examples/WEB-INF/jsp2/jsp2-example-taglib.tld
+share/tomcat/webapps/examples/WEB-INF/lib/jstl.jar
+share/tomcat/webapps/examples/WEB-INF/lib/standard.jar
+share/tomcat/webapps/examples/WEB-INF/tags/displayProducts.tag
+share/tomcat/webapps/examples/WEB-INF/tags/helloWorld.tag
+share/tomcat/webapps/examples/WEB-INF/tags/panel.tag
+share/tomcat/webapps/examples/WEB-INF/tags/xhtmlbasic.tag
+share/tomcat/webapps/examples/WEB-INF/web.xml
+share/tomcat/webapps/examples/index.html
+share/tomcat/webapps/examples/jsp/cal/Entries.java.html
+share/tomcat/webapps/examples/jsp/cal/Entry.java.html
+share/tomcat/webapps/examples/jsp/cal/JspCalendar.java.html
+share/tomcat/webapps/examples/jsp/cal/TableBean.java.html
+share/tomcat/webapps/examples/jsp/cal/cal1.jsp
+share/tomcat/webapps/examples/jsp/cal/cal1.jsp.html
+share/tomcat/webapps/examples/jsp/cal/cal2.jsp
+share/tomcat/webapps/examples/jsp/cal/cal2.jsp.html
+share/tomcat/webapps/examples/jsp/cal/calendar.html
+share/tomcat/webapps/examples/jsp/cal/login.html
+share/tomcat/webapps/examples/jsp/chat/chat.jsp
+share/tomcat/webapps/examples/jsp/chat/chat.jsp.html
+share/tomcat/webapps/examples/jsp/chat/login.jsp
+share/tomcat/webapps/examples/jsp/chat/login.jsp.html
+share/tomcat/webapps/examples/jsp/chat/post.jsp
+share/tomcat/webapps/examples/jsp/chat/post.jsp.html
+share/tomcat/webapps/examples/jsp/checkbox/CheckTest.html
+share/tomcat/webapps/examples/jsp/checkbox/check.html
+share/tomcat/webapps/examples/jsp/checkbox/checkresult.jsp
+share/tomcat/webapps/examples/jsp/checkbox/checkresult.jsp.html
+share/tomcat/webapps/examples/jsp/checkbox/cresult.html
+share/tomcat/webapps/examples/jsp/colors/ColorGameBean.html
+share/tomcat/webapps/examples/jsp/colors/clr.html
+share/tomcat/webapps/examples/jsp/colors/colors.html
+share/tomcat/webapps/examples/jsp/colors/colrs.jsp
+share/tomcat/webapps/examples/jsp/colors/colrs.jsp.html
+share/tomcat/webapps/examples/jsp/dates/date.html
+share/tomcat/webapps/examples/jsp/dates/date.jsp
+share/tomcat/webapps/examples/jsp/dates/date.jsp.html
+share/tomcat/webapps/examples/jsp/error/er.html
+share/tomcat/webapps/examples/jsp/error/err.jsp
+share/tomcat/webapps/examples/jsp/error/err.jsp.html
+share/tomcat/webapps/examples/jsp/error/error.html
+share/tomcat/webapps/examples/jsp/error/errorpge.jsp
+share/tomcat/webapps/examples/jsp/error/errorpge.jsp.html
+share/tomcat/webapps/examples/jsp/forward/forward.jsp
+share/tomcat/webapps/examples/jsp/forward/forward.jsp.html
+share/tomcat/webapps/examples/jsp/forward/fwd.html
+share/tomcat/webapps/examples/jsp/forward/one.jsp
+share/tomcat/webapps/examples/jsp/forward/one.jsp.html
+share/tomcat/webapps/examples/jsp/forward/two.html
+share/tomcat/webapps/examples/jsp/images/code.gif
+share/tomcat/webapps/examples/jsp/images/execute.gif
+share/tomcat/webapps/examples/jsp/images/read.gif
+share/tomcat/webapps/examples/jsp/images/return.gif
+share/tomcat/webapps/examples/jsp/include/foo.html
+share/tomcat/webapps/examples/jsp/include/foo.jsp
+share/tomcat/webapps/examples/jsp/include/foo.jsp.html
+share/tomcat/webapps/examples/jsp/include/inc.html
+share/tomcat/webapps/examples/jsp/include/include.jsp
+share/tomcat/webapps/examples/jsp/include/include.jsp.html
+share/tomcat/webapps/examples/jsp/index.html
+share/tomcat/webapps/examples/jsp/jsp2/el/Functions.java.html
+share/tomcat/webapps/examples/jsp/jsp2/el/basic-arithmetic.html
+share/tomcat/webapps/examples/jsp/jsp2/el/basic-arithmetic.jsp
+share/tomcat/webapps/examples/jsp/jsp2/el/basic-arithmetic.jsp.html
+share/tomcat/webapps/examples/jsp/jsp2/el/basic-comparisons.html
+share/tomcat/webapps/examples/jsp/jsp2/el/basic-comparisons.jsp
+share/tomcat/webapps/examples/jsp/jsp2/el/basic-comparisons.jsp.html
+share/tomcat/webapps/examples/jsp/jsp2/el/functions.html
+share/tomcat/webapps/examples/jsp/jsp2/el/functions.jsp
+share/tomcat/webapps/examples/jsp/jsp2/el/functions.jsp.html
+share/tomcat/webapps/examples/jsp/jsp2/el/implicit-objects.html
+share/tomcat/webapps/examples/jsp/jsp2/el/implicit-objects.jsp
+share/tomcat/webapps/examples/jsp/jsp2/el/implicit-objects.jsp.html
+share/tomcat/webapps/examples/jsp/jsp2/jspattribute/FooBean.java.html
+share/tomcat/webapps/examples/jsp/jsp2/jspattribute/HelloWorldSimpleTag.java.html
+share/tomcat/webapps/examples/jsp/jsp2/jspattribute/ShuffleSimpleTag.java.html
+share/tomcat/webapps/examples/jsp/jsp2/jspattribute/TileSimpleTag.java.html
+share/tomcat/webapps/examples/jsp/jsp2/jspattribute/jspattribute.html
+share/tomcat/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp
+share/tomcat/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp.html
+share/tomcat/webapps/examples/jsp/jsp2/jspattribute/shuffle.html
+share/tomcat/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp
+share/tomcat/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp.html
+share/tomcat/webapps/examples/jsp/jsp2/jspx/basic.html
+share/tomcat/webapps/examples/jsp/jsp2/jspx/basic.jspx
+share/tomcat/webapps/examples/jsp/jsp2/jspx/basic.jspx.html
+share/tomcat/webapps/examples/jsp/jsp2/jspx/svgexample.html
+share/tomcat/webapps/examples/jsp/jsp2/jspx/textRotate.html
+share/tomcat/webapps/examples/jsp/jsp2/jspx/textRotate.jpg
+share/tomcat/webapps/examples/jsp/jsp2/jspx/textRotate.jspx
+share/tomcat/webapps/examples/jsp/jsp2/jspx/textRotate.jspx.html
+share/tomcat/webapps/examples/jsp/jsp2/misc/EchoAttributesTag.java.html
+share/tomcat/webapps/examples/jsp/jsp2/misc/coda.jspf
+share/tomcat/webapps/examples/jsp/jsp2/misc/coda.jspf.html
+share/tomcat/webapps/examples/jsp/jsp2/misc/config.html
+share/tomcat/webapps/examples/jsp/jsp2/misc/config.jsp
+share/tomcat/webapps/examples/jsp/jsp2/misc/config.jsp.html
+share/tomcat/webapps/examples/jsp/jsp2/misc/dynamicattrs.html
+share/tomcat/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp
+share/tomcat/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp.html
+share/tomcat/webapps/examples/jsp/jsp2/misc/prelude.jspf
+share/tomcat/webapps/examples/jsp/jsp2/misc/prelude.jspf.html
+share/tomcat/webapps/examples/jsp/jsp2/simpletag/BookBean.java.html
+share/tomcat/webapps/examples/jsp/jsp2/simpletag/FindBookSimpleTag.java.html
+share/tomcat/webapps/examples/jsp/jsp2/simpletag/Functions.java.html
+share/tomcat/webapps/examples/jsp/jsp2/simpletag/HelloWorldSimpleTag.java.html
+share/tomcat/webapps/examples/jsp/jsp2/simpletag/RepeatSimpleTag.java.html
+share/tomcat/webapps/examples/jsp/jsp2/simpletag/book.html
+share/tomcat/webapps/examples/jsp/jsp2/simpletag/book.jsp
+share/tomcat/webapps/examples/jsp/jsp2/simpletag/book.jsp.html
+share/tomcat/webapps/examples/jsp/jsp2/simpletag/hello.html
+share/tomcat/webapps/examples/jsp/jsp2/simpletag/hello.jsp
+share/tomcat/webapps/examples/jsp/jsp2/simpletag/hello.jsp.html
+share/tomcat/webapps/examples/jsp/jsp2/simpletag/repeat.html
+share/tomcat/webapps/examples/jsp/jsp2/simpletag/repeat.jsp
+share/tomcat/webapps/examples/jsp/jsp2/simpletag/repeat.jsp.html
+share/tomcat/webapps/examples/jsp/jsp2/tagfiles/displayProducts.tag.html
+share/tomcat/webapps/examples/jsp/jsp2/tagfiles/hello.html
+share/tomcat/webapps/examples/jsp/jsp2/tagfiles/hello.jsp
+share/tomcat/webapps/examples/jsp/jsp2/tagfiles/hello.jsp.html
+share/tomcat/webapps/examples/jsp/jsp2/tagfiles/helloWorld.tag.html
+share/tomcat/webapps/examples/jsp/jsp2/tagfiles/panel.html
+share/tomcat/webapps/examples/jsp/jsp2/tagfiles/panel.jsp
+share/tomcat/webapps/examples/jsp/jsp2/tagfiles/panel.jsp.html
+share/tomcat/webapps/examples/jsp/jsp2/tagfiles/panel.tag.html
+share/tomcat/webapps/examples/jsp/jsp2/tagfiles/products.html
+share/tomcat/webapps/examples/jsp/jsp2/tagfiles/products.jsp
+share/tomcat/webapps/examples/jsp/jsp2/tagfiles/products.jsp.html
+share/tomcat/webapps/examples/jsp/jsp2/tagfiles/xhtmlbasic.tag.html
+share/tomcat/webapps/examples/jsp/jsptoserv/hello.jsp
+share/tomcat/webapps/examples/jsp/jsptoserv/hello.jsp.html
+share/tomcat/webapps/examples/jsp/jsptoserv/jsptoservlet.jsp
+share/tomcat/webapps/examples/jsp/jsptoserv/jsptoservlet.jsp.html
+share/tomcat/webapps/examples/jsp/jsptoserv/jts.html
+share/tomcat/webapps/examples/jsp/jsptoserv/servletToJsp.java.html
+share/tomcat/webapps/examples/jsp/num/numguess.html
+share/tomcat/webapps/examples/jsp/num/numguess.jsp
+share/tomcat/webapps/examples/jsp/num/numguess.jsp.html
+share/tomcat/webapps/examples/jsp/plugin/applet/Clock2.class
+share/tomcat/webapps/examples/jsp/plugin/applet/Clock2.java
+share/tomcat/webapps/examples/jsp/plugin/plugin.html
+share/tomcat/webapps/examples/jsp/plugin/plugin.jsp
+share/tomcat/webapps/examples/jsp/plugin/plugin.jsp.html
+share/tomcat/webapps/examples/jsp/security/protected/error.jsp
+share/tomcat/webapps/examples/jsp/security/protected/error.jsp.html
+share/tomcat/webapps/examples/jsp/security/protected/index.jsp
+share/tomcat/webapps/examples/jsp/security/protected/index.jsp.html
+share/tomcat/webapps/examples/jsp/security/protected/login.jsp
+share/tomcat/webapps/examples/jsp/security/protected/login.jsp.html
+share/tomcat/webapps/examples/jsp/sessions/DummyCart.html
+share/tomcat/webapps/examples/jsp/sessions/carts.html
+share/tomcat/webapps/examples/jsp/sessions/carts.jsp
+share/tomcat/webapps/examples/jsp/sessions/carts.jsp.html
+share/tomcat/webapps/examples/jsp/sessions/crt.html
+share/tomcat/webapps/examples/jsp/simpletag/foo.html
+share/tomcat/webapps/examples/jsp/simpletag/foo.jsp
+share/tomcat/webapps/examples/jsp/simpletag/foo.jsp.html
+share/tomcat/webapps/examples/jsp/snp/snoop.html
+share/tomcat/webapps/examples/jsp/snp/snoop.jsp
+share/tomcat/webapps/examples/jsp/snp/snoop.jsp.html
+share/tomcat/webapps/examples/jsp/source.jsp
+share/tomcat/webapps/examples/jsp/source.jsp.html
+share/tomcat/webapps/examples/jsp/tagplugin/choose.html
+share/tomcat/webapps/examples/jsp/tagplugin/choose.jsp
+share/tomcat/webapps/examples/jsp/tagplugin/choose.jsp.html
+share/tomcat/webapps/examples/jsp/tagplugin/foreach.html
+share/tomcat/webapps/examples/jsp/tagplugin/foreach.jsp
+share/tomcat/webapps/examples/jsp/tagplugin/foreach.jsp.html
+share/tomcat/webapps/examples/jsp/tagplugin/howto.html
+share/tomcat/webapps/examples/jsp/tagplugin/if.html
+share/tomcat/webapps/examples/jsp/tagplugin/if.jsp
+share/tomcat/webapps/examples/jsp/tagplugin/if.jsp.html
+share/tomcat/webapps/examples/jsp/tagplugin/notes.html
+share/tomcat/webapps/examples/jsp/xml/xml.html
+share/tomcat/webapps/examples/jsp/xml/xml.jsp
+share/tomcat/webapps/examples/jsp/xml/xml.jsp.html
+share/tomcat/webapps/examples/servlets/cookies.html
+share/tomcat/webapps/examples/servlets/helloworld.html
+share/tomcat/webapps/examples/servlets/images/code.gif
+share/tomcat/webapps/examples/servlets/images/execute.gif
+share/tomcat/webapps/examples/servlets/images/return.gif
+share/tomcat/webapps/examples/servlets/index.html
+share/tomcat/webapps/examples/servlets/reqheaders.html
+share/tomcat/webapps/examples/servlets/reqinfo.html
+share/tomcat/webapps/examples/servlets/reqparams.html
+share/tomcat/webapps/examples/servlets/sessions.html
+share/tomcat/webapps/host-manager/META-INF/context.xml
+share/tomcat/webapps/host-manager/WEB-INF/web.xml
+share/tomcat/webapps/host-manager/images/add.gif
+share/tomcat/webapps/host-manager/images/asf-logo.gif
+share/tomcat/webapps/host-manager/images/code.gif
+share/tomcat/webapps/host-manager/images/design.gif
+share/tomcat/webapps/host-manager/images/docs.gif
+share/tomcat/webapps/host-manager/images/fix.gif
+share/tomcat/webapps/host-manager/images/tomcat.gif
+share/tomcat/webapps/host-manager/images/update.gif
+share/tomcat/webapps/host-manager/images/void.gif
+share/tomcat/webapps/host-manager/manager.xml
+share/tomcat/webapps/manager/401.jsp
+share/tomcat/webapps/manager/META-INF/context.xml
+share/tomcat/webapps/manager/WEB-INF/web.xml
+share/tomcat/webapps/manager/images/add.gif
+share/tomcat/webapps/manager/images/asf-logo.gif
+share/tomcat/webapps/manager/images/code.gif
+share/tomcat/webapps/manager/images/design.gif
+share/tomcat/webapps/manager/images/docs.gif
+share/tomcat/webapps/manager/images/fix.gif
+share/tomcat/webapps/manager/images/tomcat.gif
+share/tomcat/webapps/manager/images/update.gif
+share/tomcat/webapps/manager/images/void.gif
+share/tomcat/webapps/manager/sessionDetail.jsp
+share/tomcat/webapps/manager/sessionsList.jsp
+share/tomcat/webapps/manager/status.xsd
+share/tomcat/webapps/manager/xform.xsl
+@dirrm share/tomcat/webapps/manager/images
+@dirrm share/tomcat/webapps/manager/WEB-INF
+@dirrm share/tomcat/webapps/manager/META-INF
+@dirrm share/tomcat/webapps/manager
+@dirrm share/tomcat/webapps/host-manager/images
+@dirrm share/tomcat/webapps/host-manager/WEB-INF
+@dirrm share/tomcat/webapps/host-manager/META-INF
+@dirrm share/tomcat/webapps/host-manager
+@dirrm share/tomcat/webapps/examples/servlets/images
+@dirrm share/tomcat/webapps/examples/servlets
+@dirrm share/tomcat/webapps/examples/jsp/xml
+@dirrm share/tomcat/webapps/examples/jsp/tagplugin
+@dirrm share/tomcat/webapps/examples/jsp/snp
+@dirrm share/tomcat/webapps/examples/jsp/simpletag
+@dirrm share/tomcat/webapps/examples/jsp/sessions
+@dirrm share/tomcat/webapps/examples/jsp/security/protected
+@dirrm share/tomcat/webapps/examples/jsp/security
+@dirrm share/tomcat/webapps/examples/jsp/plugin/applet
+@dirrm share/tomcat/webapps/examples/jsp/plugin
+@dirrm share/tomcat/webapps/examples/jsp/num
+@dirrm share/tomcat/webapps/examples/jsp/jsptoserv
+@dirrm share/tomcat/webapps/examples/jsp/jsp2/tagfiles
+@dirrm share/tomcat/webapps/examples/jsp/jsp2/simpletag
+@dirrm share/tomcat/webapps/examples/jsp/jsp2/misc
+@dirrm share/tomcat/webapps/examples/jsp/jsp2/jspx
+@dirrm share/tomcat/webapps/examples/jsp/jsp2/jspattribute
+@dirrm share/tomcat/webapps/examples/jsp/jsp2/el
+@dirrm share/tomcat/webapps/examples/jsp/jsp2
+@dirrm share/tomcat/webapps/examples/jsp/include
+@dirrm share/tomcat/webapps/examples/jsp/images
+@dirrm share/tomcat/webapps/examples/jsp/forward
+@dirrm share/tomcat/webapps/examples/jsp/error
+@dirrm share/tomcat/webapps/examples/jsp/dates
+@dirrm share/tomcat/webapps/examples/jsp/colors
+@dirrm share/tomcat/webapps/examples/jsp/checkbox
+@dirrm share/tomcat/webapps/examples/jsp/chat
+@dirrm share/tomcat/webapps/examples/jsp/cal
+@dirrm share/tomcat/webapps/examples/jsp
+@dirrm share/tomcat/webapps/examples/WEB-INF/tags
+@dirrm share/tomcat/webapps/examples/WEB-INF/lib
+@dirrm share/tomcat/webapps/examples/WEB-INF/jsp2
+@dirrm share/tomcat/webapps/examples/WEB-INF/jsp/applet
+@dirrm share/tomcat/webapps/examples/WEB-INF/jsp
+@dirrm share/tomcat/webapps/examples/WEB-INF/classes/validators
+@dirrm share/tomcat/webapps/examples/WEB-INF/classes/util
+@dirrm share/tomcat/webapps/examples/WEB-INF/classes/sessions
+@dirrm share/tomcat/webapps/examples/WEB-INF/classes/num
+@dirrm share/tomcat/webapps/examples/WEB-INF/classes/listeners
+@dirrm share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag
+@dirrm share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples/el
+@dirrm share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples
+@dirrm share/tomcat/webapps/examples/WEB-INF/classes/jsp2
+@dirrm share/tomcat/webapps/examples/WEB-INF/classes/filters
+@dirrm share/tomcat/webapps/examples/WEB-INF/classes/examples
+@dirrm share/tomcat/webapps/examples/WEB-INF/classes/error
+@dirrm share/tomcat/webapps/examples/WEB-INF/classes/dates
+@dirrm share/tomcat/webapps/examples/WEB-INF/classes/compressionFilters
+@dirrm share/tomcat/webapps/examples/WEB-INF/classes/colors
+@dirrm share/tomcat/webapps/examples/WEB-INF/classes/checkbox
+@dirrm share/tomcat/webapps/examples/WEB-INF/classes/chat
+@dirrm share/tomcat/webapps/examples/WEB-INF/classes/cal
+@dirrm share/tomcat/webapps/examples/WEB-INF/classes
+@dirrm share/tomcat/webapps/examples/WEB-INF
+@dirrm share/tomcat/webapps/examples
+@dirrm share/tomcat/webapps/docs/tribes
+@dirrm share/tomcat/webapps/docs/printer
+@dirrm share/tomcat/webapps/docs/images
+@dirrm share/tomcat/webapps/docs/funcspecs/printer
+@dirrm share/tomcat/webapps/docs/funcspecs
+@dirrm share/tomcat/webapps/docs/config/printer
+@dirrm share/tomcat/webapps/docs/config
+@dirrm share/tomcat/webapps/docs/architecture/startup
+@dirrm share/tomcat/webapps/docs/architecture/requestProcess
+@dirrm share/tomcat/webapps/docs/architecture/printer
+@dirrm share/tomcat/webapps/docs/architecture
+@dirrm share/tomcat/webapps/docs/appdev/sample/web/images
+@dirrm share/tomcat/webapps/docs/appdev/sample/web/WEB-INF
+@dirrm share/tomcat/webapps/docs/appdev/sample/web
+@dirrm share/tomcat/webapps/docs/appdev/sample/src/mypackage
+@dirrm share/tomcat/webapps/docs/appdev/sample/src
+@dirrm share/tomcat/webapps/docs/appdev/sample/docs
+@dirrm share/tomcat/webapps/docs/appdev/sample
+@dirrm share/tomcat/webapps/docs/appdev/printer/docs/appdev
+@dirrm share/tomcat/webapps/docs/appdev/printer/docs
+@dirrm share/tomcat/webapps/docs/appdev/printer
+@dirrm share/tomcat/webapps/docs/appdev
+@dirrm share/tomcat/webapps/docs/api
+@dirrm share/tomcat/webapps/docs/WEB-INF
+@dirrm share/tomcat/webapps/docs
+@dirrm share/tomcat/webapps/ROOT/WEB-INF
+@dirrm share/tomcat/webapps/ROOT
+@dirrm share/tomcat/webapps
+@dirrm share/tomcat/lib
+@dirrm share/tomcat/bin
+@unexec ${RMDIR} %D/share/tomcat 2>/dev/null || ${TRUE}
+@dirrm share/examples/tomcat
+@dirrm share/doc/tomcat
diff --git a/www/apache-tomcat6/distinfo b/www/apache-tomcat6/distinfo
new file mode 100644
index 00000000000..73266457c68
--- /dev/null
+++ b/www/apache-tomcat6/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1.1.1 2009/02/14 12:02:09 adrianp Exp $
+
+SHA1 (apache-tomcat-6.0.18.tar.gz) = b4c98ee2d524a82ee126b6e990006504cbf5fdb7
+RMD160 (apache-tomcat-6.0.18.tar.gz) = 92a119a2dd90269b4141e0de47c79fbeb9ca9161
+Size (apache-tomcat-6.0.18.tar.gz) = 6142197 bytes
diff --git a/www/apache-tomcat6/files/tomcat.sh b/www/apache-tomcat6/files/tomcat.sh
new file mode 100644
index 00000000000..fc960009fe4
--- /dev/null
+++ b/www/apache-tomcat6/files/tomcat.sh
@@ -0,0 +1,70 @@
+#! @RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: tomcat.sh,v 1.1.1.1 2009/02/14 12:02:09 adrianp Exp $
+#
+# PROVIDE: tomcat
+# REQUIRE: DAEMON
+#
+
+if [ -r /etc/rc.subr ]
+then
+	. /etc/rc.subr
+fi
+
+name="tomcat"
+rcvar=$name
+command="@TOMCAT_HOME@/bin/catalina.sh"
+tomcat_user="@TOMCAT_USER@"
+tomcat_group="@TOMCAT_GROUP@"
+start_cmd="$command start"
+stop_cmd="$command stop"
+restart_cmd="$stop_cmd && $start_cmd"
+run_cmd="tomcat_run"
+version_cmd="tomcat_version"
+debug_cmd="tomcat_debug"
+extra_commands="run version debug"
+
+PREFIX=@PREFIX@
+
+if [ -z "${JAVA_HOME}" ]
+then
+	JAVA_HOME="@JAVA_HOME@"
+	export JAVA_HOME
+fi
+
+CATALINA_HOME=@TOMCAT_HOME@
+TOMCAT_HOME=@TOMCAT_HOME@
+export CATALINA_HOME
+export TOMCAT_HOME
+
+CLASSPATH=${CLASSPATH}:${PREFIX}/lib/java/servlet.jar:${PREFIX}/lib/java/jaxp.jar:${PREFIX}/lib/java/parser.jar:${PREFIX}/lib/java/crimson.jar:${PREFIX}/lib/java/ant.jar
+
+if [ -n "${tomcat_classpath}" ]
+then
+	CLASSPATH=${CLASSPATH}:${tomcat_classpath}
+fi
+export CLASSPATH
+
+tomcat_run()
+{
+	${command} run
+}
+
+tomcat_version()
+{
+	${command} version
+}
+
+tomcat_debug()
+{
+	${command} debug
+}
+
+if [ -f /etc/rc.subr ]
+then
+	load_rc_config "$name"
+	run_rc_command "$1"
+else
+	echo -n ' ${name}'
+	exec ${command} ${tomcat_flags} ${command_args}
+fi