Repository: camel Updated Branches: refs/heads/camel-2.16.x 3e920506d -> 8d42d7bed refs/heads/master f32620dde -> 3ebec4335
Added todo about naming clash Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/80a17580 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/80a17580 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/80a17580 Branch: refs/heads/master Commit: 80a17580d240651aa7d3fd4ea1f44fe9a33e9d1e Parents: f32620d Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Oct 8 10:23:45 2015 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Oct 8 10:23:45 2015 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/camel/model/LoadBalanceDefinition.java | 1 + .../org/apache/camel/model/dataformat/DataFormatsDefinition.java | 1 + 2 files changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/80a17580/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java b/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java index 4539c6c..bc9370a 100644 --- a/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java @@ -51,6 +51,7 @@ public class LoadBalanceDefinition extends ProcessorDefinition<LoadBalanceDefini @XmlElements({ @XmlElement(required = false, name = "failover", type = FailoverLoadBalancerDefinition.class), @XmlElement(required = false, name = "random", type = RandomLoadBalancerDefinition.class), + // TODO: Camel 3.0 - Should be named customLoadBalancer to avoid naming clash with custom dataformat @XmlElement(required = false, name = "custom", type = CustomLoadBalancerDefinition.class), @XmlElement(required = false, name = "roundRobin", type = RoundRobinLoadBalancerDefinition.class), @XmlElement(required = false, name = "sticky", type = StickyLoadBalancerDefinition.class), http://git-wip-us.apache.org/repos/asf/camel/blob/80a17580/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java index 49d079a..d0ea53b 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java @@ -47,6 +47,7 @@ public class DataFormatsDefinition { @XmlElement(required = false, name = "castor", type = CastorDataFormat.class), @XmlElement(required = false, name = "crypto", type = CryptoDataFormat.class), @XmlElement(required = false, name = "csv", type = CsvDataFormat.class), + // TODO: Camel 3.0 - Should be named customDataFormat to avoid naming clash with custom loadbalancer @XmlElement(required = false, name = "custom", type = CustomDataFormat.class), @XmlElement(required = false, name = "flatpack", type = FlatpackDataFormat.class), @XmlElement(required = false, name = "gzip", type = GzipDataFormat.class),
