[tomcat7] 01/02: Merge tag 'upstream/7.0.47'

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to branch master
in repository tomcat7.

commit 46042fd634765ef6b179c8e67a8604095217ab5e
Merge: 28f25d2 2a6b6a9
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue Oct 22 15:00:04 2013 +0200

    Merge tag 'upstream/7.0.47'
    
    Upstream version 7.0.47

 NOTICE                                             |    2 +-
 build.properties.default                           |    6 +-
 build.xml                                          |    1 +
 conf/catalina.policy                               |    8 +-
 java/org/apache/catalina/Lifecycle.java            |    4 +-
 .../apache/catalina/core/AprLifecycleListener.java |    6 +-
 .../apache/catalina/ha/session/BackupManager.java  |   14 +-
 .../apache/catalina/ha/tcp/SimpleTcpCluster.java   |    6 +-
 .../apache/catalina/loader/WebappClassLoader.java  |   63 +-
 .../catalina/manager/StatusManagerServlet.java     |   12 +-
 java/org/apache/catalina/realm/CombinedRealm.java  |   14 +
 java/org/apache/coyote/AbstractProtocol.java       |    2 +
 .../http11/upgrade/AprServletInputStream.java      |   15 +-
 .../http11/upgrade/AprServletOutputStream.java     |   20 +-
 .../coyote/http11/upgrade/LocalStrings.properties  |    7 +-
 .../http11/upgrade/NioServletOutputStream.java     |    1 +
 java/org/apache/jasper/compiler/Node.java          |    3 +-
 java/org/apache/tomcat/jni/Poll.java               |   22 +-
 java/org/apache/tomcat/util/net/AprEndpoint.java   |  307 ++++++--
 java/org/apache/tomcat/util/net/JIoEndpoint.java   |    1 +
 java/org/apache/tomcat/util/net/NioEndpoint.java   |   53 +-
 java/org/apache/tomcat/util/net/SocketWrapper.java |    3 +
 .../tomcat/util/net/res/LocalStrings.properties    |   13 +-
 java/org/apache/tomcat/websocket/WsFrameBase.java  |   11 +-
 .../org/apache/tomcat/websocket/WsFrameClient.java |    9 +-
 .../tomcat/websocket/WsRemoteEndpointImplBase.java |    6 +-
 java/org/apache/tomcat/websocket/WsSession.java    |   12 +-
 .../websocket/server/WsHttpUpgradeHandler.java     |    3 +
 .../server/WsRemoteEndpointImplServer.java         |   14 +-
 res/META-INF/default.notice                        |    2 +-
 res/META-INF/servlet-api.jar.notice                |    2 +-
 res/maven/mvn.properties.default                   |    2 +-
 .../apache/catalina/mbeans/TestRegistration.java   |   33 +-
 test/org/apache/jasper/compiler/TestNode.java      |   49 ++
 .../webapp-3.0/bug5nnnn/bug55642a.jsp              |   26 +-
 .../webapp-3.0/bug5nnnn/bug55642b.jsp              |   23 +-
 webapps/docs/appdev/deployment.xml                 |    4 +-
 webapps/docs/changelog.xml                         |  116 ++-
 webapps/docs/cluster-howto.xml                     |    8 +-
 webapps/docs/config/cluster-valve.xml              |    5 +-
 webapps/docs/config/context.xml                    |   13 +-
 webapps/docs/proxy-howto.xml                       |    2 +-
 webapps/docs/tomcat-docs.xsl                       |    4 +-
 webapps/docs/web-socket-howto.xml                  |   12 +-
 .../WEB-INF/classes/websocket/ExamplesConfig.java  |   66 ++
 .../classes/websocket/drawboard/Client.java        |  207 +++++
 .../classes/websocket/drawboard/DrawMessage.java   |  270 +++++++
 .../DrawboardContextListener.java}                 |   25 +-
 .../websocket/drawboard/DrawboardEndpoint.java     |  227 ++++++
 .../WEB-INF/classes/websocket/drawboard/Room.java  |  415 ++++++++++
 .../wsmessages/AbstractWebsocketMessage.java       |   25 +
 .../wsmessages/BinaryWebsocketMessage.java         |   34 +
 .../wsmessages/CloseWebsocketMessage.java          |   24 +
 .../wsmessages/StringWebsocketMessage.java         |   34 +
 .../classes/websocket/echo/EchoEndpoint.java       |    2 +-
 .../WEB-INF/classes/websocket/snake/Snake.java     |   10 +-
 .../classes/websocket/snake/SnakeAnnotation.java   |   22 +
 .../classes/websocket/snake/SnakeTimer.java        |   10 +-
 webapps/examples/WEB-INF/web.xml                   |    5 +
 webapps/examples/index.html                        |   20 +-
 webapps/examples/jsp/jsptoserv/jts.html            |    2 +-
 webapps/examples/websocket-deprecated/index.html   |    2 +-
 .../examples/websocket/{chat.html => chat.xhtml}   |   29 +-
 webapps/examples/websocket/drawboard.xhtml         |  807 ++++++++++++++++++++
 .../examples/websocket/{echo.html => echo.xhtml}   |   31 +-
 .../examples/websocket/{index.html => index.xhtml} |   15 +-
 .../examples/websocket/{snake.html => snake.xhtml} |   34 +-
 67 files changed, 2949 insertions(+), 306 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat7.git