Return-Path: <commits-return-53615-archive-asf-public=cust-asf.ponee.io@camel.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 7EB4A200C07
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Sun, 22 Jan 2017 19:51:49 +0100 (CET)
Received: by cust-asf.ponee.io (Postfix)
	id 7DA1D160B39; Sun, 22 Jan 2017 18:51:49 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id A20DD160B5E
	for <archive-asf-public@cust-asf.ponee.io>; Sun, 22 Jan 2017 19:51:48 +0100 (CET)
Received: (qmail 98495 invoked by uid 500); 22 Jan 2017 18:51:47 -0000
Mailing-List: contact commits-help@camel.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@camel.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@camel.apache.org>
List-Post: <mailto:commits@camel.apache.org>
List-Id: <commits.camel.apache.org>
Reply-To: dev@camel.apache.org
Delivered-To: mailing list commits@camel.apache.org
Received: (qmail 98270 invoked by uid 99); 22 Jan 2017 18:51:47 -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; Sun, 22 Jan 2017 18:51:47 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 6371FF1718; Sun, 22 Jan 2017 18:51:47 +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: Sun, 22 Jan 2017 18:51:55 -0000
Message-Id: <90f0c39d96be4d80b069f945e0501910@git.apache.org>
In-Reply-To: <cfc2f7ea64814f43a90a42c2ed5447aa@git.apache.org>
References: <cfc2f7ea64814f43a90a42c2ed5447aa@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [09/11] camel git commit: CAMEL-10546: Add global option to camel-cdi.
archived-at: Sun, 22 Jan 2017 18:51:49 -0000

CAMEL-10546: Add global option to camel-cdi.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/67659180
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/67659180
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/67659180

Branch: refs/heads/master
Commit: 67659180feac6353e999858d26e3c55b508b704e
Parents: a158939
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Sun Jan 22 19:04:59 2017 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Sun Jan 22 19:04:59 2017 +0100

----------------------------------------------------------------------
 .../apache/camel/cdi/xml/CamelContextFactoryBean.java   | 12 ++++++++++++
 1 file changed, 12 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/67659180/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/CamelContextFactoryBean.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/CamelContextFactoryBean.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/CamelContextFactoryBean.java
index e5135f6..455f091 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/CamelContextFactoryBean.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/CamelContextFactoryBean.java
@@ -45,6 +45,7 @@ import org.apache.camel.core.xml.CamelServiceExporterDefinition;
 import org.apache.camel.core.xml.CamelStreamCachingStrategyDefinition;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.model.ContextScanDefinition;
+import org.apache.camel.model.GlobalOptionsDefinition;
 import org.apache.camel.model.HystrixConfigurationDefinition;
 import org.apache.camel.model.InterceptDefinition;
 import org.apache.camel.model.InterceptFromDefinition;
@@ -139,6 +140,9 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
     @XmlElement(name = "properties")
     private PropertiesDefinition properties;
 
+    @XmlElement(name = "globalOptions")
+    private GlobalOptionsDefinition globalOptions;
+
     @XmlElement(name = "propertyPlaceholder", type = CamelPropertyPlaceholderDefinition.class)
     private CamelPropertyPlaceholderDefinition camelPropertyPlaceholder;
 
@@ -399,6 +403,14 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.properties = properties;
     }
 
+    public GlobalOptionsDefinition getGlobalOptions() {
+        return globalOptions;
+    }
+
+    public void setGlobalOptions(GlobalOptionsDefinition globalOptions) {
+        this.globalOptions = globalOptions;
+    }
+
     public String[] getPackages() {
         return packages;
     }