[tomcat7] branch master updated (031ca79 -> 28f25d2)
Gianfranco Costamagna
locutusofborg-guest at alioth.debian.org
Fri Oct 11 12:51:22 UTC 2013
This is an automated email from the git hooks/post-receive script.
locutusofborg-guest pushed a change to branch master
in repository tomcat7.
from 031ca79 Merge branch 'master' of git+ssh://git.debian.org/git/pkg-java/tomcat7
adds 1326f29 Imported Upstream version 7.0.45
new 2e4e3ff Merge tag 'upstream/7.0.45'
new 28f25d2 New upstream release, patch refresh
The 2 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 | 32 +-
KEYS | 59 +
bin/catalina.sh | 79 +-
bin/daemon.sh | 19 +-
build.properties.default | 9 +-
build.xml | 173 ++-
conf/catalina.policy | 3 +-
conf/catalina.properties | 8 +-
debian/changelog | 6 +
...-deploy-webapps-target-from-deploy-target.patch | 4 +-
...-java.security.policy-file-in-catalina.sh.patch | 28 +-
debian/patches/0010-debianize-build-xml.patch | 12 +-
.../0011-fix-classpath-lintian-warnings.patch | 10 +-
...nt-look-for-build-properties-in-user-home.patch | 2 +-
debian/patches/fix-manager-webapp.path | 16 +-
java/javax/annotation/Generated.java | 12 +-
.../{Resources.java => ManagedBean.java} | 14 +-
java/javax/annotation/PostConstruct.java | 6 +-
java/javax/annotation/PreDestroy.java | 6 +-
java/javax/annotation/Resource.java | 10 +-
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 +-
.../DataSourceDefinition.java} | 33 +-
.../RunAs.java => sql/DataSourceDefinitions.java} | 16 +-
java/javax/el/ArrayELResolver.java | 31 +-
java/javax/el/BeanELResolver.java | 8 -
java/javax/el/ELContext.java | 7 +
java/javax/el/ListELResolver.java | 28 +-
java/javax/el/MapELResolver.java | 3 +-
java/javax/el/ResourceBundleELResolver.java | 4 +-
java/javax/servlet/ServletContext.java | 4 +-
java/javax/servlet/http/HttpSession.java | 28 +-
.../ClientEndpoint.java} | 23 +-
java/javax/websocket/ClientEndpointConfig.java | 138 ++
java/javax/websocket/CloseReason.java | 122 ++
java/javax/websocket/ContainerProvider.java | 64 +
java/javax/websocket/DecodeException.java | 56 +
.../websocket/Decoder.java} | 43 +-
.../websocket/DefaultClientEndpointConfig.java | 80 ++
.../DeploymentException.java} | 25 +-
.../EncodeException.java} | 31 +-
.../websocket/Encoder.java} | 39 +-
java/javax/websocket/Endpoint.java | 47 +
.../EndpointConfig.java} | 22 +-
.../websocket/Extension.java} | 18 +-
.../HandshakeResponse.java} | 25 +-
.../websocket/MessageHandler.java} | 44 +-
.../PreDestroy.java => websocket/OnClose.java} | 16 +-
.../PreDestroy.java => websocket/OnError.java} | 16 +-
.../PreDestroy.java => websocket/OnMessage.java} | 17 +-
.../PreDestroy.java => websocket/OnOpen.java} | 16 +-
.../PreDestroy.java => websocket/PongMessage.java} | 29 +-
java/javax/websocket/RemoteEndpoint.java | 173 +++
.../PreDestroy.java => websocket/SendHandler.java} | 21 +-
.../PreDestroy.java => websocket/SendResult.java} | 32 +-
java/javax/websocket/Session.java | 129 ++
.../SessionException.java} | 28 +-
java/javax/websocket/WebSocketContainer.java | 118 ++
.../server/DefaultServerEndpointConfig.java | 95 ++
java/javax/websocket/server/HandshakeRequest.java | 51 +
.../server/PathParam.java} | 22 +-
.../websocket/server/ServerApplicationConfig.java | 51 +
.../server/ServerContainer.java} | 27 +-
.../server/ServerEndpoint.java} | 31 +-
.../websocket/server/ServerEndpointConfig.java | 214 ++++
java/org/apache/catalina/Context.java | 13 +-
.../authenticator/SpnegoAuthenticator.java | 5 +-
.../apache/catalina/connector/CoyoteAdapter.java | 10 +-
.../apache/catalina/connector/OutputBuffer.java | 9 +-
java/org/apache/catalina/connector/Request.java | 45 +-
.../apache/catalina/connector/RequestFacade.java | 8 +-
.../apache/catalina/core/ApplicationContext.java | 126 +-
.../catalina/core/ApplicationContextFacade.java | 32 +-
.../apache/catalina/core/AprLifecycleListener.java | 6 +-
.../org/apache/catalina/core/AsyncContextImpl.java | 41 +-
.../catalina/core/DefaultInstanceManager.java | 7 +-
java/org/apache/catalina/core/StandardContext.java | 4 +-
.../catalina/filters/CsrfPreventionFilter.java | 1 +
.../catalina/ha/context/ReplicatedContext.java | 35 +-
.../catalina/ha/deploy/FileMessageFactory.java | 4 +
.../apache/catalina/ha/session/BackupManager.java | 42 +-
.../apache/catalina/ha/session/DeltaManager.java | 4 +-
.../apache/catalina/ha/session/DeltaSession.java | 67 +-
.../catalina/ha/session/SessionIDMessage.java | 11 +-
.../catalina/ha/session/mbeans-descriptors.xml | 5 +
.../apache/catalina/ha/tcp/SimpleTcpCluster.java | 3 +-
.../catalina/manager/HTMLManagerServlet.java | 10 +-
.../apache/catalina/manager/ManagerServlet.java | 13 +-
.../manager/host/HTMLHostManagerServlet.java | 8 +-
.../catalina/manager/host/HostManagerServlet.java | 10 +-
java/org/apache/catalina/mbeans/MBeanFactory.java | 4 +-
java/org/apache/catalina/realm/JAASRealm.java | 51 +-
java/org/apache/catalina/realm/JDBCRealm.java | 48 +-
java/org/apache/catalina/realm/JNDIRealm.java | 54 +-
.../apache/catalina/realm/LocalStrings.properties | 3 +-
java/org/apache/catalina/session/FileStore.java | 36 +-
java/org/apache/catalina/session/JDBCStore.java | 5 +-
.../apache/catalina/session/StandardSession.java | 26 +-
.../apache/catalina/session/mbeans-descriptors.xml | 14 +-
.../org/apache/catalina/startup/ContextConfig.java | 102 +-
.../org/apache/catalina/startup/FailedContext.java | 7 +
java/org/apache/catalina/startup/HostConfig.java | 9 +-
.../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/Tomcat.java | 89 +-
.../apache/catalina/startup/WebAnnotationSet.java | 5 +-
.../apache/catalina/tribes/MembershipService.java | 3 +-
.../apache/catalina/tribes/group/GroupChannel.java | 9 +-
.../interceptors/MessageDispatch15Interceptor.java | 3 +-
.../group/interceptors/TcpFailureDetector.java | 62 +-
.../interceptors/TwoPhaseCommitInterceptor.java | 7 +-
.../catalina/tribes/membership/McastService.java | 4 +-
.../tribes/tipis/AbstractReplicatedMap.java | 31 +-
.../catalina/tribes/tipis/LazyReplicatedMap.java | 70 +-
.../catalina/tribes/tipis/ReplicatedMap.java | 18 +-
.../catalina/tribes/transport/PooledSender.java | 7 +-
.../catalina/tribes/util/TcclThreadFactory.java | 6 +-
java/org/apache/catalina/util/ParameterMap.java | 11 +-
.../apache/catalina/valves/ErrorReportValve.java | 30 +-
java/org/apache/catalina/websocket/Constants.java | 3 +
.../apache/catalina/websocket/MessageInbound.java | 3 +
.../apache/catalina/websocket/StreamInbound.java | 3 +
.../catalina/websocket/WebSocketServlet.java | 3 +
java/org/apache/catalina/websocket/WsFrame.java | 3 +
.../websocket/WsHttpServletRequestWrapper.java | 3 +
.../apache/catalina/websocket/WsInputStream.java | 3 +
java/org/apache/catalina/websocket/WsOutbound.java | 396 +++---
java/org/apache/coyote/AbstractProcessor.java | 7 +-
java/org/apache/coyote/AbstractProtocol.java | 119 +-
java/org/apache/coyote/ActionCode.java | 7 +-
java/org/apache/coyote/AsyncStateMachine.java | 4 +
java/org/apache/coyote/Processor.java | 15 +-
java/org/apache/coyote/Request.java | 3 +-
.../apache/coyote/ajp/AbstractAjpProcessor.java | 121 +-
.../org/apache/coyote/ajp/AbstractAjpProtocol.java | 16 +-
java/org/apache/coyote/ajp/AjpAprProcessor.java | 12 +-
java/org/apache/coyote/ajp/AjpAprProtocol.java | 2 +-
java/org/apache/coyote/ajp/AjpNioProcessor.java | 33 +-
java/org/apache/coyote/ajp/AjpProcessor.java | 13 +-
.../coyote/http11/AbstractHttp11Processor.java | 94 +-
.../coyote/http11/AbstractHttp11Protocol.java | 10 +
.../apache/coyote/http11/AbstractOutputBuffer.java | 3 +-
.../apache/coyote/http11/Http11AprProcessor.java | 10 +-
.../apache/coyote/http11/Http11AprProtocol.java | 53 +-
.../apache/coyote/http11/Http11NioProcessor.java | 8 +-
.../apache/coyote/http11/Http11NioProtocol.java | 26 +-
java/org/apache/coyote/http11/Http11Processor.java | 8 +-
java/org/apache/coyote/http11/Http11Protocol.java | 26 +-
.../coyote/http11/InternalAprOutputBuffer.java | 2 +-
.../coyote/http11/InternalNioOutputBuffer.java | 4 +-
.../coyote/http11/filters/ChunkedInputFilter.java | 30 +-
.../coyote/http11/upgrade/AbstractProcessor.java | 187 +++
.../http11/upgrade/AbstractServletInputStream.java | 198 +++
.../upgrade/AbstractServletOutputStream.java | 177 +++
.../apache/coyote/http11/upgrade/AprProcessor.java | 42 +
.../http11/upgrade/AprServletInputStream.java | 114 ++
.../http11/upgrade/AprServletOutputStream.java | 162 +++
.../apache/coyote/http11/upgrade/BioProcessor.java | 42 +
.../http11/upgrade/BioServletInputStream.java | 50 +
.../http11/upgrade/BioServletOutputStream.java} | 39 +-
.../coyote/http11/upgrade/LocalStrings.properties | 17 +-
.../apache/coyote/http11/upgrade/NioProcessor.java | 42 +
.../http11/upgrade/NioServletInputStream.java | 140 ++
.../http11/upgrade/NioServletOutputStream.java | 138 ++
.../coyote/http11/upgrade/UpgradeAprProcessor.java | 4 +
.../coyote/http11/upgrade/UpgradeBioProcessor.java | 4 +
.../coyote/http11/upgrade/UpgradeInbound.java | 3 +
.../coyote/http11/upgrade/UpgradeNioProcessor.java | 4 +
.../coyote/http11/upgrade/UpgradeOutbound.java | 3 +
.../coyote/http11/upgrade/UpgradeProcessor.java | 27 +-
.../HttpUpgradeHandler.java} | 36 +-
.../http11/upgrade/servlet31/ReadListener.java | 50 +
.../http11/upgrade/servlet31/WebConnection.java | 47 +
.../http11/upgrade/servlet31/WriteListener.java | 43 +
java/org/apache/jasper/JspC.java | 2 -
java/org/apache/jasper/compiler/Generator.java | 64 +-
.../apache/jasper/compiler/JspDocumentParser.java | 27 +-
.../apache/jasper/compiler/TagFileProcessor.java | 2 +-
.../apache/jasper/compiler/TagPluginManager.java | 45 +-
java/org/apache/juli/ClassLoaderLogManager.java | 27 +-
java/org/apache/juli/JdkLoggerFormatter.java | 11 +-
.../naming/resources/DirContextURLConnection.java | 168 +--
.../org/apache/naming/resources/WARDirContext.java | 47 +-
java/org/apache/tomcat/InstanceManager.java | 6 +-
.../tomcat/util/bcel/classfile/Constant.java | 4 +-
.../tomcat/util/bcel/classfile/ConstantUtf8.java | 54 +-
java/org/apache/tomcat/util/bcel/package.html | 4 +-
java/org/apache/tomcat/util/buf/Utf8Encoder.java | 234 ++++
java/org/apache/tomcat/util/http/HttpMessages.java | 64 +-
java/org/apache/tomcat/util/http/Parameters.java | 6 +-
.../util/http/fileupload/MultipartStream.java | 4 +-
.../util/http/fileupload/disk/DiskFileItem.java | 16 +-
.../http/fileupload/disk/DiskFileItemFactory.java | 15 +-
.../tomcat/util/http/fileupload/util/Streams.java | 4 +-
.../apache/tomcat/util/http/parser/HttpParser.java | 8 +-
.../apache/tomcat/util/modeler/BaseModelMBean.java | 4 +-
.../apache/tomcat/util/modeler/ManagedBean.java | 6 +-
.../modules/MbeansDescriptorsDOMSource.java | 5 +-
.../apache/tomcat/util/net/AbstractEndpoint.java | 15 +-
java/org/apache/tomcat/util/net/AprEndpoint.java | 1343 +++++++++++++-------
java/org/apache/tomcat/util/net/JIoEndpoint.java | 7 +-
java/org/apache/tomcat/util/net/NioEndpoint.java | 265 ++--
java/org/apache/tomcat/util/net/SocketStatus.java | 2 +-
java/org/apache/tomcat/util/net/SocketWrapper.java | 52 +
.../tomcat/util/net/res/LocalStrings.properties | 36 +-
java/org/apache/tomcat/util/res/StringManager.java | 54 +-
.../tomcat/websocket/AsyncChannelWrapper.java | 47 +
.../websocket/AsyncChannelWrapperNonSecure.java | 112 ++
.../websocket/AsyncChannelWrapperSecure.java | 558 ++++++++
.../BackgroundProcess.java} | 15 +-
.../tomcat/websocket/BackgroundProcessManager.java | 128 ++
java/org/apache/tomcat/websocket/Constants.java | 67 +
.../apache/tomcat/websocket/DecoderEntry.java} | 34 +-
.../tomcat/websocket/FutureToSendHandler.java | 109 ++
.../tomcat/websocket/LocalStrings.properties | 101 ++
.../tomcat/websocket/MessageHandlerResult.java} | 33 +-
.../websocket/MessageHandlerResultType.java} | 22 +-
.../websocket/ReadBufferOverflowException.java} | 27 +-
.../SendHandlerToCompletionHandler.java} | 31 +-
java/org/apache/tomcat/websocket/Util.java | 483 +++++++
.../tomcat/websocket/WrappedMessageHandler.java} | 22 +-
.../tomcat/websocket/WsContainerProvider.java} | 25 +-
java/org/apache/tomcat/websocket/WsFrameBase.java | 679 ++++++++++
.../org/apache/tomcat/websocket/WsFrameClient.java | 126 ++
.../websocket/WsHandshakeResponse.java} | 35 +-
.../WsIOException.java} | 26 +-
.../apache/tomcat/websocket/WsPongMessage.java} | 32 +-
.../tomcat/websocket/WsRemoteEndpointAsync.java | 79 ++
.../tomcat/websocket/WsRemoteEndpointBase.java | 64 +
.../tomcat/websocket/WsRemoteEndpointBasic.java | 76 ++
.../tomcat/websocket/WsRemoteEndpointImplBase.java | 949 ++++++++++++++
.../websocket/WsRemoteEndpointImplClient.java | 56 +
java/org/apache/tomcat/websocket/WsSession.java | 644 ++++++++++
.../tomcat/websocket/WsWebSocketContainer.java | 848 ++++++++++++
.../apache/tomcat/websocket/pojo/Constants.java} | 25 +-
.../tomcat/websocket/pojo/LocalStrings.properties | 39 +
.../tomcat/websocket/pojo/PojoEndpointBase.java | 157 +++
.../tomcat/websocket/pojo/PojoEndpointClient.java | 46 +
.../tomcat/websocket/pojo/PojoEndpointServer.java | 72 ++
.../websocket/pojo/PojoMessageHandlerBase.java | 104 ++
.../pojo/PojoMessageHandlerPartialBase.java | 79 ++
.../pojo/PojoMessageHandlerPartialBinary.java} | 40 +-
.../pojo/PojoMessageHandlerPartialText.java} | 30 +-
.../pojo/PojoMessageHandlerWholeBase.java | 96 ++
.../pojo/PojoMessageHandlerWholeBinary.java | 124 ++
.../pojo/PojoMessageHandlerWholePong.java} | 40 +-
.../pojo/PojoMessageHandlerWholeText.java | 129 ++
.../tomcat/websocket/pojo/PojoMethodMapping.java | 606 +++++++++
.../pojo/PojoPathParam.java} | 34 +-
.../tomcat/websocket/pojo/package-info.java} | 24 +-
.../websocket/server/Constants.java} | 37 +-
.../server/DefaultServerEndpointConfigurator.java | 81 ++
.../websocket/server/LocalStrings.properties | 36 +
.../tomcat/websocket/server/UpgradeUtil.java | 247 ++++
.../tomcat/websocket/server/UriTemplate.java | 178 +++
.../tomcat/websocket/server/WsContextListener.java | 51 +
.../apache/tomcat/websocket/server/WsFilter.java | 87 ++
.../tomcat/websocket/server/WsFrameServer.java | 65 +
.../websocket/server/WsHandshakeRequest.java | 143 +++
.../websocket/server/WsHttpUpgradeHandler.java | 243 ++++
.../tomcat/websocket/server/WsMappingResult.java} | 37 +-
.../server/WsRemoteEndpointImplServer.java | 163 +++
java/org/apache/tomcat/websocket/server/WsSci.java | 178 +++
.../tomcat/websocket/server/WsServerContainer.java | 452 +++++++
.../websocket/server/WsSessionListener.java} | 34 +-
.../tomcat/websocket/server/WsWriteTimeout.java | 129 ++
.../tomcat/websocket/server/package-info.java} | 24 +-
modules/jdbc-pool/doc/jdbc-pool.xml | 16 +
.../apache/tomcat/jdbc/pool/ConnectionPool.java | 16 +-
.../apache/tomcat/jdbc/pool/DataSourceFactory.java | 17 +-
.../apache/tomcat/jdbc/pool/DataSourceProxy.java | 34 +
.../jdbc/pool/DisposableConnectionFacade.java | 4 +-
.../apache/tomcat/jdbc/pool/PoolConfiguration.java | 25 +
.../apache/tomcat/jdbc/pool/PoolProperties.java | 36 +
.../apache/tomcat/jdbc/pool/PooledConnection.java | 6 +
.../jdbc/pool/interceptor/SlowQueryReport.java | 2 +
.../jdbc/pool/interceptor/StatementCache.java | 4 +
.../tomcat/jdbc/pool/jmx/ConnectionPool.java | 26 +
.../apache/tomcat/jdbc/pool/mbeans-descriptors.xml | 117 ++
.../jdbc/test/TestValidationQueryTimeout.java | 266 ++++
.../sub => res/META-INF/default}/.gitignore | 0
.../javax.servlet.ServletContainerInitializer | 1 +
.../services/javax.websocket.ContainerProvider | 1 +
...socket.server.ServerEndpointConfig.Configurator | 1 +
.../tomcat7-websocket.jar/web-fragment.xml | 24 +-
res/META-INF/websocket-api.jar.manifest | 11 +
res/checkstyle/javax-import-control.xml | 3 +
res/checkstyle/org-import-control.xml | 20 +
.../eclipse/java-compiler-errors-warnings.txt | 2 +-
res/maven/mvn-pub.xml | 5 +
res/maven/mvn.properties.default | 2 +-
res/maven/tomcat-coyote.pom | 6 +
...{tomcat-coyote.pom => tomcat-websocket-api.pom} | 18 +-
.../{tomcat-coyote.pom => tomcat7-websocket.pom} | 22 +-
test/deployment/context.war | Bin 0 -> 565 bytes
.../deployment/dirContext/META-INF/context.xml | 15 +-
.../deployment/dirContext}/index.html | 20 +-
.../deployment/dirNoContext}/index.html | 20 +-
test/deployment/noContext.war | Bin 0 -> 240 bytes
test/javax/el/TestArrayELResolver.java | 362 ++++++
test/javax/el/TestBeanELResolver.java | 446 ++++++-
.../javax/el/TestELContext.java | 25 +-
test/javax/el/TestListELResolver.java | 375 ++++++
test/javax/el/TestMapELResolver.java | 311 +++++
test/javax/el/TestResourceBundleELResolver.java | 257 +++-
.../javax/el/TesterBean.java | 34 +-
.../javax/el/TesterELContext.java | 27 +-
.../catalina/connector/TestCoyoteAdapter.java | 9 +-
.../catalina/connector/TestMaxConnections.java | 57 +-
.../apache/catalina/core/TestAsyncContextImpl.java | 93 +-
.../core/TestStandardContextResources.java | 34 +
.../catalina/core/TestSwallowAbortedUploads.java | 4 +-
test/org/apache/catalina/core/TesterContext.java | 11 +
.../catalina/filters/TestCsrfPreventionFilter.java | 1 +
.../catalina/filters/TesterServletContext.java | 10 +-
.../apache/catalina/startup/TestContextConfig.java | 13 +
test/org/apache/catalina/startup/TestTomcat.java | 39 +
.../TesterServletContainerInitializer1.java | 29 +-
.../TesterServletContainerInitializer2.java | 29 +-
.../apache/catalina/websocket/TestWebSocket.java | 84 +-
test/org/apache/coyote/ajp/SimpleAjpClient.java | 41 +-
.../coyote/ajp/TestAbstractAjpProcessor.java | 170 ++-
test/org/apache/coyote/ajp/TesterAjpMessage.java | 62 +
.../coyote/http11/TestAbstractHttp11Processor.java | 48 +
.../http11/filters/TestChunkedInputFilter.java | 73 +-
test/org/apache/jasper/compiler/TestParser.java | 22 +
.../apache/tomcat/util/http/TestParameters.java | 4 +-
.../tomcat/util/http/parser/TestMediaType.java | 19 +
test/org/apache/tomcat/util/net/TesterSupport.java | 47 +-
test/org/apache/tomcat/websocket/TestUtil.java | 284 +++++
.../tomcat/websocket/TestWebSocketFrameClient.java | 95 ++
test/org/apache/tomcat/websocket/TestWsFrame.java | 49 +
.../tomcat/websocket/TestWsPingPongMessages.java | 100 ++
.../tomcat/websocket/TestWsRemoteEndpoint.java | 139 ++
.../org/apache/tomcat/websocket/TestWsSession.java | 107 ++
.../tomcat/websocket/TestWsSubprotocols.java | 121 ++
.../tomcat/websocket/TestWsWebSocketContainer.java | 880 +++++++++++++
.../apache/tomcat/websocket/TesterEchoServer.java | 152 +++
.../tomcat/websocket/TesterFirehoseServer.java | 106 ++
.../tomcat/websocket/TesterMessageCountClient.java | 226 ++++
.../tomcat/websocket/TesterWsClientAutobahn.java | 188 +++
.../websocket/pojo/TestEncodingDecoding.java | 477 +++++++
.../websocket/pojo/TestPojoEndpointBase.java | 155 +++
.../websocket/pojo/TestPojoMethodMapping.java | 152 +++
.../apache/tomcat/websocket/pojo/TesterUtil.java | 74 ++
.../tomcat/websocket/server/TestUriTemplate.java | 213 ++++
.../websocket/server/TestWsServerContainer.java | 178 +++
test/webapp-2.3/WEB-INF/tags12.tld | 2 +-
test/webapp-2.3/WEB-INF/tags20.tld | 8 +-
test/webapp-2.3/WEB-INF/tags21.tld | 2 +-
test/webapp-2.4/WEB-INF/tags20.tld | 8 +-
test/webapp-2.4/WEB-INF/tags21.tld | 2 +-
test/webapp-2.4/WEB-INF/web.xml | 6 +-
test/webapp-2.5/WEB-INF/tags20.tld | 8 +-
test/webapp-2.5/WEB-INF/tags21.tld | 2 +-
.../webapp-3.0-fragments/WEB-INF/lib/resources.jar | Bin 19244 -> 20061 bytes
.../webapp-3.0/WEB-INF/tags/bug55198.tagx | 23 +-
test/webapp-3.0/WEB-INF/tags20.tld | 8 +-
test/webapp-3.0/WEB-INF/tags21.tld | 2 +-
test/webapp-3.0/WEB-INF/web.xml | 6 +-
.../webapp-3.0/bug5nnnn/bug55198.jsp | 28 +-
webapps/docs/changelog.xml | 407 +++++-
webapps/docs/config/ajp.xml | 3 -
webapps/docs/config/cluster-channel.xml | 24 +
webapps/docs/config/cluster-manager.xml | 7 +
webapps/docs/config/http.xml | 20 +-
webapps/docs/realm-howto.xml | 2 +-
webapps/docs/web-socket-howto.xml | 81 +-
.../classes/websocket/chat/ChatAnnotation.java | 92 ++
.../classes/websocket/echo/EchoAnnotation.java | 70 +
.../classes/websocket/echo/EchoEndpoint.java | 56 +
.../classes/websocket/echo/WsConfigListener.java | 46 +
.../WEB-INF/classes/websocket/snake/Location.java | 8 +-
.../WEB-INF/classes/websocket/snake/Snake.java | 40 +-
.../classes/websocket/snake/SnakeAnnotation.java | 113 ++
.../classes/websocket/snake/SnakeTimer.java | 107 ++
.../{ => tc7}/chat/ChatWebSocketServlet.java | 4 +-
.../websocket/{ => tc7}/echo/EchoMessage.java | 8 +-
.../websocket/{ => tc7}/echo/EchoStream.java | 7 +-
.../classes/websocket/tc7/snake/Direction.java | 24 +-
.../websocket/{ => tc7}/snake/Location.java | 6 +-
.../classes/websocket/{ => tc7}/snake/Snake.java | 6 +-
.../{ => tc7}/snake/SnakeWebSocketServlet.java | 6 +-
webapps/examples/WEB-INF/web.xml | 21 +-
webapps/examples/index.html | 4 +-
webapps/examples/websocket-deprecated/chat.html | 125 ++
.../{websocket => websocket-deprecated}/echo.html | 4 +-
.../examples/{ => websocket-deprecated}/index.html | 25 +-
webapps/examples/websocket-deprecated/snake.html | 258 ++++
webapps/examples/websocket/echo.html | 14 +-
396 files changed, 24207 insertions(+), 2957 deletions(-)
copy java/javax/annotation/{Resources.java => ManagedBean.java} (90%)
copy java/javax/annotation/{security/DeclareRoles.java => sql/DataSourceDefinition.java} (58%)
copy java/javax/annotation/{security/RunAs.java => sql/DataSourceDefinitions.java} (86%)
copy java/javax/{annotation/PreDestroy.java => websocket/ClientEndpoint.java} (68%)
create mode 100644 java/javax/websocket/ClientEndpointConfig.java
create mode 100644 java/javax/websocket/CloseReason.java
create mode 100644 java/javax/websocket/ContainerProvider.java
create mode 100644 java/javax/websocket/DecodeException.java
copy java/{org/apache/coyote/http11/upgrade/UpgradeOutbound.java => javax/websocket/Decoder.java} (51%)
create mode 100644 java/javax/websocket/DefaultClientEndpointConfig.java
copy java/javax/{annotation/PreDestroy.java => websocket/DeploymentException.java} (67%)
copy java/javax/{annotation/Resources.java => websocket/EncodeException.java} (58%)
copy java/{org/apache/coyote/http11/upgrade/UpgradeOutbound.java => javax/websocket/Encoder.java} (53%)
create mode 100644 java/javax/websocket/Endpoint.java
copy java/javax/{annotation/PreDestroy.java => websocket/EndpointConfig.java} (67%)
copy java/{org/apache/tomcat/util/net/SocketStatus.java => javax/websocket/Extension.java} (78%)
copy java/javax/{annotation/PreDestroy.java => websocket/HandshakeResponse.java} (67%)
copy java/{org/apache/coyote/http11/upgrade/UpgradeOutbound.java => javax/websocket/MessageHandler.java} (50%)
copy java/javax/{annotation/PreDestroy.java => websocket/OnClose.java} (84%)
copy java/javax/{annotation/PreDestroy.java => websocket/OnError.java} (84%)
copy java/javax/{annotation/PreDestroy.java => websocket/OnMessage.java} (84%)
copy java/javax/{annotation/PreDestroy.java => websocket/OnOpen.java} (84%)
copy java/javax/{annotation/PreDestroy.java => websocket/PongMessage.java} (64%)
create mode 100644 java/javax/websocket/RemoteEndpoint.java
copy java/javax/{annotation/PreDestroy.java => websocket/SendHandler.java} (67%)
copy java/javax/{annotation/PreDestroy.java => websocket/SendResult.java} (62%)
create mode 100644 java/javax/websocket/Session.java
copy java/javax/{annotation/PreDestroy.java => websocket/SessionException.java} (63%)
create mode 100644 java/javax/websocket/WebSocketContainer.java
create mode 100644 java/javax/websocket/server/DefaultServerEndpointConfig.java
create mode 100644 java/javax/websocket/server/HandshakeRequest.java
copy java/javax/{annotation/Resources.java => websocket/server/PathParam.java} (72%)
create mode 100644 java/javax/websocket/server/ServerApplicationConfig.java
copy java/javax/{annotation/PreDestroy.java => websocket/server/ServerContainer.java} (60%)
copy java/javax/{annotation/PreDestroy.java => websocket/server/ServerEndpoint.java} (60%)
create mode 100644 java/javax/websocket/server/ServerEndpointConfig.java
create mode 100644 java/org/apache/coyote/http11/upgrade/AbstractProcessor.java
create mode 100644 java/org/apache/coyote/http11/upgrade/AbstractServletInputStream.java
create mode 100644 java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
create mode 100644 java/org/apache/coyote/http11/upgrade/AprProcessor.java
create mode 100644 java/org/apache/coyote/http11/upgrade/AprServletInputStream.java
create mode 100644 java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java
create mode 100644 java/org/apache/coyote/http11/upgrade/BioProcessor.java
create mode 100644 java/org/apache/coyote/http11/upgrade/BioServletInputStream.java
copy java/org/apache/{tomcat/util/net/SocketStatus.java => coyote/http11/upgrade/BioServletOutputStream.java} (50%)
create mode 100644 java/org/apache/coyote/http11/upgrade/NioProcessor.java
create mode 100644 java/org/apache/coyote/http11/upgrade/NioServletInputStream.java
create mode 100644 java/org/apache/coyote/http11/upgrade/NioServletOutputStream.java
copy java/org/apache/coyote/http11/upgrade/{UpgradeInbound.java => servlet31/HttpUpgradeHandler.java} (51%)
create mode 100644 java/org/apache/coyote/http11/upgrade/servlet31/ReadListener.java
create mode 100644 java/org/apache/coyote/http11/upgrade/servlet31/WebConnection.java
create mode 100644 java/org/apache/coyote/http11/upgrade/servlet31/WriteListener.java
create mode 100644 java/org/apache/tomcat/util/buf/Utf8Encoder.java
create mode 100644 java/org/apache/tomcat/websocket/AsyncChannelWrapper.java
create mode 100644 java/org/apache/tomcat/websocket/AsyncChannelWrapperNonSecure.java
create mode 100644 java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
copy java/org/apache/tomcat/{util/net/SocketStatus.java => websocket/BackgroundProcess.java} (82%)
create mode 100644 java/org/apache/tomcat/websocket/BackgroundProcessManager.java
create mode 100644 java/org/apache/tomcat/websocket/Constants.java
copy java/{javax/annotation/Resources.java => org/apache/tomcat/websocket/DecoderEntry.java} (56%)
create mode 100644 java/org/apache/tomcat/websocket/FutureToSendHandler.java
create mode 100644 java/org/apache/tomcat/websocket/LocalStrings.properties
copy java/{javax/annotation/Resources.java => org/apache/tomcat/websocket/MessageHandlerResult.java} (60%)
copy java/{javax/annotation/PreDestroy.java => org/apache/tomcat/websocket/MessageHandlerResultType.java} (71%)
copy java/{javax/annotation/PreDestroy.java => org/apache/tomcat/websocket/ReadBufferOverflowException.java} (62%)
copy java/org/apache/tomcat/{util/net/SocketStatus.java => websocket/SendHandlerToCompletionHandler.java} (56%)
create mode 100644 java/org/apache/tomcat/websocket/Util.java
copy java/{javax/annotation/PreDestroy.java => org/apache/tomcat/websocket/WrappedMessageHandler.java} (67%)
copy java/{javax/annotation/PreDestroy.java => org/apache/tomcat/websocket/WsContainerProvider.java} (67%)
create mode 100644 java/org/apache/tomcat/websocket/WsFrameBase.java
create mode 100644 java/org/apache/tomcat/websocket/WsFrameClient.java
copy java/org/apache/{coyote/http11/upgrade/UpgradeOutbound.java => tomcat/websocket/WsHandshakeResponse.java} (53%)
copy java/org/apache/tomcat/{util/net/SocketStatus.java => websocket/WsIOException.java} (57%)
copy java/{javax/annotation/Resources.java => org/apache/tomcat/websocket/WsPongMessage.java} (57%)
create mode 100644 java/org/apache/tomcat/websocket/WsRemoteEndpointAsync.java
create mode 100644 java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java
create mode 100644 java/org/apache/tomcat/websocket/WsRemoteEndpointBasic.java
create mode 100644 java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
create mode 100644 java/org/apache/tomcat/websocket/WsRemoteEndpointImplClient.java
create mode 100644 java/org/apache/tomcat/websocket/WsSession.java
create mode 100644 java/org/apache/tomcat/websocket/WsWebSocketContainer.java
copy java/{javax/annotation/PreDestroy.java => org/apache/tomcat/websocket/pojo/Constants.java} (71%)
create mode 100644 java/org/apache/tomcat/websocket/pojo/LocalStrings.properties
create mode 100644 java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
create mode 100644 java/org/apache/tomcat/websocket/pojo/PojoEndpointClient.java
create mode 100644 java/org/apache/tomcat/websocket/pojo/PojoEndpointServer.java
create mode 100644 java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBase.java
create mode 100644 java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBase.java
copy java/org/apache/{coyote/http11/upgrade/UpgradeOutbound.java => tomcat/websocket/pojo/PojoMessageHandlerPartialBinary.java} (51%)
copy java/{javax/annotation/PreDestroy.java => org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialText.java} (51%)
create mode 100644 java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBase.java
create mode 100644 java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBinary.java
copy java/org/apache/{coyote/http11/upgrade/UpgradeOutbound.java => tomcat/websocket/pojo/PojoMessageHandlerWholePong.java} (50%)
create mode 100644 java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeText.java
create mode 100644 java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
copy java/org/apache/tomcat/{util/net/SocketStatus.java => websocket/pojo/PojoPathParam.java} (52%)
copy java/{javax/annotation/PreDestroy.java => org/apache/tomcat/websocket/pojo/package-info.java} (71%)
copy java/org/apache/{coyote/http11/upgrade/UpgradeOutbound.java => tomcat/websocket/server/Constants.java} (50%)
create mode 100644 java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java
create mode 100644 java/org/apache/tomcat/websocket/server/LocalStrings.properties
create mode 100644 java/org/apache/tomcat/websocket/server/UpgradeUtil.java
create mode 100644 java/org/apache/tomcat/websocket/server/UriTemplate.java
create mode 100644 java/org/apache/tomcat/websocket/server/WsContextListener.java
create mode 100644 java/org/apache/tomcat/websocket/server/WsFilter.java
create mode 100644 java/org/apache/tomcat/websocket/server/WsFrameServer.java
create mode 100644 java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java
create mode 100644 java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
copy java/{javax/annotation/Resources.java => org/apache/tomcat/websocket/server/WsMappingResult.java} (55%)
create mode 100644 java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
create mode 100644 java/org/apache/tomcat/websocket/server/WsSci.java
create mode 100644 java/org/apache/tomcat/websocket/server/WsServerContainer.java
copy java/org/apache/{coyote/http11/upgrade/UpgradeOutbound.java => tomcat/websocket/server/WsSessionListener.java} (53%)
create mode 100644 java/org/apache/tomcat/websocket/server/WsWriteTimeout.java
copy java/{javax/annotation/PreDestroy.java => org/apache/tomcat/websocket/server/package-info.java} (71%)
create mode 100644 modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestValidationQueryTimeout.java
copy {test/webapp-3.0/welcome-files/sub => res/META-INF/default}/.gitignore (100%)
create mode 100644 res/META-INF/tomcat7-websocket.jar/services/javax.servlet.ServletContainerInitializer
create mode 100644 res/META-INF/tomcat7-websocket.jar/services/javax.websocket.ContainerProvider
create mode 100644 res/META-INF/tomcat7-websocket.jar/services/javax.websocket.server.ServerEndpointConfig.Configurator
copy webapps/examples/index.html => res/META-INF/tomcat7-websocket.jar/web-fragment.xml (65%)
create mode 100644 res/META-INF/websocket-api.jar.manifest
copy res/maven/{tomcat-coyote.pom => tomcat-websocket-api.pom} (69%)
copy res/maven/{tomcat-coyote.pom => tomcat7-websocket.pom} (69%)
create mode 100644 test/deployment/context.war
copy webapps/examples/index.html => test/deployment/dirContext/META-INF/context.xml (66%)
copy {webapps/examples => test/deployment/dirContext}/index.html (66%)
copy {webapps/examples => test/deployment/dirNoContext}/index.html (66%)
create mode 100644 test/deployment/noContext.war
create mode 100644 test/javax/el/TestArrayELResolver.java
copy java/javax/annotation/PreDestroy.java => test/javax/el/TestELContext.java (70%)
create mode 100644 test/javax/el/TestListELResolver.java
create mode 100644 test/javax/el/TestMapELResolver.java
copy java/javax/annotation/PreDestroy.java => test/javax/el/TesterBean.java (64%)
copy java/javax/annotation/PreDestroy.java => test/javax/el/TesterELContext.java (70%)
copy java/javax/annotation/PreDestroy.java => test/org/apache/catalina/startup/TesterServletContainerInitializer1.java (55%)
copy java/javax/annotation/PreDestroy.java => test/org/apache/catalina/startup/TesterServletContainerInitializer2.java (55%)
create mode 100644 test/org/apache/tomcat/websocket/TestUtil.java
create mode 100644 test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
create mode 100644 test/org/apache/tomcat/websocket/TestWsFrame.java
create mode 100644 test/org/apache/tomcat/websocket/TestWsPingPongMessages.java
create mode 100644 test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java
create mode 100644 test/org/apache/tomcat/websocket/TestWsSession.java
create mode 100644 test/org/apache/tomcat/websocket/TestWsSubprotocols.java
create mode 100644 test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
create mode 100644 test/org/apache/tomcat/websocket/TesterEchoServer.java
create mode 100644 test/org/apache/tomcat/websocket/TesterFirehoseServer.java
create mode 100644 test/org/apache/tomcat/websocket/TesterMessageCountClient.java
create mode 100644 test/org/apache/tomcat/websocket/TesterWsClientAutobahn.java
create mode 100644 test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
create mode 100644 test/org/apache/tomcat/websocket/pojo/TestPojoEndpointBase.java
create mode 100644 test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java
create mode 100644 test/org/apache/tomcat/websocket/pojo/TesterUtil.java
create mode 100644 test/org/apache/tomcat/websocket/server/TestUriTemplate.java
create mode 100644 test/org/apache/tomcat/websocket/server/TestWsServerContainer.java
copy webapps/examples/index.html => test/webapp-3.0/WEB-INF/tags/bug55198.tagx (60%)
copy webapps/examples/index.html => test/webapp-3.0/bug5nnnn/bug55198.jsp (60%)
create mode 100644 webapps/examples/WEB-INF/classes/websocket/chat/ChatAnnotation.java
create mode 100644 webapps/examples/WEB-INF/classes/websocket/echo/EchoAnnotation.java
create mode 100644 webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java
create mode 100644 webapps/examples/WEB-INF/classes/websocket/echo/WsConfigListener.java
create mode 100644 webapps/examples/WEB-INF/classes/websocket/snake/SnakeAnnotation.java
create mode 100644 webapps/examples/WEB-INF/classes/websocket/snake/SnakeTimer.java
rename webapps/examples/WEB-INF/classes/websocket/{ => tc7}/chat/ChatWebSocketServlet.java (97%)
rename webapps/examples/WEB-INF/classes/websocket/{ => tc7}/echo/EchoMessage.java (96%)
rename webapps/examples/WEB-INF/classes/websocket/{ => tc7}/echo/EchoStream.java (95%)
copy java/javax/annotation/PreDestroy.java => webapps/examples/WEB-INF/classes/websocket/tc7/snake/Direction.java (71%)
copy webapps/examples/WEB-INF/classes/websocket/{ => tc7}/snake/Location.java (95%)
copy webapps/examples/WEB-INF/classes/websocket/{ => tc7}/snake/Snake.java (97%)
rename webapps/examples/WEB-INF/classes/websocket/{ => tc7}/snake/SnakeWebSocketServlet.java (97%)
create mode 100644 webapps/examples/websocket-deprecated/chat.html
copy webapps/examples/{websocket => websocket-deprecated}/echo.html (98%)
copy webapps/examples/{ => websocket-deprecated}/index.html (61%)
create mode 100644 webapps/examples/websocket-deprecated/snake.html
--
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