You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2013/06/20 02:19:18 UTC
[2/4] git commit: Merge branch 'trunk' of
http://git-wip-us.apache.org/repos/asf/mina into trunk
Merge branch 'trunk' of http://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/d8095b19
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/d8095b19
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/d8095b19
Branch: refs/heads/trunk
Commit: d8095b1964da6d1057664eee0e30a1774904cd95
Parents: b4dbc33 fad44fe
Author: Emmanuel Lécharny <el...@apache.org>
Authored: Thu Jun 20 02:02:14 2013 +0200
Committer: Emmanuel Lécharny <el...@apache.org>
Committed: Thu Jun 20 02:02:14 2013 +0200
----------------------------------------------------------------------
ImprovedJavaConventions.xml | 21 +++++++++++
NOTICE-bin.txt | 17 +++++++++
NOTICE.slf4j.txt | 28 ++++++++++++++
NOTICE.txt | 9 +++++
.../java/org/apache/mina/codec/IoBuffer.java | 8 ++--
.../mina/util/ByteBufferInputStreamTest.java | 20 ++++++++++
.../mina/util/ByteBufferOutputStreamTest.java | 20 ++++++++++
.../apache/mina/filter/query/RequestFilter.java | 37 +++++--------------
.../apache/mina/filter/query/RequestFuture.java | 30 ++++++++++-----
.../mina/service/executor/HandlerCaller.java | 20 ++++++++++
.../mina/service/executor/package-info.java | 20 ++++++++++
.../org/apache/mina/util/ByteBufferDumper.java | 22 +++++++++--
core/src/test/resources/log4j2-test.xml | 22 +++++++++++
.../apache/mina/examples/coap/CoapClient.java | 2 +-
.../apache/mina/examples/coap/CoapServer.java | 16 ++++----
.../java/org/apache/mina/http/DateUtilTest.java | 20 ++++++++++
pom.xml | 39 +++++---------------
protobuf/prepare.sh | 19 ++++++++++
.../generated/protoc/AddressBookProtos.java | 20 ++++++++++
.../org/apache/mina/generated/protoc/Calc.java | 20 ++++++++++
protobuf/src/test/protobuf/addressbook.proto | 19 ++++++++++
protobuf/src/test/protobuf/calc.proto | 20 ++++++++++
thrift/prepare.sh | 18 +++++++++
.../mina/generated/thrift/UserProfile.java | 20 ++++++++++
.../mina/generated/thrift/UserStorage.java | 21 +++++++++++
25 files changed, 424 insertions(+), 84 deletions(-)
----------------------------------------------------------------------