[5/5] git commit: Merge branch 'trunk' of http://git-wip-us.apache.org/repos/asf/mina into trunk

[elecharny]

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/a064a8a8
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/a064a8a8
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/a064a8a8

Branch: refs/heads/trunk
Commit: a064a8a8e1c053faddba15fd29de7fffcb7c99cb
Parents: a653175 c4351ac
Author: Emmanuel Lécharny <elecha...@apache.org>
Authored: Mon May 27 20:08:35 2013 +0200
Committer: Emmanuel Lécharny <elecha...@apache.org>
Committed: Mon May 27 20:08:35 2013 +0200

----------------------------------------------------------------------
 .../coap/resource/AbstractResourceHandler.java     |    2 +-
 .../apache/mina/coap/resource/CoapResponse.java    |    8 ++
 .../apache/mina/coap/resource/ResourceHandler.java |   24 ++++
 .../mina/coap/resource/ResourceRegistry.java       |   20 ++++-
 .../mina/coap/resource/ResourceRegistryTest.java   |   83 +++++++++++++++
 5 files changed, 135 insertions(+), 2 deletions(-)
----------------------------------------------------------------------