This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository mina2.
commit ee6ec4822b487e59412aa2838d1ca4926a7fe649 Merge: be9663c ab7152f Author: Emmanuel Bourg <[email protected]> Date: Tue May 3 22:21:35 2016 +0200 Merge tag 'upstream/2.0.10' Upstream version 2.0.10 src/mina-core/META-INF/MANIFEST.MF | 197 ++++---- src/mina-core/pom.xml | 9 +- .../apache/mina/core/buffer/AbstractIoBuffer.java | 9 + .../java/org/apache/mina/core/buffer/IoBuffer.java | 447 ++++++++++++++---- .../java/org/apache/mina/core/file/FileRegion.java | 4 +- .../org/apache/mina/core/filterchain/IoFilter.java | 2 +- .../mina/core/filterchain/IoFilterChain.java | 2 +- .../org/apache/mina/core/future/CloseFuture.java | 18 +- .../org/apache/mina/core/future/ConnectFuture.java | 34 +- .../mina/core/future/DefaultCloseFuture.java | 20 + .../mina/core/future/DefaultConnectFuture.java | 67 ++- .../apache/mina/core/future/DefaultIoFuture.java | 97 ++-- .../apache/mina/core/future/DefaultReadFuture.java | 81 +++- .../mina/core/future/DefaultWriteFuture.java | 21 +- .../java/org/apache/mina/core/future/IoFuture.java | 23 +- .../org/apache/mina/core/future/ReadFuture.java | 33 +- .../org/apache/mina/core/future/WriteFuture.java | 12 +- .../core/polling/AbstractPollingIoConnector.java | 140 ++++-- .../core/polling/AbstractPollingIoProcessor.java | 95 ++-- .../mina/core/service/AbstractIoAcceptor.java | 2 +- .../mina/core/service/AbstractIoConnector.java | 2 +- .../mina/core/service/AbstractIoService.java | 6 + .../mina/core/session/AbstractIoSession.java | 30 +- .../mina/core/session/ExpiringSessionRecycler.java | 12 +- .../org/apache/mina/core/session/IoSession.java | 49 +- .../mina/core/session/IoSessionRecycler.java | 19 +- .../mina/filter/codec/ProtocolCodecFilter.java | 12 +- .../errorgenerating/ErrorGeneratingFilter.java | 6 +- .../apache/mina/filter/ssl/SslContextFactory.java | 4 +- .../java/org/apache/mina/filter/ssl/SslFilter.java | 3 +- .../org/apache/mina/filter/ssl/SslHandler.java | 31 +- .../org/apache/mina/filter/util/NoopFilter.java | 3 +- .../org/apache/mina/proxy/utils/ByteUtilities.java | 4 +- .../apache/mina/proxy/utils/StringUtilities.java | 3 +- .../transport/socket/nio/NioDatagramAcceptor.java | 2 +- .../mina/transport/socket/nio/NioSession.java | 2 +- .../transport/socket/nio/NioSocketConnector.java | 2 +- .../java/org/apache/mina/util/ExpiringMap.java | 19 +- .../apache/mina/util/LazyInitializedCacheMap.java | 6 +- .../org/apache/mina/util/Log4jXmlFormatter.java | 2 +- .../main/java/org/apache/mina/util/Transform.java | 6 +- .../mina/util/byteaccess/AbstractByteArray.java | 4 +- .../mina/util/byteaccess/BufferByteArray.java | 94 ++-- .../org/apache/mina/util/byteaccess/ByteArray.java | 22 +- .../mina/util/byteaccess/CompositeByteArray.java | 98 ++-- .../byteaccess/CompositeByteArrayRelativeBase.java | 6 +- .../CompositeByteArrayRelativeReader.java | 16 +- .../CompositeByteArrayRelativeWriter.java | 21 +- .../util/byteaccess/SimpleByteArrayFactory.java | 2 +- .../org/apache/mina/core/buffer/IoBufferTest.java | 248 +++++++++- .../mina/filter/firewall/SubnetIPv4Test.java | 3 +- .../apache/mina/filter/ssl/SslDIRMINA937Test.java | 4 +- .../org/apache/mina/filter/ssl/SslFilterTest.java | 134 ++++++ .../java/org/apache/mina/filter/ssl/SslTest.java | 21 +- .../stream/AbstractStreamWriteFilterTest.java | 2 +- src/mina-example/pom.xml | 2 +- .../mina/example/chat/client/SwingChatClient.java | 2 +- src/mina-filter-compression/LICENSE.jzlib.txt | 0 src/mina-filter-compression/META-INF/MANIFEST.MF | 22 +- src/mina-filter-compression/pom.xml | 4 +- src/mina-http/META-INF/MANIFEST.MF | 22 +- src/mina-http/pom.xml | 4 +- .../org/apache/mina/http/HttpClientEncoder.java | 69 ++- .../java/org/apache/mina/http/api/HttpMessage.java | 2 +- .../apache/mina/http/HttpRequestImplTestCase.java | 127 ++--- src/mina-integration-beans/META-INF/MANIFEST.MF | 10 +- src/mina-integration-beans/pom.xml | 2 +- src/mina-integration-jmx/META-INF/MANIFEST.MF | 22 +- src/mina-integration-jmx/pom.xml | 4 +- src/mina-integration-ognl/META-INF/MANIFEST.MF | 18 +- src/mina-integration-ognl/pom.xml | 2 +- src/mina-integration-xbean/pom.xml | 2 +- src/mina-legal/pom.xml | 2 +- src/mina-statemachine/META-INF/MANIFEST.MF | 32 +- src/mina-statemachine/pom.xml | 4 +- .../mina/statemachine/event/IoFilterEvents.java | 15 +- .../mina/statemachine/event/IoHandlerEvents.java | 11 +- src/mina-transport-apr/META-INF/MANIFEST.MF | 26 +- src/mina-transport-apr/pom.xml | 8 +- .../mina/transport/socket/apr/AprLibrary.java | 4 +- src/mina-transport-serial/LICENSE.rxtx.txt | 520 +++++++++++++++++++++ src/mina-transport-serial/META-INF/MANIFEST.MF | 24 +- src/mina-transport-serial/pom.xml | 4 +- src/pom.xml | 99 ++-- 84 files changed, 2375 insertions(+), 899 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
