Merge branch 'master' into mention
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9be660e6 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9be660e6 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9be660e6 Branch: refs/heads/mention Commit: 9be660e61f0442d1e6857e660f067db5df630235 Parents: bf18127 4bb7dcb Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Feb 7 14:07:08 2017 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Feb 7 14:07:08 2017 +0100 ---------------------------------------------------------------------- .../src/main/descriptors/common-bin.xml | 2 + .../blueprint/CamelContextFactoryBean.java | 27 +++++++++-- .../camel/cdi/xml/CamelContextFactoryBean.java | 29 ++++++++++-- .../main/docs/chronicle-engine-component.adoc | 5 +- .../engine/ChronicleEngineConfiguration.java | 13 +++++ .../engine/ChronicleEngineProducer.java | 2 +- .../xml/AbstractCamelContextFactoryBean.java | 15 +++--- components/camel-reactive-streams/pom.xml | 5 +- .../main/docs/reactive-streams-component.adoc | 20 +++++++- .../camel/spring/CamelContextFactoryBean.java | 33 +++++++++++-- .../spring/handler/CamelNamespaceHandler.java | 2 + examples/camel-example-reactive-streams/pom.xml | 1 - parent/pom.xml | 37 ++++++++++----- platforms/commands/commands-spring-boot/pom.xml | 2 +- .../features/src/main/resources/features.xml | 6 ++- .../camel-spring-boot-dependencies/pom.xml | 10 ++++ .../itest/karaf/CamelReactiveStreamsTest.java | 34 +++++++++++++ .../springboot/CamelReactiveStreamsTest.java | 50 ++++++++++++++++++++ .../itest/springboot/util/LocationUtils.java | 2 +- 19 files changed, 256 insertions(+), 39 deletions(-) ----------------------------------------------------------------------
