Reverted ABI change in AbstractCamelRunner
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/397a39b8 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/397a39b8 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/397a39b8 Branch: refs/heads/master Commit: 397a39b885ec7bb921e9253b72957d54d9735a8a Parents: 745d4c8 Author: Jyrki Ruuskanen <yur...@kotikone.fi> Authored: Fri Sep 25 13:53:59 2015 +0300 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Sep 25 16:40:13 2015 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/camel/scr/AbstractCamelRunner.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/397a39b8/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java ---------------------------------------------------------------------- diff --git a/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java b/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java index e9647ab..c4be591 100644 --- a/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java +++ b/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java @@ -42,6 +42,7 @@ import org.apache.camel.core.osgi.utils.BundleDelegatingClassLoader; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.impl.ExplicitCamelContextNameStrategy; import org.apache.camel.impl.SimpleRegistry; +import org.apache.camel.model.ModelCamelContext; import org.apache.camel.util.ReflectionHelper; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; @@ -54,7 +55,7 @@ public abstract class AbstractCamelRunner implements Runnable { public static final String PROPERTY_PREFIX = "camel.scr.properties.prefix"; protected Logger log = LoggerFactory.getLogger(getClass()); - protected CamelContext context; + protected ModelCamelContext context; protected SimpleRegistry registry = new SimpleRegistry(); // Configured fields
