Update to 7.0.47

Changelog:
 The Apache Tomcat Project is proud to announce the release of version 7.0.47 of Apache Tomcat. This release contains a number of bug fixes and improvements compared to version 7.0.42. The notable changes include:

    Back-port the JSR-356 Java WebSocket 1.0 implementation from Apache Tomcat 8. Note that use of this functionality requires Java 7.
    Deprecate the Apache Tomcat proprietary WebSocket API in favour of the new JSR-356 implementation.
    Add a drawing board example to the WebSocket examples.
    The minimum required APR/native library version required if the APR/native connector is used is now 1.1.29.

3 files changed, 84 insertions, 27 deletions

diff --git a/www/apache-tomcat7/Makefile b/www/apache-tomcat7/Makefile
index bc0213fc7ca..dbfa4408093 100644
--- a/www/apache-tomcat7/Makefile
+++ b/www/apache-tomcat7/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2013/07/12 10:45:04 jperkin Exp $
+# $NetBSD: Makefile,v 1.16 2013/11/24 04:44:51 ryoon Exp $
 #
 
 DISTNAME=	apache-tomcat-${TOMCAT_VER}
-PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE:=tomcat/tomcat-7/v${TOMCAT_VER}/bin/}
 
@@ -24,7 +23,7 @@ PKG_DESTDIR_SUPPORT=	destdir
 
 .include "../../mk/bsd.prefs.mk"
 
-TOMCAT_VER=		7.0.42
+TOMCAT_VER=		7.0.47
 TOMCAT_HOME=		${PREFIX}/share/tomcat
 EGDIR=			${PREFIX}/share/examples/tomcat
 DOCDIR=			${PREFIX}/share/doc/tomcat
diff --git a/www/apache-tomcat7/PLIST b/www/apache-tomcat7/PLIST
index ce30705b338..b10a67655fd 100644
--- a/www/apache-tomcat7/PLIST
+++ b/www/apache-tomcat7/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2013/06/17 15:07:54 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.8 2013/11/24 04:44:51 ryoon Exp $
 share/doc/tomcat/LICENSE
 share/doc/tomcat/NOTICE
 share/doc/tomcat/RELEASE-NOTES
@@ -45,6 +45,8 @@ share/tomcat/lib/tomcat-i18n-fr.jar
 share/tomcat/lib/tomcat-i18n-ja.jar
 share/tomcat/lib/tomcat-jdbc.jar
 share/tomcat/lib/tomcat-util.jar
+share/tomcat/lib/tomcat7-websocket.jar
+share/tomcat/lib/websocket-api.jar
 share/tomcat/webapps/ROOT/RELEASE-NOTES.txt
 share/tomcat/webapps/ROOT/WEB-INF/web.xml
 share/tomcat/webapps/ROOT/asf-logo-wide.gif
@@ -299,17 +301,45 @@ share/tomcat/webapps/examples/WEB-INF/classes/util/HTMLFilter.class
 share/tomcat/webapps/examples/WEB-INF/classes/util/HTMLFilter.java
 share/tomcat/webapps/examples/WEB-INF/classes/validators/DebugValidator.class
 share/tomcat/webapps/examples/WEB-INF/classes/validators/DebugValidator.java
-share/tomcat/webapps/examples/WEB-INF/classes/websocket/chat/ChatWebSocketServlet$1.class
-share/tomcat/webapps/examples/WEB-INF/classes/websocket/chat/ChatWebSocketServlet$ChatMessageInbound.class
-share/tomcat/webapps/examples/WEB-INF/classes/websocket/chat/ChatWebSocketServlet.class
-share/tomcat/webapps/examples/WEB-INF/classes/websocket/chat/ChatWebSocketServlet.java
-share/tomcat/webapps/examples/WEB-INF/classes/websocket/echo/EchoMessage$EchoMessageInbound.class
-share/tomcat/webapps/examples/WEB-INF/classes/websocket/echo/EchoMessage.class
-share/tomcat/webapps/examples/WEB-INF/classes/websocket/echo/EchoMessage.java
-share/tomcat/webapps/examples/WEB-INF/classes/websocket/echo/EchoStream$1.class
-share/tomcat/webapps/examples/WEB-INF/classes/websocket/echo/EchoStream$EchoStreamInbound.class
-share/tomcat/webapps/examples/WEB-INF/classes/websocket/echo/EchoStream.class
-share/tomcat/webapps/examples/WEB-INF/classes/websocket/echo/EchoStream.java
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/chat/ChatAnnotation.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/chat/ChatAnnotation.java
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/drawboard/Client$1.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/drawboard/Client.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/drawboard/Client.java
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage$ParseException.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage.java
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardContextListener.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardContextListener.java
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint$1.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint$2.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint$3$1.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint$3.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint.java
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/drawboard/Room$1$1.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/drawboard/Room$1.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/drawboard/Room$2.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/drawboard/Room$MessageType.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/drawboard/Room$Player.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/drawboard/wsmessages/AbstractWebsocketMessage.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/drawboard/wsmessages/AbstractWebsocketMessage.java
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/drawboard/wsmessages/BinaryWebsocketMessage.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/drawboard/wsmessages/BinaryWebsocketMessage.java
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/drawboard/wsmessages/CloseWebsocketMessage.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/drawboard/wsmessages/CloseWebsocketMessage.java
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/drawboard/wsmessages/StringWebsocketMessage.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/drawboard/wsmessages/StringWebsocketMessage.java
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/echo/EchoAnnotation.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/echo/EchoAnnotation.java
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint$1.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint$EchoMessageHandler.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java
 share/tomcat/webapps/examples/WEB-INF/classes/websocket/snake/Direction.class
 share/tomcat/webapps/examples/WEB-INF/classes/websocket/snake/Direction.java
 share/tomcat/webapps/examples/WEB-INF/classes/websocket/snake/Location$1.class
@@ -317,10 +347,33 @@ share/tomcat/webapps/examples/WEB-INF/classes/websocket/snake/Location.class
 share/tomcat/webapps/examples/WEB-INF/classes/websocket/snake/Location.java
 share/tomcat/webapps/examples/WEB-INF/classes/websocket/snake/Snake.class
 share/tomcat/webapps/examples/WEB-INF/classes/websocket/snake/Snake.java
-share/tomcat/webapps/examples/WEB-INF/classes/websocket/snake/SnakeWebSocketServlet$1.class
-share/tomcat/webapps/examples/WEB-INF/classes/websocket/snake/SnakeWebSocketServlet$SnakeMessageInbound.class
-share/tomcat/webapps/examples/WEB-INF/classes/websocket/snake/SnakeWebSocketServlet.class
-share/tomcat/webapps/examples/WEB-INF/classes/websocket/snake/SnakeWebSocketServlet.java
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/snake/SnakeAnnotation.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/snake/SnakeAnnotation.java
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/snake/SnakeTimer$1.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/snake/SnakeTimer.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/snake/SnakeTimer.java
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/tc7/chat/ChatWebSocketServlet$1.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/tc7/chat/ChatWebSocketServlet$ChatMessageInbound.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/tc7/chat/ChatWebSocketServlet.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/tc7/chat/ChatWebSocketServlet.java
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/tc7/echo/EchoMessage$EchoMessageInbound.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/tc7/echo/EchoMessage.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/tc7/echo/EchoMessage.java
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/tc7/echo/EchoStream$1.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/tc7/echo/EchoStream$EchoStreamInbound.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/tc7/echo/EchoStream.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/tc7/echo/EchoStream.java
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/tc7/snake/Direction.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/tc7/snake/Direction.java
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/tc7/snake/Location$1.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/tc7/snake/Location.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/tc7/snake/Location.java
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/tc7/snake/Snake.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/tc7/snake/Snake.java
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/tc7/snake/SnakeWebSocketServlet$1.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/tc7/snake/SnakeWebSocketServlet$SnakeMessageInbound.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/tc7/snake/SnakeWebSocketServlet.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/tc7/snake/SnakeWebSocketServlet.java
 share/tomcat/webapps/examples/WEB-INF/jsp/applet/Clock2.java
 share/tomcat/webapps/examples/WEB-INF/jsp/debug-taglib.tld
 share/tomcat/webapps/examples/WEB-INF/jsp/example-taglib.tld
@@ -522,10 +575,15 @@ share/tomcat/webapps/examples/servlets/reqheaders.html
 share/tomcat/webapps/examples/servlets/reqinfo.html
 share/tomcat/webapps/examples/servlets/reqparams.html
 share/tomcat/webapps/examples/servlets/sessions.html
-share/tomcat/webapps/examples/websocket/chat.html
-share/tomcat/webapps/examples/websocket/echo.html
-share/tomcat/webapps/examples/websocket/index.html
-share/tomcat/webapps/examples/websocket/snake.html
+share/tomcat/webapps/examples/websocket-deprecated/chat.html
+share/tomcat/webapps/examples/websocket-deprecated/echo.html
+share/tomcat/webapps/examples/websocket-deprecated/index.html
+share/tomcat/webapps/examples/websocket-deprecated/snake.html
+share/tomcat/webapps/examples/websocket/chat.xhtml
+share/tomcat/webapps/examples/websocket/drawboard.xhtml
+share/tomcat/webapps/examples/websocket/echo.xhtml
+share/tomcat/webapps/examples/websocket/index.xhtml
+share/tomcat/webapps/examples/websocket/snake.xhtml
 share/tomcat/webapps/host-manager/META-INF/context.xml
 share/tomcat/webapps/host-manager/WEB-INF/jsp/401.jsp
 share/tomcat/webapps/host-manager/WEB-INF/jsp/403.jsp
diff --git a/www/apache-tomcat7/distinfo b/www/apache-tomcat7/distinfo
index d6288c8267a..de915645d2e 100644
--- a/www/apache-tomcat7/distinfo
+++ b/www/apache-tomcat7/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.10 2013/07/08 14:26:15 ryoon Exp $
+$NetBSD: distinfo,v 1.11 2013/11/24 04:44:51 ryoon Exp $
 
-SHA1 (apache-tomcat-7.0.42.tar.gz) = 001a64629a93103d4f53ac95faf3e52a63657b95
-RMD160 (apache-tomcat-7.0.42.tar.gz) = 131341cd66866ef1c0ed9f188684e87d15ba8384
-Size (apache-tomcat-7.0.42.tar.gz) = 7955948 bytes
+SHA1 (apache-tomcat-7.0.47.tar.gz) = ea54881535fccb3dfd7da122358d983297d69196
+RMD160 (apache-tomcat-7.0.47.tar.gz) = 16ee8bfd4bba46738cb395d0750867746dd481ac
+Size (apache-tomcat-7.0.47.tar.gz) = 8234674 bytes