Applied many patches Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/mina into trunk
Project: http://git-wip-us.apache.org/repos/asf/mina/repo Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/d38458d3 Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/d38458d3 Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/d38458d3 Branch: refs/heads/trunk Commit: d38458d353ee5dace8c6daed967eccde2e867fe9 Parents: f80e27d 147f125 Author: Emmanuel Lécharny <[email protected]> Authored: Fri Sep 5 12:32:20 2014 +0200 Committer: Emmanuel Lécharny <[email protected]> Committed: Fri Sep 5 12:32:20 2014 +0200 ---------------------------------------------------------------------- benchmarks/common/pom.xml | 47 +++++ .../apache/mina/core/BenchmarkBinaryTest.java | 154 +++++++++++++++ .../org/apache/mina/core/BenchmarkClient.java | 36 ++++ .../org/apache/mina/core/BenchmarkServer.java | 35 ++++ ...ClientVsBioServerUdpBenchmarkBinaryTest.java | 69 +++++++ ...ientVsMina3ServerUdpBenchmarkBinaryTest.java | 69 +++++++ .../org/apache/mina/core/CounterFilter.java | 31 +++ ...ientVsMina3ServerTcpBenchmarkBinaryTest.java | 74 +++++++ ...ientVsMina3ServerUdpBenchmarkBinaryTest.java | 69 +++++++ .../core/bio/udp/BioUdpBenchmarkClient.java | 80 ++++++++ .../core/bio/udp/BioUdpBenchmarkServer.java | 167 ++++++++++++++++ .../core/nio/tcp/Mina3TcpBenchmarkClient.java | 107 ++++++++++ .../core/nio/tcp/Mina3TcpBenchmarkServer.java | 159 +++++++++++++++ .../core/nio/udp/Mina3UdpBenchmarkClient.java | 116 +++++++++++ .../core/nio/udp/Mina3UdpBenchmarkServer.java | 167 ++++++++++++++++ .../common/src/test/resources/log4j.properties | 23 +++ benchmarks/netty3/pom.xml | 49 +++++ ...entVsNetty3ServerTcpBenchmarkBinaryTest.java | 66 +++++++ ...ientVsMina3ServerTcpBenchmarkBinaryTest.java | 65 ++++++ ...ientVsMina3ServerUdpBenchmarkBinaryTest.java | 67 +++++++ ...entVsNetty3ServerTcpBenchmarkBinaryTest.java | 65 ++++++ ...entVsNetty3ServerUdpBenchmarkBinaryTest.java | 67 +++++++ .../core/nio/tcp/Netty3TcpBenchmarkClient.java | 104 ++++++++++ .../core/nio/tcp/Netty3TcpBenchmarkServer.java | 194 ++++++++++++++++++ .../core/nio/udp/Netty3UdpBenchmarkClient.java | 106 ++++++++++ .../core/nio/udp/Netty3UdpBenchmarkServer.java | 197 +++++++++++++++++++ benchmarks/netty4/pom.xml | 49 +++++ .../apache/mina/core/Netty4BenchmarkServer.java | 46 +++++ ...ientVsMina3ServerTcpBenchmarkBinaryTest.java | 75 +++++++ ...ientVsMina3ServerUdpBenchmarkBinaryTest.java | 69 +++++++ ...entVsNetty4ServerTcpBenchmarkBinaryTest.java | 75 +++++++ ...entVsNetty4ServerUdpBenchmarkBinaryTest.java | 69 +++++++ .../core/nio/tcp/Netty4TcpBenchmarkClient.java | 109 ++++++++++ .../core/nio/tcp/Netty4TcpBenchmarkServer.java | 155 +++++++++++++++ .../core/nio/udp/Netty4UdpBenchmarkClient.java | 100 ++++++++++ .../core/nio/udp/Netty4UdpBenchmarkServer.java | 133 +++++++++++++ benchmarks/pom.xml | 16 +- .../apache/mina/core/BenchmarkBinaryTest.java | 154 --------------- .../org/apache/mina/core/BenchmarkClient.java | 36 ---- .../mina/core/BenchmarkClientFactory.java | 53 ----- .../org/apache/mina/core/BenchmarkFactory.java | 42 ---- .../org/apache/mina/core/BenchmarkServer.java | 35 ---- .../mina/core/BenchmarkServerFactory.java | 56 ------ ...ClientVsBioServerUdpBenchmarkBinaryTest.java | 68 ------- ...ientVsMina3ServerUdpBenchmarkBinaryTest.java | 68 ------- .../org/apache/mina/core/CounterFilter.java | 31 --- ...ientVsMina3ServerTcpBenchmarkBinaryTest.java | 73 ------- ...ientVsMina3ServerUdpBenchmarkBinaryTest.java | 68 ------- ...entVsNetty3ServerTcpBenchmarkBinaryTest.java | 65 ------ ...ientVsMina3ServerTcpBenchmarkBinaryTest.java | 64 ------ ...ientVsMina3ServerUdpBenchmarkBinaryTest.java | 66 ------- ...entVsNetty3ServerTcpBenchmarkBinaryTest.java | 64 ------ ...entVsNetty3ServerUdpBenchmarkBinaryTest.java | 66 ------- .../core/bio/udp/BioUdpBenchmarkClient.java | 80 -------- .../core/bio/udp/BioUdpBenchmarkServer.java | 166 ---------------- .../core/nio/tcp/Mina3TcpBenchmarkClient.java | 107 ---------- .../core/nio/tcp/Mina3TcpBenchmarkServer.java | 159 --------------- .../core/nio/tcp/Netty3TcpBenchmarkClient.java | 104 ---------- .../core/nio/tcp/Netty3TcpBenchmarkServer.java | 194 ------------------ .../core/nio/udp/Mina3UdpBenchmarkClient.java | 116 ----------- .../core/nio/udp/Mina3UdpBenchmarkServer.java | 166 ---------------- .../core/nio/udp/Netty3UdpBenchmarkClient.java | 106 ---------- .../core/nio/udp/Netty3UdpBenchmarkServer.java | 190 ------------------ benchmarks/src/test/resources/log4j.properties | 23 --- benchmarks2/pom.xml | 71 ------- .../apache/mina/core/BenchmarkBinaryTest.java | 124 ------------ .../org/apache/mina/core/BenchmarkClient.java | 36 ---- .../mina/core/BenchmarkClientFactory.java | 42 ---- .../org/apache/mina/core/BenchmarkFactory.java | 42 ---- .../org/apache/mina/core/BenchmarkServer.java | 35 ---- .../mina/core/BenchmarkServerFactory.java | 51 ----- ...ientVsMina3ServerTcpBenchmarkBinaryTest.java | 74 ------- ...ientVsMina3ServerUdpBenchmarkBinaryTest.java | 68 ------- ...entVsNetty4ServerTcpBenchmarkBinaryTest.java | 74 ------- ...entVsNetty4ServerUdpBenchmarkBinaryTest.java | 68 ------- .../core/nio/tcp/Mina3TcpBenchmarkServer.java | 156 --------------- .../core/nio/tcp/Netty4TcpBenchmarkClient.java | 109 ---------- .../core/nio/tcp/Netty4TcpBenchmarkServer.java | 171 ---------------- .../core/nio/udp/Mina3UdpBenchmarkServer.java | 166 ---------------- .../core/nio/udp/Netty4UdpBenchmarkClient.java | 100 ---------- .../core/nio/udp/Netty4UdpBenchmarkServer.java | 149 -------------- benchmarks2/src/test/resources/log4j.properties | 23 --- monitoring/pom.xml | 6 - pom.xml | 13 +- 84 files changed, 3281 insertions(+), 3996 deletions(-) ----------------------------------------------------------------------
