[tomcat6] 01/02: Merge tag 'upstream/6.0.39'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Sun Feb 16 23:42:59 UTC 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository tomcat6.
commit 067a330fd06fb2ea9b6f6f8cfaa492bca0ad01dd
Merge: 8affa9f 2d6e9a5
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon Feb 17 00:31:37 2014 +0100
Merge tag 'upstream/6.0.39'
Upstream version 6.0.39
bin/shutdown.sh => .gitignore | 54 +-
BUILDING.txt | 7 +-
KEYS | 173 +-
LICENSE | 337 +++-
NOTICE | 10 +-
RELEASE-NOTES | 2 -
RELEASE-PLAN-6.0.txt | 2 -
RUNNING.txt | 2 -
STATUS.txt | 52 +-
bin/catalina.bat | 4 -
bin/catalina.sh | 2 -
bin/cpappend.bat | 2 -
bin/daemon.sh | 13 +-
bin/digest.bat | 2 -
bin/digest.sh | 2 -
bin/service.bat | 2 -
bin/setclasspath.bat | 2 -
bin/setclasspath.sh | 2 -
bin/shutdown.bat | 2 -
bin/shutdown.sh | 2 -
bin/startup.bat | 2 -
bin/startup.sh | 2 -
bin/tool-wrapper.bat | 2 -
bin/tool-wrapper.sh | 2 -
bin/version.bat | 2 -
bin/version.sh | 2 -
build.properties.default | 16 +-
build.xml | 15 +-
conf/catalina.policy | 2 -
conf/web.xml | 3 +-
dist.xml | 75 +-
eclipse.classpath | 6 +-
extras.xml | 2 -
java/javax/annotation/Generated.java | 12 +-
java/javax/annotation/PostConstruct.java | 6 +-
java/javax/annotation/PreDestroy.java | 6 +-
java/javax/annotation/Resource.java | 6 +-
java/javax/annotation/Resources.java | 6 +-
java/javax/annotation/security/DeclareRoles.java | 6 +-
java/javax/annotation/security/DenyAll.java | 8 +-
java/javax/annotation/security/PermitAll.java | 6 +-
java/javax/annotation/security/RolesAllowed.java | 6 +-
java/javax/annotation/security/RunAs.java | 6 +-
java/javax/el/ArrayELResolver.java | 25 +-
java/javax/el/Util.java | 57 +
java/javax/servlet/ServletContext.java | 295 ++-
java/javax/servlet/http/HttpServletRequest.java | 151 +-
java/javax/servlet/http/HttpSession.java | 160 +-
java/javax/servlet/jsp/resources/jspxml.dtd | 5 +-
java/javax/servlet/jsp/resources/jspxml.xsd | 2 +-
java/javax/servlet/resources/XMLSchema.dtd | 2 +-
java/javax/servlet/resources/datatypes.dtd | 2 +-
java/javax/servlet/resources/javaee_5.xsd | 2109 ++++++++++++++++++++
.../servlet/resources/javaee_web_services_1_2.xsd | 761 +++++++
.../resources/javaee_web_services_client_1_2.xsd | 592 ++++++
java/org/apache/catalina/Context.java | 160 +-
java/org/apache/catalina/Globals.java | 21 +-
java/org/apache/catalina/Host.java | 42 +-
java/org/apache/catalina/ant/ValidatorTask.java | 18 +-
.../catalina/ant/jmx/JMXAccessorCreateTask.java | 4 +-
.../catalina/authenticator/FormAuthenticator.java | 6 +-
java/org/apache/catalina/connector/Connector.java | 3 +-
.../apache/catalina/connector/CoyoteAdapter.java | 130 +-
java/org/apache/catalina/connector/Request.java | 18 +-
.../apache/catalina/core/ApplicationContext.java | 64 +-
java/org/apache/catalina/core/StandardContext.java | 579 +++---
java/org/apache/catalina/core/StandardHost.java | 28 +-
.../apache/catalina/core/mbeans-descriptors.xml | 18 +-
java/org/apache/catalina/ha/ClusterManager.java | 2 +-
.../org/apache/catalina/ha/ClusterMessageBase.java | 14 -
.../apache/catalina/ha/session/DeltaRequest.java | 1 -
.../apache/catalina/ha/tcp/ReplicationValve.java | 4 +-
.../apache/catalina/ha/tcp/SimpleTcpCluster.java | 35 +-
.../catalina/loader/VirtualWebappLoader.java | 7 +-
java/org/apache/catalina/manager/Constants.java | 2 +-
.../catalina/manager/HTMLManagerServlet.java | 4 +-
.../apache/catalina/manager/StatusTransformer.java | 11 +-
.../apache/catalina/manager/host/Constants.java | 2 +-
.../manager/host/HTMLHostManagerServlet.java | 5 +-
.../catalina/manager/host/HostManagerServlet.java | 3 +-
.../mbeans/JmxRemoteLifecycleListener.java | 6 +-
java/org/apache/catalina/realm/CombinedRealm.java | 4 +-
java/org/apache/catalina/realm/JNDIRealm.java | 4 +-
java/org/apache/catalina/realm/LockOutRealm.java | 4 +-
.../catalina/security/SecurityClassLoad.java | 3 +-
.../apache/catalina/servlets/DefaultServlet.java | 22 +-
.../org/apache/catalina/startup/ContextConfig.java | 322 ++-
.../apache/catalina/startup/DigesterFactory.java | 3 +
java/org/apache/catalina/startup/Embedded.java | 4 +-
.../catalina/startup/LocalStrings.properties | 6 +-
.../catalina/startup/LocalStrings_es.properties | 6 +-
.../catalina/startup/LocalStrings_fr.properties | 6 +-
.../catalina/startup/LocalStrings_ja.properties | 6 +-
java/org/apache/catalina/startup/TldConfig.java | 157 +-
.../apache/catalina/tribes/ChannelListener.java | 2 +-
.../catalina/tribes/group/ChannelCoordinator.java | 4 +-
.../apache/catalina/tribes/group/RpcChannel.java | 2 +-
.../org/apache/catalina/tribes/io/ChannelData.java | 6 +-
.../tribes/io/DirectByteArrayOutputStream.java | 1 -
.../apache/catalina/tribes/io/ObjectReader.java | 19 +-
.../catalina/tribes/io/ReplicationStream.java | 7 +-
.../org/apache/catalina/tribes/io/XByteBuffer.java | 23 +-
.../catalina/tribes/membership/MemberImpl.java | 4 +-
.../catalina/tribes/membership/Membership.java | 3 +-
.../tribes/tipis/AbstractReplicatedMap.java | 1 -
.../catalina/tribes/tipis/LazyReplicatedMap.java | 4 +-
.../catalina/tribes/tipis/ReplicatedMap.java | 8 +-
.../catalina/tribes/transport/AbstractSender.java | 20 +-
.../catalina/tribes/transport/ReceiverBase.java | 20 +-
.../tribes/transport/ReplicationTransmitter.java | 13 +-
.../catalina/tribes/transport/bio/BioReceiver.java | 16 +-
.../tribes/transport/bio/BioReplicationTask.java | 4 +-
.../catalina/tribes/transport/bio/BioSender.java | 18 +-
.../tribes/transport/bio/PooledMultiSender.java | 19 +-
.../tribes/transport/bio/util/FastQueue.java | 10 +-
.../tribes/transport/bio/util/LinkObject.java | 3 +-
.../catalina/tribes/transport/nio/NioReceiver.java | 7 +-
.../catalina/tribes/transport/nio/NioSender.java | 22 +-
.../apache/catalina/users/MemoryUserDatabase.java | 4 +-
java/org/apache/coyote/Constants.java | 9 +
java/org/apache/coyote/OutputBuffer.java | 7 +-
java/org/apache/coyote/Response.java | 123 +-
java/org/apache/coyote/ajp/AjpAprProcessor.java | 14 +-
java/org/apache/coyote/ajp/AjpProcessor.java | 14 +-
.../apache/coyote/http11/Http11AprProcessor.java | 28 +-
.../apache/coyote/http11/Http11NioProcessor.java | 28 +-
java/org/apache/coyote/http11/Http11Processor.java | 30 +-
.../coyote/http11/InternalNioInputBuffer.java | 6 +-
.../coyote/http11/filters/ChunkedInputFilter.java | 40 +-
java/org/apache/el/lang/ELSupport.java | 37 +-
java/org/apache/el/util/ReflectionUtil.java | 15 +-
java/org/apache/jasper/Constants.java | 17 +
java/org/apache/jasper/EmbeddedServletOptions.java | 223 ++-
java/org/apache/jasper/JspC.java | 32 +-
java/org/apache/jasper/compiler/ELNode.java | 8 +-
java/org/apache/jasper/compiler/ELParser.java | 181 +-
java/org/apache/jasper/compiler/Generator.java | 59 +-
.../jasper/compiler/ImplicitTagLibraryInfo.java | 34 +-
java/org/apache/jasper/compiler/JspConfig.java | 32 +-
.../apache/jasper/compiler/JspDocumentParser.java | 89 +-
java/org/apache/jasper/compiler/JspUtil.java | 3 -
.../apache/jasper/compiler/TagLibraryInfoImpl.java | 42 +-
.../apache/jasper/compiler/TagPluginManager.java | 25 +-
.../apache/jasper/compiler/TldLocationsCache.java | 67 +-
java/org/apache/jasper/compiler/Validator.java | 86 +-
.../jasper/resources/LocalStrings.properties | 4 +-
.../jasper/resources/LocalStrings_es.properties | 4 +-
.../jasper/resources/LocalStrings_ja.properties | 4 +-
.../org/apache/jasper/runtime/PageContextImpl.java | 25 -
.../apache/jasper/servlet/JspCServletContext.java | 28 +-
java/org/apache/jasper/xmlparser/ParserUtils.java | 144 +-
java/org/apache/juli/ClassLoaderLogManager.java | 32 +-
java/org/apache/naming/HandlerRef.java | 18 -
java/org/apache/naming/ServiceRef.java | 16 -
java/org/apache/tomcat/buildutil/Txt2Html.java | 6 +-
java/org/apache/tomcat/jni/SSL.java | 8 +-
.../tomcat/util/collections/ConcurrentCache.java | 59 +
.../apache/tomcat/util/descriptor/Constants.java} | 18 +-
.../tomcat/util/descriptor/DigesterFactory.java | 126 ++
.../tomcat/util/descriptor/LocalResolver.java | 143 ++
.../tomcat/util/descriptor/LocalStrings.properties | 19 +
.../util/descriptor/LocalStrings_es.properties | 17 +
.../tomcat/util/descriptor/XmlErrorHandler.java | 72 +
.../tomcat/util/descriptor/XmlIdentifiers.java | 69 +
java/org/apache/tomcat/util/digester/Digester.java | 361 ++--
.../tomcat/util/http/fileupload/package.html | 11 +-
.../apache/tomcat/util/http/parser/HttpParser.java | 501 +++++
.../apache/tomcat/util/http/parser/MediaType.java | 125 ++
.../tomcat/util/http/parser/MediaTypeCache.java | 65 +
.../apache/tomcat/util/modeler/BaseModelMBean.java | 38 -
.../tomcat/util/modeler/mbeans-descriptors.dtd | 2 +-
java/org/apache/tomcat/util/net/AprEndpoint.java | 22 +-
java/org/apache/tomcat/util/net/JIoEndpoint.java | 6 +-
.../tomcat/util/net/NioBlockingSelector.java | 1 -
java/org/apache/tomcat/util/net/NioChannel.java | 36 +-
java/org/apache/tomcat/util/net/NioEndpoint.java | 11 +-
.../apache/tomcat/util/net/SecureNioChannel.java | 3 -
.../tomcat/util/net/res/LocalStrings.properties | 2 +
java/org/apache/tomcat/util/res/StringManager.java | 182 +-
res/INSTALLLICENSE | 337 +++-
res/META-INF/default.notice | 2 +-
res/META-INF/servlet-api.jar.license | 546 +++++
res/META-INF/servlet-api.jar.notice | 11 +
res/maven/README.txt | 2 -
res/maven/catalina.pom | 2 -
res/maven/coyote.pom | 6 -
res/maven/jasper.pom | 2 +-
res/maven/mvn.properties.default | 2 +-
res/maven/servlet-api.pom | 11 +-
res/tomcat.nsi | 1 -
test/javax/el/TestArrayELResolver.java | 386 ++++
.../test/interceptors/TestTwoPhaseCommit.java | 41 -
test/org/apache/jasper/compiler/TestELParser.java | 141 ++
webapps/ROOT/index.html | 62 +-
webapps/ROOT/index.jsp | 84 +-
webapps/docs/appdev/build.xml.txt | 2 -
webapps/docs/changelog.xml | 258 ++-
webapps/docs/config/cluster-interceptor.xml | 26 +-
webapps/docs/config/cluster.xml | 9 +-
webapps/docs/config/context.xml | 75 +-
webapps/docs/config/host.xml | 10 +-
webapps/docs/config/http.xml | 30 +-
webapps/docs/config/listeners.xml | 40 +
webapps/docs/config/realm.xml | 38 +-
webapps/docs/config/systemprops.xml | 13 +
webapps/docs/funcspecs/fs-admin-apps.xml | 1 -
webapps/docs/funcspecs/fs-admin-objects.xml | 1 -
webapps/docs/funcspecs/fs-admin-opers.xml | 1 -
webapps/docs/funcspecs/fs-default.xml | 1 -
webapps/docs/funcspecs/fs-invoker.xml | 1 -
webapps/docs/funcspecs/fs-jdbc-realm.xml | 1 -
webapps/docs/funcspecs/fs-jndi-realm.xml | 1 -
webapps/docs/funcspecs/fs-memory-realm.xml | 1 -
webapps/docs/funcspecs/mbean-names.xml | 1 -
webapps/docs/jasper-howto.xml | 8 +-
webapps/docs/proxy-howto.xml | 2 +-
webapps/docs/tomcat-docs.xsl | 2 -
webapps/docs/tribes/tomcat-docs.xsl | 4 +-
.../examples/WEB-INF/classes/CookieExample.java | 3 -
.../WEB-INF/classes/HelloWorldExample.java | 3 -
.../WEB-INF/classes/LocalStrings.properties | 2 -
.../WEB-INF/classes/LocalStrings_en.properties | 2 -
.../WEB-INF/classes/LocalStrings_es.properties | 2 -
.../WEB-INF/classes/LocalStrings_fr.properties | 2 -
.../WEB-INF/classes/LocalStrings_pt.properties | 2 -
.../WEB-INF/classes/RequestHeaderExample.java | 3 -
.../WEB-INF/classes/RequestInfoExample.java | 3 -
.../WEB-INF/classes/RequestParamExample.java | 3 -
.../examples/WEB-INF/classes/SessionExample.java | 3 -
.../compressionFilters/CompressionFilter.java | 2 -
.../CompressionFilterTestServlet.java | 2 -
.../CompressionResponseStream.java | 2 -
.../CompressionServletResponseWrapper.java | 2 -
.../WEB-INF/classes/filters/ExampleFilter.java | 2 -
.../classes/filters/RequestDumperFilter.java | 2 -
.../filters/SetCharacterEncodingFilter.java | 2 -
.../WEB-INF/classes/listeners/ContextListener.java | 2 -
.../WEB-INF/classes/listeners/SessionListener.java | 2 -
.../examples/WEB-INF/classes/util/HTMLFilter.java | 2 -
.../WEB-INF/classes/validators/DebugValidator.java | 2 -
webapps/host-manager/manager.xml | 4 -
webapps/manager/WEB-INF/jsp/sessionDetail.jsp | 2 +-
webapps/manager/WEB-INF/jsp/sessionsList.jsp | 2 +-
243 files changed, 9873 insertions(+), 2782 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat6.git
More information about the pkg-java-commits
mailing list