This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository mina2.
commit 85698f56167298de64e45715f64ceb1b52d053f7 Merge: 1d08007 4ad288f Author: Emmanuel Bourg <[email protected]> Date: Tue May 3 22:47:28 2016 +0200 Merge tag 'upstream/2.0.11' Upstream version 2.0.11 .../org/apache/mina/core/MinaBenchmarkServer.java | 8 +- src/mina-core/META-INF/MANIFEST.MF | 90 +-- src/mina-core/pom.xml | 2 +- .../src/main/java/org/apache/mina/core/IoUtil.java | 19 +- .../apache/mina/core/buffer/AbstractIoBuffer.java | 37 +- .../mina/core/buffer/CachedBufferAllocator.java | 4 +- .../java/org/apache/mina/core/buffer/IoBuffer.java | 710 ++++++++++++++------- .../apache/mina/core/buffer/IoBufferAllocator.java | 5 + .../apache/mina/core/buffer/IoBufferWrapper.java | 2 +- .../apache/mina/core/file/DefaultFileRegion.java | 3 + .../apache/mina/core/file/FilenameFileRegion.java | 1 + .../core/filterchain/DefaultIoFilterChain.java | 14 +- .../filterchain/DefaultIoFilterChainBuilder.java | 92 ++- .../org/apache/mina/core/filterchain/IoFilter.java | 89 ++- .../mina/core/filterchain/IoFilterChain.java | 41 +- .../core/filterchain/IoFilterChainBuilder.java | 3 + .../mina/core/filterchain/IoFilterEvent.java | 4 +- .../apache/mina/core/future/DefaultIoFuture.java | 9 +- .../java/org/apache/mina/core/future/IoFuture.java | 9 +- .../apache/mina/core/future/IoFutureListener.java | 2 +- .../org/apache/mina/core/future/WriteFuture.java | 2 +- .../core/polling/AbstractPollingIoAcceptor.java | 2 + .../core/polling/AbstractPollingIoConnector.java | 12 +- .../core/polling/AbstractPollingIoProcessor.java | 122 ++-- .../mina/core/service/AbstractIoAcceptor.java | 6 + .../mina/core/service/AbstractIoConnector.java | 8 +- .../mina/core/service/AbstractIoService.java | 6 + .../org/apache/mina/core/service/IoAcceptor.java | 39 +- .../org/apache/mina/core/service/IoConnector.java | 25 +- .../org/apache/mina/core/service/IoHandler.java | 28 + .../apache/mina/core/service/IoHandlerAdapter.java | 24 + .../org/apache/mina/core/service/IoProcessor.java | 8 +- .../org/apache/mina/core/service/IoService.java | 50 +- .../mina/core/service/IoServiceListener.java | 15 +- .../core/service/IoServiceListenerSupport.java | 7 +- .../mina/core/service/IoServiceStatistics.java | 10 +- .../mina/core/service/SimpleIoProcessorPool.java | 4 +- .../mina/core/service/TransportMetadata.java | 14 +- .../mina/core/session/AbstractIoSession.java | 119 ++-- .../mina/core/session/AbstractIoSessionConfig.java | 2 + .../org/apache/mina/core/session/DummySession.java | 45 +- .../org/apache/mina/core/session/IdleStatus.java | 2 +- .../org/apache/mina/core/session/IoSession.java | 129 ++-- .../mina/core/session/IoSessionAttributeMap.java | 45 +- .../apache/mina/core/session/IoSessionConfig.java | 61 +- .../session/IoSessionDataStructureFactory.java | 10 +- .../mina/core/session/IoSessionRecycler.java | 2 +- .../mina/core/write/DefaultWriteRequest.java | 5 + .../org/apache/mina/core/write/WriteException.java | 44 +- .../org/apache/mina/core/write/WriteRequest.java | 6 +- .../apache/mina/core/write/WriteRequestQueue.java | 5 +- .../mina/core/write/WriteRequestWrapper.java | 22 +- .../mina/filter/buffer/BufferedWriteFilter.java | 2 +- .../filter/codec/CumulativeProtocolDecoder.java | 55 +- .../mina/filter/codec/ProtocolCodecException.java | 7 + .../mina/filter/codec/ProtocolCodecFactory.java | 8 + .../mina/filter/codec/ProtocolCodecFilter.java | 4 - .../mina/filter/codec/ProtocolCodecSession.java | 8 +- .../apache/mina/filter/codec/ProtocolDecoder.java | 6 + .../filter/codec/ProtocolDecoderException.java | 14 +- .../mina/filter/codec/ProtocolDecoderOutput.java | 3 + .../apache/mina/filter/codec/ProtocolEncoder.java | 4 + .../filter/codec/ProtocolEncoderException.java | 7 + .../filter/codec/SynchronizedProtocolDecoder.java | 11 +- .../filter/codec/SynchronizedProtocolEncoder.java | 9 +- .../codec/demux/DemuxingProtocolCodecFactory.java | 2 - .../codec/demux/DemuxingProtocolDecoder.java | 51 +- .../mina/filter/codec/demux/MessageDecoder.java | 14 +- .../filter/codec/demux/MessageDecoderFactory.java | 3 + .../mina/filter/codec/demux/MessageEncoder.java | 5 + .../filter/codec/demux/MessageEncoderFactory.java | 5 + .../prefixedstring/PrefixedStringCodecFactory.java | 12 +- .../ObjectSerializationCodecFactory.java | 16 +- .../serialization/ObjectSerializationDecoder.java | 9 +- .../serialization/ObjectSerializationEncoder.java | 7 +- .../ObjectSerializationInputStream.java | 62 +- .../ObjectSerializationOutputStream.java | 60 +- .../ConsumeToDynamicTerminatorDecodingState.java | 4 +- .../ConsumeToLinearWhitespaceDecodingState.java | 2 +- .../codec/statemachine/CrLfDecodingState.java | 6 +- .../codec/statemachine/DecodingStateMachine.java | 4 + .../codec/statemachine/IntegerDecodingState.java | 44 +- .../statemachine/ShortIntegerDecodingState.java | 7 +- .../filter/codec/statemachine/SkippingState.java | 2 +- .../mina/filter/codec/textline/LineDelimiter.java | 4 +- .../codec/textline/TextLineCodecFactory.java | 17 +- .../filter/codec/textline/TextLineDecoder.java | 22 +- .../filter/codec/textline/TextLineEncoder.java | 28 +- .../errorgenerating/ErrorGeneratingFilter.java | 13 +- .../mina/filter/executor/ExecutorFilter.java | 6 +- .../mina/filter/executor/IoEventQueueHandler.java | 13 +- .../filter/executor/OrderedThreadPoolExecutor.java | 13 +- .../executor/UnorderedThreadPoolExecutor.java | 9 +- .../mina/filter/executor/WriteRequestFilter.java | 4 +- .../mina/filter/firewall/BlacklistFilter.java | 8 + .../mina/filter/keepalive/KeepAliveFilter.java | 208 ++++-- .../filter/keepalive/KeepAliveMessageFactory.java | 21 +- .../KeepAliveRequestTimeoutException.java | 19 + .../keepalive/KeepAliveRequestTimeoutHandler.java | 14 +- .../mina/filter/logging/MdcInjectionFilter.java | 2 +- .../apache/mina/filter/ssl/KeyStoreFactory.java | 9 + .../apache/mina/filter/ssl/SslContextFactory.java | 24 +- .../java/org/apache/mina/filter/ssl/SslFilter.java | 40 +- .../org/apache/mina/filter/ssl/SslHandler.java | 12 +- .../mina/filter/statistic/ProfilerTimerFilter.java | 650 ++++++++++--------- .../filter/stream/AbstractStreamWriteFilter.java | 5 +- .../mina/filter/stream/StreamWriteFilter.java | 7 +- .../util/SessionAttributeInitializingFilter.java | 9 +- .../mina/handler/chain/ChainedIoHandler.java | 2 +- .../apache/mina/handler/chain/IoHandlerChain.java | 6 +- .../mina/handler/chain/IoHandlerCommand.java | 6 +- .../mina/handler/demux/DemuxingIoHandler.java | 77 ++- .../mina/handler/demux/ExceptionHandler.java | 8 +- .../apache/mina/handler/demux/MessageHandler.java | 2 +- .../handler/multiton/SingleSessionIoHandler.java | 13 +- .../multiton/SingleSessionIoHandlerDelegate.java | 21 +- .../multiton/SingleSessionIoHandlerFactory.java | 3 +- .../mina/handler/stream/StreamIoHandler.java | 11 +- .../apache/mina/proxy/AbstractProxyIoHandler.java | 1 + .../mina/proxy/AbstractProxyLogicHandler.java | 19 +- .../org/apache/mina/proxy/ProxyAuthException.java | 5 + .../java/org/apache/mina/proxy/ProxyConnector.java | 11 +- .../org/apache/mina/proxy/ProxyLogicHandler.java | 16 +- .../apache/mina/proxy/event/IoSessionEvent.java | 14 +- .../mina/proxy/event/IoSessionEventQueue.java | 2 + .../mina/proxy/event/IoSessionEventType.java | 2 - .../apache/mina/proxy/handlers/ProxyRequest.java | 2 - .../handlers/http/AbstractAuthLogicHandler.java | 8 +- .../handlers/http/AbstractHttpLogicHandler.java | 3 + .../handlers/http/HttpAuthenticationMethods.java | 5 +- .../mina/proxy/handlers/http/HttpProxyRequest.java | 21 +- .../proxy/handlers/http/HttpProxyResponse.java | 12 +- .../http/basic/HttpBasicAuthLogicHandler.java | 3 + .../http/basic/HttpNoAuthLogicHandler.java | 3 + .../handlers/http/digest/DigestUtilities.java | 11 +- .../http/digest/HttpDigestAuthLogicHandler.java | 8 +- .../http/ntlm/HttpNTLMAuthLogicHandler.java | 5 +- .../proxy/handlers/http/ntlm/NTLMConstants.java | 89 ++- .../proxy/handlers/http/ntlm/NTLMResponses.java | 7 + .../proxy/handlers/http/ntlm/NTLMUtilities.java | 4 + .../proxy/handlers/socks/Socks4LogicHandler.java | 4 +- .../proxy/handlers/socks/Socks5LogicHandler.java | 7 +- .../proxy/handlers/socks/SocksProxyRequest.java | 4 +- .../apache/mina/proxy/session/ProxyIoSession.java | 24 +- .../org/apache/mina/proxy/utils/ByteUtilities.java | 10 +- .../apache/mina/proxy/utils/IoBufferDecoder.java | 2 +- .../apache/mina/proxy/utils/StringUtilities.java | 5 +- .../socket/AbstractDatagramSessionConfig.java | 10 +- .../socket/AbstractSocketSessionConfig.java | 16 +- .../mina/transport/socket/DatagramAcceptor.java | 10 +- .../mina/transport/socket/DatagramConnector.java | 6 +- .../transport/socket/DatagramSessionConfig.java | 25 + .../socket/DefaultDatagramSessionConfig.java | 10 +- .../socket/DefaultSocketSessionConfig.java | 12 +- .../mina/transport/socket/SocketAcceptor.java | 24 +- .../mina/transport/socket/SocketConnector.java | 6 +- .../mina/transport/socket/SocketSessionConfig.java | 31 + .../transport/socket/nio/NioDatagramAcceptor.java | 10 +- .../transport/socket/nio/NioDatagramConnector.java | 4 + .../socket/nio/NioDatagramSessionConfig.java | 4 +- .../mina/transport/socket/nio/NioProcessor.java | 5 +- .../mina/transport/socket/nio/NioSession.java | 4 +- .../transport/socket/nio/NioSocketAcceptor.java | 2 +- .../mina/transport/vmpipe/VmPipeAcceptor.java | 26 +- .../mina/transport/vmpipe/VmPipeAddress.java | 20 +- .../mina/transport/vmpipe/VmPipeConnector.java | 11 + .../org/apache/mina/util/AvailablePortFinder.java | 11 +- .../src/main/java/org/apache/mina/util/Base64.java | 58 +- .../java/org/apache/mina/util/CircularQueue.java | 2 +- .../java/org/apache/mina/util/CopyOnWriteMap.java | 10 +- .../org/apache/mina/util/ExceptionMonitor.java | 2 +- .../java/org/apache/mina/util/ExpiringMap.java | 5 +- .../apache/mina/util/LazyInitializedCacheMap.java | 2 + .../java/org/apache/mina/util/LazyInitializer.java | 3 +- .../org/apache/mina/util/Log4jXmlFormatter.java | 14 +- .../main/java/org/apache/mina/util/Transform.java | 4 +- .../org/apache/mina/util/byteaccess/ByteArray.java | 25 +- .../apache/mina/util/byteaccess/ByteArrayList.java | 22 +- .../mina/util/byteaccess/CompositeByteArray.java | 61 +- .../byteaccess/CompositeByteArrayRelativeBase.java | 6 +- .../CompositeByteArrayRelativeReader.java | 2 +- .../CompositeByteArrayRelativeWriter.java | 2 + .../mina/util/byteaccess/IoAbsoluteReader.java | 40 +- .../mina/util/byteaccess/IoAbsoluteWriter.java | 32 +- .../mina/util/byteaccess/IoRelativeReader.java | 27 +- .../mina/util/byteaccess/IoRelativeWriter.java | 24 +- .../org/apache/mina/core/buffer/IoBufferTest.java | 14 + .../mina/core/service/AbstractIoServiceTest.java | 5 +- .../codec/CumulativeProtocolDecoderTest.java | 16 - .../serialization/ObjectSerializationTest.java | 2 + .../mina/filter/firewall/SubnetIPv4Test.java | 1 - .../apache/mina/filter/ssl/SslDIRMINA937Test.java | 2 - .../stream/AbstractStreamWriteFilterTest.java | 4 - .../test/java/org/apache/mina/proxy/NTLMTest.java | 1 - .../mina/transport/AbstractFileRegionTest.java | 24 +- .../mina/transport/socket/nio/DIRMINA777Test.java | 2 - src/mina-example/pom.xml | 2 +- .../echoserver/ssl/BogusSslContextFactory.java | 6 +- .../gettingstarted/timeserver/MinaTimeServer.java | 3 + .../mina/example/proxy/AbstractProxyIoHandler.java | 9 + .../java/org/apache/mina/example/proxy/Main.java | 32 +- .../sumup/codec/AbstractMessageDecoder.java | 2 + .../example/sumup/message/AbstractMessage.java | 2 + .../org/apache/mina/example/tapedeck/Main.java | 2 - .../apache/mina/example/tcp/perf/TcpClient.java | 4 +- .../apache/mina/example/tcp/perf/TcpServer.java | 8 +- .../org/apache/mina/example/tennis/TennisBall.java | 8 +- .../org/apache/mina/example/udp/MemoryMonitor.java | 3 - .../apache/mina/example/udp/perf/UdpClient.java | 6 +- .../apache/mina/example/udp/perf/UdpServer.java | 6 +- .../apache/mina/example/proxy/ProxyTestClient.java | 1 - src/mina-filter-compression/META-INF/MANIFEST.MF | 14 +- src/mina-filter-compression/pom.xml | 2 +- .../mina/filter/compression/CompressionFilter.java | 8 +- src/mina-http/META-INF/MANIFEST.MF | 14 +- src/mina-http/pom.xml | 2 +- .../org/apache/mina/http/HttpClientDecoder.java | 2 +- .../java/org/apache/mina/http/HttpRequestImpl.java | 34 +- .../apache/mina/http/api/DefaultHttpResponse.java | 17 +- .../java/org/apache/mina/http/api/HttpMessage.java | 19 +- .../java/org/apache/mina/http/api/HttpRequest.java | 4 +- .../org/apache/mina/http/api/HttpResponse.java | 3 +- .../java/org/apache/mina/http/api/HttpVersion.java | 1 + src/mina-integration-beans/META-INF/MANIFEST.MF | 8 +- src/mina-integration-beans/pom.xml | 2 +- .../apache/mina/integration/beans/ClassEditor.java | 3 +- .../mina/integration/beans/CollectionEditor.java | 3 +- .../apache/mina/integration/beans/EnumEditor.java | 6 +- .../integration/beans/InetSocketAddressEditor.java | 2 +- .../apache/mina/integration/beans/MapEditor.java | 6 +- .../integration/beans/PropertyEditorFactory.java | 15 +- src/mina-integration-jmx/META-INF/MANIFEST.MF | 12 +- src/mina-integration-jmx/pom.xml | 2 +- .../apache/mina/integration/jmx/ObjectMBean.java | 4 +- src/mina-integration-ognl/META-INF/MANIFEST.MF | 12 +- src/mina-integration-ognl/pom.xml | 2 +- .../mina/integration/ognl/IoSessionFinder.java | 10 + src/mina-integration-xbean/pom.xml | 2 +- .../integration/xbean/SocketAddressFactory.java | 5 + src/mina-legal/pom.xml | 2 +- src/mina-statemachine/META-INF/MANIFEST.MF | 20 +- src/mina-statemachine/pom.xml | 2 +- .../java/org/apache/mina/statemachine/State.java | 37 +- .../org/apache/mina/statemachine/StateMachine.java | 4 +- .../statemachine/StateMachineProxyBuilder.java | 5 +- .../annotation/IoFilterTransition.java | 8 +- .../annotation/IoHandlerTransition.java | 8 +- .../mina/statemachine/annotation/OnEntry.java | 2 + .../mina/statemachine/annotation/OnExit.java | 2 + .../apache/mina/statemachine/annotation/State.java | 2 + .../mina/statemachine/annotation/Transition.java | 8 + .../context/AbstractStateContextLookup.java | 10 +- .../mina/statemachine/context/StateContext.java | 4 +- .../statemachine/context/StateContextLookup.java | 3 + .../org/apache/mina/statemachine/event/Event.java | 12 +- .../event/UnhandledEventException.java | 4 +- .../transition/AbstractSelfTransition.java | 10 +- .../transition/AbstractTransition.java | 4 +- .../transition/MethodSelfTransition.java | 6 +- .../statemachine/transition/MethodTransition.java | 9 +- .../statemachine/transition/SelfTransition.java | 7 +- .../mina/statemachine/transition/Transition.java | 14 +- .../apache/mina/statemachine/StateMachineTest.java | 1 - src/mina-transport-apr/META-INF/MANIFEST.MF | 18 +- src/mina-transport-apr/pom.xml | 2 +- .../transport/socket/apr/AprSocketAcceptor.java | 2 + src/mina-transport-serial/META-INF/MANIFEST.MF | 18 +- src/mina-transport-serial/pom.xml | 2 +- .../mina/transport/serial/SerialSession.java | 5 +- .../mina/transport/serial/SerialSessionConfig.java | 8 +- src/pom.xml | 8 +- 271 files changed, 3435 insertions(+), 1868 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mina2.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
