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/51475661 Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/51475661 Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/51475661 Branch: refs/heads/trunk Commit: 5147566159b0580dd9f6ae17f15878a5381e0d41 Parents: ea82541 1e6bb8b Author: Emmanuel Lécharny <[email protected]> Authored: Thu May 9 22:37:05 2013 +0200 Committer: Emmanuel Lécharny <[email protected]> Committed: Thu May 9 22:37:05 2013 +0200 ---------------------------------------------------------------------- NOTE-serialization.txt | 36 + codec/pom.xml | 17 + .../mina/filter/codec/ProtocolCodecFilterTest.java | 152 + .../apache/mina/examples/coap/CoapGetServer.java | 4 +- pom.xml | 23 +- protobuf/pom.xml | 72 + protobuf/prepare.sh | 15 + .../mina/codec/delimited/ProtobufDecoder.java | 46 + .../codec/delimited/ProtobufDynamicDecoder.java | 40 + .../mina/codec/delimited/ProtobufEncoder.java | 42 + .../ProtobufDynamicMessageDecoder.java | 76 + .../serialization/ProtobufMessageDecoder.java | 67 + .../serialization/ProtobufMessageEncoder.java | 47 + .../apache/mina/codec/delimited/ProtobufTest.java | 63 + .../delimited/serialization/ProtobufTest.java | 70 + .../mina/generated/protoc/AddressBookProtos.java | 2563 +++++++++++++++ .../org/apache/mina/generated/protoc/Calc.java | 1160 +++++++ protobuf/src/test/protobuf/addressbook.proto | 30 + protobuf/src/test/protobuf/calc.proto | 25 + serialization/NOTES.txt | 36 - serialization/pom.xml | 91 - serialization/protobuf/pom.xml | 73 - serialization/protobuf/prepare.sh | 15 - .../mina/codec/delimited/ProtobufDecoder.java | 46 - .../codec/delimited/ProtobufDynamicDecoder.java | 40 - .../mina/codec/delimited/ProtobufEncoder.java | 42 - .../ProtobufDynamicMessageDecoder.java | 76 - .../serialization/ProtobufMessageDecoder.java | 67 - .../serialization/ProtobufMessageEncoder.java | 47 - .../apache/mina/codec/delimited/ProtobufTest.java | 63 - .../delimited/serialization/ProtobufTest.java | 70 - .../mina/generated/protoc/AddressBookProtos.java | 2563 --------------- .../org/apache/mina/generated/protoc/Calc.java | 1160 ------- .../protobuf/src/test/protobuf/addressbook.proto | 30 - .../protobuf/src/test/protobuf/calc.proto | 25 - serialization/thrift/pom.xml | 73 - serialization/thrift/prepare.sh | 14 - .../apache/mina/codec/delimited/ThriftDecoder.java | 37 - .../mina/codec/delimited/ThriftDynamicDecoder.java | 40 - .../apache/mina/codec/delimited/ThriftEncoder.java | 40 - .../serialization/ThriftDynamicMessageDecoder.java | 69 - .../serialization/ThriftMessageDecoder.java | 57 - .../serialization/ThriftMessageEncoder.java | 67 - .../apache/mina/codec/delimited/ThriftTest.java | 71 - .../codec/delimited/serialization/ThriftTest.java | 69 - .../apache/mina/generated/thrift/UserProfile.java | 602 ---- .../apache/mina/generated/thrift/UserStorage.java | 1596 --------- serialization/thrift/src/test/thrift/user.thrift | 29 - thrift/pom.xml | 70 + thrift/prepare.sh | 14 + .../apache/mina/codec/delimited/ThriftDecoder.java | 37 + .../mina/codec/delimited/ThriftDynamicDecoder.java | 40 + .../apache/mina/codec/delimited/ThriftEncoder.java | 40 + .../serialization/ThriftDynamicMessageDecoder.java | 69 + .../serialization/ThriftMessageDecoder.java | 57 + .../serialization/ThriftMessageEncoder.java | 67 + .../apache/mina/codec/delimited/ThriftTest.java | 71 + .../codec/delimited/serialization/ThriftTest.java | 69 + .../apache/mina/generated/thrift/UserProfile.java | 602 ++++ .../apache/mina/generated/thrift/UserStorage.java | 1596 +++++++++ thrift/src/test/thrift/user.thrift | 29 + 61 files changed, 7287 insertions(+), 7230 deletions(-) ----------------------------------------------------------------------
