This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository tomcat8.
commit fb2bfa928eeb082a5989e9368ec5acbd914e6042 Merge: 8026ef5 d0ed154 Author: Emmanuel Bourg <[email protected]> Date: Wed Jan 15 23:52:55 2014 +0100 Merge tag 'upstream/8.0.0_RC10' Upstream version 8.0.0~RC10 BUILDING.txt | 11 +- KEYS | 26 + NOTICE | 2 +- TOMCAT-NEXT.txt | 8 + build.properties.default | 41 +- build.xml | 133 ++- conf/catalina.policy | 4 +- conf/catalina.properties | 10 +- conf/server.xml | 2 - conf/web.xml | 4 - java/javax/el/ArrayELResolver.java | 5 +- java/javax/el/Util.java | 2 +- java/javax/servlet/http/Part.java | 2 + java/org/apache/catalina/Authenticator.java | 4 +- java/org/apache/catalina/Context.java | 68 +- java/org/apache/catalina/Globals.java | 31 +- java/org/apache/catalina/Loader.java | 15 +- java/org/apache/catalina/WebResource.java | 17 + java/org/apache/catalina/WebResourceRoot.java | 92 +- java/org/apache/catalina/WebResourceSet.java | 20 + .../WebResourceTraceWrapper.java} | 31 +- java/org/apache/catalina/ant/ValidatorTask.java | 8 +- .../catalina/authenticator/AuthenticatorBase.java | 12 +- .../catalina/authenticator/LocalStrings.properties | 1 + .../authenticator/SpnegoAuthenticator.java | 29 +- .../apache/catalina/connector/CoyoteAdapter.java | 39 +- .../catalina/connector/LocalStrings.properties | 1 + .../apache/catalina/connector/OutputBuffer.java | 7 +- java/org/apache/catalina/connector/Request.java | 27 +- .../apache/catalina/core/ApplicationContext.java | 50 +- .../catalina/core/ApplicationFilterConfig.java | 10 +- java/org/apache/catalina/core/ContainerBase.java | 12 +- java/org/apache/catalina/core/JasperListener.java | 80 -- .../catalina/core/NamingContextListener.java | 10 +- java/org/apache/catalina/core/StandardContext.java | 213 ++-- java/org/apache/catalina/core/StandardHost.java | 5 +- java/org/apache/catalina/core/StandardWrapper.java | 26 +- .../apache/catalina/core/mbeans-descriptors.xml | 14 +- .../apache/catalina/filters/RemoteIpFilter.java | 14 +- .../apache/catalina/ha/session/DeltaManager.java | 34 +- .../catalina/ha/session/mbeans-descriptors.xml | 6 +- .../apache/catalina/ha/tcp/SimpleTcpCluster.java | 4 +- .../apache/catalina/loader/LocalStrings.properties | 7 + .../apache/catalina/loader/WebappClassLoader.java | 1152 +++++--------------- java/org/apache/catalina/loader/WebappLoader.java | 318 +----- .../apache/catalina/loader/mbeans-descriptors.xml | 4 - .../catalina/manager/HTMLManagerServlet.java | 4 +- java/org/apache/catalina/mbeans/MBeanUtils.java | 32 +- .../org/apache/catalina/realm/DataSourceRealm.java | 12 +- java/org/apache/catalina/realm/JDBCRealm.java | 10 +- java/org/apache/catalina/realm/JNDIRealm.java | 81 +- java/org/apache/catalina/realm/MemoryRealm.java | 14 +- java/org/apache/catalina/realm/RealmBase.java | 81 +- .../catalina/security/SecurityClassLoad.java | 36 +- .../apache/catalina/servlets/DefaultServlet.java | 30 +- java/org/apache/catalina/session/ManagerBase.java | 8 +- java/org/apache/catalina/startup/Catalina.java | 7 +- .../org/apache/catalina/startup/ContextConfig.java | 35 +- .../org/apache/catalina/startup/FailedContext.java | 10 + java/org/apache/catalina/startup/HostConfig.java | 83 +- .../catalina/startup/LocalStrings.properties | 3 +- .../tribes/tipis/AbstractReplicatedMap.java | 35 +- .../catalina/tribes/tipis/LazyReplicatedMap.java | 2 +- .../apache/catalina/users/LocalStrings.properties | 1 + .../apache/catalina/users/MemoryUserDatabase.java | 4 +- .../apache/catalina/util/ExtensionValidator.java | 37 +- java/org/apache/catalina/valves/RemoteIpValve.java | 14 +- .../webresources/AbstractArchiveResource.java | 81 +- .../webresources/AbstractArchiveResourceSet.java | 32 +- .../webresources/AbstractFileResourceSet.java | 28 +- .../catalina/webresources/AbstractResource.java | 41 +- .../catalina/webresources/AbstractResourceSet.java | 20 +- java/org/apache/catalina/webresources/Cache.java | 82 +- .../catalina/webresources/CachedResource.java | 64 +- .../catalina/webresources/DirResourceSet.java | 5 +- .../catalina/webresources/EmptyResource.java | 30 +- .../apache/catalina/webresources/FileResource.java | 60 +- .../catalina/webresources/FileResourceSet.java | 8 +- .../apache/catalina/webresources/JarResource.java | 15 +- .../catalina/webresources/JarResourceRoot.java | 19 +- .../catalina/webresources/JarResourceSet.java | 10 +- .../catalina/webresources/JarWarResource.java | 9 +- .../catalina/webresources/JarWarResourceSet.java | 11 +- .../catalina/webresources/LocalStrings.properties | 3 + .../apache/catalina/webresources/StandardRoot.java | 283 ++++- .../TomcatURLStreamHandlerFactory.java | 2 +- .../webresources/TraceWrapperInputStream.java | 112 ++ .../catalina/webresources/mbeans-descriptors.xml | 92 ++ java/org/apache/coyote/AbstractProtocol.java | 6 +- java/org/apache/coyote/ActionCode.java | 6 + java/org/apache/coyote/Request.java | 9 +- .../apache/coyote/ajp/AbstractAjpProcessor.java | 5 + .../coyote/http11/AbstractHttp11Processor.java | 15 + .../apache/coyote/http11/Http11AprProtocol.java | 5 - .../coyote/http11/filters/ChunkedInputFilter.java | 23 +- .../http11/upgrade/AbstractServletInputStream.java | 24 +- .../upgrade/AbstractServletOutputStream.java | 20 +- .../http11/upgrade/AprServletInputStream.java | 29 +- .../http11/upgrade/AprServletOutputStream.java | 15 +- .../coyote/http11/upgrade/LocalStrings.properties | 5 +- java/org/apache/coyote/spdy/SpdyProcessor.java | 3 + java/org/apache/jasper/Constants.java | 77 +- java/org/apache/jasper/EmbeddedServletOptions.java | 21 +- java/org/apache/jasper/JspC.java | 56 +- java/org/apache/jasper/JspCompilationContext.java | 98 +- java/org/apache/jasper/Options.java | 10 +- java/org/apache/jasper/compiler/Compiler.java | 39 +- java/org/apache/jasper/compiler/ELInterpreter.java | 5 +- .../jasper/compiler/ELInterpreterFactory.java | 4 +- java/org/apache/jasper/compiler/ELNode.java | 6 +- java/org/apache/jasper/compiler/ELParser.java | 50 +- java/org/apache/jasper/compiler/Generator.java | 50 +- .../jasper/compiler/ImplicitTagLibraryInfo.java | 106 +- .../org/apache/jasper/compiler/JarURLResource.java | 56 - .../apache/jasper/compiler/JavacErrorDetail.java | 6 +- .../apache/jasper/compiler/JspDocumentParser.java | 110 +- java/org/apache/jasper/compiler/JspReader.java | 10 +- .../apache/jasper/compiler/JspRuntimeContext.java | 59 +- java/org/apache/jasper/compiler/JspUtil.java | 50 +- java/org/apache/jasper/compiler/Parser.java | 50 +- .../apache/jasper/compiler/ParserController.java | 74 +- .../apache/jasper/compiler/TagFileProcessor.java | 48 +- .../apache/jasper/compiler/TagLibraryInfoImpl.java | 698 +++--------- .../apache/jasper/compiler/TagPluginManager.java | 136 +-- java/org/apache/jasper/compiler/TldCache.java | 179 +++ java/org/apache/jasper/compiler/TldLocation.java | 61 -- .../apache/jasper/compiler/TldLocationsCache.java | 107 -- java/org/apache/jasper/compiler/Validator.java | 86 +- .../jasper/resources/LocalStrings.properties | 7 +- .../jasper/resources/LocalStrings_es.properties | 3 +- .../jasper/resources/LocalStrings_ja.properties | 3 +- .../apache/jasper/runtime/JspRuntimeLibrary.java | 3 +- .../org/apache/jasper/runtime/PageContextImpl.java | 68 +- .../apache/jasper/servlet/JasperInitializer.java | 67 +- .../apache/jasper/servlet/JspCServletContext.java | 40 +- .../apache/jasper/servlet/JspServletWrapper.java | 6 +- java/org/apache/jasper/servlet/TldScanner.java | 109 +- java/org/apache/jasper/xmlparser/ParserUtils.java | 251 ----- java/org/apache/jasper/xmlparser/TreeNode.java | 328 ------ .../jasper/xmlparser/XMLEncodingDetector.java | 7 +- java/org/apache/tomcat/JarScannerCallback.java | 23 +- java/org/apache/tomcat/util/bcel/Constants.java | 6 +- .../tomcat/util/bcel/classfile/Attribute.java | 33 +- .../tomcat/util/bcel/classfile/ClassParser.java | 7 +- .../tomcat/util/bcel/classfile/Constant.java | 10 +- .../tomcat/util/bcel/classfile/ConstantPool.java | 4 +- .../tomcat/util/bcel/classfile/JavaClass.java | 20 +- .../tomcat/util/bcel/classfile/Signature.java | 49 - .../tomcat/util/bcel/classfile/StackMap.java | 83 -- .../tomcat/util/bcel/classfile/StackMapEntry.java | 64 -- .../tomcat/util/bcel/classfile/StackMapTable.java | 83 -- .../util/bcel/classfile/StackMapTableEntry.java | 105 -- .../tomcat/util/bcel/classfile/StackMapType.java | 69 -- .../tomcat/util/bcel/classfile/Synthetic.java | 73 -- .../apache/tomcat/util/bcel/classfile/Unknown.java | 93 -- .../apache/tomcat/util/bcel/classfile/Utility.java | 170 ++- java/org/apache/tomcat/util/buf/ByteChunk.java | 8 +- .../tomcat/util/descriptor/DigesterFactory.java | 105 +- .../tomcat/util/descriptor/LocalResolver.java | 130 ++- .../tomcat/util/descriptor/LocalStrings.properties | 2 + .../TagPluginParser.java} | 52 +- .../util/descriptor/tld/ImplicitTldRuleSet.java | 51 + .../tld/{TagFile.java => TagFileXml.java} | 2 +- .../util/descriptor/tld/{Tag.java => TagXml.java} | 12 +- .../tomcat/util/descriptor/tld/TaglibXml.java | 34 +- .../tomcat/util/descriptor/tld/TldParser.java | 17 +- .../util/descriptor/tld/TldResourcePath.java | 46 +- .../tomcat/util/descriptor/tld/TldRuleSet.java | 20 +- .../tld/{Validator.java => ValidatorXml.java} | 7 +- .../descriptor/web/FragmentJarScannerCallback.java | 17 +- .../tomcat/util/descriptor/web/WebXmlParser.java | 7 +- java/org/apache/tomcat/util/digester/Digester.java | 41 +- .../apache/tomcat/util/net/AbstractEndpoint.java | 48 +- java/org/apache/tomcat/util/net/AprEndpoint.java | 36 +- java/org/apache/tomcat/util/net/JIoEndpoint.java | 33 +- java/org/apache/tomcat/util/net/NioEndpoint.java | 25 +- java/org/apache/tomcat/util/net/SocketWrapper.java | 17 +- .../tomcat/util/net/jsse/JSSESocketFactory.java | 8 +- .../tomcat/util/net/res/LocalStrings.properties | 1 + java/org/apache/tomcat/util/scan/Jar.java | 25 + java/org/apache/tomcat/util/scan/JarFactory.java | 6 +- .../scan/{FileUrlJar.java => JarFileUrlJar.java} | 50 +- ...eUrlNestedJar.java => JarFileUrlNestedJar.java} | 47 +- .../tomcat/util/scan/StandardJarScanner.java | 25 +- java/org/apache/tomcat/util/scan/UrlJar.java | 27 + .../tomcat/util/threads/TaskThreadFactory.java | 53 +- .../tomcat/websocket/LocalStrings.properties | 3 +- java/org/apache/tomcat/websocket/Util.java | 124 ++- java/org/apache/tomcat/websocket/WsFrameBase.java | 125 ++- .../tomcat/websocket/WsRemoteEndpointImplBase.java | 170 ++- java/org/apache/tomcat/websocket/WsSession.java | 2 +- .../tomcat/websocket/WsWebSocketContainer.java | 98 +- .../tomcat/websocket/pojo/LocalStrings.properties | 3 +- .../pojo/PojoMessageHandlerWholeBinary.java | 10 + .../pojo/PojoMessageHandlerWholeText.java | 9 + .../apache/tomcat/websocket/server/Constants.java | 8 + .../websocket/server/LocalStrings.properties | 2 +- .../tomcat/websocket/server/UpgradeUtil.java | 9 +- .../tomcat/websocket/server/WsContextListener.java | 1 + .../apache/tomcat/websocket/server/WsFilter.java | 3 +- .../websocket/server/WsHttpUpgradeHandler.java | 14 +- .../server/WsPerSessionServerEndpointConfig.java | 84 ++ .../server/WsRemoteEndpointImplServer.java | 99 +- .../tomcat/websocket/server/WsServerContainer.java | 96 +- .../tomcat/websocket/server/WsWriteTimeout.java | 4 +- modules/jdbc-pool/doc/jdbc-pool.xml | 45 +- res/META-INF/default.notice | 2 +- .../javax.servlet.ServletContainerInitializer | 2 +- res/META-INF/servlet-api.jar.notice | 2 +- .../javax.servlet.ServletContainerInitializer | 2 +- ...ocket.server.ServerEndpointConfig$Configurator} | 0 .../ide-support/coding-style.txt | 24 +- res/ide-support/eclipse/eclipse.classpath | 5 +- .../ide-support/idea/inspections.xml | 16 +- .../netbeans/nb-tomcat-build.properties | 2 +- res/ide-support/netbeans/project.xml | 2 +- res/maven/mvn-pub.xml | 1 + res/maven/mvn.properties.default | 2 +- res/maven/tomcat-catalina-ant.pom | 4 +- res/maven/tomcat-catalina-ha.pom | 6 + res/maven/tomcat-catalina-jmx-remote.pom | 2 +- res/maven/tomcat-catalina.pom | 18 + res/maven/tomcat-embed-jasper.pom | 2 +- res/maven/tomcat-jasper.pom | 4 +- res/maven/tomcat-spdy.pom | 12 + .../{tomcat-websocket.pom => tomcat-util-scan.pom} | 11 +- res/maven/tomcat-util.pom | 8 +- res/maven/tomcat-websocket.pom | 6 + .../javax.servlet.ServletContainerInitializer | 2 +- test/javax/el/TestArrayELResolver.java | 16 + .../servlet/resources/TestSchemaValidation.java | 57 +- .../apache/catalina/connector/TestSendFile.java | 2 - test/org/apache/catalina/core/TesterContext.java | 25 +- .../catalina/filters/TesterServletContext.java | 20 +- .../apache/catalina/loader/TestVirtualContext.java | 2 +- .../catalina/loader/TestVirtualWebappLoader.java | 8 +- .../catalina/loader/TestWebappClassLoader.java | 62 ++ .../loader/TestWebappClassLoaderWeaving.java | 5 - .../apache/catalina/mbeans/TestRegistration.java | 49 +- test/org/apache/catalina/realm/TestRealmBase.java | 53 + .../catalina/security/TestSecurityClassLoad.java | 37 +- .../startup/TestHostConfigAutomaticDeployment.java | 151 ++- .../webresources/AbstractTestResourceSet.java | 60 + .../webresources/TesterWebResourceRoot.java | 4 +- .../coyote/http11/TestAbstractHttp11Processor.java | 118 ++ test/org/apache/el/TestELInJsp.java | 3 + test/org/apache/jasper/TestJspC.java | 2 +- ...canner.java => TestJspCpompilationContext.java} | 28 +- .../jasper/compiler/TestELInterpreterFactory.java | 2 +- test/org/apache/jasper/compiler/TestELParser.java | 97 ++ .../jasper/compiler/TestJspDocumentParser.java | 43 + test/org/apache/jasper/compiler/TestParser.java | 14 +- .../TestTagLibraryInfoImpl.java} | 29 +- .../TesterValidator.java} | 12 +- test/org/apache/jasper/servlet/TestTldScanner.java | 51 +- .../tomcat/util/descriptor/TestLocalResolver.java | 42 +- .../tomcat/util/descriptor/tld/TestTldParser.java | 14 +- test/org/apache/tomcat/websocket/TestUtil.java | 89 ++ .../tomcat/websocket/TestWsRemoteEndpoint.java | 79 +- .../tomcat/websocket/TestWsSubprotocols.java | 8 +- .../tomcat/websocket/TestWsWebSocketContainer.java | 35 +- .../tomcat/websocket/TesterConnectionLimit.java | 111 ++ .../apache/tomcat/websocket/TesterEchoServer.java | 45 +- .../websocket/pojo/TestEncodingDecoding.java | 141 ++- test/webapp/WEB-INF/bugs.tld | 2 - .../webapp/WEB-INF/classes/META-INF/bug55807.tld | 37 +- test/webapp/WEB-INF/lib/test-lib.jar | Bin 0 -> 1943 bytes test/webapp/WEB-INF/tags/bug55198.tagx | 7 +- test/webapp/bug5nnnn/bug55198.jsp | 3 + .../webapp/bug5nnnn/{bug55198.jsp => bug55807.jsp} | 16 +- test/webapp/el-misc.jsp | 4 +- .../webapp/jsp/tagFileInJar.jsp | 11 +- .../webapp/{bug5nnnn/bug55198.jsp => jsp/test.jsp} | 10 +- .../manager.xml => test/webapp/valid.jspx | 20 +- .../tags/xhtmlbasic.tag => test/webapp/valid.xsd | 11 +- webapps/docs/changelog.xml | 12 +- webapps/docs/config/ajp.xml | 8 + webapps/docs/config/automatic-deployment.xml | 8 +- webapps/docs/config/cluster-interceptor.xml | 2 +- webapps/docs/config/cluster-manager.xml | 75 ++ webapps/docs/config/cluster.xml | 9 +- webapps/docs/config/context.xml | 74 +- webapps/docs/config/filter.xml | 6 +- webapps/docs/config/host.xml | 9 +- webapps/docs/config/http.xml | 10 +- webapps/docs/config/jar-scan-filter.xml | 10 +- webapps/docs/config/listeners.xml | 19 +- webapps/docs/config/realm.xml | 55 +- webapps/docs/config/systemprops.xml | 2 + webapps/docs/config/valve.xml | 2 +- webapps/docs/extras.xml | 7 +- webapps/docs/images/docs-stylesheet.css | 8 +- webapps/docs/images/fonts/OpenSans400.woff | Bin 0 -> 21956 bytes webapps/docs/images/fonts/OpenSans400italic.woff | Bin 0 -> 21092 bytes webapps/docs/images/fonts/OpenSans600.woff | Bin 0 -> 22604 bytes webapps/docs/images/fonts/OpenSans600italic.woff | Bin 0 -> 21252 bytes webapps/docs/images/fonts/OpenSans700.woff | Bin 0 -> 22748 bytes webapps/docs/images/fonts/OpenSans700italic.woff | Bin 0 -> 21184 bytes webapps/docs/images/fonts/fonts.css | 54 + webapps/docs/jndi-resources-howto.xml | 16 +- webapps/docs/rewrite.xml | 8 +- webapps/docs/security-howto.xml | 90 +- webapps/docs/tomcat-docs.xsl | 4 +- webapps/docs/web-socket-howto.xml | 67 +- webapps/docs/windows-auth-howto.xml | 38 +- .../examples/WEB-INF/classes/CookieExample.java | 6 +- .../WEB-INF/classes/HelloWorldExample.java | 4 +- .../WEB-INF/classes/RequestHeaderExample.java | 6 +- .../WEB-INF/classes/RequestInfoExample.java | 6 +- .../WEB-INF/classes/RequestParamExample.java | 6 +- .../examples/WEB-INF/classes/SessionExample.java | 9 +- .../classes/websocket/chat/ChatAnnotation.java | 19 +- .../classes/websocket/drawboard/Client.java | 26 + .../drawboard/DrawboardContextListener.java | 37 + .../websocket/drawboard/DrawboardEndpoint.java | 67 +- .../WEB-INF/classes/websocket/drawboard/Room.java | 97 +- webapps/examples/WEB-INF/web.xml | 7 +- webapps/examples/jsp/jsp2/jspx/basic.html | 14 +- webapps/examples/jsp/jsp2/jspx/basic.jspx | 20 +- webapps/examples/jsp/jsp2/jspx/svgexample.html | 12 +- webapps/examples/jsp/jsp2/jspx/textRotate.html | 14 +- webapps/examples/jsp/jsp2/jspx/textRotate.jspx | 1 + webapps/examples/websocket/drawboard.xhtml | 114 +- webapps/host-manager/manager.xml | 4 +- 324 files changed, 7141 insertions(+), 5910 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
