You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@camel.apache.org by Claus Ibsen <cl...@gmail.com> on 2013/10/08 08:37:19 UTC
Re: [1/2] git commit: CAMEL-6835 CamelBlueprintTestSupport should
provide option of not generating test bundle
The comment on the method should be javadoc so people can find that
information what the method does.
On Tue, Oct 8, 2013 at 8:32 AM, <ni...@apache.org> wrote:
> 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 <ni...@apache.org>
> Authored: Tue Oct 8 13:14:36 2013 +0800
> Committer: Willem Jiang <ni...@apache.org>
> 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();
>
--
Claus Ibsen
-----------------
Red Hat, Inc.
Email: cibsen@redhat.com
Twitter: davsclaus
Blog: http://davsclaus.com
Author of Camel in Action: http://www.manning.com/ibsen
Re: [1/2] git commit: CAMEL-6835 CamelBlueprintTestSupport
should provide option of not generating test bundle
Posted by Willem jiang <wi...@gmail.com>.
Good point, I will commit a quick fix for it shortly.
--
Willem Jiang
Red Hat, Inc.
Web: http://www.redhat.com
Blog: http://willemjiang.blogspot.com (http://willemjiang.blogspot.com/) (English)
http://jnn.iteye.com (http://jnn.javaeye.com/) (Chinese)
Twitter: willemjiang
Weibo: 姜宁willem
On Tuesday, October 8, 2013 at 2:37 PM, Claus Ibsen wrote:
> The comment on the method should be javadoc so people can find that
> information what the method does.
>
>
> On Tue, Oct 8, 2013 at 8:32 AM, <ningjiang@apache.org (mailto:ningjiang@apache.org)> wrote:
> > 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 <ningjiang@apache.org (mailto:ningjiang@apache.org)>
> > Authored: Tue Oct 8 13:14:36 2013 +0800
> > Committer: Willem Jiang <ningjiang@apache.org (mailto:ningjiang@apache.org)>
> > 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();
>
>
>
>
>
> --
> Claus Ibsen
> -----------------
> Red Hat, Inc.
> Email: cibsen@redhat.com (mailto:cibsen@redhat.com)
> Twitter: davsclaus
> Blog: http://davsclaus.com
> Author of Camel in Action: http://www.manning.com/ibsen