From commits-return-43630-apmail-camel-commits-archive=camel.apache.org@camel.apache.org Fri Sep 25 14:51:14 2015 Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EA9B018EE9 for ; Fri, 25 Sep 2015 14:51:13 +0000 (UTC) Received: (qmail 97878 invoked by uid 500); 25 Sep 2015 14:51:13 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 97741 invoked by uid 500); 25 Sep 2015 14:51:13 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 97716 invoked by uid 99); 25 Sep 2015 14:51:13 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Sep 2015 14:51:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A6E66E0243; Fri, 25 Sep 2015 14:51:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davsclaus@apache.org To: commits@camel.apache.org Date: Fri, 25 Sep 2015 14:51:14 -0000 Message-Id: In-Reply-To: <44610974938b4c0ba8779972620b5375@git.apache.org> References: <44610974938b4c0ba8779972620b5375@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] camel git commit: Reverted ABI change in AbstractCamelRunner 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 Authored: Fri Sep 25 13:53:59 2015 +0300 Committer: Claus Ibsen 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