[tomcat7] 01/03: Merge tag 'upstream/7.0.50'
James Downing Page
jamespage at moszumanska.debian.org
Tue Jan 14 19:20:51 UTC 2014
This is an automated email from the git hooks/post-receive script.
jamespage pushed a commit to branch master
in repository tomcat7.
commit 56dc8b71fc5f251add75d558e120dc95dd45d2a9
Merge: 2b623b0 319c7a4
Author: James Page <james.page at ubuntu.com>
Date: Tue Jan 14 18:01:41 2014 +0000
Merge tag 'upstream/7.0.50'
Upstream version 7.0.50
BUILDING.txt | 11 +-
KEYS | 66 +
RELEASE-NOTES | 6 +-
build.properties.default | 25 +-
build.xml | 132 +-
conf/catalina.properties | 6 +-
java/javax/el/ArrayELResolver.java | 5 +-
java/javax/el/Util.java | 57 +
java/org/apache/catalina/Context.java | 87 +-
java/org/apache/catalina/Globals.java | 27 +-
java/org/apache/catalina/ant/ValidatorTask.java | 13 +-
.../authenticator/SpnegoAuthenticator.java | 29 +-
.../apache/catalina/connector/CoyoteAdapter.java | 7 +-
.../catalina/connector/LocalStrings.properties | 1 +
.../apache/catalina/connector/OutputBuffer.java | 7 +-
java/org/apache/catalina/connector/Request.java | 25 +-
.../apache/catalina/core/ApplicationContext.java | 28 +-
java/org/apache/catalina/core/StandardContext.java | 144 +-
java/org/apache/catalina/core/StandardHost.java | 5 +-
.../apache/catalina/core/mbeans-descriptors.xml | 8 +-
.../apache/catalina/deploy/LocalStrings.properties | 2 +-
java/org/apache/catalina/deploy/WebXml.java | 79 +-
.../apache/catalina/ha/session/DeltaManager.java | 37 +-
.../catalina/ha/session/mbeans-descriptors.xml | 6 +-
.../apache/catalina/ha/tcp/SimpleTcpCluster.java | 4 +-
.../apache/catalina/loader/LocalStrings.properties | 1 +
.../apache/catalina/loader/WebappClassLoader.java | 22 +-
.../catalina/manager/HTMLManagerServlet.java | 4 +-
.../org/apache/catalina/realm/DataSourceRealm.java | 12 +-
java/org/apache/catalina/realm/JDBCRealm.java | 10 +-
java/org/apache/catalina/realm/JNDIRealm.java | 88 +-
java/org/apache/catalina/realm/MemoryRealm.java | 14 +-
java/org/apache/catalina/realm/RealmBase.java | 84 +-
java/org/apache/catalina/startup/Catalina.java | 7 +-
.../org/apache/catalina/startup/ContextConfig.java | 75 +-
.../apache/catalina/startup/DigesterFactory.java | 3 +
.../org/apache/catalina/startup/FailedContext.java | 7 +-
java/org/apache/catalina/startup/HostConfig.java | 488 +++--
.../catalina/startup/LocalStrings.properties | 7 +-
.../catalina/startup/LocalStrings_es.properties | 2 +-
java/org/apache/catalina/startup/TldConfig.java | 47 +-
.../apache/catalina/startup/XmlErrorHandler.java | 4 +
.../tribes/tipis/AbstractReplicatedMap.java | 32 +-
.../catalina/tribes/tipis/LazyReplicatedMap.java | 2 +-
.../apache/catalina/users/LocalStrings.properties | 2 +-
.../catalina/users/LocalStrings_es.properties | 2 +-
.../catalina/users/LocalStrings_fr.properties | 1 -
.../catalina/users/LocalStrings_ja.properties | 1 -
.../apache/catalina/users/MemoryUserDatabase.java | 4 +-
java/org/apache/catalina/util/SchemaResolver.java | 2 +
java/org/apache/catalina/websocket/Constants.java | 3 +-
.../apache/catalina/websocket/MessageInbound.java | 3 +-
.../apache/catalina/websocket/StreamInbound.java | 3 +-
.../catalina/websocket/WebSocketServlet.java | 3 +-
java/org/apache/catalina/websocket/WsFrame.java | 3 +-
.../websocket/WsHttpServletRequestWrapper.java | 3 +-
.../apache/catalina/websocket/WsInputStream.java | 3 +-
java/org/apache/catalina/websocket/WsOutbound.java | 3 +-
java/org/apache/coyote/AbstractProtocol.java | 6 +-
java/org/apache/coyote/ActionCode.java | 6 +
.../apache/coyote/ajp/AbstractAjpProcessor.java | 3 +
.../coyote/http11/AbstractHttp11Processor.java | 15 +
.../coyote/http11/filters/ChunkedInputFilter.java | 23 +-
.../http11/upgrade/AbstractServletInputStream.java | 24 +-
.../upgrade/AbstractServletOutputStream.java | 20 +-
.../http11/upgrade/AprServletInputStream.java | 31 +-
.../http11/upgrade/AprServletOutputStream.java | 15 +-
.../coyote/http11/upgrade/LocalStrings.properties | 5 +-
java/org/apache/jasper/Constants.java | 21 +-
java/org/apache/jasper/EmbeddedServletOptions.java | 7 +-
java/org/apache/jasper/JspC.java | 31 +-
java/org/apache/jasper/JspCompilationContext.java | 11 +
java/org/apache/jasper/compiler/ELNode.java | 6 +-
java/org/apache/jasper/compiler/ELParser.java | 50 +-
.../jasper/compiler/ImplicitTagLibraryInfo.java | 19 +-
java/org/apache/jasper/compiler/JspConfig.java | 14 +-
.../apache/jasper/compiler/JspDocumentParser.java | 67 +-
.../apache/jasper/compiler/TagLibraryInfoImpl.java | 16 +-
.../apache/jasper/compiler/TagPluginManager.java | 19 +-
.../apache/jasper/compiler/TldLocationsCache.java | 32 +-
java/org/apache/jasper/compiler/Validator.java | 86 +-
.../org/apache/jasper/runtime/PageContextImpl.java | 66 -
.../apache/jasper/servlet/JspCServletContext.java | 18 +-
java/org/apache/jasper/xmlparser/ParserUtils.java | 89 +-
java/org/apache/tomcat/util/bcel/Constants.java | 6 +-
.../tomcat/util/bcel/classfile/Attribute.java | 12 +-
.../tomcat/util/bcel/classfile/Constant.java | 10 +-
java/org/apache/tomcat/util/buf/ByteChunk.java | 8 +-
.../server => util/descriptor}/Constants.java | 21 +-
.../tomcat/util/descriptor/DigesterFactory.java | 135 ++
.../tomcat/util/descriptor/LocalResolver.java | 146 ++
.../util/descriptor/LocalStrings.properties} | 8 +-
.../util/descriptor/LocalStrings_es.properties} | 6 +-
.../util/descriptor}/XmlErrorHandler.java | 20 +-
.../tomcat/util/descriptor/XmlIdentifiers.java | 77 +
java/org/apache/tomcat/util/digester/Digester.java | 66 +-
.../apache/tomcat/util/net/AbstractEndpoint.java | 31 +-
java/org/apache/tomcat/util/net/AprEndpoint.java | 17 +-
java/org/apache/tomcat/util/net/JIoEndpoint.java | 3 +
java/org/apache/tomcat/util/net/SocketWrapper.java | 11 +
.../tomcat/util/net/jsse/JSSESocketFactory.java | 8 +-
.../tomcat/util/net/res/LocalStrings.properties | 1 +
.../tomcat/websocket/LocalStrings.properties | 3 +-
java/org/apache/tomcat/websocket/Util.java | 115 +-
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 | 117 +-
.../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 | 11 +-
.../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 | 94 +-
.../tomcat/websocket/server/WsWriteTimeout.java | 4 +-
modules/jdbc-pool/doc/jdbc-pool.xml | 45 +-
.../apache/tomcat/jdbc/pool/PooledConnection.java | 1 -
res/META-INF/jsp-api.jar.notice | 2 +-
.../javax.servlet.ServletContainerInitializer | 2 +-
...ocket.server.ServerEndpointConfig$Configurator} | 0
.../tomcat7-websocket.jar/web-fragment.xml | 8 +-
res/checkstyle/org-import-control.xml | 1 +
res/ide-support/eclipse/eclipse.classpath | 8 +-
res/maven/mvn.properties.default | 2 +-
res/maven/tomcat-embed-jasper.pom | 2 +-
res/maven/tomcat-jasper.pom | 2 +-
test/deployment/broken.war | Bin 0 -> 1507 bytes
.../bug55198.jsp => deployment/context.xml} | 15 +-
test/deployment/contextCopyXMLFalse.war | Bin 0 -> 733 bytes
test/deployment/contextCopyXMLTrue.war | Bin 0 -> 732 bytes
test/deployment/contextUnpackWARFalse.war | Bin 0 -> 583 bytes
test/deployment/contextUnpackWARTrue.war | Bin 0 -> 582 bytes
test/javax/el/TestArrayELResolver.java | 15 +
.../servlet/resources/TestSchemaValidation.java | 104 +
.../apache/catalina/connector/TestResponse.java | 36 +-
.../connector/TestResponsePerformance.java | 2 +-
.../{TesterMockRequest.java => TesterRequest.java} | 11 +-
...{TesterMockRequest.java => TesterResponse.java} | 27 +-
test/org/apache/catalina/core/TesterContext.java | 94 +-
test/org/apache/catalina/deploy/TestWebXml.java | 49 +-
.../catalina/filters/TesterServletContext.java | 12 +-
.../loader/TestWebappClassLoaderMemoryLeak.java | 17 +-
.../apache/catalina/mbeans/TestRegistration.java | 5 +
test/org/apache/catalina/realm/TestRealmBase.java | 606 ++++++
.../catalina/realm/TesterServletSecurity01.java | 30 +
.../startup/TestHostConfigAutomaticDeployment.java | 1981 ++++++++++++++++++++
.../apache/catalina/startup/TesterMapRealm.java | 65 +
.../apache/catalina/websocket/TestWebSocket.java | 109 +-
.../coyote/http11/TestAbstractHttp11Processor.java | 137 ++
test/org/apache/jasper/compiler/TestCompiler.java | 36 +
test/org/apache/jasper/compiler/TestELParser.java | 97 +
test/org/apache/jasper/compiler/TestParser.java | 14 +-
.../TesterValidator.java} | 12 +-
.../tomcat/util/descriptor/TestLocalResolver.java | 125 ++
test/org/apache/tomcat/websocket/TestUtil.java | 89 +
.../tomcat/websocket/TestWsRemoteEndpoint.java | 79 +-
.../tomcat/websocket/TestWsSubprotocols.java | 18 +-
.../tomcat/websocket/TestWsWebSocketContainer.java | 35 +-
.../apache/tomcat/websocket/TesterEchoServer.java | 45 +-
.../websocket/pojo/TestEncodingDecoding.java | 137 +-
.../webapp-2.2/WEB-INF/tags11.tld | 32 +-
.../webapp-2.2/WEB-INF/tags12.tld | 32 +-
.../webapp-2.2/WEB-INF/tags20.tld | 33 +-
.../webapp-2.2/WEB-INF/tags21.tld | 33 +-
.../webapp-2.2/WEB-INF/web.xml | 24 +-
.../bug55198.jsp => webapp-2.2/el-as-literal.jsp} | 8 +-
.../bug55198.jsp => webapp-2.2/tld-versions.jsp} | 21 +-
.../WEB-INF/classes/META-INF/bug55807.tld | 33 +-
test/webapp-3.0/WEB-INF/tags/bug55198.tagx | 7 +-
test/webapp-3.0/bug5nnnn/bug55198.jsp | 3 +
.../bug5nnnn/{bug55198.jsp => bug55807.jsp} | 16 +-
webapps/docs/changelog.xml | 441 ++++-
webapps/docs/config/ajp.xml | 8 +
webapps/docs/config/automatic-deployment.xml | 547 ++++++
webapps/docs/config/cluster-interceptor.xml | 2 +-
webapps/docs/config/cluster-manager.xml | 74 +
webapps/docs/config/cluster.xml | 9 +-
webapps/docs/config/context.xml | 56 +-
webapps/docs/config/host.xml | 180 +-
webapps/docs/config/http.xml | 8 +
webapps/docs/config/listeners.xml | 4 +-
webapps/docs/config/realm.xml | 59 +-
webapps/docs/config/systemprops.xml | 2 -
webapps/docs/extras.xml | 7 +-
webapps/docs/index.xml | 15 +-
webapps/docs/jndi-resources-howto.xml | 16 +-
webapps/docs/project.xml | 2 +
webapps/docs/security-howto.xml | 90 +-
webapps/docs/web-socket-howto.xml | 69 +-
.../docs/websocketapi/index.html | 28 +-
webapps/docs/windows-auth-howto.xml | 38 +-
.../classes/websocket/chat/ChatAnnotation.java | 19 +-
.../classes/websocket/drawboard/Client.java | 26 +
.../websocket/drawboard/DrawboardEndpoint.java | 5 +
.../WEB-INF/classes/websocket/drawboard/Room.java | 97 +-
webapps/examples/websocket/drawboard.xhtml | 114 +-
202 files changed, 8562 insertions(+), 1593 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat7.git
More information about the pkg-java-commits
mailing list