Merge branch 'master' of https://github.com/sverkera/camel into sverkera-master
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5089ab27 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5089ab27 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5089ab27 Branch: refs/heads/master Commit: 5089ab27a3cd26999b88e3b457451ea027e77afc Parents: 82490db ca9035b Author: Antonin Stefanutti <anto...@stefanutti.fr> Authored: Fri Dec 2 17:50:11 2016 +0100 Committer: Antonin Stefanutti <anto...@stefanutti.fr> Committed: Fri Dec 2 17:50:11 2016 +0100 ---------------------------------------------------------------------- .../apache/camel/cdi/CdiCamelConfiguration.java | 41 +++++++++++ .../camel/cdi/CdiCamelConfigurationEvent.java | 46 +++++++++++++ .../org/apache/camel/cdi/CdiCamelExtension.java | 34 ++++++---- .../cdi/test/CdiCamelConfigurationTest.java | 71 ++++++++++++++++++++ 4 files changed, 179 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/5089ab27/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java ----------------------------------------------------------------------
