You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2015/01/16 09:54:11 UTC
[3/3] camel git commit: CAMEL-8196 Add labels for all the model
classes
CAMEL-8196 Add labels for all the model classes
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9ec31ce6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9ec31ce6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9ec31ce6
Branch: refs/heads/master
Commit: 9ec31ce6fc21c1838cbc7574e943ddc4b1408e06
Parents: ddd0d8e
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Jan 16 16:53:10 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Jan 16 16:53:25 2015 +0800
----------------------------------------------------------------------
.../org/apache/camel/model/config/BatchResequencerConfig.java | 3 +++
.../org/apache/camel/model/config/PropertiesDefinition.java | 3 +++
.../java/org/apache/camel/model/config/ResequencerConfig.java | 5 ++---
.../org/apache/camel/model/config/StreamResequencerConfig.java | 2 ++
.../loadbalancer/CircuitBreakerLoadBalancerDefinition.java | 3 +++
.../camel/model/loadbalancer/CustomLoadBalancerDefinition.java | 2 ++
.../model/loadbalancer/FailoverLoadBalancerDefinition.java | 3 +++
.../camel/model/loadbalancer/RandomLoadBalancerDefinition.java | 2 ++
.../model/loadbalancer/RoundRobinLoadBalancerDefinition.java | 2 ++
.../camel/model/loadbalancer/StickyLoadBalancerDefinition.java | 2 ++
.../camel/model/loadbalancer/TopicLoadBalancerDefinition.java | 2 ++
.../model/loadbalancer/WeightedLoadBalancerDefinition.java | 2 ++
12 files changed, 28 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9ec31ce6/camel-core/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java b/camel-core/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java
index e9d227e..3c65d3e 100644
--- a/camel-core/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java
+++ b/camel-core/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java
@@ -21,9 +21,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
+import org.apache.camel.spi.Label;
+
/**
* Configures batch-processing resequence eip.
*/
+@Label("configuration")
@XmlRootElement(name = "batch-config")
@XmlAccessorType(XmlAccessType.FIELD)
public class BatchResequencerConfig extends ResequencerConfig {
http://git-wip-us.apache.org/repos/asf/camel/blob/9ec31ce6/camel-core/src/main/java/org/apache/camel/model/config/PropertiesDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/config/PropertiesDefinition.java b/camel-core/src/main/java/org/apache/camel/model/config/PropertiesDefinition.java
index 7f46849..b4eceea 100644
--- a/camel-core/src/main/java/org/apache/camel/model/config/PropertiesDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/config/PropertiesDefinition.java
@@ -25,9 +25,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
+import org.apache.camel.spi.Label;
+
/**
* Represents the XML type for <properties>.
*/
+@Label("configuration")
@XmlRootElement(name = "properties")
@XmlAccessorType(XmlAccessType.FIELD)
public class PropertiesDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/9ec31ce6/camel-core/src/main/java/org/apache/camel/model/config/ResequencerConfig.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/config/ResequencerConfig.java b/camel-core/src/main/java/org/apache/camel/model/config/ResequencerConfig.java
index 0cfa6f3..5d8042b 100644
--- a/camel-core/src/main/java/org/apache/camel/model/config/ResequencerConfig.java
+++ b/camel-core/src/main/java/org/apache/camel/model/config/ResequencerConfig.java
@@ -20,9 +20,8 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlType;
-/**
- *
- */
+import org.apache.camel.spi.Label;
+
@XmlType(name = "resequencerConfig")
@XmlAccessorType(XmlAccessType.FIELD)
public abstract class ResequencerConfig {
http://git-wip-us.apache.org/repos/asf/camel/blob/9ec31ce6/camel-core/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java b/camel-core/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java
index 56333b8..8fac5c7 100644
--- a/camel-core/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java
+++ b/camel-core/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java
@@ -24,10 +24,12 @@ import javax.xml.bind.annotation.XmlTransient;
import org.apache.camel.processor.resequencer.DefaultExchangeComparator;
import org.apache.camel.processor.resequencer.ExpressionResultComparator;
+import org.apache.camel.spi.Label;
/**
* Configures stream-processing resequence eip.
*/
+@Label("configuration")
@XmlRootElement(name = "stream-config")
@XmlAccessorType(XmlAccessType.FIELD)
public class StreamResequencerConfig extends ResequencerConfig {
http://git-wip-us.apache.org/repos/asf/camel/blob/9ec31ce6/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CircuitBreakerLoadBalancerDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CircuitBreakerLoadBalancerDefinition.java b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CircuitBreakerLoadBalancerDefinition.java
index 81602b0..7971c6d 100644
--- a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CircuitBreakerLoadBalancerDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CircuitBreakerLoadBalancerDefinition.java
@@ -18,6 +18,7 @@ package org.apache.camel.model.loadbalancer;
import java.util.ArrayList;
import java.util.List;
+
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
@@ -27,12 +28,14 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.apache.camel.model.LoadBalancerDefinition;
import org.apache.camel.processor.loadbalancer.CircuitBreakerLoadBalancer;
import org.apache.camel.processor.loadbalancer.LoadBalancer;
+import org.apache.camel.spi.Label;
import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.ObjectHelper;
/**
* Represents an XML <circuitBreaker/> element
*/
+@Label("EIP,routing")
@XmlRootElement(name = "circuitBreaker")
@XmlAccessorType(XmlAccessType.FIELD)
public class CircuitBreakerLoadBalancerDefinition extends LoadBalancerDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/9ec31ce6/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java
index 0b4aaf2..af26e85 100644
--- a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java
@@ -23,6 +23,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.apache.camel.model.LoadBalancerDefinition;
import org.apache.camel.processor.loadbalancer.LoadBalancer;
+import org.apache.camel.spi.Label;
import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.CamelContextHelper;
import org.apache.camel.util.ObjectHelper;
@@ -30,6 +31,7 @@ import org.apache.camel.util.ObjectHelper;
/**
* Represents an XML <customLoadBalancer/> element
*/
+@Label("EIP,routing")
@XmlRootElement(name = "customLoadBalancer")
@XmlAccessorType(XmlAccessType.FIELD)
public class CustomLoadBalancerDefinition extends LoadBalancerDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/9ec31ce6/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java
index 9158132..2faf4ec 100644
--- a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java
@@ -18,6 +18,7 @@ package org.apache.camel.model.loadbalancer;
import java.util.ArrayList;
import java.util.List;
+
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
@@ -27,11 +28,13 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.apache.camel.model.LoadBalancerDefinition;
import org.apache.camel.processor.loadbalancer.FailOverLoadBalancer;
import org.apache.camel.processor.loadbalancer.LoadBalancer;
+import org.apache.camel.spi.Label;
import org.apache.camel.spi.RouteContext;
/**
* Represents an XML <failover/> element
*/
+@Label("EIP,routing")
@XmlRootElement(name = "failover")
@XmlAccessorType(XmlAccessType.FIELD)
public class FailoverLoadBalancerDefinition extends LoadBalancerDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/9ec31ce6/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java
index ea4c021..ae390a3 100644
--- a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java
@@ -22,11 +22,13 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.apache.camel.model.LoadBalancerDefinition;
import org.apache.camel.processor.loadbalancer.LoadBalancer;
+import org.apache.camel.spi.Label;
import org.apache.camel.spi.RouteContext;
/**
* Represents an XML <random/> element
*/
+@Label("EIP,routing")
@XmlRootElement(name = "random")
@XmlAccessorType(XmlAccessType.FIELD)
public class RandomLoadBalancerDefinition extends LoadBalancerDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/9ec31ce6/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java
index e22a1fe..009e5fb 100644
--- a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java
@@ -22,11 +22,13 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.apache.camel.model.LoadBalancerDefinition;
import org.apache.camel.processor.loadbalancer.LoadBalancer;
+import org.apache.camel.spi.Label;
import org.apache.camel.spi.RouteContext;
/**
* Represents an XML <roundRobin/> element
*/
+@Label("EIP,routing")
@XmlRootElement(name = "roundRobin")
@XmlAccessorType(XmlAccessType.FIELD)
public class RoundRobinLoadBalancerDefinition extends LoadBalancerDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/9ec31ce6/camel-core/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java
index 3c7c071..2f73b2e 100644
--- a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java
@@ -25,11 +25,13 @@ import org.apache.camel.model.ExpressionSubElementDefinition;
import org.apache.camel.model.LoadBalancerDefinition;
import org.apache.camel.processor.loadbalancer.LoadBalancer;
import org.apache.camel.processor.loadbalancer.StickyLoadBalancer;
+import org.apache.camel.spi.Label;
import org.apache.camel.spi.RouteContext;
/**
* Represents an XML <sticky/> element
*/
+@Label("EIP,routing")
@XmlRootElement(name = "sticky")
@XmlAccessorType(XmlAccessType.FIELD)
public class StickyLoadBalancerDefinition extends LoadBalancerDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/9ec31ce6/camel-core/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java
index 3736cc3..65e9435 100644
--- a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java
@@ -22,12 +22,14 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.apache.camel.model.LoadBalancerDefinition;
import org.apache.camel.processor.loadbalancer.LoadBalancer;
+import org.apache.camel.spi.Label;
import org.apache.camel.spi.RouteContext;
/**
* Represents an XML <topic/> element
*
*/
+@Label("EIP,routing")
@XmlRootElement(name = "topic")
@XmlAccessorType(XmlAccessType.FIELD)
public class TopicLoadBalancerDefinition extends LoadBalancerDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/9ec31ce6/camel-core/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java
index 2c54be8..fe8af34 100644
--- a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java
@@ -29,12 +29,14 @@ import org.apache.camel.processor.loadbalancer.LoadBalancer;
import org.apache.camel.processor.loadbalancer.WeightedLoadBalancer;
import org.apache.camel.processor.loadbalancer.WeightedRandomLoadBalancer;
import org.apache.camel.processor.loadbalancer.WeightedRoundRobinLoadBalancer;
+import org.apache.camel.spi.Label;
import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.ObjectHelper;
/**
* Represents an XML <weighted/> element
*/
+@Label("EIP,routing")
@XmlRootElement(name = "weighted")
@XmlAccessorType(XmlAccessType.FIELD)
public class WeightedLoadBalancerDefinition extends LoadBalancerDefinition {