Updated Branches: refs/heads/master 3e2dedfe4 -> 2119a095b
CAMEL-6835 CamelBlueprintTestSupport should provide option of not generating test bundle Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a81232e9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a81232e9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a81232e9 Branch: refs/heads/master Commit: a81232e9b6b59619162b9703528daf13ce3f4aa3 Parents: 3e2dedf Author: Willem Jiang <[email protected]> Authored: Tue Oct 8 13:14:36 2013 +0800 Committer: Willem Jiang <[email protected]> Committed: Tue Oct 8 13:14:36 2013 +0800 ---------------------------------------------------------------------- .../camel/test/blueprint/CamelBlueprintTestSupport.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/a81232e9/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java ---------------------------------------------------------------------- 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 cce7a8e..8c5bd00 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 @@ -47,13 +47,19 @@ public abstract class CamelBlueprintTestSupport extends CamelTestSupport { private static ThreadLocal<BundleContext> threadLocalBundleContext = new ThreadLocal<BundleContext>(); private volatile BundleContext bundleContext; private final Set<ServiceRegistration<?>> services = new LinkedHashSet<ServiceRegistration<?>>(); + + // CamelBlueprintTestSupport creates the test bundle which includes blueprint configuration files if the value is true + // You can override the return value to false if you already has the test bundle in your class path + protected boolean includeTestBundle() { + return true; + } @SuppressWarnings({"rawtypes", "unchecked"}) protected BundleContext createBundleContext() throws Exception { String symbolicName = getClass().getSimpleName(); BundleContext answer = CamelBlueprintHelper.createBundleContext(symbolicName, getBlueprintDescriptor(), - true, getBundleFilter(), getBundleVersion(), getBundleDirectives()); + includeTestBundle(), getBundleFilter(), getBundleVersion(), getBundleDirectives()); // must register override properties early in OSGi containers Properties extra = useOverridePropertiesWithPropertiesComponent();
