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/06 09:58:44 UTC
[3/3] 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/f5f64750
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/f5f64750
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/f5f64750
Branch: refs/heads/trunk
Commit: f5f64750cea1c3a380a9e4a8b6f776c47d200d0a
Parents: f310bad 31767ad
Author: Emmanuel Lécharny <el...@apache.org>
Authored: Thu Jun 6 09:57:25 2013 +0200
Committer: Emmanuel Lécharny <el...@apache.org>
Committed: Thu Jun 6 09:57:25 2013 +0200
----------------------------------------------------------------------
.../java/org/apache/mina/coap/CoapOptionType.java | 2 +-
.../org/apache/mina/coap/codec/CoapDecoder.java | 3 +
.../apache/mina/coap/codec/CoapDecoderTest.java | 5 +
.../apache/mina/coap/codec/CoapEncoderTest.java | 6 +
.../org/apache/mina/coap/codec/TestMessages.java | 11 +-
.../mina/filter/codec/ProtocolCodecFilter.java | 1 +
.../org/apache/mina/transport/nio/SslHelper.java | 300 +++++----------
.../org/apache/mina/transport/nio/SslTest.java | 5 +-
.../org/apache/mina/transport/nio/keystore.cert | Bin 0 -> 937 bytes
.../org/apache/mina/transport/nio/keystore.sslTest | Bin 0 -> 1368 bytes
.../apache/mina/transport/nio/truststore.sslTest | Bin 0 -> 654 bytes
.../org/apache/mina/transport/tcp/keystore.cert | Bin 937 -> 0 bytes
.../org/apache/mina/transport/tcp/keystore.sslTest | Bin 1368 -> 0 bytes
.../apache/mina/transport/tcp/truststore.sslTest | Bin 654 -> 0 bytes
14 files changed, 127 insertions(+), 206 deletions(-)
----------------------------------------------------------------------