Update to 5.0.16.

Submitted by:	maintainer
PR:		60036

4 files changed, 39 insertions, 25 deletions

diff --git a/www/tomcat7/Makefile b/www/tomcat7/Makefile
index 6952930e0fb8..5c8944689256 100644
--- a/www/tomcat7/Makefile
+++ b/www/tomcat7/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	jakarta-tomcat
-PORTVERSION=	5.0.14
+PORTVERSION=	5.0.16
 CATEGORIES=	www java
-MASTER_SITES=	http://www.apache.org/dist/jakarta/tomcat-5/v${PORTVERSION}-beta/bin/ \
-		http://apache.lemon4ssc.org/dist/jakarta/tomcat-5/v{PORTVERSION}-beta/bin/ \
+MASTER_SITES=	http://www.apache.org/dist/jakarta/tomcat-5/v${PORTVERSION}/bin/ \
+		http://apache.lemon4ssc.org/dist/jakarta/tomcat-5/v{PORTVERSION}/bin/ \
 		http://distfiles.coredump.cn/
 
 MAINTAINER=	liukang@bjpu.edu.cn
 COMMENT=	Open-source Java web server by Apache, 5.0.x branch
 
-USE_JAVA=	1.4+
+USE_JAVA=	1.3+
 NO_BUILD=	YES
 
 MAJOR_VER=	${PORTVERSION:R}
@@ -171,5 +171,4 @@ post-install:
 .if ${AUTO_START} == "YES"
 	@${CONTROL_SCRIPT} start || true
 .endif
-	@${ECHO_CMD} "Using Tomcat 5.x in a production environment is NOT recommended!"
 .include <bsd.port.post.mk>
diff --git a/www/tomcat7/distinfo b/www/tomcat7/distinfo
index e8862a3e1994..7d5f03237b84 100644
--- a/www/tomcat7/distinfo
+++ b/www/tomcat7/distinfo
@@ -1 +1 @@
-MD5 (jakarta-tomcat-5.0.14.tar.gz) = d92fd86da7ae159392ac222930619f4f
+MD5 (jakarta-tomcat-5.0.16.tar.gz) = 8297bc97fb7c42f870069503bfddcb7d
diff --git a/www/tomcat7/pkg-descr b/www/tomcat7/pkg-descr
index 1e2e6670a0e2..717a166a2658 100644
--- a/www/tomcat7/pkg-descr
+++ b/www/tomcat7/pkg-descr
@@ -1,23 +1,22 @@
 Jakarta Tomcat is a web server written in 100% Pure Java.
 
-Tomcat 5.x is the upcoming major release of Tomcat,
-and builds upon the Tomcat 3.3 and Tomcat 4.1 codebases.
+Tomcat 5.x is the current release of Tomcat, 
+and builds upon the Tomcat 3.3 and Tomcat 4.1 codebases. 
 The 5.x releases implement the Servlet 2.4 and JSP 2.0 specifications.
 
-Tomcat 5.0.x. Tomcat 5.0 improves on Tomcat 4.1 in many ways, including:
+Tomcat 5.0.x. Tomcat 5.0 improves on Tomcat 4.1 in many ways, including: 
 
-o Performance optimizations and reduced garbage collection
-o Refactored application deployer, 
-  with an optional standalone deployer allowing validation
-  and compilation of a web application before putting it in production
-o Complete server monitoring using JMX and the manager web application
-o Scalability and reliability enhancements
-o Improved Taglibs handling, including advanced pooling and tag plugins
-o Improved platform integration, with native Windows and Unix wrappers
-o Embedding of Tomcat using JMX
-o Expanded documentation
-
-ATTENTION: Tomcat 5.x is still under development, 
-           DO NOT use it in production environment.
+o Performance optimizations and reduced garbage collection 
+o Refactored application deployer, with an optional standalone deployer 
+  allowing validation and compilation of a web application before 
+  putting it in production 
+o Complete server monitoring using JMX and the manager web application 
+o Scalability and reliability enhancements 
+o Improved Taglibs handling, including advanced pooling and tag plugins 
+o Improved platform integration, with native Windows and Unix wrappers 
+o Embedding of Tomcat using JMX 
+o Enhanced Security Manager support 
+o Integrated session clustering 
+o Expanded documentation 
 
 WWW: http://jakarta.apache.org/tomcat/
diff --git a/www/tomcat7/pkg-plist b/www/tomcat7/pkg-plist
index 01a4c45c868f..35168e4a477d 100644
--- a/www/tomcat7/pkg-plist
+++ b/www/tomcat7/pkg-plist
@@ -29,9 +29,9 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/common/lib/commons-pool-1.1.jar
 %%T%%/common/lib/jasper-compiler.jar
 %%T%%/common/lib/jasper-runtime.jar
-%%T%%/common/lib/jmx.jar
-%%T%%/common/lib/jmx-remote.jar
 %%T%%/common/lib/jmx-remote-tools.jar
+%%T%%/common/lib/jmx-remote.jar
+%%T%%/common/lib/jmx.jar
 %%T%%/common/lib/jsp-api.jar
 %%T%%/common/lib/naming-common.jar
 %%T%%/common/lib/naming-factory.jar
@@ -40,6 +40,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/common/lib/servlet-api.jar
 %%T%%/common/lib/tools.jar
 %%T%%/conf/Catalina/localhost/admin.xml
+%%T%%/conf/Catalina/localhost/balancer.xml
 %%T%%/conf/Catalina/localhost/manager.xml
 %%T%%/conf/catalina.policy
 %%T%%/conf/catalina.properties
@@ -164,11 +165,16 @@ etc/rc.d/020.jakarta-tomcat50.sh
 @exec mkdir %D/%%T%%/temp || true
 %%T%%/webapps/ROOT/RELEASE-NOTES.txt
 %%T%%/webapps/ROOT/WEB-INF/classes/org/apache/jsp/index_jsp.class
+%%T%%/webapps/ROOT/WEB-INF/lib/catalina-root.jar
 %%T%%/webapps/ROOT/WEB-INF/web.xml
 %%T%%/webapps/ROOT/index.jsp
 %%T%%/webapps/ROOT/jakarta-banner.gif
 %%T%%/webapps/ROOT/tomcat-power.gif
 %%T%%/webapps/ROOT/tomcat.gif
+%%T%%/webapps/balancer/WEB-INF/config/rules.xml
+%%T%%/webapps/balancer/WEB-INF/lib/catalina-balancer.jar
+%%T%%/webapps/balancer/WEB-INF/web.xml
+%%T%%/webapps/balancer/balancer.xml
 %%T%%/webapps/jsp-examples/WEB-INF/classes/cal/Entries.class
 %%T%%/webapps/jsp-examples/WEB-INF/classes/cal/Entries.java
 %%T%%/webapps/jsp-examples/WEB-INF/classes/cal/Entry.class
@@ -515,6 +521,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/appdev/sample/web/index.html
 %%T%%/webapps/tomcat-docs/appdev/source.html
 %%T%%/webapps/tomcat-docs/appdev/web.xml.txt
+%%T%%/webapps/tomcat-docs/balancer-howto.html
 %%T%%/webapps/tomcat-docs/build.xml
 %%T%%/webapps/tomcat-docs/building.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/allclasses-frame.html
@@ -810,6 +817,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%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
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/CopyParentClassLoaderRule.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/DigesterFactory.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/Embedded.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/EngineConfig.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/EngineRuleSet.html
@@ -821,7 +829,6 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%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/SetAllPropertiesRule.html
-%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/SetAllPropertiesRule.SystemPropertyPropertyResource.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/SetDocBaseRule.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/TldConfig.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/TldRuleSet.html
@@ -846,6 +853,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/users/package-tree.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/Base64.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/CGIProcessEnvironment.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/CatalinaDigester.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/CharsetMapper.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/CookieTools.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/CustomObjectInputStream.html
@@ -1364,6 +1372,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/SmapUtil.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/TagPluginManager.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/package-frame.html
 %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/package-summary.html
@@ -1556,6 +1565,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/jspapi/stylesheet.css
 %%T%%/webapps/tomcat-docs/manager-howto.html
 %%T%%/webapps/tomcat-docs/mbeans-descriptor-howto.html
+%%T%%/webapps/tomcat-docs/printer/balancer-howto.html
 %%T%%/webapps/tomcat-docs/printer/building.html
 %%T%%/webapps/tomcat-docs/printer/cgi-howto.html
 %%T%%/webapps/tomcat-docs/printer/changelog.html
@@ -1893,6 +1903,12 @@ etc/rc.d/020.jakarta-tomcat50.sh
 @dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes
 @dirrm %%T%%/webapps/jsp-examples/WEB-INF
 @dirrm %%T%%/webapps/jsp-examples
+@dirrm %%T%%/webapps/balancer/images
+@dirrm %%T%%/webapps/balancer/WEB-INF/lib
+@dirrm %%T%%/webapps/balancer/WEB-INF/config
+@dirrm %%T%%/webapps/balancer/WEB-INF
+@dirrm %%T%%/webapps/balancer
+@dirrm %%T%%/webapps/ROOT/WEB-INF/lib
 @dirrm %%T%%/webapps/ROOT/WEB-INF/classes/org/apache/jsp
 @dirrm %%T%%/webapps/ROOT/WEB-INF/classes/org/apache
 @dirrm %%T%%/webapps/ROOT/WEB-INF/classes/org