Merge branch 'CAMEL-6694' of https://github.com/grgrzybek/camel
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/56468305 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/56468305 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/56468305 Branch: refs/heads/master Commit: 56468305ef13cebb3719815002b36827169495bc Parents: 5f6477c 4530543 Author: Claus Ibsen <davscl...@apache.org> Authored: Fri Apr 4 08:34:57 2014 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Apr 4 08:34:57 2014 +0200 ---------------------------------------------------------------------- .../camel/component/log/LogComponent.java | 37 ++++- .../component/log/LogCustomLoggerTest.java | 147 +++++++++++++++++++ .../camel/itest/osgi/core/log/LogRouteTest.java | 2 +- ...ogRouteWithLoggersPresentInRegistryTest.java | 98 +++++++++++++ .../log/LogRouteWithNonDefaultLoggerTest.java | 96 ++++++++++++ .../src/test/resources/log4j.properties | 13 ++ 6 files changed, 389 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
