6 files changed, 151 insertions, 164 deletions

diff --git a/www/tomcat41/Makefile b/www/tomcat41/Makefile
index 045591ca3464..e9d8a5f8bf02 100644
--- a/www/tomcat41/Makefile
+++ b/www/tomcat41/Makefile
@@ -5,14 +5,13 @@
 # $FreeBSD$
 #
 
-PORTNAME=	jakarta-tomcat
-PORTVERSION=	4.1.31
-PORTREVISION=	5
+PORTNAME=	apache-tomcat
+PORTVERSION=	4.1.34
 CATEGORIES=	www java
-MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
+MASTER_SITES=	${MASTER_SITE_APACHE_TOMCAT}
 MASTER_SITE_SUBDIR=	tomcat-4/v${PORTVERSION}/bin
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	nemoliu@gmail.com
 COMMENT=	Open-source Java web server by Apache, stable 4.1.x branch
 
 USE_JAVA=	yes
@@ -27,7 +26,7 @@ MAJOR_VER=	${PORTVERSION:R}
 APP_HOME?=	${PREFIX}/${PKGBASE}${PORTVERSION:R}
 LOG_DIR=	${APP_HOME}/logs
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${TOMCAT_USER} WWWGRP=${TOMCAT_GROUP}
-APP_TITLE=	Jakarta Tomcat
+APP_TITLE=	Apache Tomca
 APP_SHORTNAME=	tomcat${MAJOR_VER:S/.//}
 TOMCAT_USER?=	www
 TOMCAT_GROUP?=	www
diff --git a/www/tomcat41/distinfo b/www/tomcat41/distinfo
index 46a2f224ed1c..d107dd8c7727 100644
--- a/www/tomcat41/distinfo
+++ b/www/tomcat41/distinfo
@@ -1,3 +1,3 @@
-MD5 (jakarta-tomcat-4.1.31.tar.gz) = e768c4681a1c3460f959dd5fe93c4b55
-SHA256 (jakarta-tomcat-4.1.31.tar.gz) = 8ef7b105d80d2cc068f63898c942eefa5e4aac92b888a3c92bfbd976390750ad
-SIZE (jakarta-tomcat-4.1.31.tar.gz) = 8058534
+MD5 (apache-tomcat-4.1.34.tar.gz) = 22e558cada51732e575e57821ce23e7d
+SHA256 (apache-tomcat-4.1.34.tar.gz) = 6a34e862367b907acef92af585c413def556ec6b2fbc3c8875f4d6170db7fe59
+SIZE (apache-tomcat-4.1.34.tar.gz) = 9250693
diff --git a/www/tomcat41/files/patch-aa b/www/tomcat41/files/patch-aa
deleted file mode 100644
index 532aab14ae53..000000000000
--- a/www/tomcat41/files/patch-aa
+++ /dev/null
@@ -1,37 +0,0 @@
-$FreeBSD$
-
---- conf/server.xml.orig	Fri Jan  3 14:55:15 2003
-+++ conf/server.xml	Fri Jan  3 14:58:21 2003
-@@ -10,7 +10,7 @@
-      define subcomponents such as "Valves" or "Loggers" at this level.
-  -->
- 
--<Server port="8005" shutdown="SHUTDOWN" debug="0">
-+<Server port="%%SHUTDOWN_PORT%%" shutdown="SHUTDOWN" debug="0">
- 
- 
-   <!-- Comment these entries out to disable JMX MBeans support -->
-@@ -88,9 +88,9 @@
-          IP address of the remote client.
-     -->
- 
--    <!-- Define a non-SSL Coyote HTTP/1.1 Connector on port 8080 -->
-+    <!-- Define a non-SSL Coyote HTTP/1.1 Connector -->
-     <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
--               port="8080" minProcessors="5" maxProcessors="75"
-+               port="%%HTTP_PORT%%" minProcessors="5" maxProcessors="75"
-                enableLookups="true" redirectPort="8443"
-                acceptCount="100" debug="0" connectionTimeout="20000"
-                useURIValidationHack="false" disableUploadTimeout="true" />
-@@ -109,9 +109,9 @@
-     </Connector>
-     -->
- 
--    <!-- Define a Coyote/JK2 AJP 1.3 Connector on port 8009 -->
-+    <!-- Define a Coyote/JK2 AJP 1.3 Connector -->
-     <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
--               port="8009" minProcessors="5" maxProcessors="75"
-+               port="%%AJP_1_3_PORT%%" minProcessors="5" maxProcessors="75"
-                enableLookups="true" redirectPort="8443"
-                acceptCount="10" debug="0" connectionTimeout="0"
-                useURIValidationHack="false"
diff --git a/www/tomcat41/files/patch-conf_server.xml b/www/tomcat41/files/patch-conf_server.xml
new file mode 100644
index 000000000000..4cafe37d50ec
--- /dev/null
+++ b/www/tomcat41/files/patch-conf_server.xml
@@ -0,0 +1,35 @@
+--- ./conf/server.xml.orig	Thu Feb 22 00:41:26 2007
++++ ./conf/server.xml	Thu Feb 22 00:41:26 2007
+@@ -10,7 +10,7 @@
+      define subcomponents such as "Valves" or "Loggers" at this level.
+  -->
+ 
+-<Server port="8005" shutdown="SHUTDOWN" debug="0">
++<Server port="%%SHUTDOWN_PORT%%" shutdown="SHUTDOWN" debug="0">
+ 
+ 
+   <!-- Comment these entries out to disable JMX MBeans support -->
+@@ -88,9 +88,9 @@
+          IP address of the remote client.
+     -->
+ 
+-    <!-- Define a non-SSL Coyote HTTP/1.1 Connector on port 8080 -->
++    <!-- Define a non-SSL Coyote HTTP/1.1 Connector -->
+     <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
+-               port="8080" enableLookups="true" redirectPort="8443"
++               port="%%HTTP_PORT%%" enableLookups="true" redirectPort="8443"
+                acceptCount="100" connectionTimeout="20000"
+                useURIValidationHack="false" disableUploadTimeout="true" />
+     <!-- Note : To disable connection timeouts, set connectionTimeout value
+@@ -105,9 +105,9 @@
+                clientAuth="false" sslProtocol="TLS" />
+     -->
+ 
+-    <!-- Define a Coyote AJP/1.3 Connector on port 8009 -->
++    <!-- Define a Coyote AJP/1.3 Connector -->
+     <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
+-               port="8009" enableLookups="true" redirectPort="8443"
++               port="%%AJP_1_3_PORT%%" enableLookups="true" redirectPort="8443"
+                connectionTimeout="0"
+                useURIValidationHack="false"
+                protocolHandlerClassName="org.apache.jk.server.JkCoyoteHandler" />
diff --git a/www/tomcat41/pkg-descr b/www/tomcat41/pkg-descr
index 738b5471a310..0b34641d9046 100644
--- a/www/tomcat41/pkg-descr
+++ b/www/tomcat41/pkg-descr
@@ -1,4 +1,4 @@
-Jakarta Tomcat is a web server written in 100% Pure Java. The
+Apache Tomcat is a web server written in 100% Pure Java. The
 Tomcat 4 branch is the reference implementation for the Java
 Servlet 2.3 and JavaServer Pages 1.2 technologies.
 
@@ -16,4 +16,4 @@ o Custom Ant tasks to interact with the manager application directly from
   build.xml scripts
 
 
-WWW: http://jakarta.apache.org/tomcat/
+WWW: http://tomcat.apache.org/
diff --git a/www/tomcat41/pkg-plist b/www/tomcat41/pkg-plist
index ae81d16685d3..96abb9152b03 100644
--- a/www/tomcat41/pkg-plist
+++ b/www/tomcat41/pkg-plist
@@ -1,14 +1,8 @@
 @comment $FreeBSD$
-@unexec if cmp -s %D/%%T%%/conf/server.xml %D/%%T%%/conf/server.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/server.xml; else echo If permanently deleting this package, %D/%%T%%/conf/server.xml must be removed manually; fi
-@unexec if cmp -s %D/%%T%%/conf/jk2.properties %D/%%T%%/conf/jk2.properties.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/jk2.properties; else echo If permanently deleting this package, %D/%%T%%/conf/jk2.properties must be removed manually; fi
-@unexec if cmp -s %D/%%T%%/conf/server-noexamples.xml.config %D/%%T%%/conf/server-noexamples.xml.config.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/server-noexamples.xml.config; else echo If permanently deleting this package, %D/%%T%%/conf/server-noexamples.xml.config must be removed manually; fi
-@unexec if cmp -s %D/%%T%%/conf/catalina.policy %D/%%T%%/conf/catalina.policy.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/catalina.policy; else echo If permanently deleting this package, %D/%%T%%/conf/server.xml must be removed manually; fi
-@unexec if cmp -s %D/%%T%%/conf/tomcat-users.xml %D/%%T%%/conf/tomcat-users.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/tomcat-users.xml; else echo If permanently deleting this package, %D/%%T%%/conf/tomcat-users.xml must be removed manually; fi
-@unexec if cmp -s %D/%%T%%/conf/web.xml %D/%%T%%/conf/web.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/web.xml; else echo If permanently deleting this package, %D/%%T%%/conf/web.xml must be removed manually; fi
+%%T%%/BUILDING.txt
 %%T%%/LICENSE
 %%T%%/README.txt
 %%T%%/RELEASE-NOTES-4.1.txt
-%%T%%/RELEASE-PLAN-4.1.txt
 %%T%%/RUNNING.txt
 %%T%%/bin/bootstrap.jar
 %%T%%/bin/catalina.sh
@@ -22,14 +16,14 @@
 %%T%%/bin/tomcat-jni.jar
 %%T%%/bin/tool-wrapper.sh
 %%T%%/common/endorsed/xercesImpl.jar
-%%T%%/common/endorsed/xmlParserAPIs.jar
+%%T%%/common/endorsed/xml-apis.jar
 %%T%%/common/lib/activation.jar
 %%T%%/common/lib/ant-launcher.jar
 %%T%%/common/lib/ant.jar
-%%T%%/common/lib/commons-collections.jar
-%%T%%/common/lib/commons-dbcp-1.1.jar
-%%T%%/common/lib/commons-logging-api.jar
-%%T%%/common/lib/commons-pool-1.1.jar
+%%T%%/common/lib/commons-collections-3.2.jar
+%%T%%/common/lib/commons-dbcp-1.2.1.jar
+%%T%%/common/lib/commons-logging-api-1.1.jar
+%%T%%/common/lib/commons-pool-1.3.jar
 %%T%%/common/lib/jasper-compiler.jar
 %%T%%/common/lib/jasper-runtime.jar
 %%T%%/common/lib/jdbc2_0-stdext.jar
@@ -41,23 +35,30 @@
 %%T%%/common/lib/naming-resources.jar
 %%T%%/common/lib/servlet.jar
 %%T%%/common/lib/tools.jar
-%%T%%/conf/catalina.policy.%%CONF_EXT%%
-%%T%%/conf/jk2.properties.%%CONF_EXT%%
-%%T%%/conf/server-noexamples.xml.config.%%CONF_EXT%%
-%%T%%/conf/server.xml.%%CONF_EXT%%
-%%T%%/conf/tomcat-users.xml.%%CONF_EXT%%
-%%T%%/conf/web.xml.%%CONF_EXT%%
+%%T%%/conf/catalina.policy
+%%T%%/conf/catalina.policy.sample
+%%T%%/conf/jk2.properties
+%%T%%/conf/jk2.properties.sample
+%%T%%/conf/server-noexamples.xml.config
+%%T%%/conf/server-noexamples.xml.config.sample
+%%T%%/conf/server.xml
+%%T%%/conf/server.xml.sample
+%%T%%/conf/tomcat-users.xml
+%%T%%/conf/tomcat-users.xml.sample
+%%T%%/conf/web.xml
+%%T%%/conf/web.xml.sample
 %%T%%/logs/stderr.log
 %%T%%/logs/stdout.log
 %%T%%/server/lib/catalina-ant.jar
 %%T%%/server/lib/catalina.jar
 %%T%%/server/lib/commons-beanutils.jar
-%%T%%/server/lib/commons-digester.jar
-%%T%%/server/lib/commons-fileupload-1.0.jar
-%%T%%/server/lib/commons-logging.jar
+%%T%%/server/lib/commons-digester-1.7.jar
+%%T%%/server/lib/commons-fileupload-1.1.1.jar
+%%T%%/server/lib/commons-io-1.2.jar
+%%T%%/server/lib/commons-logging-1.1.jar
 %%T%%/server/lib/commons-modeler.jar
 %%T%%/server/lib/jaas.jar
-%%T%%/server/lib/jakarta-regexp-1.3.jar
+%%T%%/server/lib/jakarta-regexp-1.4.jar
 %%T%%/server/lib/mx4j-jmx.jar
 %%T%%/server/lib/mx4j.license
 %%T%%/server/lib/servlets-cgi.renametojar
@@ -72,8 +73,7 @@
 %%T%%/server/lib/tomcat-jk.jar
 %%T%%/server/lib/tomcat-jk2.jar
 %%T%%/server/lib/tomcat-util.jar
-%%T%%/server/lib/tomcat-warp.jar
-%%T%%/server/webapps/admin/WEB-INF/classes/filters/SetCharacterEncodingFilter.class
+%%T%%/server/lib/tomcat4-coyote.jar
 %%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ActionTag.class
 %%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ActionsTag.class
 %%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationLocales.class
@@ -126,6 +126,7 @@
 %%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext/DeleteDefaultContextsAction.class
 %%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext/EditDefaultContextAction.class
 %%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext/SaveDefaultContextAction.class
+%%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/filters/SetCharacterEncodingFilter.class
 %%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddAliasAction.class
 %%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddHostAction.class
 %%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AliasForm.class
@@ -150,6 +151,7 @@
 %%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/LoggersForm.class
 %%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/SaveLoggerAction.class
 %%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.class
+%%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DataSourceRealmForm.class
 %%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DeleteRealmAction.class
 %%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DeleteRealmForm.class
 %%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DeleteRealmsAction.class
@@ -159,6 +161,7 @@
 %%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/MemoryRealmForm.class
 %%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/RealmForm.class
 %%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/RealmsForm.class
+%%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveDataSourceRealmAction.class
 %%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJDBCRealmAction.class
 %%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJNDIRealmAction.class
 %%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveMemoryRealmAction.class
@@ -305,6 +308,7 @@
 %%T%%/server/webapps/admin/logger/logger.jsp
 %%T%%/server/webapps/admin/logger/loggers.jsp
 %%T%%/server/webapps/admin/login.jsp
+%%T%%/server/webapps/admin/realm/dataSourceRealm.jsp
 %%T%%/server/webapps/admin/realm/jdbcRealm.jsp
 %%T%%/server/webapps/admin/realm/jndiRealm.jsp
 %%T%%/server/webapps/admin/realm/memoryRealm.jsp
@@ -366,14 +370,14 @@
 %%T%%/server/webapps/admin/valve/valves.jsp
 %%T%%/server/webapps/manager/WEB-INF/web.xml
 %%T%%/server/webapps/manager/html-manager-howto.html
-%%T%%/server/webapps/manager/images/jakarta-logo.gif
+%%T%%/server/webapps/manager/images/asf-logo.gif
 %%T%%/server/webapps/manager/images/tomcat.gif
 %%T%%/server/webapps/manager/images/void.gif
 %%T%%/server/webapps/manager/manager-howto.html
 %%T%%/temp/README.txt
 %%T%%/webapps/ROOT/WEB-INF/web.xml
+%%T%%/webapps/ROOT/asf-logo-wide.gif
 %%T%%/webapps/ROOT/index.jsp
-%%T%%/webapps/ROOT/jakarta-banner.gif
 %%T%%/webapps/ROOT/tomcat-power.gif
 %%T%%/webapps/ROOT/tomcat.gif
 %%T%%/webapps/admin.xml
@@ -691,24 +695,6 @@
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/package-frame.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/package-summary.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/package-tree.html
-%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/Constants.html
-%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/WarpCertificates.html
-%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/WarpConfigurationHandler.html
-%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/WarpConnection.html
-%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/WarpConnector.html
-%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/WarpEngine.html
-%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/WarpHost.html
-%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/WarpLogger.html
-%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/WarpPacket.html
-%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/WarpRequest.Stream.html
-%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/WarpRequest.html
-%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/WarpRequestHandler.html
-%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/WarpResponse.Stream.html
-%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/WarpResponse.html
-%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/WarpSSLData.html
-%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/package-frame.html
-%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/package-summary.html
-%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/package-tree.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/ApplicationContext.PrivilegedGetInitParameter.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/ApplicationContext.PrivilegedGetInitParameterNames.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/ApplicationContext.PrivilegedGetNamedDispatcher.html
@@ -890,6 +876,7 @@
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/CatalinaManagerMBean.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/CatalinaService.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/ClassLoaderFactory.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/ConnectorCreateRule.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/Constants.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/ContextConfig.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/ContextRuleSet.html
@@ -907,6 +894,7 @@
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/NamingRuleSet.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/PasswdUserDatabase.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/SecurityClassLoad.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/SetAllPropertiesRule.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/TldRuleSet.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/Tool.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/UserConfig.html
@@ -1069,9 +1057,11 @@
 %%T%%/webapps/tomcat-docs/catalina/funcspecs/printer/mbean-names.html
 %%T%%/webapps/tomcat-docs/cgi-howto.html
 %%T%%/webapps/tomcat-docs/class-loader-howto.html
+%%T%%/webapps/tomcat-docs/config/ajp13.html
 %%T%%/webapps/tomcat-docs/config/connectors.html
 %%T%%/webapps/tomcat-docs/config/context.html
 %%T%%/webapps/tomcat-docs/config/coyote.html
+%%T%%/webapps/tomcat-docs/config/coyotejk.html
 %%T%%/webapps/tomcat-docs/config/defaultcontext.html
 %%T%%/webapps/tomcat-docs/config/engine.html
 %%T%%/webapps/tomcat-docs/config/globalresources.html
@@ -1083,9 +1073,11 @@
 %%T%%/webapps/tomcat-docs/config/loader.html
 %%T%%/webapps/tomcat-docs/config/logger.html
 %%T%%/webapps/tomcat-docs/config/manager.html
+%%T%%/webapps/tomcat-docs/config/printer/ajp13.html
 %%T%%/webapps/tomcat-docs/config/printer/connectors.html
 %%T%%/webapps/tomcat-docs/config/printer/context.html
 %%T%%/webapps/tomcat-docs/config/printer/coyote.html
+%%T%%/webapps/tomcat-docs/config/printer/coyotejk.html
 %%T%%/webapps/tomcat-docs/config/printer/defaultcontext.html
 %%T%%/webapps/tomcat-docs/config/printer/engine.html
 %%T%%/webapps/tomcat-docs/config/printer/globalresources.html
@@ -1110,7 +1102,7 @@
 %%T%%/webapps/tomcat-docs/config/valve.html
 %%T%%/webapps/tomcat-docs/config/webapp.html
 %%T%%/webapps/tomcat-docs/html-manager-howto.html
-%%T%%/webapps/tomcat-docs/images/jakarta-logo.gif
+%%T%%/webapps/tomcat-docs/images/asf-logo.gif
 %%T%%/webapps/tomcat-docs/images/printer.gif
 %%T%%/webapps/tomcat-docs/images/tomcat.gif
 %%T%%/webapps/tomcat-docs/images/void.gif
@@ -1178,6 +1170,7 @@
 %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/ServletWriter.html
 %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/TagConstants.html
 %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/TagLibraryInfoImpl.html
+%%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/TextOptimizer.html
 %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/TldLocationsCache.html
 %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Validator.html
 %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/package-frame.html
@@ -1239,58 +1232,61 @@
 %%T%%/webapps/tomcat-docs/jasper/docs/api/resources/inherit.gif
 %%T%%/webapps/tomcat-docs/jasper/docs/api/serialized-form.html
 %%T%%/webapps/tomcat-docs/jasper/docs/api/stylesheet.css
-%%T%%/webapps/tomcat-docs/jk2/common/AJPv13-extensions-proposal.html
-%%T%%/webapps/tomcat-docs/jk2/common/AJPv13.html
-%%T%%/webapps/tomcat-docs/jk2/common/doccontrib.html
-%%T%%/webapps/tomcat-docs/jk2/common/printer/AJPv13-extensions-proposal.html
-%%T%%/webapps/tomcat-docs/jk2/common/printer/AJPv13.html
-%%T%%/webapps/tomcat-docs/jk2/common/printer/doccontrib.html
-%%T%%/webapps/tomcat-docs/jk2/common/printer/tools.html
-%%T%%/webapps/tomcat-docs/jk2/common/tools.html
-%%T%%/webapps/tomcat-docs/jk2/faq.html
-%%T%%/webapps/tomcat-docs/jk2/images/corner.gif
-%%T%%/webapps/tomcat-docs/jk2/images/jakarta.gif
-%%T%%/webapps/tomcat-docs/jk2/images/jk2.gif
-%%T%%/webapps/tomcat-docs/jk2/images/jk2.png
-%%T%%/webapps/tomcat-docs/jk2/images/mod_jk.jpg
-%%T%%/webapps/tomcat-docs/jk2/images/pixel.gif
-%%T%%/webapps/tomcat-docs/jk2/images/tomcat.ico
-%%T%%/webapps/tomcat-docs/jk2/index.html
-%%T%%/webapps/tomcat-docs/jk2/jk/aphowto.html
-%%T%%/webapps/tomcat-docs/jk2/jk/domhowto.html
-%%T%%/webapps/tomcat-docs/jk2/jk/iishowto.html
-%%T%%/webapps/tomcat-docs/jk2/jk/neshowto.html
-%%T%%/webapps/tomcat-docs/jk2/jk/printer/aphowto.html
-%%T%%/webapps/tomcat-docs/jk2/jk/printer/domhowto.html
-%%T%%/webapps/tomcat-docs/jk2/jk/printer/iishowto.html
-%%T%%/webapps/tomcat-docs/jk2/jk/printer/neshowto.html
-%%T%%/webapps/tomcat-docs/jk2/jk/printer/quickhowto.html
-%%T%%/webapps/tomcat-docs/jk2/jk/printer/workershowto.html
-%%T%%/webapps/tomcat-docs/jk2/jk/quickhowto.html
-%%T%%/webapps/tomcat-docs/jk2/jk/workershowto.html
-%%T%%/webapps/tomcat-docs/jk2/jk2/confighowto.html
-%%T%%/webapps/tomcat-docs/jk2/jk2/configtc.html
-%%T%%/webapps/tomcat-docs/jk2/jk2/configtccom.html
-%%T%%/webapps/tomcat-docs/jk2/jk2/configtcex.html
-%%T%%/webapps/tomcat-docs/jk2/jk2/configweb.html
-%%T%%/webapps/tomcat-docs/jk2/jk2/configwebcom.html
-%%T%%/webapps/tomcat-docs/jk2/jk2/configwebex.html
-%%T%%/webapps/tomcat-docs/jk2/jk2/davhowto.html
-%%T%%/webapps/tomcat-docs/jk2/jk2/installhowto.html
-%%T%%/webapps/tomcat-docs/jk2/jk2/printer/confighowto.html
-%%T%%/webapps/tomcat-docs/jk2/jk2/printer/configtc.html
-%%T%%/webapps/tomcat-docs/jk2/jk2/printer/configtccom.html
-%%T%%/webapps/tomcat-docs/jk2/jk2/printer/configtcex.html
-%%T%%/webapps/tomcat-docs/jk2/jk2/printer/configweb.html
-%%T%%/webapps/tomcat-docs/jk2/jk2/printer/configwebcom.html
-%%T%%/webapps/tomcat-docs/jk2/jk2/printer/configwebex.html
-%%T%%/webapps/tomcat-docs/jk2/jk2/printer/davhowto.html
-%%T%%/webapps/tomcat-docs/jk2/jk2/printer/installhowto.html
-%%T%%/webapps/tomcat-docs/jk2/jk2/printer/vhosthowto.html
-%%T%%/webapps/tomcat-docs/jk2/jk2/vhosthowto.html
-%%T%%/webapps/tomcat-docs/jk2/printer/faq.html
-%%T%%/webapps/tomcat-docs/jk2/printer/index.html
-%%T%%/webapps/tomcat-docs/jk2/style.css
+%%T%%/webapps/tomcat-docs/jk/changelog.html
+%%T%%/webapps/tomcat-docs/jk/common/ajpv13a.html
+%%T%%/webapps/tomcat-docs/jk/common/ajpv13ext.html
+%%T%%/webapps/tomcat-docs/jk/common/printer/ajpv13a.html
+%%T%%/webapps/tomcat-docs/jk/common/printer/ajpv13ext.html
+%%T%%/webapps/tomcat-docs/jk/common/printer/tools.html
+%%T%%/webapps/tomcat-docs/jk/common/tools.html
+%%T%%/webapps/tomcat-docs/jk/config/apache.html
+%%T%%/webapps/tomcat-docs/jk/config/iis.html
+%%T%%/webapps/tomcat-docs/jk/config/printer/apache.html
+%%T%%/webapps/tomcat-docs/jk/config/printer/iis.html
+%%T%%/webapps/tomcat-docs/jk/config/printer/workers.html
+%%T%%/webapps/tomcat-docs/jk/config/workers.html
+%%T%%/webapps/tomcat-docs/jk/faq.html
+%%T%%/webapps/tomcat-docs/jk/howto/apache.html
+%%T%%/webapps/tomcat-docs/jk/howto/doccontrib.html
+%%T%%/webapps/tomcat-docs/jk/howto/domino.html
+%%T%%/webapps/tomcat-docs/jk/howto/iis.html
+%%T%%/webapps/tomcat-docs/jk/howto/index.html
+%%T%%/webapps/tomcat-docs/jk/howto/loadbalancers.html
+%%T%%/webapps/tomcat-docs/jk/howto/nes.html
+%%T%%/webapps/tomcat-docs/jk/howto/printer/apache.html
+%%T%%/webapps/tomcat-docs/jk/howto/printer/doccontrib.html
+%%T%%/webapps/tomcat-docs/jk/howto/printer/domino.html
+%%T%%/webapps/tomcat-docs/jk/howto/printer/iis.html
+%%T%%/webapps/tomcat-docs/jk/howto/printer/index.html
+%%T%%/webapps/tomcat-docs/jk/howto/printer/loadbalancers.html
+%%T%%/webapps/tomcat-docs/jk/howto/printer/nes.html
+%%T%%/webapps/tomcat-docs/jk/howto/printer/quick.html
+%%T%%/webapps/tomcat-docs/jk/howto/printer/workers.html
+%%T%%/webapps/tomcat-docs/jk/howto/quick.html
+%%T%%/webapps/tomcat-docs/jk/howto/workers.html
+%%T%%/webapps/tomcat-docs/jk/images/add.gif
+%%T%%/webapps/tomcat-docs/jk/images/code.gif
+%%T%%/webapps/tomcat-docs/jk/images/design.gif
+%%T%%/webapps/tomcat-docs/jk/images/docs.gif
+%%T%%/webapps/tomcat-docs/jk/images/fix.gif
+%%T%%/webapps/tomcat-docs/jk/images/jakarta-logo.gif
+%%T%%/webapps/tomcat-docs/jk/images/printer.gif
+%%T%%/webapps/tomcat-docs/jk/images/tomcat.gif
+%%T%%/webapps/tomcat-docs/jk/images/update.gif
+%%T%%/webapps/tomcat-docs/jk/images/void.gif
+%%T%%/webapps/tomcat-docs/jk/index.html
+%%T%%/webapps/tomcat-docs/jk/news/20041100.html
+%%T%%/webapps/tomcat-docs/jk/news/20050101.html
+%%T%%/webapps/tomcat-docs/jk/news/20060101.html
+%%T%%/webapps/tomcat-docs/jk/news/printer/20041100.html
+%%T%%/webapps/tomcat-docs/jk/news/printer/20050101.html
+%%T%%/webapps/tomcat-docs/jk/news/printer/20060101.html
+%%T%%/webapps/tomcat-docs/jk/printer/changelog.html
+%%T%%/webapps/tomcat-docs/jk/printer/faq.html
+%%T%%/webapps/tomcat-docs/jk/printer/index.html
+%%T%%/webapps/tomcat-docs/jk/printer/proxy.html
+%%T%%/webapps/tomcat-docs/jk/proxy.html
+%%T%%/webapps/tomcat-docs/jk/style.css
 %%T%%/webapps/tomcat-docs/jndi-datasource-examples-howto.html
 %%T%%/webapps/tomcat-docs/jndi-resources-howto.html
 %%T%%/webapps/tomcat-docs/manager-howto.html
@@ -1479,14 +1475,8 @@
 %%T%%/webapps/webdav/index.html
 %%T%%/webapps/webdav/tomcat-power.gif
 %%T%%/webapps/webdav/tomcat.gif
-@exec mkdir %D/%%T%%/server/classes || true
-@exec mkdir %D/%%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/filters ||true
-@exec mkdir %D/%%T%%/shared || true
-@exec mkdir %D/%%T%%/shared/classes || true
-@exec mkdir %D/%%T%%/shared/lib || true
-@exec mkdir %D/%%T%%/work || true
-@exec mkdir %D/%%T%%/common/classes ||true
-@exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%T%%/conf %D/%%T%%/logs %D/%%T%%/temp %D/%%T%%/work
+@dirrm share/nls/en_US.US-ASCII
+@dirrm share/nls/POSIX
 @dirrm %%T%%/work
 @dirrm %%T%%/webapps/webdav/WEB-INF
 @dirrm %%T%%/webapps/webdav
@@ -1503,15 +1493,17 @@
 @dirrm %%T%%/webapps/tomcat-docs/servletapi/javax
 @dirrm %%T%%/webapps/tomcat-docs/servletapi
 @dirrm %%T%%/webapps/tomcat-docs/printer
-@dirrm %%T%%/webapps/tomcat-docs/jk2/printer
-@dirrm %%T%%/webapps/tomcat-docs/jk2/jk2/printer
-@dirrm %%T%%/webapps/tomcat-docs/jk2/jk2
-@dirrm %%T%%/webapps/tomcat-docs/jk2/jk/printer
-@dirrm %%T%%/webapps/tomcat-docs/jk2/jk
-@dirrm %%T%%/webapps/tomcat-docs/jk2/images
-@dirrm %%T%%/webapps/tomcat-docs/jk2/common/printer
-@dirrm %%T%%/webapps/tomcat-docs/jk2/common
-@dirrm %%T%%/webapps/tomcat-docs/jk2
+@dirrm %%T%%/webapps/tomcat-docs/jk/printer
+@dirrm %%T%%/webapps/tomcat-docs/jk/news/printer
+@dirrm %%T%%/webapps/tomcat-docs/jk/news
+@dirrm %%T%%/webapps/tomcat-docs/jk/images
+@dirrm %%T%%/webapps/tomcat-docs/jk/howto/printer
+@dirrm %%T%%/webapps/tomcat-docs/jk/howto
+@dirrm %%T%%/webapps/tomcat-docs/jk/config/printer
+@dirrm %%T%%/webapps/tomcat-docs/jk/config
+@dirrm %%T%%/webapps/tomcat-docs/jk/common/printer
+@dirrm %%T%%/webapps/tomcat-docs/jk/common
+@dirrm %%T%%/webapps/tomcat-docs/jk
 @dirrm %%T%%/webapps/tomcat-docs/jasper/docs/api/resources
 @dirrm %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/xmlparser
 @dirrm %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/util
@@ -1550,7 +1542,6 @@
 @dirrm %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader
 @dirrm %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy
 @dirrm %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core
-@dirrm %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp
 @dirrm %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/http10
 @dirrm %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/http
 @dirrm %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector
@@ -1652,7 +1643,6 @@
 @dirrm %%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp
 @dirrm %%T%%/server/webapps/admin/WEB-INF/classes/org/apache
 @dirrm %%T%%/server/webapps/admin/WEB-INF/classes/org
-@dirrm %%T%%/server/webapps/admin/WEB-INF/classes/filters
 @dirrm %%T%%/server/webapps/admin/WEB-INF/classes
 @dirrm %%T%%/server/webapps/admin/WEB-INF
 @dirrm %%T%%/server/webapps/admin