This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository tomcat8.
commit 532c5d6ca115596f1759a0d365f53d9016dd5610 Merge: 18ee3b2 c354e8d Author: Emmanuel Bourg <[email protected]> Date: Tue Oct 22 10:10:38 2013 +0200 Merge tag 'upstream/8.0.0_RC5' Upstream version 8.0.0~RC5 bin/catalina.bat | 19 +- bin/catalina.sh | 16 +- build.properties.default | 10 +- build.xml | 25 +- conf/catalina.policy | 9 +- conf/catalina.properties | 5 +- conf/context.xml | 4 +- conf/web.xml | 4 + java/org/apache/catalina/Lifecycle.java | 4 +- .../apache/catalina/core/AprLifecycleListener.java | 6 +- .../org/apache/catalina/core/AsyncContextImpl.java | 20 +- .../apache/catalina/core/StandardWrapperValve.java | 4 +- .../apache/catalina/ha/session/BackupManager.java | 17 +- .../apache/catalina/ha/session/DeltaManager.java | 4 +- .../catalina/ha/session/mbeans-descriptors.xml | 5 - .../apache/catalina/ha/tcp/SimpleTcpCluster.java | 6 +- .../apache/catalina/loader/LocalStrings.properties | 5 + .../apache/catalina/loader/WebappClassLoader.java | 233 +++++- .../catalina/manager/StatusManagerServlet.java | 12 +- java/org/apache/catalina/realm/CombinedRealm.java | 14 + .../catalina/security/SecurityClassLoad.java | 3 +- .../apache/catalina/servlets/DefaultServlet.java | 74 +- java/org/apache/catalina/startup/Bootstrap.java | 47 +- .../storeconfig/ConnectorStoreAppender.java | 5 - .../storeconfig/GlobalNamingResourcesSF.java | 2 +- .../catalina/storeconfig/StandardContextSF.java | 25 +- .../apache/catalina/storeconfig/StoreAppender.java | 9 +- .../catalina/storeconfig/server-registry.xml | 29 +- java/org/apache/catalina/util/ParameterMap.java | 11 +- java/org/apache/catalina/util/TomcatCSS.java | 2 +- .../apache/catalina/valves/ErrorReportValve.java | 20 +- .../apache/catalina/webresources/StandardRoot.java | 2 +- .../TomcatURLStreamHandlerFactory.java | 77 +- .../catalina/webresources/WarURLStreamHandler.java | 2 +- java/org/apache/coyote/AbstractProtocol.java | 15 +- java/org/apache/coyote/ActionCode.java | 10 +- java/org/apache/coyote/AsyncStateMachine.java | 1 + .../apache/coyote/ajp/AbstractAjpProcessor.java | 4 +- .../coyote/http11/AbstractHttp11Processor.java | 2 + .../apache/coyote/http11/Http11AprProcessor.java | 12 +- java/org/apache/coyote/http11/Http11Processor.java | 8 +- .../http11/upgrade/AprServletInputStream.java | 17 +- .../http11/upgrade/AprServletOutputStream.java | 20 +- .../coyote/http11/upgrade/LocalStrings.properties | 7 +- .../http11/upgrade/NioServletOutputStream.java | 1 + java/org/apache/jasper/JspC.java | 5 +- java/org/apache/jasper/compiler/Node.java | 3 +- .../apache/jasper/compiler/TagFileProcessor.java | 2 +- java/org/apache/jasper/servlet/TldScanner.java | 20 +- java/org/apache/juli/ClassLoaderLogManager.java | 6 +- .../apache/tomcat/InstrumentableClassLoader.java | 79 ++ java/org/apache/tomcat/buildutil/Txt2Html.java | 80 +- java/org/apache/tomcat/jni/Poll.java | 22 +- .../tomcat/util/descriptor/tld/TldParser.java | 4 + .../util/descriptor/tld/TldResourcePath.java | 7 +- java/org/apache/tomcat/util/http/Parameters.java | 6 +- .../apache/tomcat/util/net/AbstractEndpoint.java | 44 +- java/org/apache/tomcat/util/net/AprEndpoint.java | 394 +++++++--- java/org/apache/tomcat/util/net/JIoEndpoint.java | 73 +- java/org/apache/tomcat/util/net/NioChannel.java | 32 +- java/org/apache/tomcat/util/net/NioEndpoint.java | 65 +- java/org/apache/tomcat/util/net/SocketWrapper.java | 38 +- .../tomcat/util/net/res/LocalStrings.properties | 15 +- java/org/apache/tomcat/util/scan/FileUrlJar.java | 9 + .../apache/tomcat/util/scan/FileUrlNestedJar.java | 9 + java/org/apache/tomcat/util/scan/Jar.java | 6 + java/org/apache/tomcat/util/scan/JarFactory.java | 16 + java/org/apache/tomcat/util/scan/UrlJar.java | 5 + java/org/apache/tomcat/websocket/WsFrameBase.java | 11 +- .../org/apache/tomcat/websocket/WsFrameClient.java | 9 +- .../tomcat/websocket/WsRemoteEndpointImplBase.java | 14 +- java/org/apache/tomcat/websocket/WsSession.java | 12 +- .../websocket/server/WsHttpUpgradeHandler.java | 3 + .../server/WsRemoteEndpointImplServer.java | 4 +- .../javax.websocket.server.ServerContainerProvider | 1 - res/findbugs/filter-false-positives.xml | 19 +- res/welcome.bin.html | 44 +- res/welcome.main.html | 44 +- .../catalina/connector/TestCoyoteOutputStream.java | 5 - .../apache/catalina/loader/TestVirtualContext.java | 8 +- .../TestWebappClassLoaderExecutorMemoryLeak.java | 17 +- .../loader/TestWebappClassLoaderWeaving.java | 429 +++++++++++ .../catalina/loader/TesterNeverWeavedClass.java | 24 + .../catalina/loader/TesterUnweavedClass.java | 24 + .../apache/catalina/mbeans/TestRegistration.java | 33 +- .../nonblocking/TesterAjpNonBlockingClient.java | 3 +- .../catalina/servlets/TestDefaultServlet.java | 69 ++ .../org/apache/catalina/startup/TestBootstrap.java | 121 +++ .../apache/catalina/startup/TomcatBaseTest.java | 2 +- test/org/apache/jasper/compiler/TestNode.java | 49 ++ .../apache/tomcat/util/http/TestParameters.java | 4 +- .../tomcat/websocket/TestWsSubprotocols.java | 10 +- .../tomcat/websocket/TestWsWebSocketContainer.java | 17 +- .../target/{classes/META-INF => WEB-INF}/C.tld | 0 .../META-INF/resources/rsrc/resourceE.properties | 0 .../classes/rsrc/resourceC.properties | 0 .../webapp/bug5nnnn/bug55642a.jsp | 32 +- .../webapp/bug5nnnn/bug55642b.jsp | 29 +- test/webapp/index.html.gz | Bin 0 -> 135 bytes test/webresources/war-url-connection.war | Bin 882 -> 868 bytes webapps/ROOT/index.jsp | 17 +- webapps/docs/WEB-INF/web.xml | 2 +- webapps/docs/aio.xml | 2 +- webapps/docs/api/index.html | 4 +- webapps/docs/appdev/deployment.xml | 6 +- webapps/docs/appdev/index.xml | 2 +- webapps/docs/appdev/installation.xml | 6 +- webapps/docs/appdev/introduction.xml | 2 +- webapps/docs/appdev/processes.xml | 6 +- webapps/docs/appdev/project.xml | 2 +- webapps/docs/appdev/sample/index.html | 2 + .../docs/appdev/sample/src/mypackage/Hello.java | 39 +- webapps/docs/appdev/sample/web/WEB-INF/web.xml | 11 +- webapps/docs/appdev/sample/web/hello.jsp | 22 +- webapps/docs/appdev/sample/web/index.html | 17 +- webapps/docs/appdev/source.xml | 2 +- webapps/docs/apr.xml | 2 +- webapps/docs/architecture/index.xml | 2 +- webapps/docs/architecture/overview.xml | 2 +- webapps/docs/architecture/project.xml | 2 +- webapps/docs/architecture/requestProcess.xml | 2 +- webapps/docs/architecture/startup.xml | 2 +- webapps/docs/balancer-howto.xml | 2 +- webapps/docs/building.xml | 6 +- webapps/docs/cgi-howto.xml | 2 +- webapps/docs/changelog.xml | 25 + webapps/docs/class-loader-howto.xml | 2 +- webapps/docs/cluster-howto.xml | 18 +- webapps/docs/comments.xml | 2 +- webapps/docs/config/ajp.xml | 2 +- webapps/docs/config/automatic-deployment.xml | 2 +- webapps/docs/config/cluster-channel.xml | 2 +- webapps/docs/config/cluster-deployer.xml | 2 +- webapps/docs/config/cluster-interceptor.xml | 2 +- webapps/docs/config/cluster-listener.xml | 2 +- webapps/docs/config/cluster-manager.xml | 8 +- webapps/docs/config/cluster-membership.xml | 2 +- webapps/docs/config/cluster-receiver.xml | 2 +- webapps/docs/config/cluster-sender.xml | 2 +- webapps/docs/config/cluster-valve.xml | 7 +- webapps/docs/config/cluster.xml | 2 +- webapps/docs/config/context.xml | 15 +- webapps/docs/config/engine.xml | 2 +- webapps/docs/config/executor.xml | 2 +- webapps/docs/config/filter.xml | 2 +- webapps/docs/config/globalresources.xml | 2 +- webapps/docs/config/host.xml | 2 +- webapps/docs/config/http.xml | 5 +- webapps/docs/config/index.xml | 4 +- webapps/docs/config/jar-scan-filter.xml | 22 +- webapps/docs/config/jar-scanner.xml | 17 +- webapps/docs/config/listeners.xml | 2 +- webapps/docs/config/loader.xml | 2 +- webapps/docs/config/manager.xml | 2 +- webapps/docs/config/project.xml | 2 +- webapps/docs/config/realm.xml | 2 +- webapps/docs/config/resources.xml | 2 +- webapps/docs/config/server.xml | 2 +- webapps/docs/config/service.xml | 2 +- webapps/docs/config/systemprops.xml | 2 +- webapps/docs/config/valve.xml | 2 +- webapps/docs/connectors.xml | 2 +- webapps/docs/default-servlet.xml | 14 +- webapps/docs/deployer-howto.xml | 4 +- webapps/docs/developers.xml | 2 +- webapps/docs/elapi/index.html | 4 +- webapps/docs/extras.xml | 2 +- webapps/docs/funcspecs/fs-admin-apps.xml | 4 +- webapps/docs/funcspecs/fs-admin-objects.xml | 4 +- webapps/docs/funcspecs/fs-admin-opers.xml | 4 +- webapps/docs/funcspecs/fs-default.xml | 4 +- webapps/docs/funcspecs/fs-jdbc-realm.xml | 4 +- webapps/docs/funcspecs/fs-jndi-realm.xml | 4 +- webapps/docs/funcspecs/fs-memory-realm.xml | 4 +- webapps/docs/funcspecs/index.xml | 2 +- webapps/docs/funcspecs/mbean-names.xml | 4 +- webapps/docs/funcspecs/project.xml | 2 +- webapps/docs/html-manager-howto.xml | 2 +- webapps/docs/images/asf-feather.png | Bin 0 -> 40042 bytes webapps/docs/images/docs-stylesheet.css | 32 +- webapps/docs/index.xml | 10 +- webapps/docs/introduction.xml | 12 +- webapps/docs/jasper-howto.xml | 4 +- webapps/docs/jndi-datasource-examples-howto.xml | 4 +- webapps/docs/jndi-resources-howto.xml | 2 +- webapps/docs/jspapi/index.html | 4 +- webapps/docs/logging.xml | 2 +- webapps/docs/manager-howto.xml | 2 +- webapps/docs/maven-jars.xml | 2 +- webapps/docs/mbeans-descriptor-howto.xml | 2 +- webapps/docs/monitoring.xml | 2 +- webapps/docs/project.xml | 2 +- webapps/docs/proxy-howto.xml | 4 +- webapps/docs/realm-howto.xml | 2 +- webapps/docs/rewrite.xml | 2 +- webapps/docs/security-howto.xml | 14 +- webapps/docs/security-manager-howto.xml | 2 +- webapps/docs/servletapi/index.html | 4 +- webapps/docs/setup.xml | 2 +- webapps/docs/ssi-howto.xml | 2 +- webapps/docs/ssl-howto.xml | 2 +- webapps/docs/tomcat-docs.xsl | 69 +- webapps/docs/tribes/developers.xml | 2 +- webapps/docs/tribes/faq.xml | 2 +- webapps/docs/tribes/interceptors.xml | 2 +- webapps/docs/tribes/introduction.xml | 2 +- webapps/docs/tribes/membership.xml | 2 +- webapps/docs/tribes/project.xml | 2 +- webapps/docs/tribes/setup.xml | 2 +- webapps/docs/tribes/status.xml | 2 +- webapps/docs/tribes/transport.xml | 2 +- webapps/docs/virtual-hosting-howto.xml | 2 +- webapps/docs/web-socket-howto.xml | 2 +- webapps/docs/websocketapi/index.html | 4 +- webapps/docs/windows-auth-howto.xml | 8 +- webapps/docs/windows-service-howto.xml | 53 +- .../WEB-INF/classes/websocket/ExamplesConfig.java | 66 ++ .../classes/websocket/drawboard/Client.java | 203 +++++ .../classes/websocket/drawboard/DrawMessage.java | 270 +++++++ .../websocket/drawboard/DrawboardEndpoint.java | 213 ++++++ .../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 | 38 +- .../classes/websocket/echo/WsConfigListener.java | 46 -- .../WEB-INF/classes/websocket/snake/Snake.java | 20 +- .../classes/websocket/snake/SnakeAnnotation.java | 28 +- .../classes/websocket/snake/SnakeTimer.java | 12 +- webapps/examples/WEB-INF/web.xml | 13 +- webapps/examples/index.html | 20 +- webapps/examples/jsp/index.html | 355 ++++----- webapps/examples/jsp/jsptoserv/jts.html | 20 +- webapps/examples/servlets/index.html | 182 +++-- .../examples/websocket/{chat.html => chat.xhtml} | 31 +- webapps/examples/websocket/drawboard.xhtml | 807 ++++++++++++++++++++ .../examples/websocket/{echo.html => echo.xhtml} | 33 +- .../examples/websocket/{index.html => index.xhtml} | 15 +- .../examples/websocket/{snake.html => snake.xhtml} | 40 +- 240 files changed, 5090 insertions(+), 1333 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
