This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository mina2.
commit 612a41c1ee7e3b86fb96f728cad2158dc72dfae7 Merge: 8a5c1ab 0bb9992 Author: Emmanuel Bourg <[email protected]> Date: Thu Oct 20 19:13:38 2016 +0200 Merge tag 'upstream/2.0.15' Upstream version 2.0.15 src/mina-core/META-INF/MANIFEST.MF | 92 ++++++------ src/mina-core/pom.xml | 2 +- .../core/filterchain/DefaultIoFilterChain.java | 6 +- .../org/apache/mina/core/filterchain/IoFilter.java | 2 +- .../mina/core/filterchain/IoFilterChain.java | 2 +- .../apache/mina/core/future/DefaultIoFuture.java | 2 +- .../apache/mina/core/future/IoFutureListener.java | 2 +- .../package-info.java} | 19 +-- .../main/java/org/apache/mina/core/package.html | 24 --- .../core/polling/AbstractPollingIoAcceptor.java | 31 ++-- .../core/polling/AbstractPollingIoProcessor.java | 163 ++++++++++++--------- .../polling/package-info.java} | 21 +-- .../java/org/apache/mina/core/polling/package.html | 26 ---- .../mina/core/service/AbstractIoAcceptor.java | 47 ++++-- .../mina/core/service/AbstractIoConnector.java | 2 +- .../core/service/DefaultTransportMetadata.java | 22 +++ .../apache/mina/core/service/IoHandlerAdapter.java | 2 +- .../core/service/IoServiceListenerSupport.java | 2 +- .../mina/core/session/AbstractIoSession.java | 119 +++++---------- .../mina/core/session/AbstractIoSessionConfig.java | 53 +++++-- .../DefaultIoSessionDataStructureFactory.java | 11 +- .../org/apache/mina/core/session/DummySession.java | 8 - .../mina/core/session/ExpiringSessionRecycler.java | 2 +- .../org/apache/mina/core/session/IoSession.java | 2 + .../filter/codec/CumulativeProtocolDecoder.java | 19 ++- .../mina/filter/codec/ProtocolCodecFilter.java | 5 +- .../codec/demux/package-info.java} | 19 +-- .../apache/mina/filter/codec/demux/package.html | 25 ---- .../codec/package-info.java} | 19 +-- .../java/org/apache/mina/filter/codec/package.html | 25 ---- .../ObjectSerializationOutputStream.java | 1 - .../codec/serialization/package-info.java} | 19 +-- .../mina/filter/codec/serialization/package.html | 25 ---- .../codec/textline/package-info.java} | 19 +-- .../apache/mina/filter/codec/textline/package.html | 24 --- .../errorgenerating/package-info.java} | 19 +-- .../mina/filter/errorgenerating/package.html | 24 --- .../executor/package-info.java} | 19 +-- .../org/apache/mina/filter/executor/package.html | 25 ---- .../mina/filter/firewall/BlacklistFilter.java | 2 +- .../filter/firewall/ConnectionThrottleFilter.java | 2 +- .../firewall/package-info.java} | 19 +-- .../org/apache/mina/filter/firewall/package.html | 24 --- .../keepalive/KeepAliveRequestTimeoutHandler.java | 2 +- .../keepalive/package-info.java} | 19 +-- .../org/apache/mina/filter/keepalive/package.html | 24 --- .../logging/package-info.java} | 19 +-- .../org/apache/mina/filter/logging/package.html | 24 --- .../package-info.java} | 19 +-- .../main/java/org/apache/mina/filter/package.html | 24 --- .../java/org/apache/mina/filter/ssl/SslFilter.java | 22 +-- .../org/apache/mina/filter/ssl/SslHandler.java | 4 +- .../ssl/package-info.java} | 19 +-- .../java/org/apache/mina/filter/ssl/package.html | 24 --- .../statistic/package-info.java} | 19 +-- .../org/apache/mina/filter/statistic/package.html | 24 --- .../stream/package-info.java} | 19 +-- .../org/apache/mina/filter/stream/package.html | 24 --- .../util/package-info.java} | 19 +-- .../java/org/apache/mina/filter/util/package.html | 24 --- .../chain/package-info.java} | 19 +-- .../org/apache/mina/handler/chain/package.html | 25 ---- .../mina/handler/demux/ExceptionHandler.java | 2 +- .../demux/package-info.java} | 20 +-- .../org/apache/mina/handler/demux/package.html | 25 ---- .../multiton/package-info.java} | 19 +-- .../org/apache/mina/handler/multiton/package.html | 26 ---- .../package-info.java} | 19 +-- .../main/java/org/apache/mina/handler/package.html | 24 --- .../mina/handler/stream/IoSessionOutputStream.java | 2 +- .../mina/handler/stream/StreamIoHandler.java | 2 +- .../mina/proxy/AbstractProxyLogicHandler.java | 2 +- .../socket/AbstractDatagramSessionConfig.java | 25 ++-- .../socket/AbstractSocketSessionConfig.java | 14 +- .../socket/DefaultSocketSessionConfig.java | 93 ++++++++++++ .../mina/transport/socket/nio/NioProcessor.java | 9 +- .../transport/socket/nio/NioSocketSession.java | 95 +++++++++++- .../nio/package-info.java} | 22 +-- .../apache/mina/transport/socket/nio/package.html | 32 ---- .../vmpipe/DefaultVmPipeSessionConfig.java | 5 - .../mina/transport/vmpipe/VmPipeConnector.java | 2 +- .../mina/transport/vmpipe/VmPipeFilterChain.java | 2 +- ...tVmPipeSessionConfig.java => package-info.java} | 33 +++-- .../org/apache/mina/transport/vmpipe/package.html | 42 ------ .../package-info.java} | 19 +-- .../main/java/org/apache/mina/util/package.html | 24 --- .../mina/core/service/AbstractIoServiceTest.java | 2 +- .../filter/buffer/BufferedWriteFilterTest.java | 2 +- .../mina/filter/keepalive/KeepAliveFilterTest.java | 2 +- .../filter/logging/MdcInjectionFilterTest.java | 2 +- .../java/org/apache/mina/filter/ssl/SslTest.java | 109 ++++++++++++-- .../stream/AbstractStreamWriteFilterTest.java | 4 +- .../apache/mina/transport/AbstractBindTest.java | 21 ++- .../mina/transport/AbstractConnectorTest.java | 4 +- .../mina/transport/AbstractFileRegionTest.java | 6 +- .../mina/transport/AbstractTrafficControlTest.java | 2 +- .../mina/transport/socket/nio/DIRMINA1041Test.java | 130 ++++++++++++++++ .../mina/transport/socket/nio/DIRMINA777Test.java | 8 +- .../transport/socket/nio/DatagramConfigTest.java | 2 +- .../transport/socket/nio/DatagramRecyclerTest.java | 8 +- .../socket/nio/PollingIoProcessorTest.java | 2 +- .../transport/vmpipe/VmPipeEventOrderTest.java | 6 +- .../src/test/java/testcase/MinaRegressionTest.java | 2 +- .../src/test/java/testcase/MyIoHandler.java | 4 +- .../src/test/java/testcase/MyRequestDecoder.java | 4 +- src/mina-example/pom.xml | 2 +- .../mina/example/chat/ChatProtocolHandler.java | 6 +- .../example/chat/client/ChatClientSupport.java | 10 +- .../timeserver/TimeServerHandler.java | 2 +- .../example/imagine/step1/client/ImageClient.java | 2 +- .../mina/example/netcat/NetCatProtocolHandler.java | 2 +- .../mina/example/proxy/AbstractProxyIoHandler.java | 2 +- .../mina/example/proxy/ClientToProxyIoHandler.java | 2 +- .../example/reverser/ReverseProtocolHandler.java | 2 +- .../mina/example/sumup/ClientSessionHandler.java | 6 +- .../mina/example/sumup/ServerSessionHandler.java | 4 +- .../example/tapedeck/AuthenticationHandler.java | 2 +- .../mina/example/tapedeck/TapeDeckServer.java | 2 +- .../example/tcp/perf/BogusSslContextFactory.java | 146 ++++++++++++++++++ .../example/tcp/perf/BogusTrustManagerFactory.java | 74 ++++++++++ .../apache/mina/example/tcp/perf/TcpClient.java | 74 ++++++---- .../apache/mina/example/tcp/perf/TcpServer.java | 2 +- .../tcp/perf/{TcpClient.java => TcpSslClient.java} | 96 ++++++++---- .../tcp/perf/{TcpServer.java => TcpSslServer.java} | 24 ++- .../apache/mina/example/tennis/TennisPlayer.java | 4 +- .../mina/example/udp/MemoryMonitorHandler.java | 2 +- .../apache/mina/example/udp/perf/UdpClient.java | 1 - .../apache/mina/example/udp/perf/UdpServer.java | 2 +- .../mina/example/echoserver/ConnectorTest.java | 25 +--- .../mina/example/echoserver/ssl/SslFilterTest.java | 2 +- .../mina/example/proxy/ClientSessionHandler.java | 2 +- .../example/proxy/telnet/TelnetSessionHandler.java | 4 +- src/mina-filter-compression/META-INF/MANIFEST.MF | 16 +- src/mina-filter-compression/pom.xml | 2 +- src/mina-http/META-INF/MANIFEST.MF | 16 +- src/mina-http/pom.xml | 2 +- .../org/apache/mina/http/HttpClientDecoder.java | 2 +- src/mina-integration-beans/META-INF/MANIFEST.MF | 10 +- src/mina-integration-beans/pom.xml | 2 +- src/mina-integration-jmx/META-INF/MANIFEST.MF | 18 +-- src/mina-integration-jmx/pom.xml | 2 +- src/mina-integration-ognl/META-INF/MANIFEST.MF | 16 +- src/mina-integration-ognl/pom.xml | 2 +- .../mina/integration/ognl/IoSessionFinder.java | 29 ++++ src/mina-integration-xbean/pom.xml | 2 +- src/mina-legal/pom.xml | 2 +- src/mina-statemachine/META-INF/MANIFEST.MF | 26 ++-- src/mina-statemachine/pom.xml | 2 +- src/mina-transport-apr/META-INF/MANIFEST.MF | 20 +-- src/mina-transport-apr/pom.xml | 2 +- .../mina/transport/socket/apr/AprIoProcessor.java | 2 +- src/mina-transport-serial/META-INF/MANIFEST.MF | 20 +-- src/mina-transport-serial/pom.xml | 2 +- .../serial/DefaultSerialSessionConfig.java | 12 +- src/pom.xml | 26 ++-- 155 files changed, 1455 insertions(+), 1527 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
