[camel] branch master updated: CAMEL-6715: Add to blueprint testing docs that only 1 CamelContext is supported.

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 4300ca9  CAMEL-6715: Add to blueprint testing docs that only 1 CamelContext is supported.
4300ca9 is described below

commit 4300ca9c206252e4239f7a194b84a90c1cf8cfa4
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Aug 5 14:58:18 2019 +0200

    CAMEL-6715: Add to blueprint testing docs that only 1 CamelContext is supported.
---
 components/camel-test-blueprint/src/main/docs/test-blueprint.adoc      | 3 ++-
 .../org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java     | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/components/camel-test-blueprint/src/main/docs/test-blueprint.adoc b/components/camel-test-blueprint/src/main/docs/test-blueprint.adoc
index 8e5b1d0..b2a4b53 100644
--- a/components/camel-test-blueprint/src/main/docs/test-blueprint.adoc
+++ b/components/camel-test-blueprint/src/main/docs/test-blueprint.adoc
@@ -22,7 +22,8 @@ Also notice the use of *`getBlueprintDescriptor`* to specify the
 location of the OSGi Blueprint XML file. +
  If you have multiple OSGi Blueprint XML files, then you can specify
 them with a comma-separated list in the *`getBlueprintDescriptor`*
-method.
+method. Notice that only **one** `CamelContext` is supported per blueprint bundle,
+so if you have multiple XML files then only one of them should have `<camelContext>`.
 
 Here's the
 http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/camelContext.xml?view=markup[Blueprint
diff --git a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
index 3aa04cc..e7b7adb 100644
--- a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
+++ b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
@@ -428,6 +428,9 @@ public abstract class CamelBlueprintTestSupport extends CamelTestSupport {
      * Return the location(s) of the bundle descriptors from the classpath.
      * Separate multiple locations by comma, or return a single location.
      * <p/>
+     * Only one CamelContext is supported per blueprint bundle,
+     * so if you have multiple XML files then only one of them should have <tt>&lt;camelContext&gt</tt>.
+     * <p/>
      * For example override this method and return <tt>OSGI-INF/blueprint/camel-context.xml</tt>
      *
      * @return the location of the bundle descriptor file.