You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2017/01/13 15:39:05 UTC
camel git commit: Fix build
Repository: camel
Updated Branches:
refs/heads/master 9d63c03b9 -> 0bca784c6
Fix build
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0bca784c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0bca784c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0bca784c
Branch: refs/heads/master
Commit: 0bca784c697bd83f0d6f8605788032e67f6c0894
Parents: 9d63c03
Author: lburgazzoli <lb...@gmail.com>
Authored: Fri Jan 13 16:38:26 2017 +0100
Committer: lburgazzoli <lb...@gmail.com>
Committed: Fri Jan 13 16:38:36 2017 +0100
----------------------------------------------------------------------
.../org/apache/camel/blueprint/CamelContextFactoryBean.java | 2 +-
.../org/apache/camel/spring/CamelContextFactoryBean.java | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/0bca784c/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
----------------------------------------------------------------------
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
index 6d94f9f..0261638 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
@@ -148,10 +148,10 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
@XmlElement(name = "fluentTemplate", type = CamelFluentProducerTemplateFactoryBean.class),
@XmlElement(name = "consumerTemplate", type = CamelConsumerTemplateFactoryBean.class),
@XmlElement(name = "proxy", type = CamelProxyFactoryBean.class),
- @XmlElement(name = "export", type = CamelServiceExporterDefinition.class),
@XmlElement(name = "errorHandler", type = CamelErrorHandlerFactoryBean.class)})
private List<AbstractCamelFactoryBean<?>> beansFactory;
@XmlElements({
+ @XmlElement(name = "export", type = CamelServiceExporterDefinition.class),
@XmlElement(name = "serviceCallConfiguration", type = ServiceCallConfigurationDefinition.class),
@XmlElement(name = "hystrixConfiguration", type = HystrixConfigurationDefinition.class)})
private List<?> beans;
http://git-wip-us.apache.org/repos/asf/camel/blob/0bca784c/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
index 215206f..7861c6b 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
@@ -155,12 +155,12 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Spr
@XmlElements({
@XmlElement(name = "template", type = CamelProducerTemplateFactoryBean.class),
@XmlElement(name = "fluentTemplate", type = CamelFluentProducerTemplateFactoryBean.class),
- @XmlElement(name = "consumerTemplate", type = CamelConsumerTemplateFactoryBean.class),
- @XmlElement(name = "proxy", type = CamelProxyFactoryDefinition.class),
- @XmlElement(name = "export", type = CamelServiceExporterDefinition.class),
- @XmlElement(name = "errorHandler", type = ErrorHandlerDefinition.class)})
+ @XmlElement(name = "consumerTemplate", type = CamelConsumerTemplateFactoryBean.class)})
private List<AbstractCamelFactoryBean<?>> beansFactory;
@XmlElements({
+ @XmlElement(name = "proxy", type = CamelProxyFactoryDefinition.class),
+ @XmlElement(name = "export", type = CamelServiceExporterDefinition.class),
+ @XmlElement(name = "errorHandler", type = ErrorHandlerDefinition.class),
@XmlElement(name = "serviceCallConfiguration", type = ServiceCallConfigurationDefinition.class),
@XmlElement(name = "hystrixConfiguration", type = HystrixConfigurationDefinition.class)})
private List<?> beans;