3 files changed, 63 insertions, 58 deletions

diff --git a/www/tomcat7/Makefile b/www/tomcat7/Makefile
index faf5abbd416d..6952930e0fb8 100644
--- a/www/tomcat7/Makefile
+++ b/www/tomcat7/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	jakarta-tomcat
-PORTVERSION=	5.0.12
-PORTREVISION=	1
+PORTVERSION=	5.0.14
 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/ \
diff --git a/www/tomcat7/distinfo b/www/tomcat7/distinfo
index 06f287fedb21..e8862a3e1994 100644
--- a/www/tomcat7/distinfo
+++ b/www/tomcat7/distinfo
@@ -1 +1 @@
-MD5 (jakarta-tomcat-5.0.12.tar.gz) = f74f15c7b5b6b0c80d4ac42c82c6e075
+MD5 (jakarta-tomcat-5.0.14.tar.gz) = d92fd86da7ae159392ac222930619f4f
diff --git a/www/tomcat7/pkg-plist b/www/tomcat7/pkg-plist
index d2577b401c4c..01a4c45c868f 100644
--- a/www/tomcat7/pkg-plist
+++ b/www/tomcat7/pkg-plist
@@ -24,12 +24,14 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/common/endorsed/xmlParserAPIs.jar
 %%T%%/common/lib/ant.jar
 %%T%%/common/lib/commons-collections.jar
-%%T%%/common/lib/commons-dbcp.jar
+%%T%%/common/lib/commons-dbcp-1.1.jar
 %%T%%/common/lib/commons-el.jar
-%%T%%/common/lib/commons-pool.jar
+%%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/jsp-api.jar
 %%T%%/common/lib/naming-common.jar
 %%T%%/common/lib/naming-factory.jar
@@ -298,36 +300,36 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/jsp-examples/WEB-INF/tags/panel.tag
 %%T%%/webapps/jsp-examples/WEB-INF/tags/xhtmlbasic.tag
 %%T%%/webapps/jsp-examples/WEB-INF/web.xml
-%%T%%/webapps/jsp-examples/cal/Entries.java.txt
-%%T%%/webapps/jsp-examples/cal/Entry.java.txt
-%%T%%/webapps/jsp-examples/cal/JspCalendar.java.txt
-%%T%%/webapps/jsp-examples/cal/TableBean.java.txt
+%%T%%/webapps/jsp-examples/cal/Entries.java.html
+%%T%%/webapps/jsp-examples/cal/Entry.java.html
+%%T%%/webapps/jsp-examples/cal/JspCalendar.java.html
+%%T%%/webapps/jsp-examples/cal/TableBean.java.html
 %%T%%/webapps/jsp-examples/cal/cal1.jsp
-%%T%%/webapps/jsp-examples/cal/cal1.jsp.txt
+%%T%%/webapps/jsp-examples/cal/cal1.jsp.html
 %%T%%/webapps/jsp-examples/cal/cal2.jsp
-%%T%%/webapps/jsp-examples/cal/cal2.jsp.txt
+%%T%%/webapps/jsp-examples/cal/cal2.jsp.html
 %%T%%/webapps/jsp-examples/cal/calendar.html
 %%T%%/webapps/jsp-examples/cal/login.html
 %%T%%/webapps/jsp-examples/checkbox/CheckTest.html
 %%T%%/webapps/jsp-examples/checkbox/check.html
 %%T%%/webapps/jsp-examples/checkbox/checkresult.jsp
-%%T%%/webapps/jsp-examples/checkbox/checkresult.jsp.txt
+%%T%%/webapps/jsp-examples/checkbox/checkresult.jsp.html
 %%T%%/webapps/jsp-examples/checkbox/cresult.html
 %%T%%/webapps/jsp-examples/colors/ColorGameBean.html
 %%T%%/webapps/jsp-examples/colors/clr.html
 %%T%%/webapps/jsp-examples/colors/colors.html
 %%T%%/webapps/jsp-examples/colors/colrs.jsp
-%%T%%/webapps/jsp-examples/colors/colrs.jsp.txt
+%%T%%/webapps/jsp-examples/colors/colrs.jsp.html
 %%T%%/webapps/jsp-examples/dates/date.html
 %%T%%/webapps/jsp-examples/dates/date.jsp
-%%T%%/webapps/jsp-examples/dates/date.jsp.txt
+%%T%%/webapps/jsp-examples/dates/date.jsp.html
 %%T%%/webapps/jsp-examples/error/er.html
 %%T%%/webapps/jsp-examples/error/err.jsp
-%%T%%/webapps/jsp-examples/error/err.jsp.txt
+%%T%%/webapps/jsp-examples/error/err.jsp.html
 %%T%%/webapps/jsp-examples/error/error.html
 %%T%%/webapps/jsp-examples/error/errorpge.jsp
 %%T%%/webapps/jsp-examples/forward/forward.jsp
-%%T%%/webapps/jsp-examples/forward/forward.jsp.txt
+%%T%%/webapps/jsp-examples/forward/forward.jsp.html
 %%T%%/webapps/jsp-examples/forward/fwd.html
 %%T%%/webapps/jsp-examples/forward/one.jsp
 %%T%%/webapps/jsp-examples/forward/two.html
@@ -339,108 +341,108 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/jsp-examples/include/foo.jsp
 %%T%%/webapps/jsp-examples/include/inc.html
 %%T%%/webapps/jsp-examples/include/include.jsp
-%%T%%/webapps/jsp-examples/include/include.jsp.txt
+%%T%%/webapps/jsp-examples/include/include.jsp.html
 %%T%%/webapps/jsp-examples/index.html
-%%T%%/webapps/jsp-examples/jsp2/el/Functions.java.txt
+%%T%%/webapps/jsp-examples/jsp2/el/Functions.java.html
 %%T%%/webapps/jsp-examples/jsp2/el/basic-arithmetic.html
 %%T%%/webapps/jsp-examples/jsp2/el/basic-arithmetic.jsp
-%%T%%/webapps/jsp-examples/jsp2/el/basic-arithmetic.jsp.txt
+%%T%%/webapps/jsp-examples/jsp2/el/basic-arithmetic.jsp.html
 %%T%%/webapps/jsp-examples/jsp2/el/basic-comparisons.html
 %%T%%/webapps/jsp-examples/jsp2/el/basic-comparisons.jsp
-%%T%%/webapps/jsp-examples/jsp2/el/basic-comparisons.jsp.txt
+%%T%%/webapps/jsp-examples/jsp2/el/basic-comparisons.jsp.html
 %%T%%/webapps/jsp-examples/jsp2/el/functions.html
 %%T%%/webapps/jsp-examples/jsp2/el/functions.jsp
-%%T%%/webapps/jsp-examples/jsp2/el/functions.jsp.txt
+%%T%%/webapps/jsp-examples/jsp2/el/functions.jsp.html
 %%T%%/webapps/jsp-examples/jsp2/el/implicit-objects.html
 %%T%%/webapps/jsp-examples/jsp2/el/implicit-objects.jsp
-%%T%%/webapps/jsp-examples/jsp2/el/implicit-objects.jsp.txt
-%%T%%/webapps/jsp-examples/jsp2/jspattribute/FooBean.java.txt
-%%T%%/webapps/jsp-examples/jsp2/jspattribute/HelloWorldSimpleTag.java.txt
-%%T%%/webapps/jsp-examples/jsp2/jspattribute/ShuffleSimpleTag.java.txt
-%%T%%/webapps/jsp-examples/jsp2/jspattribute/TileSimpleTag.java.txt
+%%T%%/webapps/jsp-examples/jsp2/el/implicit-objects.jsp.html
+%%T%%/webapps/jsp-examples/jsp2/jspattribute/FooBean.java.html
+%%T%%/webapps/jsp-examples/jsp2/jspattribute/HelloWorldSimpleTag.java.html
+%%T%%/webapps/jsp-examples/jsp2/jspattribute/ShuffleSimpleTag.java.html
+%%T%%/webapps/jsp-examples/jsp2/jspattribute/TileSimpleTag.java.html
 %%T%%/webapps/jsp-examples/jsp2/jspattribute/jspattribute.html
 %%T%%/webapps/jsp-examples/jsp2/jspattribute/jspattribute.jsp
-%%T%%/webapps/jsp-examples/jsp2/jspattribute/jspattribute.jsp.txt
+%%T%%/webapps/jsp-examples/jsp2/jspattribute/jspattribute.jsp.html
 %%T%%/webapps/jsp-examples/jsp2/jspattribute/shuffle.html
 %%T%%/webapps/jsp-examples/jsp2/jspattribute/shuffle.jsp
-%%T%%/webapps/jsp-examples/jsp2/jspattribute/shuffle.jsp.txt
+%%T%%/webapps/jsp-examples/jsp2/jspattribute/shuffle.jsp.html
 %%T%%/webapps/jsp-examples/jsp2/jspx/basic.html
 %%T%%/webapps/jsp-examples/jsp2/jspx/basic.jspx
-%%T%%/webapps/jsp-examples/jsp2/jspx/basic.jspx.txt
+%%T%%/webapps/jsp-examples/jsp2/jspx/basic.jspx.html
 %%T%%/webapps/jsp-examples/jsp2/jspx/svgexample.html
 %%T%%/webapps/jsp-examples/jsp2/jspx/textRotate.html
 %%T%%/webapps/jsp-examples/jsp2/jspx/textRotate.jpg
 %%T%%/webapps/jsp-examples/jsp2/jspx/textRotate.jspx
-%%T%%/webapps/jsp-examples/jsp2/jspx/textRotate.jspx.txt
-%%T%%/webapps/jsp-examples/jsp2/misc/EchoAttributesTag.java.txt
+%%T%%/webapps/jsp-examples/jsp2/jspx/textRotate.jspx.html
+%%T%%/webapps/jsp-examples/jsp2/misc/EchoAttributesTag.java.html
 %%T%%/webapps/jsp-examples/jsp2/misc/coda.jspf
-%%T%%/webapps/jsp-examples/jsp2/misc/coda.jspf.txt
+%%T%%/webapps/jsp-examples/jsp2/misc/coda.jspf.html
 %%T%%/webapps/jsp-examples/jsp2/misc/config.html
 %%T%%/webapps/jsp-examples/jsp2/misc/config.jsp
-%%T%%/webapps/jsp-examples/jsp2/misc/config.jsp.txt
+%%T%%/webapps/jsp-examples/jsp2/misc/config.jsp.html
 %%T%%/webapps/jsp-examples/jsp2/misc/dynamicattrs.html
 %%T%%/webapps/jsp-examples/jsp2/misc/dynamicattrs.jsp
-%%T%%/webapps/jsp-examples/jsp2/misc/dynamicattrs.jsp.txt
+%%T%%/webapps/jsp-examples/jsp2/misc/dynamicattrs.jsp.html
 %%T%%/webapps/jsp-examples/jsp2/misc/prelude.jspf
-%%T%%/webapps/jsp-examples/jsp2/misc/prelude.jspf.txt
-%%T%%/webapps/jsp-examples/jsp2/simpletag/BookBean.java.txt
-%%T%%/webapps/jsp-examples/jsp2/simpletag/FindBookSimpleTag.java.txt
-%%T%%/webapps/jsp-examples/jsp2/simpletag/Functions.java.txt
-%%T%%/webapps/jsp-examples/jsp2/simpletag/HelloWorldSimpleTag.java.txt
-%%T%%/webapps/jsp-examples/jsp2/simpletag/RepeatSimpleTag.java.txt
+%%T%%/webapps/jsp-examples/jsp2/misc/prelude.jspf.html
+%%T%%/webapps/jsp-examples/jsp2/simpletag/BookBean.java.html
+%%T%%/webapps/jsp-examples/jsp2/simpletag/FindBookSimpleTag.java.html
+%%T%%/webapps/jsp-examples/jsp2/simpletag/Functions.java.html
+%%T%%/webapps/jsp-examples/jsp2/simpletag/HelloWorldSimpleTag.java.html
+%%T%%/webapps/jsp-examples/jsp2/simpletag/RepeatSimpleTag.java.html
 %%T%%/webapps/jsp-examples/jsp2/simpletag/book.html
 %%T%%/webapps/jsp-examples/jsp2/simpletag/book.jsp
-%%T%%/webapps/jsp-examples/jsp2/simpletag/book.jsp.txt
+%%T%%/webapps/jsp-examples/jsp2/simpletag/book.jsp.html
 %%T%%/webapps/jsp-examples/jsp2/simpletag/hello.html
 %%T%%/webapps/jsp-examples/jsp2/simpletag/hello.jsp
-%%T%%/webapps/jsp-examples/jsp2/simpletag/hello.jsp.txt
+%%T%%/webapps/jsp-examples/jsp2/simpletag/hello.jsp.html
 %%T%%/webapps/jsp-examples/jsp2/simpletag/repeat.html
 %%T%%/webapps/jsp-examples/jsp2/simpletag/repeat.jsp
-%%T%%/webapps/jsp-examples/jsp2/simpletag/repeat.jsp.txt
-%%T%%/webapps/jsp-examples/jsp2/tagfiles/displayProducts.tag.txt
+%%T%%/webapps/jsp-examples/jsp2/simpletag/repeat.jsp.html
+%%T%%/webapps/jsp-examples/jsp2/tagfiles/displayProducts.tag.html
 %%T%%/webapps/jsp-examples/jsp2/tagfiles/hello.html
 %%T%%/webapps/jsp-examples/jsp2/tagfiles/hello.jsp
-%%T%%/webapps/jsp-examples/jsp2/tagfiles/hello.jsp.txt
-%%T%%/webapps/jsp-examples/jsp2/tagfiles/helloWorld.tag.txt
+%%T%%/webapps/jsp-examples/jsp2/tagfiles/hello.jsp.html
+%%T%%/webapps/jsp-examples/jsp2/tagfiles/helloWorld.tag.html
 %%T%%/webapps/jsp-examples/jsp2/tagfiles/panel.html
 %%T%%/webapps/jsp-examples/jsp2/tagfiles/panel.jsp
-%%T%%/webapps/jsp-examples/jsp2/tagfiles/panel.jsp.txt
-%%T%%/webapps/jsp-examples/jsp2/tagfiles/panel.tag.txt
+%%T%%/webapps/jsp-examples/jsp2/tagfiles/panel.jsp.html
+%%T%%/webapps/jsp-examples/jsp2/tagfiles/panel.tag.html
 %%T%%/webapps/jsp-examples/jsp2/tagfiles/products.html
 %%T%%/webapps/jsp-examples/jsp2/tagfiles/products.jsp
-%%T%%/webapps/jsp-examples/jsp2/tagfiles/products.jsp.txt
-%%T%%/webapps/jsp-examples/jsp2/tagfiles/xhtmlbasic.tag.txt
+%%T%%/webapps/jsp-examples/jsp2/tagfiles/products.jsp.html
+%%T%%/webapps/jsp-examples/jsp2/tagfiles/xhtmlbasic.tag.html
 %%T%%/webapps/jsp-examples/jsptoserv/hello.jsp
 %%T%%/webapps/jsp-examples/jsptoserv/jsptoservlet.jsp
-%%T%%/webapps/jsp-examples/jsptoserv/jsptoservlet.jsp.txt
+%%T%%/webapps/jsp-examples/jsptoserv/jsptoservlet.jsp.html
 %%T%%/webapps/jsp-examples/jsptoserv/jts.html
-%%T%%/webapps/jsp-examples/jsptoserv/servletToJsp.java.txt
+%%T%%/webapps/jsp-examples/jsptoserv/servletToJsp.java.html
 %%T%%/webapps/jsp-examples/num/numguess.html
 %%T%%/webapps/jsp-examples/num/numguess.jsp
-%%T%%/webapps/jsp-examples/num/numguess.jsp.txt
+%%T%%/webapps/jsp-examples/num/numguess.jsp.html
 %%T%%/webapps/jsp-examples/plugin/applet/Clock2.class
 %%T%%/webapps/jsp-examples/plugin/applet/Clock2.java
 %%T%%/webapps/jsp-examples/plugin/plugin.html
 %%T%%/webapps/jsp-examples/plugin/plugin.jsp
-%%T%%/webapps/jsp-examples/plugin/plugin.jsp.txt
+%%T%%/webapps/jsp-examples/plugin/plugin.jsp.html
 %%T%%/webapps/jsp-examples/security/protected/error.jsp
 %%T%%/webapps/jsp-examples/security/protected/index.jsp
 %%T%%/webapps/jsp-examples/security/protected/login.jsp
 %%T%%/webapps/jsp-examples/sessions/DummyCart.html
 %%T%%/webapps/jsp-examples/sessions/carts.html
 %%T%%/webapps/jsp-examples/sessions/carts.jsp
-%%T%%/webapps/jsp-examples/sessions/carts.jsp.txt
+%%T%%/webapps/jsp-examples/sessions/carts.jsp.html
 %%T%%/webapps/jsp-examples/sessions/crt.html
 %%T%%/webapps/jsp-examples/simpletag/foo.html
 %%T%%/webapps/jsp-examples/simpletag/foo.jsp
-%%T%%/webapps/jsp-examples/simpletag/foo.jsp.txt
+%%T%%/webapps/jsp-examples/simpletag/foo.jsp.html
 %%T%%/webapps/jsp-examples/snp/snoop.html
 %%T%%/webapps/jsp-examples/snp/snoop.jsp
-%%T%%/webapps/jsp-examples/snp/snoop.jsp.txt
+%%T%%/webapps/jsp-examples/snp/snoop.jsp.html
 %%T%%/webapps/jsp-examples/source.jsp
 %%T%%/webapps/jsp-examples/xml/xml.html
 %%T%%/webapps/jsp-examples/xml/xml.jsp
-%%T%%/webapps/jsp-examples/xml/xml.jsp.txt
+%%T%%/webapps/jsp-examples/xml/xml.jsp.html
 %%T%%/webapps/servlets-examples/WEB-INF/classes/CookieExample.class
 %%T%%/webapps/servlets-examples/WEB-INF/classes/CookieExample.java
 %%T%%/webapps/servlets-examples/WEB-INF/classes/HelloWorldExample.class
@@ -819,6 +821,7 @@ 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
@@ -913,6 +916,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/http11/InternalOutputBuffer.OutputStreamOutputBuffer.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/http11/InternalOutputBuffer.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/http11/OutputFilter.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/http11/filters/BufferedInputFilter.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/http11/filters/ChunkedInputFilter.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/http11/filters/ChunkedOutputFilter.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/http11/filters/GzipOutputFilter.FakeOutputStream.html
@@ -1234,6 +1238,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/cgi-howto.html
 %%T%%/webapps/tomcat-docs/changelog.html
 %%T%%/webapps/tomcat-docs/class-loader-howto.html
+%%T%%/webapps/tomcat-docs/cluster-howto.html
 %%T%%/webapps/tomcat-docs/config/context.html
 %%T%%/webapps/tomcat-docs/config/coyote.html
 %%T%%/webapps/tomcat-docs/config/defaultcontext.html
@@ -1555,6 +1560,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/printer/cgi-howto.html
 %%T%%/webapps/tomcat-docs/printer/changelog.html
 %%T%%/webapps/tomcat-docs/printer/class-loader-howto.html
+%%T%%/webapps/tomcat-docs/printer/cluster-howto.html
 %%T%%/webapps/tomcat-docs/printer/default-servlet.html
 %%T%%/webapps/tomcat-docs/printer/deployer-howto.html
 %%T%%/webapps/tomcat-docs/printer/developers.html