[tomcat7] 03/04: Merge tag 'upstream/7.0.54'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu May 22 14:19:34 UTC 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository tomcat7.
commit 4612d0bcdf60cab070a6f7d90f19e5067dc554d6
Merge: 74390a3 8ed7d6b
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu May 22 10:30:21 2014 +0200
Merge tag 'upstream/7.0.54'
Upstream version 7.0.54
BUILDING.txt | 23 +-
bin/service.bat | 11 +-
build.properties.default | 4 +-
build.xml | 11 +-
conf/catalina.properties | 6 +-
conf/web.xml | 4 +
java/javax/el/Util.java | 88 ++-
.../authenticator/SpnegoAuthenticator.java | 9 +-
.../apache/catalina/connector/CoyoteAdapter.java | 38 ++
.../catalina/connector/LocalStrings.properties | 2 +
java/org/apache/catalina/connector/Request.java | 12 +-
.../apache/catalina/core/ApplicationContext.java | 12 +-
.../apache/catalina/core/AprLifecycleListener.java | 90 ++-
.../org/apache/catalina/core/AsyncContextImpl.java | 31 +-
java/org/apache/catalina/core/ContainerBase.java | 4 +-
.../apache/catalina/core/LocalStrings.properties | 5 +
.../catalina/core/NamingContextListener.java | 146 ++---
java/org/apache/catalina/core/StandardContext.java | 10 +-
.../apache/catalina/core/StandardHostValve.java | 17 +-
.../catalina/core/StandardThreadExecutor.java | 1 +
.../core/ThreadLocalLeakPreventionListener.java | 6 +-
.../catalina/ha/context/ReplicatedContext.java | 21 +-
.../apache/catalina/ha/session/BackupManager.java | 38 +-
.../catalina/ha/session/ClusterManagerBase.java | 57 +-
.../apache/catalina/ha/session/DeltaManager.java | 58 --
.../apache/catalina/ha/session/DeltaSession.java | 4 +-
.../apache/catalina/ha/tcp/SimpleTcpCluster.java | 21 +-
.../apache/catalina/manager/ManagerServlet.java | 53 +-
.../manager/host/HTMLHostManagerServlet.java | 7 +-
.../catalina/manager/host/HostManagerServlet.java | 14 +-
.../catalina/manager/host/LocalStrings.properties | 1 +
.../catalina/realm/JAASMemoryLoginModule.java | 2 +-
.../catalina/security/SecurityClassLoad.java | 28 +-
.../apache/catalina/servlets/DefaultServlet.java | 58 +-
.../apache/catalina/session/StandardSession.java | 54 +-
.../org/apache/catalina/startup/ContextConfig.java | 5 +-
java/org/apache/catalina/startup/HostConfig.java | 31 +-
.../catalina/startup/LocalStrings.properties | 3 +
java/org/apache/catalina/startup/TldConfig.java | 40 +-
.../tribes/tipis/AbstractReplicatedMap.java | 437 +++++++-------
.../catalina/tribes/tipis/LazyReplicatedMap.java | 2 +-
.../catalina/tribes/tipis/ReplicatedMap.java | 2 +-
.../apache/catalina/valves/ErrorReportValve.java | 145 +++--
.../apache/catalina/valves/mbeans-descriptors.xml | 10 +
java/org/apache/coyote/Adapter.java | 13 +
java/org/apache/coyote/AsyncStateMachine.java | 27 +-
.../apache/coyote/ajp/AbstractAjpProcessor.java | 2 +
.../coyote/http11/AbstractHttp11Processor.java | 2 +
.../org/apache/el/parser/AstLiteralExpression.java | 5 +-
java/org/apache/el/util/ReflectionUtil.java | 91 ++-
.../apache/jasper/compiler/ELFunctionMapper.java | 10 +-
java/org/apache/jasper/compiler/ELParser.java | 135 ++++-
java/org/apache/jasper/compiler/Generator.java | 4 +-
.../apache/jasper/compiler/JspDocumentParser.java | 74 ++-
java/org/apache/jasper/compiler/Node.java | 4 +-
.../apache/jasper/compiler/TldLocationsCache.java | 5 +-
java/org/apache/jasper/compiler/Validator.java | 124 ++--
.../jasper/resources/LocalStrings.properties | 5 +-
java/org/apache/jasper/util/ExceptionUtils.java | 4 +
java/org/apache/jasper/xmlparser/ParserUtils.java | 26 +
.../org/apache/naming/ContextAccessController.java | 6 +
.../apache/naming/resources/BaseDirContext.java | 27 +-
.../apache/naming/resources/ProxyDirContext.java | 4 +-
.../apache/naming/resources/VirtualDirContext.java | 2 +-
java/org/apache/tomcat/jni/SSL.java | 15 +-
java/org/apache/tomcat/util/ExceptionUtils.java | 4 +
.../org/apache/tomcat/util/IntrospectionUtils.java | 30 +-
java/org/apache/tomcat/util/bcel/Constants.java | 11 +-
.../util/bcel/classfile/AnnotationDefault.java | 2 +-
.../bcel/classfile/AnnotationElementValue.java | 3 +-
.../util/bcel/classfile/AnnotationEntry.java | 2 +-
.../tomcat/util/bcel/classfile/Annotations.java | 2 +-
.../util/bcel/classfile/ArrayElementValue.java | 6 +-
.../tomcat/util/bcel/classfile/Attribute.java | 10 +-
.../tomcat/util/bcel/classfile/ClassParser.java | 16 +-
.../apache/tomcat/util/bcel/classfile/Code.java | 4 +-
.../tomcat/util/bcel/classfile/Constant.java | 6 +-
.../tomcat/util/bcel/classfile/ConstantPool.java | 2 +-
.../tomcat/util/bcel/classfile/ElementValue.java | 2 +-
.../util/bcel/classfile/ElementValuePair.java | 2 +-
.../tomcat/util/bcel/classfile/JavaClass.java | 3 +-
.../bcel/classfile/ParameterAnnotationEntry.java | 2 +-
.../util/bcel/classfile/ParameterAnnotations.java | 2 +-
.../classfile/RuntimeInvisibleAnnotations.java | 4 +-
.../RuntimeInvisibleParameterAnnotations.java | 4 +-
.../bcel/classfile/RuntimeVisibleAnnotations.java | 2 +-
.../RuntimeVisibleParameterAnnotations.java | 2 +-
.../apache/tomcat/util/bcel/classfile/Utility.java | 20 +
java/org/apache/tomcat/util/bcel/package.html | 2 +-
java/org/apache/tomcat/util/bcel/util/package.html | 2 +-
java/org/apache/tomcat/util/buf/Utf8Decoder.java | 2 +-
.../tomcat/util/file/LocalStrings.properties | 16 -
java/org/apache/tomcat/util/file/Matcher.java | 372 +-----------
.../org/apache/tomcat/util/http/mapper/Mapper.java | 3 +
.../tomcat/util/http/mapper/MappingData.java | 2 +
.../apache/tomcat/util/modeler/BaseModelMBean.java | 17 +-
java/org/apache/tomcat/util/net/AprEndpoint.java | 17 +-
java/org/apache/tomcat/util/net/JIoEndpoint.java | 17 +-
java/org/apache/tomcat/util/net/NioEndpoint.java | 11 -
.../tomcat/util/net/res/LocalStrings.properties | 1 -
.../tomcat/util/net/res/LocalStrings_es.properties | 1 -
.../tomcat/util/scan/StandardJarScanner.java | 15 +-
.../PrivilegedGetTccl.java} | 15 +-
.../PrivilegedSetTccl.java} | 21 +-
.../StopPooledThreadException.java} | 14 +-
.../org/apache/tomcat/util/threads/TaskThread.java | 30 +-
.../tomcat/util/threads/ThreadPoolExecutor.java | 16 +-
.../tomcat/websocket/AsyncChannelGroupUtil.java | 117 ++++
.../websocket/AsyncChannelWrapperSecure.java | 21 +-
.../tomcat/websocket/LocalStrings.properties | 3 +-
.../tomcat/websocket/WsWebSocketContainer.java | 102 ++--
.../tomcat/websocket/pojo/PojoEndpointBase.java | 13 +-
.../websocket/server/LocalStrings.properties | 3 +-
.../tomcat/websocket/server/WsContextListener.java | 1 -
.../tomcat/websocket/server/WsServerContainer.java | 26 +-
modules/jdbc-pool/doc/jdbc-pool.xml | 166 +++---
res/checkstyle/org-import-control.xml | 1 +
res/maven/mvn.properties.default | 2 +-
res/tomcat.nsi | 2 +-
.../org/apache/catalina/connector/TestRequest.java | 110 ++++
.../apache/catalina/startup/TomcatBaseTest.java | 8 +-
test/org/apache/catalina/tribes/demos/MapDemo.java | 17 +-
test/org/apache/el/TestELEvaluation.java | 16 +-
test/org/apache/el/TestELInJsp.java | 2 +-
test/org/apache/jasper/compiler/TestELParser.java | 177 +++++-
test/org/apache/jasper/compiler/TestGenerator.java | 61 ++
test/org/apache/jasper/compiler/TestParser.java | 35 ++
test/org/apache/tomcat/util/buf/TestUtf8.java | 319 ++++++++---
.../apache/tomcat/util/scan/TestJarScanner.java | 50 +-
.../tomcat/websocket/TestWsWebSocketContainer.java | 2 +
test/webapp-3.0/WEB-INF/bugs.tld | 14 +
test/webapp-3.0/bug45nnn/bug45451.jspf | 7 +-
test/webapp-3.0/bug5nnnn/bug56334.jspx | 40 ++
.../webapp-3.0/bug5nnnn/bug56529.jsp | 28 +-
webapps/docs/aio.xml | 36 +-
webapps/docs/appdev/deployment.xml | 8 +-
webapps/docs/appdev/index.xml | 2 +-
webapps/docs/appdev/introduction.xml | 10 +-
webapps/docs/appdev/processes.xml | 118 ++--
webapps/docs/appdev/source.xml | 28 +-
webapps/docs/apr.xml | 54 +-
webapps/docs/architecture/startup.xml | 2 +-
webapps/docs/building.xml | 42 +-
webapps/docs/cgi-howto.xml | 4 +-
webapps/docs/changelog.xml | 320 ++++++++++-
webapps/docs/class-loader-howto.xml | 6 +-
webapps/docs/cluster-howto.xml | 353 ++++++------
webapps/docs/config/ajp.xml | 13 +-
webapps/docs/config/cluster-interceptor.xml | 24 +-
webapps/docs/config/cluster-membership.xml | 2 +-
webapps/docs/config/cluster.xml | 30 +-
webapps/docs/config/context.xml | 166 +++---
webapps/docs/config/engine.xml | 38 +-
webapps/docs/config/executor.xml | 8 +-
webapps/docs/config/filter.xml | 597 +++++++++----------
webapps/docs/config/globalresources.xml | 72 +--
webapps/docs/config/host.xml | 90 ++-
webapps/docs/config/http.xml | 12 +-
webapps/docs/config/jar-scanner.xml | 46 +-
webapps/docs/config/listeners.xml | 83 ++-
webapps/docs/config/loader.xml | 6 +-
webapps/docs/config/manager.xml | 12 +-
webapps/docs/config/project.xml | 5 +-
webapps/docs/config/realm.xml | 6 +-
webapps/docs/config/systemprops.xml | 16 +-
webapps/docs/config/valve.xml | 475 ++++++++-------
webapps/docs/connectors.xml | 3 +-
webapps/docs/default-servlet.xml | 296 +++++-----
webapps/docs/deployer-howto.xml | 3 +-
webapps/docs/funcspecs/fs-admin-apps.xml | 14 +-
webapps/docs/funcspecs/fs-jdbc-realm.xml | 8 +-
webapps/docs/funcspecs/fs-jndi-realm.xml | 4 +-
webapps/docs/html-manager-howto.xml | 153 ++---
webapps/docs/jasper-howto.xml | 111 ++--
webapps/docs/jndi-datasource-examples-howto.xml | 234 ++++----
webapps/docs/jndi-resources-howto.xml | 283 ++++-----
webapps/docs/logging.xml | 132 +++--
webapps/docs/manager-howto.xml | 638 +++++++++------------
webapps/docs/realm-howto.xml | 15 +-
webapps/docs/security-howto.xml | 25 +-
webapps/docs/security-manager-howto.xml | 9 +-
webapps/docs/tomcat-docs.xsl | 190 +++---
webapps/docs/web-socket-howto.xml | 2 +-
webapps/docs/windows-service-howto.xml | 115 ++--
184 files changed, 5064 insertions(+), 4119 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