You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2014/09/07 09:22:49 UTC
[4/6] git commit: Merge branch 'master' of
https://github.com/svenrienstra/camel
Merge branch 'master' of https://github.com/svenrienstra/camel
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ad51b204
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ad51b204
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ad51b204
Branch: refs/heads/master
Commit: ad51b2043964bdd6db85e16bbdc6efa43f52277f
Parents: 5db09a8 35eaafc
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Sep 7 09:02:51 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Sep 7 09:02:51 2014 +0200
----------------------------------------------------------------------
.../syslog/Rfc3164SyslogConverter.java | 270 --------------
.../syslog/Rfc3164SyslogDataFormat.java | 68 ----
.../component/syslog/Rfc5424SyslogMessage.java | 76 ++++
.../camel/component/syslog/SyslogConverter.java | 371 +++++++++++++++++++
.../component/syslog/SyslogDataFormat.java | 70 ++++
.../camel/component/syslog/SyslogMessage.java | 12 +-
.../component/syslog/netty/Rfc5425Encoder.java | 38 ++
.../syslog/netty/Rfc5425FrameDecoder.java | 100 +++++
.../services/org/apache/camel/TypeConverter | 2 +-
.../services/org/apache/camel/dataformat/syslog | 2 +-
.../syslog/AutomatedConversionTest.java | 30 +-
.../component/syslog/MinaDataFormatTest.java | 2 +-
.../syslog/MinaManyUDPMessagesTest.java | 2 +-
.../component/syslog/NettyDataFormatTest.java | 2 +-
.../syslog/NettyManyUDPMessagesTest.java | 2 +-
.../syslog/NettyRfc5425LongMessageTest.java | 88 +++++
.../component/syslog/NettyRfc5425Test.java | 91 +++++
.../component/syslog/SyslogSpringMinaTest.java | 2 +-
18 files changed, 865 insertions(+), 363 deletions(-)
----------------------------------------------------------------------