camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [09/11] camel git commit: CAMEL-10546: Add global option to camel-cdi.
Date Sun, 22 Jan 2017 18:51:55 GMT
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;
     }


Mime
View raw message