[tomcat7] branch master updated (28f25d2 -> cebd039)

[Gianfranco Costamagna]

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

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

      from  28f25d2   New upstream release, patch refresh
      adds  2a6b6a9   Imported Upstream version 7.0.47
       new  46042fd   Merge tag 'upstream/7.0.47'
       new  cebd039   New upstream release, patch refresh

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 NOTICE                                             |    2 +-
 build.properties.default                           |    6 +-
 build.xml                                          |    1 +
 conf/catalina.policy                               |    8 +-
 debian/changelog                                   |    8 +
 ...-deploy-webapps-target-from-deploy-target.patch |    4 +-
 debian/patches/0010-debianize-build-xml.patch      |    4 +-
 .../0011-fix-classpath-lintian-warnings.patch      |   10 +-
 ...nt-look-for-build-properties-in-user-home.patch |    2 +-
 ...anager-webapp.path => fix-manager-webapp.patch} |    2 +-
 debian/patches/series                              |    2 +-
 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 +-
 .../compiler/{TestJspReader.java => TestNode.java} |   13 +-
 .../webapp-3.0/bug5nnnn/bug55642a.jsp              |   11 +-
 .../webapp-3.0/bug5nnnn/bug55642b.jsp              |    8 +-
 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 +++++++
 .../drawboard/DrawboardContextListener.java        |   26 +-
 .../websocket/drawboard/DrawboardEndpoint.java     |  227 ++++++
 .../WEB-INF/classes/websocket/drawboard/Room.java  |  415 ++++++++++
 .../wsmessages/AbstractWebsocketMessage.java       |   12 +-
 .../wsmessages/BinaryWebsocketMessage.java         |   21 +-
 .../wsmessages/CloseWebsocketMessage.java          |   12 +-
 .../wsmessages/StringWebsocketMessage.java         |   23 +-
 .../classes/websocket/echo/EchoEndpoint.java       |    2 +-
 .../classes/websocket/echo/WsConfigListener.java   |   46 --
 .../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 +-
 75 files changed, 2847 insertions(+), 372 deletions(-)
 rename debian/patches/{fix-manager-webapp.path => fix-manager-webapp.patch} (99%)
 copy test/org/apache/jasper/compiler/{TestJspReader.java => TestNode.java} (78%)
 copy webapps/host-manager/index.jsp => test/webapp-3.0/bug5nnnn/bug55642a.jsp (75%)
 copy webapps/host-manager/index.jsp => test/webapp-3.0/bug5nnnn/bug55642b.jsp (81%)
 create mode 100644 webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java
 create mode 100644 webapps/examples/WEB-INF/classes/websocket/drawboard/Client.java
 create mode 100644 webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage.java
 copy test/org/apache/catalina/connector/TesterMockRequest.java => webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardContextListener.java (63%)
 create mode 100644 webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint.java
 create mode 100644 webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
 copy java/org/apache/tomcat/util/net/SocketStatus.java => webapps/examples/WEB-INF/classes/websocket/drawboard/wsmessages/AbstractWebsocketMessage.java (81%)
 copy java/org/apache/tomcat/util/MutableInteger.java => webapps/examples/WEB-INF/classes/websocket/drawboard/wsmessages/BinaryWebsocketMessage.java (69%)
 copy java/org/apache/tomcat/websocket/BackgroundProcess.java => webapps/examples/WEB-INF/classes/websocket/drawboard/wsmessages/CloseWebsocketMessage.java (82%)
 copy java/org/apache/tomcat/util/MutableInteger.java => webapps/examples/WEB-INF/classes/websocket/drawboard/wsmessages/StringWebsocketMessage.java (71%)
 delete mode 100644 webapps/examples/WEB-INF/classes/websocket/echo/WsConfigListener.java
 rename webapps/examples/websocket/{chat.html => chat.xhtml} (80%)
 create mode 100644 webapps/examples/websocket/drawboard.xhtml
 rename webapps/examples/websocket/{echo.html => echo.xhtml} (83%)
 rename webapps/examples/websocket/{index.html => index.xhtml} (69%)
 rename webapps/examples/websocket/{snake.html => snake.xhtml} (90%)

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