[tomcat8] branch master updated (7edb8b2 -> bda29f3)
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Apr 29 09:29:07 UTC 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a change to branch master
in repository tomcat8.
from 7edb8b2 update changelog
adds e46a1a5 Imported Upstream version 8.0.4
new 8088fe0 Merge tag 'upstream/8.0.4'
new 53cf70b Refreshed the patches
new 1a869d6 Disabled Java 8 support in JSPs
new 6b6fc35 Fixed the name of the doc-base file for libservlet3.1-java
adds d83103e Imported Upstream version 8.0.5
new 474edbc Merge tag 'upstream/8.0.5'
new bda29f3 Upload to unstable
The 6 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:
BUILDING.txt | 17 +-
bin/catalina.bat | 8 +-
bin/configtest.bat | 3 +-
bin/cpappend.bat | 33 -
bin/digest.bat | 3 +-
bin/service.bat | 73 +-
bin/shutdown.bat | 3 +-
bin/startup.bat | 3 +-
bin/tool-wrapper.bat | 3 +-
bin/version.bat | 3 +-
build.properties.default | 32 +-
build.xml | 113 +-
conf/server.xml | 11 +-
conf/web.xml | 14 +-
debian/changelog | 9 +
debian/libservlet3.1-java-doc.doc-base | 3 +-
...02-do-not-load-AJP13-connector-by-default.patch | 2 +-
...-deploy-webapps-target-from-deploy-target.patch | 4 +-
debian/patches/0005-skip-test-failures.patch | 6 +-
debian/patches/0010-debianize-build-xml.patch | 4 +-
...nt-look-for-build-properties-in-user-home.patch | 2 +-
.../0015_disable_test_TestCometProcessor.patch | 10 +-
.../0019-add-distribution-to-error-page.patch | 2 +-
...20-disable-java8-support-with-jdtcompiler.patch | 27 +
debian/patches/series | 1 +
java/javax/servlet/jsp/JspFactory.java | 6 +-
java/org/apache/catalina/Container.java | 8 +-
java/org/apache/catalina/Session.java | 11 +
.../apache/catalina/ant/AbstractCatalinaTask.java | 24 +-
...rinfoTask.java => SslConnectorCiphersTask.java} | 7 +-
.../{ServerinfoTask.java => ThreaddumpTask.java} | 7 +-
.../ant/{ServerinfoTask.java => VminfoTask.java} | 7 +-
java/org/apache/catalina/ant/antlib.xml | 12 +
java/org/apache/catalina/ant/catalina.tasks | 4 +
.../apache/catalina/connector/CoyoteAdapter.java | 26 +-
.../catalina/connector/CoyoteInputStream.java | 2 +-
.../org/apache/catalina/connector/InputBuffer.java | 2 +-
.../apache/catalina/core/ApplicationContext.java | 6 +
.../org/apache/catalina/core/AsyncContextImpl.java | 14 +-
java/org/apache/catalina/core/ContainerBase.java | 11 +
.../apache/catalina/core/LocalStrings.properties | 2 +
java/org/apache/catalina/core/StandardContext.java | 9 +-
java/org/apache/catalina/core/StandardEngine.java | 16 +
java/org/apache/catalina/core/StandardWrapper.java | 7 +-
.../apache/catalina/ha/session/DeltaSession.java | 8 +-
.../apache/catalina/loader/LocalStrings.properties | 3 +
.../apache/catalina/loader/WebappClassLoader.java | 135 +-
.../apache/catalina/loader/mbeans-descriptors.xml | 5 -
.../apache/catalina/manager/DummyProxySession.java | 10 +
.../catalina/manager/HTMLManagerServlet.java | 4 +-
.../catalina/manager/LocalStrings.properties | 2 +
.../apache/catalina/manager/ManagerServlet.java | 210 ++--
.../apache/catalina/manager/StatusTransformer.java | 2 +-
java/org/apache/catalina/realm/MemoryRealm.java | 7 +-
.../apache/catalina/servlets/DefaultServlet.java | 282 +++--
.../catalina/servlets/LocalStrings.properties | 3 +
.../catalina/session/PersistentManagerBase.java | 24 +-
.../apache/catalina/session/StandardSession.java | 38 +-
java/org/apache/catalina/session/package.html | 3 -
.../org/apache/catalina/startup/FailedContext.java | 3 +
java/org/apache/catalina/startup/HostConfig.java | 2 +-
.../catalina/storeconfig/server-registry.xml | 2 -
.../webresources/AbstractArchiveResourceSet.java | 20 +-
.../catalina/webresources/AbstractResourceSet.java | 3 +-
java/org/apache/catalina/webresources/Cache.java | 2 -
.../catalina/webresources/JarResourceRoot.java | 14 +-
.../catalina/webresources/LocalStrings.properties | 6 +
.../apache/catalina/webresources/StandardRoot.java | 9 +-
.../apache/coyote/ajp/AbstractAjpProcessor.java | 53 +-
java/org/apache/coyote/ajp/AjpNio2Processor.java | 271 ++++
.../{AjpNioProtocol.java => AjpNio2Protocol.java} | 80 +-
java/org/apache/coyote/ajp/AjpNioProcessor.java | 2 +-
.../coyote/http11/AbstractHttp11Processor.java | 4 +-
.../apache/coyote/http11/AbstractInputBuffer.java | 8 +
...1NioProcessor.java => Http11Nio2Processor.java} | 183 +--
...p11NioProtocol.java => Http11Nio2Protocol.java} | 155 +--
...putBuffer.java => InternalNio2InputBuffer.java} | 321 +++--
.../coyote/http11/InternalNio2OutputBuffer.java | 508 ++++++++
.../apache/coyote/http11/LocalStrings.properties | 1 +
.../coyote/http11/filters/ChunkedInputFilter.java | 11 +-
.../http11/upgrade/AbstractServletInputStream.java | 44 +-
.../upgrade/AbstractServletOutputStream.java | 98 +-
.../{NioProcessor.java => Nio2Processor.java} | 17 +-
.../http11/upgrade/Nio2ServletInputStream.java | 232 ++++
.../http11/upgrade/Nio2ServletOutputStream.java | 175 +++
java/org/apache/el/parser/ELParser.java | 327 ++---
java/org/apache/el/parser/ELParser.jjt | 4 +-
java/org/apache/jasper/EmbeddedServletOptions.java | 4 +-
java/org/apache/jasper/JspC.java | 21 +-
java/org/apache/jasper/compiler/Generator.java | 2 +-
java/org/apache/jasper/compiler/JDTCompiler.java | 22 +-
.../apache/jasper/compiler/JspDocumentParser.java | 80 +-
java/org/apache/jasper/compiler/SmapUtil.java | 17 +-
.../apache/jasper/compiler/TagLibraryInfoImpl.java | 31 +-
java/org/apache/jasper/compiler/Validator.java | 58 +-
.../apache/jasper/servlet/JspCServletContext.java | 31 +-
java/org/apache/tomcat/util/buf/Ascii.java | 18 +-
.../tomcat/util/descriptor/DigesterFactory.java | 86 +-
.../tomcat/util/descriptor/LocalResolver.java | 19 +
.../tomcat/util/descriptor/LocalStrings.properties | 2 +
.../tomcat/util/descriptor/XmlIdentifiers.java | 37 +-
.../apache/tomcat/util/descriptor/web/WebXml.java | 689 ++++++-----
.../MbeansDescriptorsIntrospectionSource.java | 12 +-
.../util/net/{NioChannel.java => Nio2Channel.java} | 193 +--
java/org/apache/tomcat/util/net/Nio2Endpoint.java | 1299 ++++++++++++++++++++
.../apache/tomcat/util/net/SecureNio2Channel.java | 1005 +++++++++++++++
.../apache/tomcat/util/net/SocketProperties.java | 57 +-
.../tomcat/util/net/res/LocalStrings.properties | 1 +
java/org/apache/tomcat/util/scan/Jar.java | 4 +-
java/org/apache/tomcat/util/threads/TaskQueue.java | 4 +-
.../tomcat/websocket/WsRemoteEndpointImplBase.java | 37 +-
modules/bayeux/build.xml | 2 -
modules/jdbc-pool/build.properties.default | 3 +
modules/jdbc-pool/build.xml | 2 -
modules/jdbc-pool/doc/jdbc-pool.xml | 6 +-
.../apache/tomcat/jdbc/test/DefaultTestCase.java | 26 +-
modules/tomcat-lite/build.xml | 6 -
res/findbugs/filter-false-positives.xml | 9 +-
res/ide-support/eclipse/eclipse.classpath | 2 +-
.../netbeans/nb-tomcat-build.properties | 2 +-
res/ide-support/netbeans/nb-tomcat.xml | 1 -
res/ide-support/netbeans/project.xml | 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 | 48 +-
.../catalina/connector/TestCoyoteAdapter.java | 25 +-
.../catalina/core/TestApplicationContext.java | 7 +
.../apache/catalina/core/TestAsyncContextImpl.java | 255 ++--
test/org/apache/catalina/core/TesterContext.java | 5 +
.../ha/session/TestSerializablePrincipal.java | 90 +-
.../apache/catalina/mbeans/TestRegistration.java | 4 +-
.../catalina/nonblocking/TestNonBlockingAPI.java | 13 +-
.../org/apache/catalina/realm/TestMemoryRealm.java | 25 +-
.../apache/catalina/startup/TomcatBaseTest.java | 8 +
.../webresources/AbstractTestResourceSet.java | 55 +-
.../coyote/ajp/TestAbstractAjpProcessor.java | 139 +++
.../http11/filters/TestChunkedInputFilter.java | 185 ++-
.../apache/coyote/http11/upgrade/TestUpgrade.java | 3 +-
test/org/apache/el/TestELInJsp.java | 26 +
test/org/apache/el/TestMethodExpressionImpl.java | 12 -
.../el/{TesterBeanB.java => TesterBeanD.java} | 26 +-
test/org/apache/el/parser/TestELParser.java | 115 ++
.../org/apache/el/parser/TesterBeanC.java | 38 +-
test/org/apache/jasper/TestJspC.java | 10 +-
.../jasper/compiler/TestELInterpreterFactory.java | 26 +-
test/org/apache/jasper/compiler/TestELParser.java | 19 +
test/org/apache/jasper/compiler/TestParser.java | 62 +-
.../jasper/servlet/TestJspCServletContext.java | 32 +-
test/org/apache/tomcat/util/buf/TestAscii.java | 65 +
.../tomcat/util/descriptor/web/TestWebXml.java | 224 +++-
.../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 | 9 +-
.../tomcat/websocket/TestWebSocketFrameClient.java | 84 +-
...lient.java => TestWebSocketFrameClientSSL.java} | 24 +-
.../tomcat/websocket/TestWsWebSocketContainer.java | 11 +-
.../tomcat/websocket/TesterFirehoseServer.java | 5 +-
test/webapp/WEB-INF/tags/bug55198.tagx | 4 +-
.../webapp/WEB-INF/tags/bug56265.tagx | 15 +-
.../webapp/bug5nnnn/{bug54242.jsp => bug56147.jsp} | 16 +-
.../webapp/bug5nnnn/{bug55198.jsp => bug56265.jsp} | 13 +-
webapps/docs/appdev/build.xml.txt | 24 +-
webapps/docs/changelog.xml | 334 ++++-
webapps/docs/config/ajp.xml | 96 +-
webapps/docs/config/cluster.xml | 15 -
webapps/docs/config/http.xml | 142 ++-
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/jasper-howto.xml | 4 +-
webapps/docs/jndi-datasource-examples-howto.xml | 20 +-
webapps/docs/jndi-resources-howto.xml | 6 +-
webapps/docs/realm-howto.xml | 2 +-
webapps/docs/security-howto.xml | 10 +-
webapps/docs/tribes/introduction.xml | 2 +-
webapps/docs/web-socket-howto.xml | 19 +
webapps/docs/windows-service-howto.xml | 22 +-
.../WEB-INF/classes/async/AsyncStockServlet.java | 13 +-
webapps/examples/websocket/echo.xhtml | 4 +-
182 files changed, 7992 insertions(+), 2192 deletions(-)
delete mode 100755 bin/cpappend.bat
create mode 100644 debian/patches/0020-disable-java8-support-with-jdtcompiler.patch
copy java/org/apache/catalina/ant/{ServerinfoTask.java => SslConnectorCiphersTask.java} (86%)
copy java/org/apache/catalina/ant/{ServerinfoTask.java => ThreaddumpTask.java} (86%)
copy java/org/apache/catalina/ant/{ServerinfoTask.java => VminfoTask.java} (86%)
create mode 100644 java/org/apache/coyote/ajp/AjpNio2Processor.java
copy java/org/apache/coyote/ajp/{AjpNioProtocol.java => AjpNio2Protocol.java} (62%)
copy java/org/apache/coyote/http11/{Http11NioProcessor.java => Http11Nio2Processor.java} (74%)
copy java/org/apache/coyote/http11/{Http11NioProtocol.java => Http11Nio2Protocol.java} (60%)
copy java/org/apache/coyote/http11/{InternalNioInputBuffer.java => InternalNio2InputBuffer.java} (74%)
create mode 100644 java/org/apache/coyote/http11/InternalNio2OutputBuffer.java
copy java/org/apache/coyote/http11/upgrade/{NioProcessor.java => Nio2Processor.java} (69%)
create mode 100644 java/org/apache/coyote/http11/upgrade/Nio2ServletInputStream.java
create mode 100644 java/org/apache/coyote/http11/upgrade/Nio2ServletOutputStream.java
copy java/org/apache/tomcat/util/net/{NioChannel.java => Nio2Channel.java} (50%)
create mode 100644 java/org/apache/tomcat/util/net/Nio2Endpoint.java
create mode 100644 java/org/apache/tomcat/util/net/SecureNio2Channel.java
copy webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.java => test/org/apache/catalina/realm/TestMemoryRealm.java (67%)
copy test/org/apache/el/{TesterBeanB.java => TesterBeanD.java} (68%)
copy java/org/apache/el/parser/AstFalse.java => test/org/apache/el/parser/TesterBeanC.java (62%)
create mode 100644 test/org/apache/tomcat/util/buf/TestAscii.java
copy test/org/apache/tomcat/websocket/{TestWebSocketFrameClient.java => TestWebSocketFrameClientSSL.java} (86%)
copy java/org/apache/naming/factory/package.html => test/webapp/WEB-INF/tags/bug56265.tagx (69%)
copy test/webapp/bug5nnnn/{bug54242.jsp => bug56147.jsp} (73%)
copy test/webapp/bug5nnnn/{bug55198.jsp => bug56265.jsp} (64%)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git
More information about the pkg-java-commits
mailing list