- Update to 4.1.34

- Follow the project name change as it was with tomcat55 - Pass maintainership to submitter PR: ports/109424 Submitted by: Nemo Liu <nemoliu@gmail.com> Repo-opied by: marcus
svn path=/head/; revision=187598
2025-06-03 11:56:28 -04:00 · 2007-03-17 20:54:58 +00:00 · 2007-03-17 20:54:58 +00:00 · f1f0c957e6 · 2021-03-31 03:12:20 +00:00
commit f1f0c957e6
parent c0b36a5750
16 changed files with 153 additions and 2289 deletions
--- a/1
+++ b/1
@ -2870,3 +2870,4 @@ comms/mwavem||2007-03-13|Has expired: Broken on all supported versions of FreeBS
 chinese/big5fs||2007-03-14|Has expired: Use mount_cd9660(8), mount_msdosfs(8), or mount_ntfs(8) instead
 chinese/gbfs||2007-03-14|Has expired: Use mount_cd9660(8), mount_msdosfs(8), or mount_ntfs(8) instead
 audio/anthem||2007-03-16|Has expired: this software is not developed any more
+www/jakarta-tomcat41|www/tomcat41|2007-03-17|Renamed (no longer a Jakarta project)
--- a/www/Makefile
+++ b/www/Makefile
@ -213,8 +213,8 @@
    SUBDIR += iwebcal
    SUBDIR += jakarta-jmeter
    SUBDIR += jakarta-tomcat4
-    SUBDIR += jakarta-tomcat41
    SUBDIR += jakarta-tomcat5
+    SUBDIR += tomcat41
    SUBDIR += tomcat55
    SUBDIR += tomcat6
    SUBDIR += jdresolve
--- a/www/jakarta-tomcat41/Makefile
+++ b/www/jakarta-tomcat41/Makefile
@ -1,135 +0,0 @@
-# New ports collection makefile for:	jakarta-tomcat
-# Date created:		20 Oct 2000
-# Whom:			des
-#
-# $FreeBSD$
-#
-
-PORTNAME=	jakarta-tomcat
-PORTVERSION=	4.1.31
-PORTREVISION=	5
-CATEGORIES=	www java
-MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
-MASTER_SITE_SUBDIR=	tomcat-4/v${PORTVERSION}/bin
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Open-source Java web server by Apache, stable 4.1.x branch
-
-USE_JAVA=	yes
-JAVA_VERSION=	1.2+
-NO_BUILD=	YES
-LATEST_LINK=	${APP_SHORTNAME}
-
-USE_RC_SUBR=	tomcat41.sh
-SUB_FILES=	pkg-install pkg-deinstall
-
-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_SHORTNAME=	tomcat${MAJOR_VER:S/.//}
-TOMCAT_USER?=	www
-TOMCAT_GROUP?=	www
-PW?=		/usr/sbin/pw
-HTTP_PORT?=	8180
-SHUTDOWN_PORT?=	8005
-AJP_1_3_PORT?=	8009
-STDOUT_LOG=	${LOG_DIR}/stdout.log
-STDERR_LOG=	${LOG_DIR}/stderr.log
-PID_FILE=	/var/run/${APP_SHORTNAME}.pid
-REPLACE_FILES=	${WRKSRC}/conf/server.xml
-REPLACE_LIST_TEMP=	${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/}
-JAR_FILE=	bin/bootstrap.jar
-WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-CONF_EXT=	sample
-PLIST_SUB+=	CONF_EXT=${CONF_EXT}
-
-SUB_LIST=	AJP_1_3_PORT=${AJP_1_3_PORT} \
-		APP_HOME=${APP_HOME} \
-		APP_SHORTNAME=${APP_SHORTNAME} \
-		APP_TITLE="${APP_TITLE}" \
-		GROUP=${TOMCAT_GROUP} \
-		HTTP_PORT=${HTTP_PORT} \
-		JAR_FILE=${JAR_FILE} \
-		JAVA_HOME=${JAVA_HOME} \
-		PID_FILE=${PID_FILE} \
-		SHUTDOWN_PORT=${SHUTDOWN_PORT} \
-		STDERR_LOG=${STDERR_LOG} \
-		STDOUT_LOG=${STDOUT_LOG} \
-		TOMCAT_HOME=${APP_HOME} \
-		TOMCAT_VERSION=${MAJOR_VER:S/.//} \
-		USER=${TOMCAT_USER} \
-
-.include <bsd.port.pre.mk>
-
-pre-patch:
-	@${ECHO_MSG} "Installation settings:"
-	@${ECHO_MSG} "   Destination directory:    ${APP_HOME}"
-	@${ECHO_MSG} "   Location of JDK:          ${JAVA_HOME}"
-	@${ECHO_MSG} "   Location of Java port:    ${JAVA_PORT}"
-	@${ECHO_MSG} "   Running as (user/group):  ${TOMCAT_USER}/${TOMCAT_GROUP}"
-	@${ECHO_MSG} "   HTTP port:                ${HTTP_PORT}"
-	@${ECHO_MSG} "   Shutdown listener port:   ${SHUTDOWN_PORT}"
-	@${ECHO_MSG} "   AJP 1.3 connector port:   ${AJP_1_3_PORT}"
-	@${ECHO_MSG} "   Logfile stdout:           ${STDOUT_LOG}"
-	@${ECHO_MSG} "   Logfile stderr:           ${STDERR_LOG}"
-
-post-patch:
-	@${ECHO_MSG} -n ">> Removing unneeded files..."
-	@${RM} -f `${FIND} ${WRKSRC} -name '*.bat'` `${FIND} ${WRKSRC} -name '*.orig'` `${FIND} ${WRKSRC} -name '*.exe'`
-	@${ECHO_MSG} " [ DONE ]"
-
-.for file in ${REPLACE_FILES}
-	@${ECHO_MSG} -n ">> Customizing `basename ${file}`..."
-	@${SED} ${REPLACE_LIST_TEMP} ${file} > ${WRKDIR}/`basename ${file}`
-	@${ECHO_MSG} " [ DONE ]"
-.endfor
-
-pre-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-do-install:
-	@${ECHO_MSG} -n ">> Creating destination directory..."
-	@${MKDIR} ${APP_HOME}
-	@${MKDIR} ${LOG_DIR}
-	@${ECHO_MSG} " [ DONE ]"
-
-	@${ECHO_MSG} ">> Copying files to destination directory..."
-	@${CP} ${WRKDIR}/server.xml ${WRKSRC}/conf/
-	@(cd ${WRKSRC};${FIND} conf -type f | ${SED} -e '/${CONF_EXT}/d') \
-		| while read a; do \
-			${MV} ${WRKSRC}/$$a ${WRKSRC}/$$a.${CONF_EXT}; \
-			if [ ! -e "${APP_HOME}/$$a" ]; then \
-				${ECHO_MSG} "	Installing local configuration file: ${APP_HOME}/$$a"; \
-				${CP} ${WRKSRC}/$$a.${CONF_EXT} ${WRKSRC}/$$a; \
-			else \
-				${ECHO_MSG} "	Preserving local configuration file: ${APP_HOME}/$$a"; \
-			fi; \
-		done
-	@${CP} -R ${WRKSRC}/* ${APP_HOME}
-	@${ECHO_MSG} " [ DONE ]"
-
-	@${ECHO_MSG} -n ">> Creating log files..."
-	@${INSTALL} /dev/null ${STDOUT_LOG}
-	@${INSTALL} /dev/null ${STDERR_LOG}
-	@${ECHO_MSG} " [ DONE ]"
-
-	@${ECHO_MSG} -n ">> Creating symlink to tools.jar..."
-	@${LN} -sf ${JAVA_HOME}/lib/tools.jar ${APP_HOME}/common/lib/tools.jar
-	@${ECHO_MSG} " [ DONE ]"
-
-	@${ECHO_MSG} -n ">> Fixing ownership settings..."
-	@${CHOWN} -R ${TOMCAT_USER}:${TOMCAT_GROUP} ${APP_HOME}/conf ${APP_HOME}/logs \
-		${APP_HOME}/temp ${APP_HOME}/work
-	@${ECHO_MSG} " [ DONE ]"
-
-	@${ECHO_MSG} -n ">> Fixing permissions..."
-	@${CHMOD} 755 `${FIND} ${APP_HOME} -type d`
-	@${ECHO_MSG} " [ DONE ]"
-
-post-install:
-	@${ECHO_MSG} "${APP_TITLE} ${PORTVERSION} has been installed in ${APP_HOME}."
-
-.include <bsd.port.post.mk>
--- a/www/jakarta-tomcat41/distinfo
+++ b/www/jakarta-tomcat41/distinfo
@ -1,3 +0,0 @@
-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
--- a/www/jakarta-tomcat41/files/patch-aa
+++ b/www/jakarta-tomcat41/files/patch-aa
@ -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"
--- a/www/jakarta-tomcat41/files/pkg-deinstall.in
+++ b/www/jakarta-tomcat41/files/pkg-deinstall.in
@ -1,47 +0,0 @@
-#!/bin/sh
-#
-# This script does the following.
-#
-# * Checks if the PID file exists. If it does, it kills the
-#   process and removes the PID file.
-#
-# * Checks if the '%%USER%%' user exists. If it does, then it displays
-#   a message.
-#
-# $FreeBSD: /tmp/pcvs/ports/www/jakarta-tomcat41/files/Attic/pkg-deinstall.in,v 1.1 2006-02-07 08:50:08 lawrance Exp $
-#
-
-USER=%%USER%%
-PID_FILE=%%PID_FILE%%
-
-# Make sure we're in the right stage of the process
-if [ "$2" = "DEINSTALL" ]; then
-
-	# Kill the process if it is still running
-	if [ -s ${PID_FILE} ]; then
-		PID=`cat ${PID_FILE}`
-		echo -n ">> Killing Jakarta Tomcat process (${PID})..."
-		/bin/kill ${PID} > /dev/null 2> /dev/null
-		if [ $? -eq 0 ]; then
-			echo " [ DONE ]"
-		else
-			echo " [ FAILED ]"
-		fi
-		echo -n ">> Removing PID file (${PID_FILE})..."
-		rm ${PID_FILE} > /dev/null 2> /dev/null
-		if [ $? -eq 0 ]; then
-			echo " [ DONE ]"
-		else
-			echo " [ FAILED ]"
-		fi
-	fi
-fi
-
-if [ "$2" = "POST-DEINSTALL" ]; then
-	# If the user exists, then display a message
-	if pw usershow "${USER}" 2>/dev/null 1>&2; then
-		echo "To delete the ${USER} user permanently, use 'pw userdel ${USER}'"
-	fi
-fi
-
-exit 0
--- a/www/jakarta-tomcat41/files/pkg-install.in
+++ b/www/jakarta-tomcat41/files/pkg-install.in
@ -1,46 +0,0 @@
-#!/bin/sh
-#
-# Checks if the 'www' user and group exist. If they don't, then
-# an attempt is made to create both.
-#
-# $FreeBSD: /tmp/pcvs/ports/www/jakarta-tomcat41/files/Attic/pkg-install.in,v 1.1 2006-02-07 08:50:08 lawrance Exp $
-#
-
-# Make sure we're called during the 'make install' process
-if [ "$2" != "PRE-INSTALL" ]; then
-    exit 0
-fi
-
-# Set some constants
-UID=80
-GID=${UID}
-USER=%%USER%%
-GROUP=%%GROUP%%
-
-# See if the group already exists
-if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
-
-	# If not, try to create it
-	if pw groupadd ${GROUP} -g ${GID}; then
-		echo "Added group \"${GROUP}\"."
-	else
-		echo "Adding group \"${GROUP}\" failed..."
-		exit 1
-	fi
-fi
-
-# See if the user already exists
-if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
-
-	# If not, try to create it
-	if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-		-s "/sbin/nologin" -d "/nonexistent" \
-		-c "World Wide Web Owner"; \
-	then
-		echo "Added user \"${USER}\"."
-	else
-		echo "Adding user \"${USER}\" failed..."
-		exit 1
-	fi
-fi
-exit 0
--- a/www/jakarta-tomcat41/files/tomcat41.sh.in
+++ b/www/jakarta-tomcat41/files/tomcat41.sh.in
@ -1,167 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: tomcat%%TOMCAT_VERSION%%
-# REQUIRE: NETWORKING SERVERS
-# BEFORE: DAEMON
-# KEYWORD: shutdown
-
-#
-# Configuration settings for tomcat%%TOMCAT_VERSION%% in /etc/rc.conf:
-#
-# tomcat%%TOMCAT_VERSION%%_enable (bool):
-#   Set to "NO" by default.
-#   Set it to "YES" to enable tomcat%%TOMCAT_VERSION%%
-#
-# tomcat%%TOMCAT_VERSION%%_flags (str):
-#   Set to "" by default.
-#   Extra flags passed to start command
-#
-# tomcat%%TOMCAT_VERSION%%_catalina_home (str)
-#   Set to "%%TOMCAT_HOME%%" by default.
-#   Set the CATALINA_HOME variable for the Tomcat process
-#
-# tomcat%%TOMCAT_VERSION%%_catalina_base (str)
-#   Set to "%%TOMCAT_HOME%%" by default.
-#   Set the CATALINA_BASE variable for the Tomcat process
-#
-# tomcat%%TOMCAT_VERSION%%_catalina_tmpdir (str)
-#   Set to "%%TOMCAT_HOME%%/temp" by default.
-#   Set the CATALINA_TMPDIR variable for the Tomcat process
-#
-# tomcat%%TOMCAT_VERSION%%_stdout_log (str)
-#   Set to "%%STDOUT_LOG%%" by default.
-#   Set the location for the Tomcat process log (standard output)
-#
-# tomcat%%TOMCAT_VERSION%%_stderr_log (str)
-#   Set to "%%STDERR_LOG%%" by default.
-#   Set the location for the Tomcat process log (error output)
-#
-# tomcat%%TOMCAT_VERSION%%_stop_timeout (num)
-#   Set to "10" by default.
-#   Sets the timeout in seconds to allow tomcat to shutdown.
-#   After the timeout has elapsed, tomcat will be killed.
-#
-# tomcat%%TOMCAT_VERSION%%_java_home (str):
-# tomcat%%TOMCAT_VERSION%%_java_vendor (str):
-# tomcat%%TOMCAT_VERSION%%_java_version (str):
-# tomcat%%TOMCAT_VERSION%%_java_os (str):
-#   Specify the requirements of the Java VM to use. See javavm(1).
-#
-# tomcat%%TOMCAT_VERSION%%_classpath (str):
-#   Set to "" by default.
-#   Addtional classes to add to the CLASSPATH
-#
-# tomcat%%TOMCAT_VERSION%%_java_opts (str):
-#   Set to "" by default.
-#   Java VM args to use.
-#
-
-tomcat%%TOMCAT_VERSION%%_enable="${tomcat%%TOMCAT_VERSION%%_enable:-"NO"}"
-tomcat%%TOMCAT_VERSION%%_java_version="${tomcat%%TOMCAT_VERSION%%_java_version:-"%%JAVA_VERSION%%"}"
-tomcat%%TOMCAT_VERSION%%_user="${tomcat%%TOMCAT_VERSION%%_user:-"%%USER%%"}"
-tomcat%%TOMCAT_VERSION%%_catalina_home="${tomcat%%TOMCAT_VERSION%%_catalina_home:-"%%TOMCAT_HOME%%"}"
-tomcat%%TOMCAT_VERSION%%_catalina_base="${tomcat%%TOMCAT_VERSION%%_catalina_base:-"%%TOMCAT_HOME%%"}"
-tomcat%%TOMCAT_VERSION%%_catalina_tmpdir="${tomcat%%TOMCAT_VERSION%%_catalina_tmpdir:-"%%TOMCAT_HOME%%/temp"}"
-tomcat%%TOMCAT_VERSION%%_stdout_log="${tomcat%%TOMCAT_VERSION%%_stdout_log:-"%%STDOUT_LOG%%"}"
-tomcat%%TOMCAT_VERSION%%_stderr_log="${tomcat%%TOMCAT_VERSION%%_stderr_log:-"%%STDERR_LOG%%"}"
-tomcat%%TOMCAT_VERSION%%_stop_timeout="${tomcat%%TOMCAT_VERSION%%_stop_timeout:-"10"}"
-
-. %%RC_SUBR%%
-
-name="tomcat%%TOMCAT_VERSION%%"
-rcvar=`set_rcvar`
-pidfile="%%PID_FILE%%"
-
-load_rc_config "${name}"
-
-if [ -n "${tomcat%%TOMCAT_VERSION%%_java_home}" ] ; then
-	export JAVA_HOME="${tomcat%%TOMCAT_VERSION%%_java_home}"
-fi
-
-if [ -n "${tomcat%%TOMCAT_VERSION%%_java_version}" ] ; then
-	export JAVA_VERSION="${tomcat%%TOMCAT_VERSION%%_java_version}"
-fi
-
-if [ -n "${tomcat%%TOMCAT_VERSION%%_java_vendor}" ] ; then
-	export JAVA_VENDOR="${tomcat%%TOMCAT_VERSION%%_java_vendor}"
-fi
-
-if [ -n "${tomcat%%TOMCAT_VERSION%%_java_os}" ] ; then
-	export JAVA_OS="${tomcat%%TOMCAT_VERSION%%_java_os}"
-fi
-
-java_command="%%LOCALBASE%%/bin/java \
-	${tomcat%%TOMCAT_VERSION%%_java_opts} \
-	-Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS \
-	-classpath %%TOMCAT_HOME%%/%%JAR_FILE%%:%%TOMCAT_HOME%%/bin/commons-logging-api.jar:${tomcat%%TOMCAT_VERSION%%_classpath} \
-	-Dcatalina.base=${tomcat%%TOMCAT_VERSION%%_catalina_base} \
-	-Dcatalina.home=${tomcat%%TOMCAT_VERSION%%_catalina_home} \
-	-Djava.io.tmpdir=${tomcat%%TOMCAT_VERSION%%_catalina_tmpdir} \
-	org.apache.catalina.startup.Bootstrap"
-
-log_args=">> ${tomcat%%TOMCAT_VERSION%%_stdout_log} \
-	2>> ${tomcat%%TOMCAT_VERSION%%_stderr_log} "
-
-# Subvert the check_pid_file procname check.
-if [ -f $pidfile ]; then
-  read rc_pid junk < $pidfile
-  if [ ! -z "$rc_pid" ]; then
-    procname=`ps -o ucomm= $rc_pid`
-  fi
-fi
-
-required_files="${tomcat%%TOMCAT_VERSION%%_catalina_home}/conf/server.xml"
-
-command="/usr/sbin/daemon"
-flags="-p ${pidfile} ${java_command} start ${tomcat%%TOMCAT_VERSION%%_flags} ${log_args}"
-
-start_precmd=pid_touch
-stop_cmd="tomcat%%TOMCAT_VERSION%%_stop"
-
-pid_touch ()
-{
-	touch $pidfile
-	chown $tomcat%%TOMCAT_VERSION%%_user $pidfile
-}
-
-tomcat%%TOMCAT_VERSION%%_stop() {
-	rc_pid=$(check_pidfile $pidfile *$procname*)
-
-	if [ -z "$rc_pid" ]; then
-		[ -n "$rc_fast" ] && return 0
-		if [ -n "$pidfile" ]; then
-			echo "${name} not running? (check $pidfile)."
-		else
-			echo "${name} not running?"
-		fi
-		return 1
-	fi
-	
-	echo "Stopping ${name}."
-	${java_command} stop
-	tomcat_wait_max_for_pid ${tomcat%%TOMCAT_VERSION%%_stop_timeout} ${rc_pid}
-	kill -KILL ${rc_pid} 2> /dev/null && echo "Killed."
-	echo -n > ${pidfile}
-}
-
-tomcat_wait_max_for_pid() {
-	_timeout=$1
-	shift
-	_pid=$1
-	_prefix=
-	while [ $_timeout -gt 0 ] ; do
-		echo -n ${_prefix:-"Waiting (max $_timeout secs) for PIDS: "}$_pid
-		_prefix=", "
-		sleep 2
-		kill -0 $_pid 2> /dev/null || break
-		_timeout=$(($_timeout-2))
-	done
-	if [ -n "$_prefix" ]; then
-		echo "."
-	fi
-}
-
-run_rc_command "$1"
--- a/www/jakarta-tomcat41/pkg-descr
+++ b/www/jakarta-tomcat41/pkg-descr
@ -1,19 +0,0 @@
-Jakarta 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.
-
-Tomcat 4.1 is a refactoring of Tomcat 4.0.x, and contains significant
-enhancements, including:
-
-o JMX based administration features
-o JSP and Struts based administration web application
-o New Coyote connector (HTTP/1.1, AJP 1.3 and JNI support)
-o Rewritten Jasper JSP page compiler
-o Performance and memory efficiency improvements
-o Enhanced manager application support for integration with development
-  tools
-o Custom Ant tasks to interact with the manager application directly from
-  build.xml scripts
-
-
-WWW: http://jakarta.apache.org/tomcat/
--- a/www/jakarta-tomcat41/pkg-plist
+++ b/www/jakarta-tomcat41/pkg-plist
--- 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
--- 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
--- a/www/tomcat41/files/patch-aa
+++ b/www/tomcat41/files/patch-aa
@ -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"
--- a/www/tomcat41/files/patch-conf_server.xml
+++ 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" />
--- 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/
--- 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