[tomcat8] branch master updated (abb0119 -> ba53720)

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Mon Jan 19 09:00:34 UTC 2015


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a change to branch master
in repository tomcat8.

      from  abb0119   Upload to experimental
      adds  05189c8   Imported Upstream version 8.0.17
       new  f7b0d1c   Merge tag 'upstream/8.0.17'
       new  0616fd7   Refreshed the patches
       new  ba53720   Upload to experimental

The 3 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                                       |   9 +-
 NOTICE                                             |   2 +-
 build.properties.default                           |   8 +-
 build.xml                                          | 201 ++++----
 conf/server.xml                                    |   4 +-
 conf/web.xml                                       |   3 +-
 debian/changelog                                   |   7 +
 ...-deploy-webapps-target-from-deploy-target.patch |   4 +-
 debian/patches/0005-skip-test-failures.patch       |   4 +-
 debian/patches/0010-debianize-build-xml.patch      |   4 +-
 ...nt-look-for-build-properties-in-user-home.patch |   2 +-
 java/javax/el/BeanELResolver.java                  |  30 +-
 java/javax/el/BeanNameELResolver.java              |   2 +-
 java/javax/el/ExpressionFactory.java               |  19 +-
 java/javax/el/ImportHandler.java                   |  90 ++--
 java/javax/servlet/ServletResponse.java            |   2 +
 java/javax/servlet/ServletResponseWrapper.java     |   4 +-
 java/javax/servlet/http/LocalStrings.properties    |   2 +-
 java/org/apache/catalina/AccessLog.java            |   1 -
 java/org/apache/catalina/Container.java            |  47 +-
 java/org/apache/catalina/ContainerEvent.java       |  12 +-
 java/org/apache/catalina/ContainerServlet.java     |  13 +-
 java/org/apache/catalina/Context.java              |  35 +-
 java/org/apache/catalina/Host.java                 |   6 +-
 java/org/apache/catalina/Lifecycle.java            |  13 +-
 java/org/apache/catalina/Wrapper.java              |   4 +-
 .../catalina/authenticator/LocalStrings.properties |  24 +
 .../catalina/authenticator/SingleSignOn.java       | 370 ++++++++-------
 .../catalina/authenticator/SingleSignOnEntry.java  | 101 ++--
 .../authenticator/SingleSignOnListener.java        |  64 +++
 .../authenticator/SingleSignOnSessionKey.java      | 122 +++++
 .../apache/catalina/connector/CoyoteAdapter.java   | 142 +++---
 .../apache/catalina/connector/CoyoteWriter.java    |   8 +-
 .../catalina/connector/LocalStrings.properties     |   3 +-
 java/org/apache/catalina/connector/Request.java    |  65 ++-
 java/org/apache/catalina/connector/Response.java   |   5 +-
 .../apache/catalina/core/ApplicationContext.java   |  52 ++-
 .../org/apache/catalina/core/AsyncContextImpl.java |   2 +-
 .../apache/catalina/core/LocalStrings.properties   |   7 +-
 .../catalina/core/LocalStrings_es.properties       |   1 -
 .../catalina/core/LocalStrings_fr.properties       |   1 -
 .../catalina/core/LocalStrings_ja.properties       |   1 -
 java/org/apache/catalina/core/StandardContext.java | 109 +----
 .../apache/catalina/core/StandardHostValve.java    |  54 ++-
 java/org/apache/catalina/core/StandardServer.java  |  33 +-
 java/org/apache/catalina/core/StandardWrapper.java |  10 -
 java/org/apache/catalina/filters/CorsFilter.java   |   6 +-
 .../org/apache/catalina/filters/ExpiresFilter.java |   3 +-
 .../ha/authenticator/ClusterSingleSignOn.java      | 405 ++++------------
 .../authenticator/ClusterSingleSignOnListener.java | 148 +-----
 .../ha/authenticator/SingleSignOnMessage.java      | 192 --------
 .../apache/catalina/ha/session/DeltaRequest.java   |  34 +-
 .../apache/catalina/ha/session/DeltaSession.java   |  58 ++-
 ...nstants.java => ReplicatedSessionListener.java} |  17 +-
 .../catalina/ha/session/SerializablePrincipal.java | 213 ---------
 .../apache/catalina/loader/LocalStrings.properties |   2 +-
 .../catalina/loader/WebappClassLoaderBase.java     |  35 +-
 java/org/apache/catalina/manager/Constants.java    |   2 +-
 .../catalina/manager/HTMLManagerServlet.java       |   2 +-
 java/org/apache/catalina/manager/JspHelper.java    |   7 +-
 .../catalina/manager/LocalStrings.properties       |   4 +
 .../apache/catalina/manager/ManagerServlet.java    |  62 ++-
 .../apache/catalina/manager/host/Constants.java    |   2 +-
 java/org/apache/catalina/mapper/Mapper.java        |  18 +-
 .../apache/catalina/realm/GenericPrincipal.java    |  74 ++-
 java/org/apache/catalina/realm/JNDIRealm.java      |  46 +-
 .../catalina/realm/NestedCredentialHandler.java    |   5 +
 .../apache/catalina/realm/mbeans-descriptors.xml   |  18 +-
 java/org/apache/catalina/security/Constants.java   |   1 -
 .../apache/catalina/security/SecurityListener.java |   2 +-
 .../org/apache/catalina/security/SecurityUtil.java |  59 ++-
 java/org/apache/catalina/servlets/CGIServlet.java  |   2 +-
 .../apache/catalina/servlets/DefaultServlet.java   |  14 +-
 .../org/apache/catalina/startup/ContextConfig.java |  30 +-
 .../{RealmSF.java => CredentialHandlerSF.java}     |  22 +-
 .../catalina/storeconfig/LocalStrings.properties   |   5 +-
 .../org/apache/catalina/storeconfig/ManagerSF.java |   1 -
 java/org/apache/catalina/storeconfig/RealmSF.java  |   6 +
 .../storeconfig/StoreConfigLifecycleListener.java  |  40 +-
 .../catalina/storeconfig/server-registry.xml       |  12 +-
 java/org/apache/catalina/util/URLEncoder.java      |  10 +
 .../apache/catalina/valves/ErrorReportValve.java   |  11 +-
 .../apache/catalina/valves/RemoteAddrValve.java    |  45 +-
 .../apache/catalina/valves/RemoteHostValve.java    |  45 +-
 .../apache/catalina/valves/RequestFilterValve.java |  44 ++
 .../apache/catalina/valves/mbeans-descriptors.xml  |  30 +-
 .../catalina/valves/rewrite/RewriteValve.java      |  31 +-
 .../catalina/webresources/DirResourceSet.java      |   4 +-
 .../catalina/webresources/FileResourceSet.java     |   4 +-
 .../apache/catalina/webresources/JarResource.java  |   2 +-
 .../catalina/webresources/JarWarResource.java      |   2 +-
 .../catalina/webresources/LocalStrings.properties  |   2 +
 .../apache/catalina/webresources/StandardRoot.java | 102 ++--
 java/org/apache/coyote/AbstractProtocol.java       |   7 +-
 java/org/apache/coyote/Adapter.java                |  22 +-
 java/org/apache/coyote/AsyncStateMachine.java      |  60 ++-
 java/org/apache/coyote/InputBuffer.java            |   3 -
 java/org/apache/coyote/Processor.java              |   7 +
 .../apache/coyote/ajp/AbstractAjpProcessor.java    |   7 +
 .../org/apache/coyote/ajp/AbstractAjpProtocol.java |   4 +-
 java/org/apache/coyote/ajp/AjpNioProcessor.java    |   8 +-
 .../coyote/http11/AbstractHttp11Processor.java     |  42 +-
 .../apache/coyote/http11/AbstractInputBuffer.java  |  10 +
 .../apache/coyote/http11/Http11AprProtocol.java    |  14 +-
 .../apache/coyote/http11/Http11Nio2Protocol.java   |   7 +-
 .../apache/coyote/http11/Http11NioProcessor.java   |  11 +-
 .../apache/coyote/http11/Http11NioProtocol.java    |   5 +-
 java/org/apache/coyote/http11/Http11Protocol.java  |   5 +-
 .../coyote/http11/InternalNio2OutputBuffer.java    |   1 +
 .../coyote/http11/InternalNioInputBuffer.java      |   2 +-
 .../coyote/http11/InternalNioOutputBuffer.java     |   6 +-
 .../coyote/http11/upgrade/AbstractProcessor.java   |   6 +
 .../apache/coyote/http11/upgrade/AprProcessor.java |   6 +-
 .../http11/upgrade/AprServletInputStream.java      |  19 +-
 .../apache/coyote/http11/upgrade/BioProcessor.java |   5 +-
 .../http11/upgrade/BioServletInputStream.java      |  21 +-
 .../coyote/http11/upgrade/Nio2Processor.java       |   7 +-
 .../apache/coyote/http11/upgrade/NioProcessor.java |  14 +-
 .../http11/upgrade/NioServletInputStream.java      |   2 +-
 .../http11/upgrade/NioServletOutputStream.java     |   4 +-
 java/org/apache/coyote/spdy/SpdyProcessor.java     |   6 +
 java/org/apache/el/ExpressionFactoryImpl.java      |   2 +-
 java/org/apache/el/lang/ELSupport.java             | 159 +++++--
 java/org/apache/el/parser/AstAnd.java              |   4 +-
 java/org/apache/el/parser/AstChoice.java           |   2 +-
 .../apache/el/parser/AstCompositeExpression.java   |   2 +-
 java/org/apache/el/parser/AstConcatenation.java    |   4 +-
 java/org/apache/el/parser/AstEqual.java            |   2 +-
 java/org/apache/el/parser/AstFunction.java         |   4 +-
 java/org/apache/el/parser/AstGreaterThan.java      |   2 +-
 java/org/apache/el/parser/AstGreaterThanEqual.java |   2 +-
 java/org/apache/el/parser/AstLessThan.java         |   2 +-
 java/org/apache/el/parser/AstLessThanEqual.java    |   2 +-
 java/org/apache/el/parser/AstNegative.java         |   2 +-
 java/org/apache/el/parser/AstNot.java              |   2 +-
 java/org/apache/el/parser/AstNotEqual.java         |   2 +-
 java/org/apache/el/parser/AstOr.java               |   4 +-
 java/org/apache/el/parser/AstValue.java            |  16 +-
 java/org/apache/el/parser/ParseException.java      |  14 +-
 java/org/apache/el/stream/Stream.java              |   8 +-
 java/org/apache/el/util/ReflectionUtil.java        |  12 +-
 java/org/apache/jasper/Constants.java              |   5 -
 java/org/apache/jasper/JspCompilationContext.java  |   8 +-
 java/org/apache/jasper/compiler/AntCompiler.java   |  15 +-
 .../jasper/compiler/DefaultErrorHandler.java       |  19 +-
 .../apache/jasper/compiler/ErrorDispatcher.java    |   3 +-
 java/org/apache/jasper/compiler/Generator.java     |  73 ++-
 .../apache/jasper/compiler/JavacErrorDetail.java   |   3 +-
 .../apache/jasper/compiler/JspRuntimeContext.java  |   5 +-
 .../apache/jasper/compiler/TagFileProcessor.java   | 179 +++----
 .../apache/jasper/compiler/TagLibraryInfoImpl.java | 156 +++----
 java/org/apache/jasper/compiler/TldCache.java      |   2 +-
 .../jasper/resources/LocalStrings.properties       |   4 +-
 .../jasper/resources/LocalStrings_es.properties    |   4 +-
 .../jasper/resources/LocalStrings_fr.properties    |   4 +-
 .../jasper/resources/LocalStrings_ja.properties    |   4 +-
 .../org/apache/jasper/runtime/BodyContentImpl.java |   6 +-
 .../apache/jasper/runtime/JspSourceImports.java}   |  19 +-
 java/org/apache/jasper/runtime/JspWriterImpl.java  |   5 +-
 .../org/apache/jasper/runtime/PageContextImpl.java |  56 +--
 .../apache/jasper/security/SecurityClassLoad.java  |   2 -
 .../apache/jasper/servlet/JspServletWrapper.java   |   7 +-
 .../apache/jasper/tagplugins/jstl/core/Set.java    |  14 +-
 java/org/apache/juli/ClassLoaderLogManager.java    |   6 +-
 java/org/apache/juli/JdkLoggerFormatter.java       |  10 +-
 java/org/apache/juli/OneLineFormatter.java         |   5 +-
 java/org/apache/juli/VerbatimFormatter.java        |   6 +-
 java/org/apache/tomcat/buildutil/CheckEol.java     |   8 +-
 .../dbcp/pool2/impl/BaseGenericObjectPool.java     |  38 +-
 .../dbcp/pool2/impl/DefaultPooledObject.java       |  12 +-
 .../dbcp/pool2/impl/LinkedBlockingDeque.java       |  35 +-
 java/org/apache/tomcat/jni/Library.java            |   5 +-
 .../tomcat/util/bcel/classfile/ClassParser.java    |   4 +-
 java/org/apache/tomcat/util/buf/UDecoder.java      |   2 +-
 .../util/descriptor/tld/TldResourcePath.java       |   8 +
 java/org/apache/tomcat/util/net/AprEndpoint.java   |  24 +
 java/org/apache/tomcat/util/net/NioChannel.java    |   3 +-
 java/org/apache/tomcat/util/net/NioEndpoint.java   |  49 +-
 java/org/apache/tomcat/util/net/SSLSupport.java    |  16 +-
 .../tomcat/util/net/jsse/JSSESocketFactory.java    |   2 +-
 .../apache/tomcat/util/net/jsse/JSSESupport.java   |   8 +-
 .../tomcat/util/net/res/LocalStrings.properties    |   1 +
 .../tomcat/util/scan/StandardJarScanner.java       |   3 +-
 .../tomcat/websocket/CaseInsensitiveKeyMap.java    | 208 +++++++++
 java/org/apache/tomcat/websocket/Constants.java    |  44 +-
 .../tomcat/websocket/LocalStrings.properties       |   6 +-
 .../tomcat/websocket/TransformationFactory.java    |   8 +-
 java/org/apache/tomcat/websocket/Util.java         |  92 ++--
 java/org/apache/tomcat/websocket/WsFrameBase.java  |   4 +-
 .../tomcat/websocket/WsHandshakeResponse.java      |  15 +-
 .../tomcat/websocket/WsRemoteEndpointImplBase.java |  98 +++-
 java/org/apache/tomcat/websocket/WsSession.java    |  29 +-
 .../tomcat/websocket/WsWebSocketContainer.java     |  32 +-
 .../websocket/pojo/PojoMessageHandlerBase.java     |   2 +-
 .../tomcat/websocket/pojo/PojoMethodMapping.java   | 190 ++++++--
 .../tomcat/websocket/server/UpgradeUtil.java       |  14 +-
 .../websocket/server/WsHandshakeRequest.java       |  11 +-
 modules/jdbc-pool/NOTICE                           |   2 +-
 res/checkstyle/checkstyle.xml                      |   3 -
 .../eclipse/org.eclipse.jdt.core.prefs.properties  |   9 +-
 res/maven/mvn.properties.default                   |   2 +-
 res/tomcat.nsi                                     |   1 -
 test/javax/el/TestImportHandler.java               |   5 +-
 .../apache/catalina/comet/TestCometProcessor.java  |   7 +-
 .../org/apache/catalina/connector/TestRequest.java |  37 ++
 .../catalina/core/TestApplicationContext.java      |  93 ++++
 .../catalina/core/TestApplicationFilterChain.java  | 110 +++++
 .../apache/catalina/core/TestAsyncContextImpl.java | 142 +++++-
 .../apache/catalina/core/TestStandardContext.java  |  54 ++-
 .../catalina/core/TestStandardHostValve.java       |  46 ++
 .../apache/catalina/core/TestStandardWrapper.java  |  11 +-
 .../ha/session/TestSerializablePrincipal.java      | 123 -----
 .../catalina/ha/session/TesterPrincipal.java       |  38 --
 .../catalina/realm/TestGenericPrincipal.java       |  89 ++++
 .../org/apache/catalina/realm/TesterPrincipal.java |  66 +++
 .../realm/TesterPrincipalNonSerializable.java      |  63 +++
 .../apache/catalina/startup/TestContextConfig.java |   8 +-
 test/org/apache/catalina/startup/TestListener.java |   4 +-
 test/org/apache/catalina/startup/TestTomcat.java   |   6 +-
 .../apache/catalina/startup/TomcatBaseTest.java    | 362 +++++++++++++++
 .../catalina/valves/TestRequestFilterValve.java    | 350 ++++++++++++++
 .../catalina/valves/rewrite/TestRewriteValve.java  |  74 +++
 test/org/apache/coyote/ajp/SimpleAjpClient.java    | 242 +++++++++-
 .../coyote/ajp/TestAbstractAjpProcessor.java       | 515 +++++++++++++++++++--
 test/org/apache/coyote/ajp/TesterAjpMessage.java   |  45 +-
 .../coyote/http11/TestAbstractHttp11Processor.java | 135 +++---
 test/org/apache/el/TestELEvaluation.java           |   4 +-
 test/org/apache/el/TestELInJsp.java                |  32 +-
 test/org/apache/el/lang/TestELSupport.java         |  22 +-
 .../apache/el/stream/TestCollectionOperations.java |  12 +-
 test/org/apache/el/util/TestReflectionUtil.java    |   8 +-
 .../apache/jasper/TestJspCompilationContext.java   |  11 +-
 test/org/apache/jasper/compiler/TestCompiler.java  |  66 +--
 test/org/apache/jasper/compiler/TestGenerator.java |  81 +---
 .../jasper/compiler/TestJspDocumentParser.java     |  44 +-
 test/org/apache/jasper/compiler/TestJspReader.java |  13 +-
 .../jasper/compiler/TestNodeIntegration.java       |  16 +-
 test/org/apache/jasper/compiler/TestParser.java    | 159 +------
 .../compiler/TestParserNoStrictWhitespace.java     |  45 +-
 .../jasper/compiler/TestScriptingVariabler.java    |  29 +-
 .../jasper/compiler/TestTagLibraryInfoImpl.java    |  10 +-
 .../jasper/compiler/TestTagPluginManager.java      |  10 +-
 test/org/apache/jasper/compiler/TestValidator.java |   9 +-
 .../apache/jasper/runtime/TestJspWriterImpl.java   |  17 +-
 .../apache/jasper/runtime/TestPageContextImpl.java |  14 +-
 test/org/apache/jasper/servlet/TestJspServlet.java |  18 +-
 .../org/apache/juli/TestClassLoaderLogManager.java |  29 +-
 .../apache/tomcat/util/bcel/TesterPerformance.java |  27 +-
 test/org/apache/tomcat/util/buf/TestUtf8.java      |  22 +-
 .../util/net/jsse/openssl/TesterOpenSSL.java       |   3 +-
 .../tomcat/websocket/TesterFirehoseServer.java     |   8 +-
 .../bug5nnnn/bug57142.jsp}                         |   6 +-
 webapps/docs/architecture/overview.xml             |   2 +-
 webapps/docs/building.xml                          | 106 +++--
 webapps/docs/cgi-howto.xml                         |  40 +-
 webapps/docs/changelog.xml                         | 375 ++++++++++++++-
 webapps/docs/config/ajp.xml                        |  10 +-
 webapps/docs/config/cluster-valve.xml              |  55 +++
 webapps/docs/config/filter.xml                     |  71 ++-
 webapps/docs/config/http.xml                       |  15 +-
 webapps/docs/config/listeners.xml                  |  34 ++
 webapps/docs/config/realm.xml                      |  10 +
 webapps/docs/config/resources.xml                  |   2 +-
 webapps/docs/config/systemprops.xml                |  41 ++
 webapps/docs/config/valve.xml                      |  86 +++-
 webapps/docs/html-manager-howto.xml                |  13 +-
 webapps/docs/index.xml                             |   7 +-
 webapps/docs/manager-howto.xml                     | 487 ++++++++++++-------
 webapps/docs/project.xml                           |   2 +-
 webapps/docs/security-howto.xml                    |  27 +-
 webapps/docs/ssl-howto.xml                         | 137 +++---
 webapps/docs/tomcat-docs.xsl                       |  21 +-
 webapps/manager/WEB-INF/jsp/connectorCiphers.jsp   |   2 +-
 webapps/manager/WEB-INF/jsp/sessionDetail.jsp      |   2 +-
 webapps/manager/WEB-INF/jsp/sessionsList.jsp       |   2 +-
 275 files changed, 6945 insertions(+), 3689 deletions(-)
 create mode 100644 java/org/apache/catalina/authenticator/SingleSignOnListener.java
 create mode 100644 java/org/apache/catalina/authenticator/SingleSignOnSessionKey.java
 delete mode 100644 java/org/apache/catalina/ha/authenticator/SingleSignOnMessage.java
 copy java/org/apache/catalina/ha/session/{Constants.java => ReplicatedSessionListener.java} (72%)
 delete mode 100644 java/org/apache/catalina/ha/session/SerializablePrincipal.java
 copy java/org/apache/catalina/storeconfig/{RealmSF.java => CredentialHandlerSF.java} (78%)
 copy java/{javax/annotation/PostConstruct.java => org/apache/jasper/runtime/JspSourceImports.java} (63%)
 create mode 100644 java/org/apache/tomcat/websocket/CaseInsensitiveKeyMap.java
 copy test/webresources/dir3/.ignore-me.txt => res/ide-support/eclipse/org.eclipse.jdt.core.prefs.properties (80%)
 create mode 100644 test/org/apache/catalina/core/TestApplicationFilterChain.java
 delete mode 100644 test/org/apache/catalina/ha/session/TestSerializablePrincipal.java
 delete mode 100644 test/org/apache/catalina/ha/session/TesterPrincipal.java
 create mode 100644 test/org/apache/catalina/realm/TestGenericPrincipal.java
 create mode 100644 test/org/apache/catalina/realm/TesterPrincipal.java
 create mode 100644 test/org/apache/catalina/realm/TesterPrincipalNonSerializable.java
 create mode 100644 test/org/apache/catalina/valves/TestRequestFilterValve.java
 create mode 100644 test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
 copy test/{webapp-2.3/el-as-literal.jsp => webapp/bug5nnnn/bug57142.jsp} (80%)

-- 
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