[tomcat7] branch wheezy-backports updated (86cbe55 -> e905cda)
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Dec 10 13:58:35 UTC 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a change to branch wheezy-backports
in repository tomcat7.
discards 86cbe55 Rebuild for wheezy-backports
discards a155230 Loosened the versioned dependency on libhamcrest-java
adds c9780ab update DEP-5 URL in d/copyright
adds b5dec95 Imported Upstream version 7.0.53
adds 358a193 Merge tag 'upstream/7.0.53'
adds d9328e2 Prepare 7.0.53-1 upload to unstable
adds 946c3a0 Add patch 0020-disable-java8-support-with-jdtcompiler.patch
adds ac508e7 Fix typo in debian/patches/0011-fix-classpath-lintian-warnings.patch
adds 5deb546 Upload to unstable
adds 1df09f2 Added myself to the uploaders
adds 74390a3 Use XZ compression for the upstream tarball
adds 8ed7d6b Imported Upstream version 7.0.54
adds 4612d0b Merge tag 'upstream/7.0.54'
adds 77e5eb9 Refreshed the patches
adds ec332dc Bumped the required version of Java mentioned in /etc/default/tomcat7
adds 35f35f3 Search for OpenJDK 8 when starting the server
adds a7208d9 Search for Oracle JDKs when starting the server
adds 25e2fdc Updated the version required for libtcnative-1 (>= 1.1.30)
adds a6262b8 prepare for upload
adds c5e7d45 Imported Upstream version 7.0.55
adds 0376d7e Merge tag 'upstream/7.0.55'
adds 6fda755 Refreshed the patches
adds e230ddc Removed the note about the authbind IPv6 incompatibility in /etc/defaults/tomcat7
adds 5ba2759 Added the SimpleInstanceManager from Tomcat 8 to help integrating the JSP compiler into Jetty 8
adds adac2a8 Install the extra jar catalina-jmx-remote.jar (Closes: #719921)
adds 6c55a33 Imported Upstream version 7.0.56
adds 57a057d Merge tag 'upstream/7.0.56'
adds e62f237 Refreshed the patches
adds ef26acb Upload to unstable
new d3843e8 Loosened the versioned dependency on libhamcrest-java
new 87b4e8c Rebuild for wheezy-backports
new e905cda Added a patch to build the tests with the version of junit4 in wheezy
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (86cbe55)
\
N -- N -- N refs/heads/wheezy-backports (e905cda)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omits" are not gone; other references still
refer to them. Any revisions marked "discards" are gone forever.
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 | 51 +-
STATUS.txt | 10 -
bin/catalina.bat | 12 +-
bin/configtest.bat | 3 +-
bin/cpappend.bat | 33 -
bin/daemon.sh | 4 +-
bin/digest.bat | 3 +-
bin/service.bat | 68 +-
bin/setclasspath.bat | 13 +-
bin/setclasspath.sh | 12 +-
bin/shutdown.bat | 3 +-
bin/startup.bat | 3 +-
bin/tool-wrapper.bat | 3 +-
bin/version.bat | 3 +-
build.properties.default | 26 +-
build.xml | 164 ++-
conf/catalina.properties | 6 +-
conf/server.xml | 11 +-
conf/web.xml | 12 +-
debian/changelog | 55 +-
debian/control | 7 +-
debian/copyright | 3 +-
debian/defaults.template | 5 +-
debian/libtomcat7-java.poms | 1 +
debian/orig-tar.sh | 4 +-
...02-do-not-load-AJP13-connector-by-default.patch | 2 +-
...-deploy-webapps-target-from-deploy-target.patch | 13 +-
.../0006-add-JARs-below-var-to-class-loader.patch | 6 +-
debian/patches/0010-debianize-build-xml.patch | 6 +-
.../0011-fix-classpath-lintian-warnings.patch | 20 +-
...nt-look-for-build-properties-in-user-home.patch | 2 +-
.../0015_disable_test_TestCometProcessor.patch | 13 +-
debian/patches/0017-use-jdbc-pool-default.patch | 4 +-
debian/patches/0018-fix-manager-webapp.patch | 16 +-
.../0019-add-distribution-to-error-page.patch | 11 +-
...20-disable-java8-support-with-jdtcompiler.patch | 28 +
.../patches/0021-add-simple-instance-manager.patch | 73 ++
debian/patches/0099-junit-compatibility.patch | 103 ++
debian/patches/series | 3 +
debian/rules | 17 +-
debian/tomcat7.init | 34 +-
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 | 736 +++++++++++++
java/javax/servlet/jsp/JspFactory.java | 6 +-
java/javax/websocket/Session.java | 48 +-
java/org/apache/catalina/Context.java | 31 +-
java/org/apache/catalina/Globals.java | 10 +
java/org/apache/catalina/Wrapper.java | 2 +-
java/org/apache/catalina/ant/antlib.xml | 3 +
java/org/apache/catalina/ant/catalina.tasks | 1 +
.../catalina/authenticator/AuthenticatorBase.java | 37 +-
.../authenticator/DigestAuthenticator.java | 4 +-
.../catalina/authenticator/SSLAuthenticator.java | 23 +-
.../catalina/authenticator/SingleSignOn.java | 19 +
.../authenticator/SpnegoAuthenticator.java | 9 +-
.../apache/catalina/connector/CoyoteAdapter.java | 140 ++-
.../catalina/connector/LocalStrings.properties | 5 +
.../apache/catalina/connector/MapperListener.java | 111 +-
.../apache/catalina/connector/OutputBuffer.java | 14 +-
java/org/apache/catalina/connector/Request.java | 47 +-
java/org/apache/catalina/connector/Response.java | 96 +-
.../catalina/connector/mbeans-descriptors.xml | 4 +
.../apache/catalina/core/ApplicationContext.java | 25 +-
.../catalina/core/ApplicationContextFacade.java | 17 +-
.../catalina/core/ApplicationHttpRequest.java | 23 +
.../apache/catalina/core/AprLifecycleListener.java | 90 +-
.../org/apache/catalina/core/AsyncContextImpl.java | 45 +-
java/org/apache/catalina/core/ContainerBase.java | 44 +-
.../catalina/core/DefaultInstanceManager.java | 167 +--
.../apache/catalina/core/LocalStrings.properties | 10 +
.../catalina/core/NamingContextListener.java | 146 +--
java/org/apache/catalina/core/StandardContext.java | 88 +-
java/org/apache/catalina/core/StandardHost.java | 17 +
.../apache/catalina/core/StandardHostValve.java | 83 +-
java/org/apache/catalina/core/StandardServer.java | 8 +
.../catalina/core/StandardThreadExecutor.java | 1 +
java/org/apache/catalina/core/StandardWrapper.java | 7 +-
.../apache/catalina/core/StandardWrapperValve.java | 2 +-
.../core/ThreadLocalLeakPreventionListener.java | 6 +-
.../catalina/deploy/ApplicationListener.java | 29 +
java/org/apache/catalina/deploy/WebXml.java | 619 ++++++-----
.../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 | 8 +-
.../apache/catalina/ha/tcp/SimpleTcpCluster.java | 21 +-
.../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 | 287 ++---
.../apache/catalina/manager/StatusTransformer.java | 2 +-
.../manager/host/HTMLHostManagerServlet.java | 7 +-
.../catalina/manager/host/HostManagerServlet.java | 14 +-
.../catalina/manager/host/LocalStrings.properties | 1 +
.../catalina/realm/JAASMemoryLoginModule.java | 2 +-
java/org/apache/catalina/realm/JNDIRealm.java | 8 +-
java/org/apache/catalina/realm/MemoryRealm.java | 7 +-
java/org/apache/catalina/realm/MemoryRuleSet.java | 4 +-
java/org/apache/catalina/realm/RealmBase.java | 2 +-
java/org/apache/catalina/realm/package.html | 52 +-
.../catalina/security/SecurityClassLoad.java | 29 +-
.../apache/catalina/servlets/DefaultServlet.java | 297 +++++-
.../catalina/servlets/LocalStrings.properties | 3 +
.../apache/catalina/servlets/WebdavServlet.java | 4 +-
.../catalina/session/PersistentManagerBase.java | 34 +-
.../apache/catalina/session/StandardSession.java | 54 +-
java/org/apache/catalina/session/package.html | 3 -
.../catalina/startup/CatalinaProperties.java | 10 +-
.../org/apache/catalina/startup/ContextConfig.java | 147 +--
java/org/apache/catalina/startup/HostConfig.java | 40 +-
.../catalina/startup/LocalStrings.properties | 3 +
java/org/apache/catalina/startup/TldConfig.java | 41 +-
.../apache/catalina/startup/WebAnnotationSet.java | 163 +--
.../apache/catalina/tribes/group/RpcChannel.java | 3 +-
.../tribes/tipis/AbstractReplicatedMap.java | 451 ++++----
.../catalina/tribes/tipis/LazyReplicatedMap.java | 2 +-
.../catalina/tribes/tipis/ReplicatedMap.java | 2 +-
.../tribes/transport/bio/MultipointBioSender.java | 3 +-
.../tribes/transport/nio/ParallelNioSender.java | 3 +-
java/org/apache/catalina/util/CharsetMapper.java | 13 +-
.../apache/catalina/util/ExtensionValidator.java | 23 +-
java/org/apache/catalina/util/ServerInfo.java | 16 +-
.../apache/catalina/valves/ErrorReportValve.java | 210 ++--
.../catalina/valves/ExtendedAccessLogValve.java | 4 +-
.../apache/catalina/valves/LocalStrings.properties | 1 +
.../catalina/valves/StuckThreadDetectionValve.java | 120 ++-
.../apache/catalina/valves/mbeans-descriptors.xml | 15 +
java/org/apache/coyote/AbstractProcessor.java | 59 +-
java/org/apache/coyote/AbstractProtocol.java | 12 +-
java/org/apache/coyote/ActionCode.java | 9 +
java/org/apache/coyote/Adapter.java | 19 +-
java/org/apache/coyote/AsyncStateMachine.java | 32 +-
...extCallback.java => ContainerThreadMarker.java} | 25 +-
java/org/apache/coyote/ErrorState.java | 69 ++
java/org/apache/coyote/LocalStrings.properties | 2 +
java/org/apache/coyote/Processor.java | 2 +
java/org/apache/coyote/Response.java | 33 +-
.../apache/coyote/ajp/AbstractAjpProcessor.java | 197 ++--
.../org/apache/coyote/ajp/AbstractAjpProtocol.java | 2 +-
java/org/apache/coyote/ajp/AjpAprProcessor.java | 66 +-
java/org/apache/coyote/ajp/AjpAprProtocol.java | 5 +-
java/org/apache/coyote/ajp/AjpNioProcessor.java | 82 +-
java/org/apache/coyote/ajp/AjpNioProtocol.java | 5 +-
java/org/apache/coyote/ajp/AjpProcessor.java | 67 +-
java/org/apache/coyote/ajp/AjpProtocol.java | 4 +-
java/org/apache/coyote/ajp/Constants.java | 1 +
.../coyote/http11/AbstractHttp11JsseProtocol.java | 4 +-
.../coyote/http11/AbstractHttp11Processor.java | 376 ++++---
.../coyote/http11/AbstractHttp11Protocol.java | 23 +-
.../apache/coyote/http11/AbstractInputBuffer.java | 10 +-
.../apache/coyote/http11/AbstractOutputBuffer.java | 4 +-
.../apache/coyote/http11/Http11AprProcessor.java | 116 +-
.../apache/coyote/http11/Http11AprProtocol.java | 10 +-
.../apache/coyote/http11/Http11NioProcessor.java | 145 +--
.../apache/coyote/http11/Http11NioProtocol.java | 10 +-
java/org/apache/coyote/http11/Http11Processor.java | 66 +-
java/org/apache/coyote/http11/Http11Protocol.java | 10 +-
.../coyote/http11/InternalAprInputBuffer.java | 9 +-
.../coyote/http11/InternalAprOutputBuffer.java | 4 +-
.../apache/coyote/http11/InternalInputBuffer.java | 9 +-
.../coyote/http11/InternalNioInputBuffer.java | 7 +-
.../coyote/http11/InternalNioOutputBuffer.java | 2 +-
.../apache/coyote/http11/InternalOutputBuffer.java | 2 +-
.../coyote/http11/filters/ChunkedInputFilter.java | 152 +--
.../coyote/http11/filters/IdentityInputFilter.java | 22 +-
.../http11/filters}/LocalStrings.properties | 14 +-
.../coyote/http11/upgrade/AbstractProcessor.java | 5 +
.../http11/upgrade/AbstractServletInputStream.java | 48 +-
.../upgrade/AbstractServletOutputStream.java | 140 ++-
.../apache/coyote/http11/upgrade/AprProcessor.java | 5 +-
.../http11/upgrade/AprServletOutputStream.java | 3 +-
.../apache/coyote/http11/upgrade/BioProcessor.java | 5 +-
.../http11/upgrade/BioServletOutputStream.java | 7 +-
.../coyote/http11/upgrade/LocalStrings.properties | 2 +
.../apache/coyote/http11/upgrade/NioProcessor.java | 5 +-
.../http11/upgrade/NioServletOutputStream.java | 7 +-
.../coyote/http11/upgrade/UpgradeProcessor.java | 5 +
.../org/apache/el/parser/AstLiteralExpression.java | 5 +-
java/org/apache/el/parser/AstValue.java | 5 +-
java/org/apache/el/util/ReflectionUtil.java | 202 +++-
java/org/apache/jasper/Constants.java | 14 +-
java/org/apache/jasper/JspC.java | 19 +
java/org/apache/jasper/compiler/Compiler.java | 12 +-
.../apache/jasper/compiler/ELFunctionMapper.java | 10 +-
java/org/apache/jasper/compiler/ELParser.java | 136 ++-
java/org/apache/jasper/compiler/Generator.java | 18 +-
java/org/apache/jasper/compiler/JDTCompiler.java | 37 +-
java/org/apache/jasper/compiler/JspConfig.java | 2 +-
.../apache/jasper/compiler/JspDocumentParser.java | 74 +-
java/org/apache/jasper/compiler/JspReader.java | 40 +
java/org/apache/jasper/compiler/Node.java | 4 +-
java/org/apache/jasper/compiler/Parser.java | 27 +-
java/org/apache/jasper/compiler/SmapUtil.java | 17 +-
.../apache/jasper/compiler/TldLocationsCache.java | 7 +-
java/org/apache/jasper/compiler/Validator.java | 180 ++--
java/org/apache/jasper/el/JasperELResolver.java | 2 +-
.../jasper/resources/LocalStrings.properties | 5 +-
java/org/apache/jasper/servlet/JspServlet.java | 11 +-
.../apache/jasper/servlet/JspServletWrapper.java | 4 +-
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 | 99 +-
.../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 | 473 ---------
.../tomcat/util/bcel/classfile/AccessFlags.java | 41 -
.../util/bcel/classfile/AnnotationDefault.java | 87 --
.../bcel/classfile/AnnotationElementValue.java | 23 +-
.../util/bcel/classfile/AnnotationEntry.java | 52 +-
.../tomcat/util/bcel/classfile/Annotations.java | 49 +-
.../util/bcel/classfile/ArrayElementValue.java | 39 +-
.../tomcat/util/bcel/classfile/Attribute.java | 227 ----
.../util/bcel/classfile/AttributeReader.java | 56 -
.../util/bcel/classfile/ClassElementValue.java | 15 +-
.../util/bcel/classfile/ClassFormatException.java | 4 -
.../tomcat/util/bcel/classfile/ClassParser.java | 213 ++--
.../apache/tomcat/util/bcel/classfile/Code.java | 240 -----
.../tomcat/util/bcel/classfile/CodeException.java | 127 ---
.../tomcat/util/bcel/classfile/Constant.java | 97 +-
.../tomcat/util/bcel/classfile/ConstantCP.java | 86 --
.../tomcat/util/bcel/classfile/ConstantClass.java | 23 +-
.../tomcat/util/bcel/classfile/ConstantDouble.java | 24 +-
.../util/bcel/classfile/ConstantFieldref.java | 44 -
.../tomcat/util/bcel/classfile/ConstantFloat.java | 24 +-
.../util/bcel/classfile/ConstantInteger.java | 24 +-
.../bcel/classfile/ConstantInterfaceMethodref.java | 44 -
.../util/bcel/classfile/ConstantInvokeDynamic.java | 95 --
.../tomcat/util/bcel/classfile/ConstantLong.java | 24 +-
.../util/bcel/classfile/ConstantMethodHandle.java | 93 --
.../util/bcel/classfile/ConstantMethodType.java | 80 --
.../util/bcel/classfile/ConstantMethodref.java | 44 -
.../util/bcel/classfile/ConstantNameAndType.java | 87 --
.../tomcat/util/bcel/classfile/ConstantPool.java | 184 +---
.../tomcat/util/bcel/classfile/ConstantString.java | 74 --
.../tomcat/util/bcel/classfile/ConstantUtf8.java | 59 +-
.../tomcat/util/bcel/classfile/ConstantValue.java | 108 --
.../tomcat/util/bcel/classfile/Deprecated.java | 92 --
.../tomcat/util/bcel/classfile/ElementValue.java | 29 +-
.../util/bcel/classfile/ElementValuePair.java | 23 +-
.../util/bcel/classfile/EnclosingMethod.java | 46 -
.../util/bcel/classfile/EnumElementValue.java | 21 +-
.../tomcat/util/bcel/classfile/ExceptionTable.java | 118 ---
.../util/bcel/classfile/FastDataInputStream.java | 234 +++++
.../apache/tomcat/util/bcel/classfile/Field.java | 130 ---
.../tomcat/util/bcel/classfile/FieldOrMethod.java | 106 --
.../tomcat/util/bcel/classfile/InnerClass.java | 132 ---
.../tomcat/util/bcel/classfile/InnerClasses.java | 109 --
.../tomcat/util/bcel/classfile/JavaClass.java | 258 +----
.../tomcat/util/bcel/classfile/LineNumber.java | 91 --
.../util/bcel/classfile/LineNumberTable.java | 119 ---
.../tomcat/util/bcel/classfile/LocalVariable.java | 141 ---
.../util/bcel/classfile/LocalVariableTable.java | 128 ---
.../bcel/classfile/LocalVariableTypeTable.java | 111 --
.../apache/tomcat/util/bcel/classfile/Method.java | 174 ---
.../tomcat/util/bcel/classfile/PMGClass.java | 103 --
.../bcel/classfile/ParameterAnnotationEntry.java | 50 -
.../util/bcel/classfile/ParameterAnnotations.java | 79 --
.../classfile/RuntimeInvisibleAnnotations.java | 63 --
.../RuntimeInvisibleParameterAnnotations.java | 58 -
.../bcel/classfile/RuntimeVisibleAnnotations.java | 63 --
.../RuntimeVisibleParameterAnnotations.java | 58 -
.../tomcat/util/bcel/classfile/Signature.java | 90 --
.../util/bcel/classfile/SimpleElementValue.java | 38 +-
.../tomcat/util/bcel/classfile/SourceFile.java | 99 --
.../tomcat/util/bcel/classfile/StackMap.java | 116 --
.../tomcat/util/bcel/classfile/StackMapEntry.java | 138 ---
.../tomcat/util/bcel/classfile/StackMapTable.java | 116 --
.../util/bcel/classfile/StackMapTableEntry.java | 211 ----
.../tomcat/util/bcel/classfile/StackMapType.java | 141 ---
.../tomcat/util/bcel/classfile/Synthetic.java | 102 --
.../apache/tomcat/util/bcel/classfile/Unknown.java | 128 ---
.../apache/tomcat/util/bcel/classfile/Utility.java | 758 +-------------
java/org/apache/tomcat/util/bcel/package.html | 2 +-
.../tomcat/util/bcel/util/BCELComparator.java | 45 -
.../apache/tomcat/util/bcel/util/ByteSequence.java | 57 -
java/org/apache/tomcat/util/bcel/util/package.html | 38 -
java/org/apache/tomcat/util/buf/Ascii.java | 18 +-
java/org/apache/tomcat/util/buf/Utf8Decoder.java | 2 +-
.../tomcat/util/descriptor/DigesterFactory.java | 84 +-
.../tomcat/util/descriptor/LocalResolver.java | 18 +
.../tomcat/util/descriptor/LocalStrings.properties | 2 +
java/org/apache/tomcat/util/file/Constants.java | 27 -
.../tomcat/util/file/LocalStrings.properties | 16 -
java/org/apache/tomcat/util/file/Matcher.java | 375 +------
.../util/http/mapper/LocalStrings.properties | 8 +-
.../org/apache/tomcat/util/http/mapper/Mapper.java | 944 ++++++++++-------
.../tomcat/util/http/mapper/MappingData.java | 2 +
.../util/http/mapper/WrapperMappingInfo.java | 58 +
.../apache/tomcat/util/modeler/BaseModelMBean.java | 17 +-
.../apache/tomcat/util/net/AbstractEndpoint.java | 8 +-
java/org/apache/tomcat/util/net/AprEndpoint.java | 49 +-
.../util/net/DefaultServerSocketFactory.java | 2 +-
java/org/apache/tomcat/util/net/JIoEndpoint.java | 30 +-
.../tomcat/util/net/NioBlockingSelector.java | 20 +-
java/org/apache/tomcat/util/net/NioChannel.java | 20 +
java/org/apache/tomcat/util/net/NioEndpoint.java | 29 +-
.../apache/tomcat/util/net/SSLImplementation.java | 4 +-
.../apache/tomcat/util/net/SecureNioChannel.java | 1 +
java/org/apache/tomcat/util/net/SocketStatus.java | 2 +-
.../tomcat/util/net/jsse/JSSEImplementation.java | 4 +-
.../tomcat/util/net/jsse/JSSESocketFactory.java | 16 +-
.../tomcat/util/net/res/LocalStrings.properties | 5 +-
.../tomcat/util/net/res/LocalStrings_es.properties | 1 -
.../tomcat/util/scan/StandardJarScanner.java | 15 +-
.../util/security}/ConcurrentMessageDigest.java | 21 +-
.../util => tomcat/util/security}/MD5Encoder.java | 2 +-
.../tomcat/util/security/PrivilegedGetTccl.java | 12 +-
.../tomcat/util/security/PrivilegedSetTccl.java | 22 +-
.../util/threads/StopPooledThreadException.java} | 17 +-
.../org/apache/tomcat/util/threads/TaskThread.java | 30 +-
.../tomcat/util/threads/ThreadPoolExecutor.java | 29 +-
.../tomcat/websocket/AsyncChannelGroupUtil.java | 117 +++
.../websocket/AsyncChannelWrapperSecure.java | 22 +-
java/org/apache/tomcat/websocket/Constants.java | 13 +
.../tomcat/websocket/LocalStrings.properties | 15 +-
java/org/apache/tomcat/websocket/MessagePart.java | 76 ++
.../apache/tomcat/websocket/PerMessageDeflate.java | 439 ++++++++
.../apache/tomcat/websocket/Transformation.java | 97 ++
...ndlerResult.java => TransformationFactory.java} | 30 +-
...andlerResult.java => TransformationResult.java} | 41 +-
java/org/apache/tomcat/websocket/Util.java | 93 +-
.../org/apache/tomcat/websocket/WsExtension.java | 26 +-
.../tomcat/websocket/WsExtensionParameter.java | 24 +-
java/org/apache/tomcat/websocket/WsFrameBase.java | 239 +++--
.../org/apache/tomcat/websocket/WsFrameClient.java | 6 +-
.../tomcat/websocket/WsRemoteEndpointImplBase.java | 157 +--
.../websocket/WsRemoteEndpointImplClient.java | 8 +-
java/org/apache/tomcat/websocket/WsSession.java | 41 +-
.../tomcat/websocket/WsWebSocketContainer.java | 127 +--
.../tomcat/websocket/pojo/PojoEndpointBase.java | 13 +-
.../tomcat/websocket/pojo/PojoEndpointClient.java | 2 +-
.../websocket/pojo/PojoMessageHandlerBase.java | 20 +
.../pojo/PojoMessageHandlerPartialBase.java | 6 +-
.../pojo/PojoMessageHandlerPartialBinary.java | 2 +-
.../pojo/PojoMessageHandlerPartialText.java | 2 +-
.../pojo/PojoMessageHandlerWholeBase.java | 6 +-
.../server/DefaultServerEndpointConfigurator.java | 9 +-
.../websocket/server/LocalStrings.properties | 3 +-
.../tomcat/websocket/server/UpgradeUtil.java | 150 ++-
.../tomcat/websocket/server/WsContextListener.java | 1 -
.../tomcat/websocket/server/WsFrameServer.java | 13 +-
.../websocket/server/WsHttpUpgradeHandler.java | 23 +-
.../server/WsRemoteEndpointImplServer.java | 9 +
.../tomcat/websocket/server/WsServerContainer.java | 69 +-
modules/jdbc-pool/doc/changelog.xml | 18 +-
modules/jdbc-pool/doc/jdbc-pool.xml | 174 ++-
.../apache/tomcat/jdbc/pool/FairBlockingQueue.java | 30 +-
.../java/org/apache/tomcat/jdbc/bugs/Bug53367.java | 177 ++++
res/META-INF/websocket-api.jar.manifest | 8 +-
res/checkstyle/checkstyle.xml | 2 +-
res/checkstyle/org-import-control.xml | 1 +
...lipse.classpath => eclipse-websocket.classpath} | 13 +-
.../{eclipse.project => eclipse-websocket.project} | 15 +-
res/ide-support/eclipse/eclipse.classpath | 2 +-
...rg.eclipse.jdt.core.prefs-websocket.properties} | 12 +-
.../eclipse/org.eclipse.jdt.core.prefs.properties} | 12 +-
res/maven/mvn.properties.default | 2 +-
res/maven/tomcat-embed-jasper.pom | 2 +-
res/maven/tomcat-jasper.pom | 2 +-
res/tomcat.nsi | 10 +-
.../authenticator/TestDigestAuthenticator.java | 4 +-
.../TestSSOnonLoginAndDigestAuthenticator.java | 4 +-
.../TesterDigestAuthenticatorPerformance.java | 4 +-
.../apache/catalina/comet/TestCometProcessor.java | 46 +-
.../catalina/connector/TestMapperListener.java | 124 +++
.../org/apache/catalina/connector/TestRequest.java | 147 ++-
.../apache/catalina/connector/TesterRequest.java | 34 +
.../catalina/core/TestApplicationContext.java | 7 +
.../apache/catalina/core/TestAsyncContextImpl.java | 281 ++---
.../catalina/core/TestNamingContextListener.java | 7 +-
.../apache/catalina/core/TestStandardContext.java | 66 ++
.../catalina/core/TestSwallowAbortedUploads.java | 82 +-
test/org/apache/catalina/deploy/TestWebXml.java | 121 ++-
.../ha/session/TestSerializablePrincipal.java | 90 +-
.../org/apache/catalina/realm/TestMemoryRealm.java | 25 +-
.../catalina/session/TestPersistentManager.java | 235 +++++
.../catalina/session/TestStandardSession.java | 103 ++
.../apache/catalina/startup/SimpleHttpClient.java | 5 +
.../startup/TestHostConfigAutomaticDeployment.java | 15 +-
test/org/apache/catalina/startup/TestListener.java | 4 +-
.../apache/catalina/startup/TomcatBaseTest.java | 18 +-
test/org/apache/catalina/tribes/demos/MapDemo.java | 17 +-
.../valves/TestStuckThreadDetectionValve.java | 162 +++
.../apache/catalina/websocket/TestWebSocket.java | 8 -
.../coyote/http11/TestAbstractHttp11Processor.java | 99 +-
.../http11/filters/TestChunkedInputFilter.java | 185 +++-
test/org/apache/el/TestELEvaluation.java | 21 +-
test/org/apache/el/TestELInJsp.java | 43 +-
test/org/apache/el/TestMethodExpressionImpl.java | 18 +
test/org/apache/el/TesterBeanA.java | 8 +
test/org/apache/el/TesterBeanAA.java | 12 +-
.../el/{TesterBeanB.java => TesterBeanD.java} | 26 +-
test/org/apache/el/parser/TestELParser.java | 115 ++
.../org/apache/el/parser/TesterBeanC.java | 38 +-
.../jasper/compiler/TestELInterpreterFactory.java | 24 +-
test/org/apache/jasper/compiler/TestELParser.java | 202 +++-
test/org/apache/jasper/compiler/TestGenerator.java | 90 ++
test/org/apache/jasper/compiler/TestParser.java | 100 +-
.../org/apache/jasper/el/TestJasperELResolver.java | 1 -
.../apache/jasper/runtime/TestPageContextImpl.java | 32 +
.../apache/tomcat/util/bcel/TesterPerformance.java | 72 ++
test/org/apache/tomcat/util/buf/TestAscii.java | 65 ++
test/org/apache/tomcat/util/buf/TestUtf8.java | 319 ++++--
.../apache/tomcat/util/http/mapper/TestMapper.java | 397 ++++++-
.../util/http/mapper/TestMapperContextRoot.java | 79 --
.../tomcat/util/http/mapper/TestMapperWebapps.java | 239 +++++
.../util/http/mapper/TestMapperWelcomeFiles.java | 94 --
.../org/apache/tomcat/util/net/TestClientCert.java | 44 +-
test/org/apache/tomcat/util/net/TestCustomSsl.java | 17 +-
test/org/apache/tomcat/util/net/TestSsl.java | 6 +-
test/org/apache/tomcat/util/net/TesterSupport.java | 9 +-
.../util/net/jsse/TesterBug50640SslImpl.java | 2 +-
.../apache/tomcat/util/scan/TestJarScanner.java | 50 +-
test/org/apache/tomcat/websocket/TestUtil.java | 110 +-
.../tomcat/websocket/TestWebSocketFrameClient.java | 93 +-
...lient.java => TestWebSocketFrameClientSSL.java} | 20 +-
.../tomcat/websocket/TestWsPingPongMessages.java | 4 +-
.../tomcat/websocket/TestWsRemoteEndpoint.java | 4 +-
.../tomcat/websocket/TestWsSubprotocols.java | 4 +-
.../tomcat/websocket/TestWsWebSocketContainer.java | 47 +-
.../tomcat/websocket/TesterFirehoseServer.java | 5 +-
.../websocket/pojo/TestEncodingDecoding.java | 20 +-
.../websocket/pojo/TestPojoEndpointBase.java | 7 +-
.../websocket/pojo/TestPojoMethodMapping.java | 4 +-
.../websocket/server/TestWsServerContainer.java | 4 +-
test/util/TestCookieFilter.java | 93 ++
test/webapp-3.0/WEB-INF/bug53545.tld | 17 +
test/webapp-3.0/WEB-INF/bugs.tld | 14 +
test/webapp-3.0/WEB-INF/tags/bug55198.tagx | 4 +-
.../webapp-3.0/WEB-INF/tags/bug56265.tagx | 15 +-
test/webapp-3.0/bug45nnn/bug45451.jspf | 7 +-
test/webapp-3.0/bug5nnnn/bug53545.html | 16 +
.../bug5nnnn/{bug55807.jsp => bug56147.jsp} | 21 +-
.../bug5nnnn/{bug55198.jsp => bug56265.jsp} | 13 +-
test/webapp-3.0/bug5nnnn/bug56334and56561.jspx | 68 ++
.../bug48701-TVI-NFA.jsp => bug5nnnn/bug56529.jsp} | 10 +-
.../webapp-3.0/bug5nnnn/bug56581.jsp | 15 +-
.../webapp-3.0/bug5nnnn/bug56612.jsp | 6 +-
.../webapp-3.0/jsp/pageContext1.jsp | 25 +-
.../webapp-3.0/jsp/pageContext2.jsp | 4 +-
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 | 1105 +++++++++++++++++++-
webapps/docs/class-loader-howto.xml | 18 +-
webapps/docs/cluster-howto.xml | 353 +++----
webapps/docs/config/ajp.xml | 13 +-
webapps/docs/config/cluster-interceptor.xml | 26 +-
webapps/docs/config/cluster-membership.xml | 2 +-
webapps/docs/config/cluster.xml | 30 +-
webapps/docs/config/context.xml | 174 ++-
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 | 99 +-
webapps/docs/config/http.xml | 30 +-
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 | 12 +-
webapps/docs/config/systemprops.xml | 19 +-
webapps/docs/config/valve.xml | 461 +++++---
webapps/docs/connectors.xml | 3 +-
webapps/docs/default-servlet.xml | 327 +++---
webapps/docs/deployer-howto.xml | 11 +-
webapps/docs/funcspecs/fs-admin-apps.xml | 14 +-
webapps/docs/funcspecs/fs-admin-objects.xml | 4 -
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 | 35 +-
webapps/docs/security-manager-howto.xml | 9 +-
webapps/docs/tomcat-docs.xsl | 222 ++--
webapps/docs/tribes/introduction.xml | 2 +-
webapps/docs/web-socket-howto.xml | 25 +-
webapps/docs/windows-auth-howto.xml | 34 +-
webapps/docs/windows-service-howto.xml | 130 ++-
.../examples/WEB-INF/classes/CookieExample.java | 1 +
.../WEB-INF/classes/RequestHeaderExample.java | 14 +-
.../WEB-INF/classes/util/CookieFilter.java | 81 ++
webapps/examples/jsp/forward/one.jsp | 2 +-
webapps/examples/jsp/forward/two.html | 2 +-
webapps/examples/jsp/include/foo.jsp | 6 +-
webapps/examples/jsp/include/include.jsp | 9 +-
webapps/examples/websocket/echo.xhtml | 4 +-
513 files changed, 16737 insertions(+), 14903 deletions(-)
delete mode 100755 bin/cpappend.bat
create mode 100644 debian/patches/0020-disable-java8-support-with-jdtcompiler.patch
create mode 100644 debian/patches/0021-add-simple-instance-manager.patch
create mode 100644 debian/patches/0099-junit-compatibility.patch
copy java/org/apache/coyote/{AsyncContextCallback.java => ContainerThreadMarker.java} (66%)
create mode 100644 java/org/apache/coyote/ErrorState.java
copy java/org/apache/{tomcat/util/descriptor => coyote/http11/filters}/LocalStrings.properties (50%)
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/AccessFlags.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/Attribute.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/AttributeReader.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/Code.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/CodeException.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/ConstantCP.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/ConstantFieldref.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/ConstantInterfaceMethodref.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/ConstantInvokeDynamic.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/ConstantMethodHandle.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/ConstantMethodType.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/ConstantMethodref.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/ConstantNameAndType.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/ConstantString.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/Deprecated.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/EnclosingMethod.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java
create mode 100644 java/org/apache/tomcat/util/bcel/classfile/FastDataInputStream.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/Field.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/FieldOrMethod.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/InnerClass.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/LineNumber.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/LocalVariable.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/Method.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/PMGClass.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotationEntry.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleParameterAnnotations.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleParameterAnnotations.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/Signature.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/SourceFile.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/StackMap.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/StackMapType.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/Synthetic.java
delete mode 100644 java/org/apache/tomcat/util/bcel/classfile/Unknown.java
delete mode 100644 java/org/apache/tomcat/util/bcel/util/BCELComparator.java
delete mode 100644 java/org/apache/tomcat/util/bcel/util/ByteSequence.java
delete mode 100644 java/org/apache/tomcat/util/bcel/util/package.html
delete mode 100644 java/org/apache/tomcat/util/file/Constants.java
delete mode 100644 java/org/apache/tomcat/util/file/LocalStrings.properties
create mode 100644 java/org/apache/tomcat/util/http/mapper/WrapperMappingInfo.java
rename java/org/apache/{catalina/util => tomcat/util/security}/ConcurrentMessageDigest.java (84%)
rename java/org/apache/{catalina/util => tomcat/util/security}/MD5Encoder.java (98%)
copy test/org/apache/el/TesterEnum.java => java/org/apache/tomcat/util/security/PrivilegedGetTccl.java (76%)
copy test/javax/el/TesterELContext.java => java/org/apache/tomcat/util/security/PrivilegedSetTccl.java (72%)
copy java/{javax/websocket/DeploymentException.java => org/apache/tomcat/util/threads/StopPooledThreadException.java} (73%)
create mode 100644 java/org/apache/tomcat/websocket/AsyncChannelGroupUtil.java
create mode 100644 java/org/apache/tomcat/websocket/MessagePart.java
create mode 100644 java/org/apache/tomcat/websocket/PerMessageDeflate.java
create mode 100644 java/org/apache/tomcat/websocket/Transformation.java
copy java/org/apache/tomcat/websocket/{MessageHandlerResult.java => TransformationFactory.java} (51%)
copy java/org/apache/tomcat/websocket/{MessageHandlerResult.java => TransformationResult.java} (62%)
copy test/org/apache/catalina/ha/session/TesterPrincipal.java => java/org/apache/tomcat/websocket/WsExtension.java (63%)
copy test/org/apache/catalina/ha/session/TesterPrincipal.java => java/org/apache/tomcat/websocket/WsExtensionParameter.java (70%)
create mode 100644 modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug53367.java
copy res/ide-support/eclipse/{eclipse.classpath => eclipse-websocket.classpath} (60%)
copy res/ide-support/eclipse/{eclipse.project => eclipse-websocket.project} (73%)
copy res/{META-INF/default/.gitignore => ide-support/eclipse/org.eclipse.jdt.core.prefs-websocket.properties} (78%)
copy res/{META-INF/default/.gitignore => ide-support/eclipse/org.eclipse.jdt.core.prefs.properties} (78%)
create mode 100644 test/org/apache/catalina/connector/TestMapperListener.java
copy webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.java => test/org/apache/catalina/realm/TestMemoryRealm.java (67%)
create mode 100644 test/org/apache/catalina/session/TestPersistentManager.java
create mode 100644 test/org/apache/catalina/session/TestStandardSession.java
create mode 100644 test/org/apache/catalina/valves/TestStuckThreadDetectionValve.java
copy test/org/apache/el/{TesterBeanB.java => TesterBeanD.java} (67%)
copy java/org/apache/el/parser/AstTrue.java => test/org/apache/el/parser/TesterBeanC.java (62%)
create mode 100644 test/org/apache/tomcat/util/bcel/TesterPerformance.java
create mode 100644 test/org/apache/tomcat/util/buf/TestAscii.java
delete mode 100644 test/org/apache/tomcat/util/http/mapper/TestMapperContextRoot.java
create mode 100644 test/org/apache/tomcat/util/http/mapper/TestMapperWebapps.java
delete mode 100644 test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java
copy test/org/apache/tomcat/websocket/{TestWebSocketFrameClient.java => TestWebSocketFrameClientSSL.java} (92%)
create mode 100644 test/util/TestCookieFilter.java
copy java/org/apache/naming/factory/package.html => test/webapp-3.0/WEB-INF/tags/bug56265.tagx (69%)
copy test/webapp-3.0/bug5nnnn/{bug55807.jsp => bug56147.jsp} (66%)
copy test/webapp-3.0/bug5nnnn/{bug55198.jsp => bug56265.jsp} (64%)
create mode 100644 test/webapp-3.0/bug5nnnn/bug56334and56561.jspx
copy test/webapp-3.0/{bug48nnn/bug48701-TVI-NFA.jsp => bug5nnnn/bug56529.jsp} (81%)
copy webapps/host-manager/index.jsp => test/webapp-3.0/bug5nnnn/bug56581.jsp (73%)
copy webapps/examples/WEB-INF/tags/helloWorld.tag => test/webapp-3.0/bug5nnnn/bug56612.jsp (96%)
copy webapps/host-manager/index.jsp => test/webapp-3.0/jsp/pageContext1.jsp (50%)
copy webapps/host-manager/index.jsp => test/webapp-3.0/jsp/pageContext2.jsp (87%)
create mode 100644 webapps/examples/WEB-INF/classes/util/CookieFilter.java
--
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