[tomcat7] 01/02: Merge tag 'upstream/7.0.53'
Miguel Landaeta
nomadium at moszumanska.debian.org
Fri May 2 01:34:14 UTC 2014
This is an automated email from the git hooks/post-receive script.
nomadium pushed a commit to branch master
in repository tomcat7.
commit 358a193df579207168648615d3e436000a647e8e
Merge: c9780ab b5dec95
Author: Miguel Landaeta <nomadium at debian.org>
Date: Thu May 1 22:06:40 2014 -0300
Merge tag 'upstream/7.0.53'
Upstream release 7.0.53
BUILDING.txt | 22 +-
STATUS.txt | 10 -
bin/catalina.bat | 8 +-
bin/configtest.bat | 3 +-
bin/cpappend.bat | 33 --
bin/digest.bat | 3 +-
bin/service.bat | 61 +-
bin/shutdown.bat | 3 +-
bin/startup.bat | 3 +-
bin/tool-wrapper.bat | 3 +-
bin/version.bat | 3 +-
build.properties.default | 9 +-
build.xml | 78 ++-
conf/server.xml | 11 +-
conf/web.xml | 10 +-
java/javax/el/ArrayELResolver.java | 4 +-
java/javax/el/BeanELResolver.java | 242 +++-----
java/javax/el/ELResolver.java | 27 -
java/javax/el/ListELResolver.java | 2 +-
java/javax/el/LocalStrings.properties | 3 +
java/javax/el/MapELResolver.java | 2 +-
java/javax/el/ResourceBundleELResolver.java | 2 +-
java/javax/el/Util.java | 646 +++++++++++++++++++++
java/javax/servlet/jsp/JspFactory.java | 6 +-
java/org/apache/catalina/Globals.java | 10 +
java/org/apache/catalina/ant/antlib.xml | 3 +
java/org/apache/catalina/ant/catalina.tasks | 1 +
.../apache/catalina/core/ApplicationContext.java | 13 +
.../org/apache/catalina/core/AsyncContextImpl.java | 14 +-
.../apache/catalina/core/LocalStrings.properties | 2 +
java/org/apache/catalina/core/StandardContext.java | 2 +-
java/org/apache/catalina/core/StandardWrapper.java | 7 +-
java/org/apache/catalina/deploy/WebXml.java | 587 ++++++++++---------
.../apache/catalina/loader/LocalStrings.properties | 1 +
.../apache/catalina/loader/WebappClassLoader.java | 32 +-
.../catalina/manager/HTMLManagerServlet.java | 6 +-
.../catalina/manager/LocalStrings.properties | 2 +
.../apache/catalina/manager/ManagerServlet.java | 225 ++++---
.../apache/catalina/manager/StatusTransformer.java | 2 +-
java/org/apache/catalina/realm/MemoryRealm.java | 7 +-
.../apache/catalina/servlets/DefaultServlet.java | 202 ++++++-
.../catalina/servlets/LocalStrings.properties | 3 +
java/org/apache/catalina/session/package.html | 3 -
java/org/apache/catalina/startup/HostConfig.java | 2 +-
java/org/apache/coyote/ajp/AjpNioProcessor.java | 14 +-
.../coyote/http11/filters/ChunkedInputFilter.java | 11 +-
java/org/apache/el/parser/AstValue.java | 5 +-
java/org/apache/el/util/ReflectionUtil.java | 96 ++-
java/org/apache/jasper/Constants.java | 9 +
java/org/apache/jasper/JspC.java | 15 +
java/org/apache/jasper/compiler/Generator.java | 2 +-
java/org/apache/jasper/compiler/JDTCompiler.java | 22 +-
java/org/apache/jasper/compiler/JspConfig.java | 2 +-
java/org/apache/jasper/compiler/SmapUtil.java | 17 +-
.../apache/jasper/compiler/TldLocationsCache.java | 2 +-
java/org/apache/jasper/compiler/Validator.java | 58 +-
java/org/apache/tomcat/util/buf/Ascii.java | 18 +-
.../tomcat/util/descriptor/DigesterFactory.java | 84 ++-
.../tomcat/util/descriptor/LocalResolver.java | 18 +
.../tomcat/util/descriptor/LocalStrings.properties | 2 +
.../tomcat/util/net/NioBlockingSelector.java | 16 +-
.../tomcat/websocket/WsRemoteEndpointImplBase.java | 33 +-
java/org/apache/tomcat/websocket/WsSession.java | 4 +
modules/jdbc-pool/doc/jdbc-pool.xml | 6 +-
res/ide-support/eclipse/eclipse.classpath | 2 +-
res/maven/mvn.properties.default | 2 +-
res/maven/tomcat-embed-jasper.pom | 2 +-
res/maven/tomcat-jasper.pom | 2 +-
res/tomcat.nsi | 6 +-
.../apache/catalina/comet/TestCometProcessor.java | 46 +-
.../catalina/core/TestApplicationContext.java | 7 +
.../apache/catalina/core/TestAsyncContextImpl.java | 257 ++++----
test/org/apache/catalina/deploy/TestWebXml.java | 121 +++-
.../ha/session/TestSerializablePrincipal.java | 90 ++-
.../org/apache/catalina/realm/TestMemoryRealm.java | 37 ++
.../startup/TestHostConfigAutomaticDeployment.java | 15 +-
.../http11/filters/TestChunkedInputFilter.java | 185 +++++-
test/org/apache/el/TestELInJsp.java | 23 +
test/org/apache/el/TesterBeanD.java | 40 ++
test/org/apache/el/parser/TestELParser.java | 115 ++++
test/org/apache/el/parser/TesterBeanC.java | 49 ++
.../jasper/compiler/TestELInterpreterFactory.java | 26 +-
test/org/apache/jasper/compiler/TestELParser.java | 18 +
test/org/apache/jasper/compiler/TestParser.java | 57 +-
test/org/apache/tomcat/util/buf/TestAscii.java | 65 +++
.../org/apache/tomcat/util/net/TestClientCert.java | 11 +-
test/org/apache/tomcat/util/net/TestCustomSsl.java | 13 +-
test/org/apache/tomcat/util/net/TestSsl.java | 6 +-
.../tomcat/websocket/TestWebSocketFrameClient.java | 89 +--
...lient.java => TestWebSocketFrameClientSSL.java} | 13 +-
.../tomcat/websocket/TestWsWebSocketContainer.java | 11 +-
.../tomcat/websocket/TesterFirehoseServer.java | 5 +-
test/webapp-3.0/WEB-INF/tags/bug55198.tagx | 4 +-
.../WEB-INF/tags/{bug55198.tagx => bug56265.tagx} | 20 +-
.../tags/bug55198.tagx => bug5nnnn/bug56147.jsp} | 31 +-
.../tags/bug55198.tagx => bug5nnnn/bug56265.jsp} | 28 +-
webapps/docs/changelog.xml | 240 +++++++-
webapps/docs/config/valve.xml | 43 ++
webapps/docs/default-servlet.xml | 31 +-
webapps/docs/deployer-howto.xml | 8 +-
webapps/docs/funcspecs/fs-admin-objects.xml | 4 -
webapps/docs/security-howto.xml | 10 +-
webapps/docs/tomcat-docs.xsl | 32 +-
webapps/docs/tribes/introduction.xml | 2 +-
webapps/docs/web-socket-howto.xml | 18 +
webapps/docs/windows-service-howto.xml | 15 +-
webapps/examples/websocket/echo.xhtml | 4 +-
107 files changed, 3319 insertions(+), 1236 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