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 D2CAE18768 for ; Wed, 13 May 2015 07:22:21 +0000 (UTC) Received: (qmail 61314 invoked by uid 500); 13 May 2015 07:22:21 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 61173 invoked by uid 500); 13 May 2015 07:22:21 -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 60979 invoked by uid 99); 13 May 2015 07:22:21 -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; Wed, 13 May 2015 07:22:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 859D8E0329; Wed, 13 May 2015 07:22:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ningjiang@apache.org To: commits@camel.apache.org Date: Wed, 13 May 2015 07:22:24 -0000 Message-Id: <4ddebf31ab2144c6b108506241b95193@git.apache.org> In-Reply-To: <434c40bfcdda40968a269d373f0b0b16@git.apache.org> References: <434c40bfcdda40968a269d373f0b0b16@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/6] camel git commit: CAMEL-8770 Fixed the depends-on issue of Camel Blueprint CAMEL-8770 Fixed the depends-on issue of Camel Blueprint Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bd701e04 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bd701e04 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bd701e04 Branch: refs/heads/camel-2.15.x Commit: bd701e048650ffdf155b12d3febc4441119b6866 Parents: 21107ff Author: Willem Jiang Authored: Wed May 13 14:37:38 2015 +0800 Committer: Willem Jiang Committed: Wed May 13 15:13:48 2015 +0800 ---------------------------------------------------------------------- .../apache/camel/blueprint/handler/CamelNamespaceHandler.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/bd701e04/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java ---------------------------------------------------------------------- diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java index cd44d85..474d130 100644 --- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java +++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java @@ -259,6 +259,10 @@ public class CamelNamespaceHandler implements NamespaceHandler { factory2.addProperty("blueprintContainer", createRef(context, "blueprintContainer")); factory2.addProperty("bundleContext", createRef(context, "blueprintBundleContext")); factory2.addDependsOn(propertiesComponentResolver.getId()); + // We need to add other components which the camel context dependsOn + if (ObjectHelper.isNotEmpty(ccfb.getDependsOn())) { + factory2.addDependsOn(ccfb.getDependsOn()); + } context.getComponentDefinitionRegistry().registerComponentDefinition(factory2); MutableBeanMetadata ctx = context.createMetadata(MutableBeanMetadata.class);