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/ddd0d8e2 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ddd0d8e2 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ddd0d8e2 Branch: refs/heads/master Commit: ddd0d8e2aed1fd31250b1140d95aa60a49876732 Parents: 18d7fa3 Author: Willem Jiang <willem.ji...@gmail.com> Authored: Fri Jan 16 15:01:17 2015 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Fri Jan 16 16:53:24 2015 +0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/camel/model/AOPDefinition.java | 3 +++ .../java/org/apache/camel/model/AggregateDefinition.java | 3 +++ .../src/main/java/org/apache/camel/model/BeanDefinition.java | 2 ++ .../main/java/org/apache/camel/model/CatchDefinition.java | 2 ++ .../main/java/org/apache/camel/model/ChoiceDefinition.java | 3 +++ .../java/org/apache/camel/model/ContextScanDefinition.java | 4 ++++ .../java/org/apache/camel/model/ConvertBodyDefinition.java | 2 +- .../main/java/org/apache/camel/model/DelayDefinition.java | 3 +++ .../java/org/apache/camel/model/DynamicRouterDefinition.java | 3 +++ .../main/java/org/apache/camel/model/EnrichDefinition.java | 2 +- .../main/java/org/apache/camel/model/FilterDefinition.java | 2 ++ .../main/java/org/apache/camel/model/FinallyDefinition.java | 2 ++ .../src/main/java/org/apache/camel/model/FromDefinition.java | 2 ++ .../org/apache/camel/model/IdempotentConsumerDefinition.java | 2 ++ .../main/java/org/apache/camel/model/InOnlyDefinition.java | 2 ++ .../main/java/org/apache/camel/model/InOutDefinition.java | 2 ++ .../java/org/apache/camel/model/InterceptDefinition.java | 3 +++ .../java/org/apache/camel/model/InterceptFromDefinition.java | 2 ++ .../camel/model/InterceptSendToEndpointDefinition.java | 3 +++ .../java/org/apache/camel/model/LoadBalanceDefinition.java | 2 ++ .../java/org/apache/camel/model/LoadBalancerDefinition.java | 3 +++ .../src/main/java/org/apache/camel/model/LogDefinition.java | 2 ++ .../src/main/java/org/apache/camel/model/LoopDefinition.java | 2 ++ .../main/java/org/apache/camel/model/MarshalDefinition.java | 2 +- .../java/org/apache/camel/model/MulticastDefinition.java | 3 +++ .../java/org/apache/camel/model/OnCompletionDefinition.java | 3 +++ .../java/org/apache/camel/model/OnExceptionDefinition.java | 3 +++ .../camel/model/OptimisticLockRetryPolicyDefinition.java | 2 ++ .../org/apache/camel/model/OptionalIdentifiedDefinition.java | 1 - .../java/org/apache/camel/model/OtherwiseDefinition.java | 3 +++ .../main/java/org/apache/camel/model/OutputDefinition.java | 4 ++++ .../main/java/org/apache/camel/model/PipelineDefinition.java | 2 ++ .../main/java/org/apache/camel/model/PolicyDefinition.java | 2 ++ .../java/org/apache/camel/model/PollEnrichDefinition.java | 2 +- .../main/java/org/apache/camel/model/ProcessDefinition.java | 2 ++ .../java/org/apache/camel/model/RecipientListDefinition.java | 3 +++ .../org/apache/camel/model/RedeliveryPolicyDefinition.java | 2 ++ .../java/org/apache/camel/model/RemoveHeaderDefinition.java | 2 ++ .../java/org/apache/camel/model/RemoveHeadersDefinition.java | 2 ++ .../org/apache/camel/model/RemovePropertiesDefinition.java | 2 ++ .../org/apache/camel/model/RemovePropertyDefinition.java | 2 ++ .../java/org/apache/camel/model/ResequenceDefinition.java | 3 +++ .../main/java/org/apache/camel/model/RollbackDefinition.java | 2 ++ .../java/org/apache/camel/model/RouteBuilderDefinition.java | 2 ++ .../org/apache/camel/model/RouteContextRefDefinition.java | 3 +++ .../main/java/org/apache/camel/model/RouteDefinition.java | 3 +++ .../main/java/org/apache/camel/model/RoutesDefinition.java | 3 +++ .../java/org/apache/camel/model/RoutingSlipDefinition.java | 3 +++ .../main/java/org/apache/camel/model/SamplingDefinition.java | 3 +++ .../main/java/org/apache/camel/model/SetBodyDefinition.java | 2 ++ .../org/apache/camel/model/SetExchangePatternDefinition.java | 2 ++ .../java/org/apache/camel/model/SetFaultBodyDefinition.java | 2 ++ .../java/org/apache/camel/model/SetHeaderDefinition.java | 2 ++ .../java/org/apache/camel/model/SetOutHeaderDefinition.java | 2 ++ .../java/org/apache/camel/model/SetPropertyDefinition.java | 2 ++ .../src/main/java/org/apache/camel/model/SortDefinition.java | 4 +++- .../main/java/org/apache/camel/model/SplitDefinition.java | 2 ++ .../src/main/java/org/apache/camel/model/StopDefinition.java | 2 ++ .../org/apache/camel/model/ThreadPoolProfileDefinition.java | 5 ++++- .../main/java/org/apache/camel/model/ThreadsDefinition.java | 2 ++ .../main/java/org/apache/camel/model/ThrottleDefinition.java | 3 +++ .../org/apache/camel/model/ThrowExceptionDefinition.java | 2 ++ .../src/main/java/org/apache/camel/model/ToDefinition.java | 2 ++ .../java/org/apache/camel/model/TransactedDefinition.java | 3 +++ .../java/org/apache/camel/model/TransformDefinition.java | 2 +- .../src/main/java/org/apache/camel/model/TryDefinition.java | 3 +++ .../java/org/apache/camel/model/UnmarshalDefinition.java | 2 +- .../main/java/org/apache/camel/model/ValidateDefinition.java | 2 ++ .../src/main/java/org/apache/camel/model/WhenDefinition.java | 2 ++ .../apache/camel/model/WhenSkipSendToEndpointDefinition.java | 8 +++++--- .../main/java/org/apache/camel/model/WireTapDefinition.java | 2 ++ 71 files changed, 166 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/AOPDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/AOPDefinition.java b/camel-core/src/main/java/org/apache/camel/model/AOPDefinition.java index 638db7b..462eee0 100644 --- a/camel-core/src/main/java/org/apache/camel/model/AOPDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/AOPDefinition.java @@ -18,6 +18,7 @@ package org.apache.camel.model; import java.util.ArrayList; import java.util.Collection; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; @@ -25,6 +26,7 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.Processor; import org.apache.camel.processor.AOPProcessor; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; /** @@ -34,6 +36,7 @@ import org.apache.camel.spi.RouteContext; * {@link org.apache.camel.spi.InterceptStrategy} to do AOP in Camel. * @version */ +@Label("EIP,intercepting") @XmlRootElement(name = "aop") @XmlAccessorType(XmlAccessType.FIELD) @Deprecated http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java b/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java index 10c0872..bcd4e2a 100644 --- a/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.ExecutorService; import java.util.concurrent.ScheduledExecutorService; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; @@ -41,6 +42,7 @@ import org.apache.camel.processor.aggregate.AggregationStrategyBeanAdapter; import org.apache.camel.processor.aggregate.GroupedExchangeAggregationStrategy; import org.apache.camel.processor.aggregate.OptimisticLockRetryPolicy; import org.apache.camel.spi.AggregationRepository; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.concurrent.SynchronousExecutorService; @@ -49,6 +51,7 @@ import org.apache.camel.util.concurrent.SynchronousExecutorService; * * @version */ +@Label("EIP,routing") @XmlRootElement(name = "aggregate") @XmlAccessorType(XmlAccessType.FIELD) public class AggregateDefinition extends ProcessorDefinition<AggregateDefinition> implements ExecutorServiceAwareDefinition<AggregateDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java b/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java index 2f738af..d6d0d10 100644 --- a/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java @@ -31,6 +31,7 @@ import org.apache.camel.component.bean.ConstantStaticTypeBeanHolder; import org.apache.camel.component.bean.ConstantTypeBeanHolder; import org.apache.camel.component.bean.MethodNotFoundException; import org.apache.camel.component.bean.RegistryBean; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.CamelContextHelper; import org.apache.camel.util.ObjectHelper; @@ -40,6 +41,7 @@ import org.apache.camel.util.ObjectHelper; * * @version */ +@Label("EIP,endpoints") @XmlRootElement(name = "bean") @XmlAccessorType(XmlAccessType.FIELD) public class BeanDefinition extends NoOutputDefinition<BeanDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java b/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java index 7484363..26b6a0e 100644 --- a/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java @@ -32,6 +32,7 @@ import org.apache.camel.Predicate; import org.apache.camel.Processor; import org.apache.camel.builder.ExpressionBuilder; import org.apache.camel.processor.CatchProcessor; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.ExpressionToPredicateAdapter; @@ -40,6 +41,7 @@ import org.apache.camel.util.ExpressionToPredicateAdapter; * * @version */ +@Label("EIP,errorHandler") @XmlRootElement(name = "doCatch") @XmlAccessorType(XmlAccessType.FIELD) public class CatchDefinition extends ProcessorDefinition<CatchDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java index 718a9d6..5af254a 100644 --- a/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java @@ -19,6 +19,7 @@ package org.apache.camel.model; import java.util.AbstractList; 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.XmlElement; @@ -29,6 +30,7 @@ import org.apache.camel.Predicate; import org.apache.camel.Processor; import org.apache.camel.builder.ExpressionClause; import org.apache.camel.processor.ChoiceProcessor; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.CollectionStringBuffer; import org.apache.camel.util.ObjectHelper; @@ -38,6 +40,7 @@ import org.apache.camel.util.ObjectHelper; * * @version */ +@Label("EIP,routing") @XmlRootElement(name = "choice") @XmlAccessorType(XmlAccessType.FIELD) public class ChoiceDefinition extends ProcessorDefinition<ChoiceDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/ContextScanDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/ContextScanDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ContextScanDefinition.java index cea272e..0d092db 100644 --- a/camel-core/src/main/java/org/apache/camel/model/ContextScanDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/ContextScanDefinition.java @@ -18,14 +18,18 @@ package org.apache.camel.model; 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.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import org.apache.camel.spi.Label; + /** * <code>ContextScanDefinition</code> represents a <contextScan/> element. */ +@Label("configuration") @XmlRootElement(name = "contextScan") @XmlAccessorType(XmlAccessType.FIELD) public class ContextScanDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/ConvertBodyDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/ConvertBodyDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ConvertBodyDefinition.java index 9e4ad7a..e0ef1d1 100644 --- a/camel-core/src/main/java/org/apache/camel/model/ConvertBodyDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/ConvertBodyDefinition.java @@ -33,7 +33,7 @@ import org.apache.camel.spi.RouteContext; /** * Represents an XML <convertBodyTo/> element */ -@Label("transformation") +@Label("EIP,transformation") @XmlRootElement(name = "convertBodyTo") @XmlAccessorType(XmlAccessType.FIELD) public class ConvertBodyDefinition extends NoOutputDefinition<ConvertBodyDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java b/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java index 193b502..f858cd3 100644 --- a/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java @@ -18,6 +18,7 @@ package org.apache.camel.model; import java.util.concurrent.ExecutorService; import java.util.concurrent.ScheduledExecutorService; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; @@ -29,6 +30,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.ExpressionBuilder; import org.apache.camel.model.language.ExpressionDefinition; import org.apache.camel.processor.Delayer; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; /** @@ -36,6 +38,7 @@ import org.apache.camel.spi.RouteContext; * * @version */ +@Label("EIP,routing") @XmlRootElement(name = "delay") @XmlAccessorType(XmlAccessType.FIELD) public class DelayDefinition extends ExpressionNode implements ExecutorServiceAwareDefinition<DelayDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java b/camel-core/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java index 3f174c8..f6334d4 100644 --- a/camel-core/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java @@ -18,6 +18,7 @@ package org.apache.camel.model; import java.util.Collections; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; @@ -26,11 +27,13 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.Expression; import org.apache.camel.Processor; import org.apache.camel.processor.DynamicRouter; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; /** * Represents an XML <dynamicRouter/> element */ +@Label("EIP,routing") @XmlRootElement(name = "dynamicRouter") @XmlAccessorType(XmlAccessType.FIELD) public class DynamicRouterDefinition<Type extends ProcessorDefinition<Type>> extends NoOutputExpressionNode { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java b/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java index 7b9f59c..6c4e6e9 100644 --- a/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java @@ -37,7 +37,7 @@ import org.apache.camel.util.ObjectHelper; * * @see Enricher */ -@Label("transformation") +@Label("EIP,transformation") @XmlRootElement(name = "enrich") @XmlAccessorType(XmlAccessType.FIELD) public class EnrichDefinition extends NoOutputDefinition<EnrichDefinition> implements EndpointRequiredDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/FilterDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/FilterDefinition.java b/camel-core/src/main/java/org/apache/camel/model/FilterDefinition.java index e9218fd..39f4048 100644 --- a/camel-core/src/main/java/org/apache/camel/model/FilterDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/FilterDefinition.java @@ -24,6 +24,7 @@ import org.apache.camel.Predicate; import org.apache.camel.Processor; import org.apache.camel.model.language.ExpressionDefinition; import org.apache.camel.processor.FilterProcessor; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; /** @@ -31,6 +32,7 @@ import org.apache.camel.spi.RouteContext; * * @version */ +@Label("EIP,routing") @XmlRootElement(name = "filter") @XmlAccessorType(XmlAccessType.FIELD) public class FilterDefinition extends ExpressionNode { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/FinallyDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/FinallyDefinition.java b/camel-core/src/main/java/org/apache/camel/model/FinallyDefinition.java index c7e84de..5e05e66 100644 --- a/camel-core/src/main/java/org/apache/camel/model/FinallyDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/FinallyDefinition.java @@ -22,6 +22,7 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.Processor; import org.apache.camel.processor.FinallyProcessor; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; /** @@ -29,6 +30,7 @@ import org.apache.camel.spi.RouteContext; * * @version */ +@Label("EIP,errorHandler") @XmlRootElement(name = "doFinally") @XmlAccessorType(XmlAccessType.FIELD) public class FinallyDefinition extends OutputDefinition<FinallyDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java b/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java index 3e9d725..40a457a 100644 --- a/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java @@ -23,6 +23,7 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlTransient; import org.apache.camel.Endpoint; +import org.apache.camel.spi.Label; import org.apache.camel.spi.Required; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.ObjectHelper; @@ -32,6 +33,7 @@ import org.apache.camel.util.ObjectHelper; * * @version */ +@Label("EIP,routing") @XmlRootElement(name = "from") @XmlAccessorType(XmlAccessType.FIELD) public class FromDefinition extends OptionalIdentifiedDefinition<FromDefinition> implements EndpointRequiredDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerDefinition.java b/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerDefinition.java index 6159de1..9b39010 100644 --- a/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerDefinition.java @@ -26,12 +26,14 @@ import org.apache.camel.Expression; import org.apache.camel.Processor; import org.apache.camel.processor.idempotent.IdempotentConsumer; import org.apache.camel.spi.IdempotentRepository; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.ObjectHelper; /** * Represents an XML <idempotentConsumer/> element */ +@Label("EIP,endpoints") @XmlRootElement(name = "idempotentConsumer") @XmlAccessorType(XmlAccessType.FIELD) public class IdempotentConsumerDefinition extends ExpressionNode { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/InOnlyDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/InOnlyDefinition.java b/camel-core/src/main/java/org/apache/camel/model/InOnlyDefinition.java index 759494e..cb6230e 100644 --- a/camel-core/src/main/java/org/apache/camel/model/InOnlyDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/InOnlyDefinition.java @@ -22,12 +22,14 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.Endpoint; import org.apache.camel.ExchangePattern; +import org.apache.camel.spi.Label; /** * Represents an XML <inOnly/> element * * @version */ +@Label("MEP") @XmlRootElement(name = "inOnly") @XmlAccessorType(XmlAccessType.FIELD) public class InOnlyDefinition extends SendDefinition<InOnlyDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/InOutDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/InOutDefinition.java b/camel-core/src/main/java/org/apache/camel/model/InOutDefinition.java index 372ebd7..38fe60d 100644 --- a/camel-core/src/main/java/org/apache/camel/model/InOutDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/InOutDefinition.java @@ -22,12 +22,14 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.Endpoint; import org.apache.camel.ExchangePattern; +import org.apache.camel.spi.Label; /** * Represents an XML <inOut/> element * * @version */ +@Label("MEP") @XmlRootElement(name = "inOut") @XmlAccessorType(XmlAccessType.FIELD) public class InOutDefinition extends SendDefinition<InOutDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java b/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java index e4fb4b4..bbc2e36 100644 --- a/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java @@ -18,6 +18,7 @@ package org.apache.camel.model; 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.XmlRootElement; @@ -28,6 +29,7 @@ import org.apache.camel.Predicate; import org.apache.camel.Processor; import org.apache.camel.processor.Pipeline; import org.apache.camel.spi.InterceptStrategy; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; /** @@ -35,6 +37,7 @@ import org.apache.camel.spi.RouteContext; * * @version */ +@Label("EIP,intercepting") @XmlRootElement(name = "intercept") @XmlAccessorType(XmlAccessType.FIELD) public class InterceptDefinition extends OutputDefinition<InterceptDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/InterceptFromDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/InterceptFromDefinition.java b/camel-core/src/main/java/org/apache/camel/model/InterceptFromDefinition.java index 3b358b4..1e51c4f 100644 --- a/camel-core/src/main/java/org/apache/camel/model/InterceptFromDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/InterceptFromDefinition.java @@ -23,6 +23,7 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.Exchange; import org.apache.camel.Processor; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; import org.apache.camel.support.ExpressionAdapter; @@ -31,6 +32,7 @@ import org.apache.camel.support.ExpressionAdapter; * * @version */ +@Label("EIP,intercepting") @XmlRootElement(name = "interceptFrom") @XmlAccessorType(XmlAccessType.FIELD) public class InterceptFromDefinition extends InterceptDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java b/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java index 1e2bd4a..118e39e 100644 --- a/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java @@ -17,6 +17,7 @@ package org.apache.camel.model; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; @@ -29,6 +30,7 @@ import org.apache.camel.Processor; import org.apache.camel.impl.InterceptSendToEndpoint; import org.apache.camel.processor.InterceptEndpointProcessor; import org.apache.camel.spi.EndpointStrategy; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.EndpointHelper; import org.apache.camel.util.URISupport; @@ -38,6 +40,7 @@ import org.apache.camel.util.URISupport; * * @version */ +@Label("EIP,intercepting") @XmlRootElement(name = "interceptSendToEndpoint") @XmlAccessorType(XmlAccessType.FIELD) public class InterceptSendToEndpointDefinition extends OutputDefinition<InterceptSendToEndpointDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/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 2ec633a..25e775e 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 @@ -49,12 +49,14 @@ import org.apache.camel.processor.loadbalancer.TopicLoadBalancer; 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.CollectionStringBuffer; /** * Represents an XML <loadBalance/> element */ +@Label("EIP,routing") @XmlRootElement(name = "loadBalance") @XmlAccessorType(XmlAccessType.FIELD) public class LoadBalanceDefinition extends ProcessorDefinition<LoadBalanceDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java b/camel-core/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java index 4cad474..fd815e4 100644 --- a/camel-core/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java @@ -17,6 +17,7 @@ package org.apache.camel.model; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlTransient; @@ -26,6 +27,7 @@ import org.apache.camel.AsyncCallback; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.processor.loadbalancer.LoadBalancer; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; @@ -33,6 +35,7 @@ import org.apache.camel.util.ObjectHelper; /** * Represents an XML <loadBalancer/> element */ +@Label("EIP,routing") @XmlType(name = "loadBalancer") @XmlAccessorType(XmlAccessType.FIELD) public class LoadBalancerDefinition extends IdentifiedType implements LoadBalancer { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java b/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java index b736230..66428f9 100644 --- a/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java @@ -28,6 +28,7 @@ import org.apache.camel.Expression; import org.apache.camel.LoggingLevel; import org.apache.camel.Processor; import org.apache.camel.processor.LogProcessor; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.CamelContextHelper; import org.apache.camel.util.CamelLogger; @@ -40,6 +41,7 @@ import org.slf4j.LoggerFactory; * * @version */ +@Label("EIP,management") @XmlRootElement(name = "log") @XmlAccessorType(XmlAccessType.FIELD) public class LogDefinition extends NoOutputDefinition<LogDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java b/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java index 3d259f3..456e928 100644 --- a/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java @@ -25,6 +25,7 @@ import org.apache.camel.Expression; import org.apache.camel.Processor; import org.apache.camel.model.language.ExpressionDefinition; import org.apache.camel.processor.LoopProcessor; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; /** @@ -32,6 +33,7 @@ import org.apache.camel.spi.RouteContext; * * @version */ +@Label("EIP,routing") @XmlRootElement(name = "loop") @XmlAccessorType(XmlAccessType.FIELD) public class LoopDefinition extends ExpressionNode { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java b/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java index 1fc7303..f2b9f79 100644 --- a/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java @@ -67,7 +67,7 @@ import org.apache.camel.spi.RouteContext; * * @version */ -@Label("transformation") +@Label("EIP,transformation") @XmlRootElement(name = "marshal") @XmlAccessorType(XmlAccessType.FIELD) public class MarshalDefinition extends NoOutputDefinition<MarshalDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java b/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java index 8a50f49..dab88ae 100644 --- a/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java @@ -19,6 +19,7 @@ package org.apache.camel.model; import java.util.ArrayList; import java.util.List; import java.util.concurrent.ExecutorService; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; @@ -32,6 +33,7 @@ import org.apache.camel.processor.MulticastProcessor; import org.apache.camel.processor.aggregate.AggregationStrategy; import org.apache.camel.processor.aggregate.AggregationStrategyBeanAdapter; import org.apache.camel.processor.aggregate.UseLatestAggregationStrategy; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.CamelContextHelper; @@ -40,6 +42,7 @@ import org.apache.camel.util.CamelContextHelper; * * @version */ +@Label("EIP,routing") @XmlRootElement(name = "multicast") @XmlAccessorType(XmlAccessType.FIELD) public class MulticastDefinition extends OutputDefinition<MulticastDefinition> implements ExecutorServiceAwareDefinition<MulticastDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java b/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java index 096ce1d..1849dbb 100644 --- a/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java @@ -23,6 +23,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.concurrent.ExecutorService; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; @@ -35,6 +36,7 @@ import org.apache.camel.Predicate; import org.apache.camel.Processor; import org.apache.camel.processor.CamelInternalProcessor; import org.apache.camel.processor.OnCompletionProcessor; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; /** @@ -42,6 +44,7 @@ import org.apache.camel.spi.RouteContext; * * @version */ +@Label("EIP,routing") @XmlRootElement(name = "onCompletion") @XmlAccessorType(XmlAccessType.FIELD) public class OnCompletionDefinition extends ProcessorDefinition<OnCompletionDefinition> implements ExecutorServiceAwareDefinition<OnCompletionDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java b/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java index ba98d4c..d0e9888 100644 --- a/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java @@ -21,6 +21,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; @@ -41,6 +42,7 @@ import org.apache.camel.processor.CatchProcessor; import org.apache.camel.processor.FatalFallbackErrorHandler; import org.apache.camel.processor.RedeliveryPolicy; import org.apache.camel.spi.ClassResolver; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.CamelContextHelper; import org.apache.camel.util.ExpressionToPredicateAdapter; @@ -51,6 +53,7 @@ import org.apache.camel.util.ObjectHelper; * * @version */ +@Label("EIP, errorHandler") @XmlRootElement(name = "onException") @XmlAccessorType(XmlAccessType.FIELD) public class OnExceptionDefinition extends ProcessorDefinition<OnExceptionDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/OptimisticLockRetryPolicyDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/OptimisticLockRetryPolicyDefinition.java b/camel-core/src/main/java/org/apache/camel/model/OptimisticLockRetryPolicyDefinition.java index 87b449d..e4c383a 100644 --- a/camel-core/src/main/java/org/apache/camel/model/OptimisticLockRetryPolicyDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/OptimisticLockRetryPolicyDefinition.java @@ -22,12 +22,14 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.processor.aggregate.OptimisticLockRetryPolicy; +import org.apache.camel.spi.Label; /** * Represents an XML <optimisticLockRetryPolicy/> element * * @version */ +@Label("EIP,policy") @XmlRootElement(name = "optimisticLockRetryPolicy") @XmlAccessorType(XmlAccessType.FIELD) public class OptimisticLockRetryPolicyDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java b/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java index 43caaf9..e4b3512 100644 --- a/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java @@ -21,7 +21,6 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.XmlType; import org.apache.camel.NamedNode; http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/OtherwiseDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/OtherwiseDefinition.java b/camel-core/src/main/java/org/apache/camel/model/OtherwiseDefinition.java index 86157e0..002f2f7 100644 --- a/camel-core/src/main/java/org/apache/camel/model/OtherwiseDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/OtherwiseDefinition.java @@ -17,11 +17,13 @@ package org.apache.camel.model; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.Processor; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.CollectionStringBuffer; @@ -30,6 +32,7 @@ import org.apache.camel.util.CollectionStringBuffer; * * @version */ +@Label("EIP,routing") @XmlRootElement(name = "otherwise") @XmlAccessorType(XmlAccessType.FIELD) public class OtherwiseDefinition extends OutputDefinition<OtherwiseDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java b/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java index 3639f1b..d7e7af0 100644 --- a/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java @@ -18,16 +18,20 @@ package org.apache.camel.model; 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.XmlElementRef; import javax.xml.bind.annotation.XmlType; +import org.apache.camel.spi.Label; + /** * A useful base class for output types * * @version */ +@Label("EIP,routing") @XmlType(name = "output") @XmlAccessorType(XmlAccessType.FIELD) public class OutputDefinition<Type extends ProcessorDefinition<Type>> extends ProcessorDefinition<Type> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/PipelineDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/PipelineDefinition.java b/camel-core/src/main/java/org/apache/camel/model/PipelineDefinition.java index 8146616..d660231 100644 --- a/camel-core/src/main/java/org/apache/camel/model/PipelineDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/PipelineDefinition.java @@ -21,6 +21,7 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.Processor; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; /** @@ -29,6 +30,7 @@ import org.apache.camel.spi.RouteContext; * * @version */ +@Label("EIP,routing") @XmlRootElement(name = "pipeline") @XmlAccessorType(XmlAccessType.FIELD) public class PipelineDefinition extends OutputDefinition<PipelineDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java b/camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java index b211d03..3566fff 100644 --- a/camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java @@ -25,6 +25,7 @@ import javax.xml.bind.annotation.XmlTransient; import org.apache.camel.Processor; import org.apache.camel.Service; import org.apache.camel.processor.WrapProcessor; +import org.apache.camel.spi.Label; import org.apache.camel.spi.Policy; import org.apache.camel.spi.RouteContext; import org.apache.camel.spi.TransactedPolicy; @@ -35,6 +36,7 @@ import org.apache.camel.util.ObjectHelper; * * @version */ +@Label("EIP,policy") @XmlRootElement(name = "policy") @XmlAccessorType(XmlAccessType.FIELD) public class PolicyDefinition extends OutputDefinition<PolicyDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/PollEnrichDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/PollEnrichDefinition.java b/camel-core/src/main/java/org/apache/camel/model/PollEnrichDefinition.java index a70e84f..2f5aa24 100644 --- a/camel-core/src/main/java/org/apache/camel/model/PollEnrichDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/PollEnrichDefinition.java @@ -37,7 +37,7 @@ import org.apache.camel.util.ObjectHelper; * * @see org.apache.camel.processor.Enricher */ -@Label("transformation") +@Label("EIP,transformation") @XmlRootElement(name = "pollEnrich") @XmlAccessorType(XmlAccessType.FIELD) public class PollEnrichDefinition extends NoOutputDefinition<PollEnrichDefinition> implements EndpointRequiredDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java index fae5610..222489a 100644 --- a/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java @@ -27,6 +27,7 @@ import org.apache.camel.Processor; import org.apache.camel.Service; import org.apache.camel.processor.DelegateAsyncProcessor; import org.apache.camel.processor.DelegateSyncProcessor; +import org.apache.camel.spi.Label; import org.apache.camel.spi.Required; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.ObjectHelper; @@ -36,6 +37,7 @@ import org.apache.camel.util.ObjectHelper; * * @version */ +@Label("EIP,transformation") @XmlRootElement(name = "process") @XmlAccessorType(XmlAccessType.FIELD) public class ProcessDefinition extends NoOutputDefinition<ProcessDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java b/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java index c7a3051..3cda843 100644 --- a/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java @@ -19,6 +19,7 @@ package org.apache.camel.model; import java.util.ArrayList; import java.util.List; import java.util.concurrent.ExecutorService; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; @@ -35,6 +36,7 @@ import org.apache.camel.processor.RecipientList; import org.apache.camel.processor.aggregate.AggregationStrategy; import org.apache.camel.processor.aggregate.AggregationStrategyBeanAdapter; import org.apache.camel.processor.aggregate.UseLatestAggregationStrategy; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.CamelContextHelper; @@ -43,6 +45,7 @@ import org.apache.camel.util.CamelContextHelper; * * @version */ +@Label("EIP,routing") @XmlRootElement(name = "recipientList") @XmlAccessorType(XmlAccessType.FIELD) public class RecipientListDefinition<Type extends ProcessorDefinition<Type>> extends NoOutputExpressionNode implements ExecutorServiceAwareDefinition<RecipientListDefinition<Type>> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyDefinition.java b/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyDefinition.java index 929766d..13ce369 100644 --- a/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyDefinition.java @@ -24,6 +24,7 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.CamelContext; import org.apache.camel.LoggingLevel; import org.apache.camel.processor.RedeliveryPolicy; +import org.apache.camel.spi.Label; import org.apache.camel.util.CamelContextHelper; import org.apache.camel.util.ObjectHelper; @@ -32,6 +33,7 @@ import org.apache.camel.util.ObjectHelper; * * @version */ +@Label("EIP,policy") @XmlRootElement(name = "redeliveryPolicy") @XmlAccessorType(XmlAccessType.FIELD) public class RedeliveryPolicyDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/RemoveHeaderDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/RemoveHeaderDefinition.java b/camel-core/src/main/java/org/apache/camel/model/RemoveHeaderDefinition.java index 5ec2934..c691193 100644 --- a/camel-core/src/main/java/org/apache/camel/model/RemoveHeaderDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/RemoveHeaderDefinition.java @@ -23,12 +23,14 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.Processor; import org.apache.camel.processor.RemoveHeaderProcessor; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.ObjectHelper; /** * Represents an XML <removeHeader/> element */ +@Label("EIP,transformation") @XmlRootElement(name = "removeHeader") @XmlAccessorType(XmlAccessType.FIELD) public class RemoveHeaderDefinition extends NoOutputDefinition<RemoveHeaderDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/RemoveHeadersDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/RemoveHeadersDefinition.java b/camel-core/src/main/java/org/apache/camel/model/RemoveHeadersDefinition.java index f219546..fbb35c1 100644 --- a/camel-core/src/main/java/org/apache/camel/model/RemoveHeadersDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/RemoveHeadersDefinition.java @@ -24,12 +24,14 @@ import javax.xml.bind.annotation.XmlTransient; import org.apache.camel.Processor; import org.apache.camel.processor.RemoveHeadersProcessor; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.ObjectHelper; /** * Represents an XML <removeHeaders/> element */ +@Label("EIP,transformation") @XmlRootElement(name = "removeHeaders") @XmlAccessorType(XmlAccessType.FIELD) public class RemoveHeadersDefinition extends NoOutputDefinition<RemoveHeadersDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/RemovePropertiesDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/RemovePropertiesDefinition.java b/camel-core/src/main/java/org/apache/camel/model/RemovePropertiesDefinition.java index 2ff38d5..b0504ce 100644 --- a/camel-core/src/main/java/org/apache/camel/model/RemovePropertiesDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/RemovePropertiesDefinition.java @@ -24,12 +24,14 @@ import javax.xml.bind.annotation.XmlTransient; import org.apache.camel.Processor; import org.apache.camel.processor.RemovePropertiesProcessor; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.ObjectHelper; /** * Represents an XML <removeProperties/> element */ +@Label("EIP,transformation") @XmlRootElement(name = "removeProperties") @XmlAccessorType(XmlAccessType.FIELD) public class RemovePropertiesDefinition extends NoOutputDefinition<RemovePropertiesDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/RemovePropertyDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/RemovePropertyDefinition.java b/camel-core/src/main/java/org/apache/camel/model/RemovePropertyDefinition.java index ce9e844..ac8f88a 100644 --- a/camel-core/src/main/java/org/apache/camel/model/RemovePropertyDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/RemovePropertyDefinition.java @@ -23,12 +23,14 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.Processor; import org.apache.camel.processor.RemovePropertyProcessor; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.ObjectHelper; /** * Represents an XML <removeProperty/> element */ +@Label("EIP,transformation") @XmlRootElement(name = "removeProperty") @XmlAccessorType(XmlAccessType.FIELD) public class RemovePropertyDefinition extends NoOutputDefinition<RemovePropertyDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java index df8ebda..2bd63e7 100644 --- a/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java @@ -18,6 +18,7 @@ package org.apache.camel.model; 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.XmlElement; @@ -36,6 +37,7 @@ import org.apache.camel.processor.CamelInternalProcessor; import org.apache.camel.processor.Resequencer; import org.apache.camel.processor.StreamResequencer; import org.apache.camel.processor.resequencer.ExpressionResultComparator; +import org.apache.camel.spi.Label; import org.apache.camel.spi.Required; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.CamelContextHelper; @@ -46,6 +48,7 @@ import org.apache.camel.util.ObjectHelper; * * @version */ +@Label("EIP,routing") @XmlRootElement(name = "resequence") @XmlAccessorType(XmlAccessType.FIELD) public class ResequenceDefinition extends ProcessorDefinition<ResequenceDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/RollbackDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/RollbackDefinition.java b/camel-core/src/main/java/org/apache/camel/model/RollbackDefinition.java index 90173d7..b0c6d0f 100644 --- a/camel-core/src/main/java/org/apache/camel/model/RollbackDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/RollbackDefinition.java @@ -23,11 +23,13 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.Processor; import org.apache.camel.processor.RollbackProcessor; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; /** * Represents an XML <rollback/> element */ +@Label("EIP,routing") @XmlRootElement(name = "rollback") @XmlAccessorType(XmlAccessType.FIELD) public class RollbackDefinition extends NoOutputDefinition<RollbackDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/RouteBuilderDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/RouteBuilderDefinition.java b/camel-core/src/main/java/org/apache/camel/model/RouteBuilderDefinition.java index 5190065..10b2da3 100644 --- a/camel-core/src/main/java/org/apache/camel/model/RouteBuilderDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/RouteBuilderDefinition.java @@ -24,6 +24,7 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.CamelContext; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.spi.Label; import org.apache.camel.util.CamelContextHelper; import org.apache.camel.util.ObjectHelper; @@ -32,6 +33,7 @@ import org.apache.camel.util.ObjectHelper; * * @version */ +@Label("EIP,configuration") @XmlRootElement(name = "routeBuilder") @XmlAccessorType(XmlAccessType.FIELD) public class RouteBuilderDefinition extends IdentifiedType { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinition.java b/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinition.java index f1093dc..03a64a8 100644 --- a/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinition.java @@ -17,18 +17,21 @@ package org.apache.camel.model; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.CamelContext; +import org.apache.camel.spi.Label; /** * Represents an XML <routeContextRef/> element * * @version */ +@Label("configuration") @XmlRootElement(name = "routeContextRef") @XmlAccessorType(XmlAccessType.FIELD) public class RouteContextRefDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java b/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java index 3b35236..a23a212 100644 --- a/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java @@ -21,6 +21,7 @@ import java.util.Collection; import java.util.List; import java.util.StringTokenizer; import java.util.concurrent.atomic.AtomicBoolean; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; @@ -46,6 +47,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.DefaultRouteContext; import org.apache.camel.model.rest.RestDefinition; import org.apache.camel.processor.interceptor.HandleFault; +import org.apache.camel.spi.Label; import org.apache.camel.spi.LifecycleStrategy; import org.apache.camel.spi.RouteContext; import org.apache.camel.spi.RoutePolicy; @@ -58,6 +60,7 @@ import org.apache.camel.util.ObjectHelper; * * @version */ +@Label("configuration") @XmlRootElement(name = "route") @XmlType(propOrder = {"inputs", "outputs"}) @XmlAccessorType(XmlAccessType.PROPERTY) http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java b/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java index 8582f67..ccb8053 100644 --- a/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java @@ -18,6 +18,7 @@ package org.apache.camel.model; 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.XmlElementRef; @@ -26,12 +27,14 @@ import javax.xml.bind.annotation.XmlTransient; import org.apache.camel.Endpoint; import org.apache.camel.ErrorHandlerFactory; +import org.apache.camel.spi.Label; /** * Represents a collection of routes * * @version */ +@Label("configuration") @XmlRootElement(name = "routes") @XmlAccessorType(XmlAccessType.FIELD) public class RoutesDefinition extends OptionalIdentifiedDefinition<RoutesDefinition> implements RouteContainer { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java b/camel-core/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java index eecfa73..aed3738 100644 --- a/camel-core/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java @@ -18,6 +18,7 @@ package org.apache.camel.model; import java.util.Collections; 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 org.apache.camel.Expression; import org.apache.camel.Processor; import org.apache.camel.model.language.HeaderExpression; import org.apache.camel.processor.RoutingSlip; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; /** * Represents an XML <routingSlip/> element */ +@Label("EIP,routing") @XmlRootElement(name = "routingSlip") @XmlAccessorType(XmlAccessType.FIELD) public class RoutingSlipDefinition<Type extends ProcessorDefinition<Type>> extends NoOutputExpressionNode { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java b/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java index c691663..e46e263 100644 --- a/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java @@ -18,6 +18,7 @@ package org.apache.camel.model; import java.util.Locale; import java.util.concurrent.TimeUnit; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; @@ -27,6 +28,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.apache.camel.Processor; import org.apache.camel.builder.xml.TimeUnitAdapter; import org.apache.camel.processor.SamplingThrottler; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; /** @@ -34,6 +36,7 @@ import org.apache.camel.spi.RouteContext; * * @version */ +@Label("EIP,management") @XmlRootElement(name = "sample") @XmlAccessorType(XmlAccessType.FIELD) public class SamplingDefinition extends OutputDefinition<SamplingDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/SetBodyDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/SetBodyDefinition.java b/camel-core/src/main/java/org/apache/camel/model/SetBodyDefinition.java index ffd32fe..9027225 100644 --- a/camel-core/src/main/java/org/apache/camel/model/SetBodyDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/SetBodyDefinition.java @@ -23,11 +23,13 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.Expression; import org.apache.camel.Processor; import org.apache.camel.processor.SetBodyProcessor; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; /** * Represents an XML <setBody/> element. */ +@Label("EIP,transformation") @XmlRootElement(name = "setBody") @XmlAccessorType(XmlAccessType.FIELD) public class SetBodyDefinition extends NoOutputExpressionNode { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/SetExchangePatternDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/SetExchangePatternDefinition.java b/camel-core/src/main/java/org/apache/camel/model/SetExchangePatternDefinition.java index 03a135c..d0174d4 100644 --- a/camel-core/src/main/java/org/apache/camel/model/SetExchangePatternDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/SetExchangePatternDefinition.java @@ -25,6 +25,7 @@ import javax.xml.bind.annotation.XmlTransient; import org.apache.camel.ExchangePattern; import org.apache.camel.Processor; import org.apache.camel.processor.ExchangePatternProcessor; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; /** @@ -32,6 +33,7 @@ import org.apache.camel.spi.RouteContext; * * @version */ +@Label("MEP") @XmlRootElement(name = "setExchangePattern") @XmlAccessorType(XmlAccessType.FIELD) public class SetExchangePatternDefinition extends NoOutputDefinition<SetExchangePatternDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/SetFaultBodyDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/SetFaultBodyDefinition.java b/camel-core/src/main/java/org/apache/camel/model/SetFaultBodyDefinition.java index 9fe5512..047b20a 100644 --- a/camel-core/src/main/java/org/apache/camel/model/SetFaultBodyDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/SetFaultBodyDefinition.java @@ -23,11 +23,13 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.Expression; import org.apache.camel.Processor; import org.apache.camel.builder.ProcessorBuilder; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; /** * Represents an XML <setFaultBody/> element. */ +@Label("EIP,transformation") @XmlRootElement(name = "setFaultBody") @XmlAccessorType(XmlAccessType.FIELD) public class SetFaultBodyDefinition extends NoOutputExpressionNode { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/SetHeaderDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/SetHeaderDefinition.java b/camel-core/src/main/java/org/apache/camel/model/SetHeaderDefinition.java index f73000e..e5c90e4 100644 --- a/camel-core/src/main/java/org/apache/camel/model/SetHeaderDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/SetHeaderDefinition.java @@ -26,6 +26,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.ExpressionBuilder; import org.apache.camel.model.language.ExpressionDefinition; import org.apache.camel.processor.SetHeaderProcessor; +import org.apache.camel.spi.Label; import org.apache.camel.spi.Required; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.ObjectHelper; @@ -33,6 +34,7 @@ import org.apache.camel.util.ObjectHelper; /** * Represents an XML <setHeader/> element */ +@Label("EIP,transformation") @XmlRootElement(name = "setHeader") @XmlAccessorType(XmlAccessType.FIELD) public class SetHeaderDefinition extends NoOutputExpressionNode { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/SetOutHeaderDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/SetOutHeaderDefinition.java b/camel-core/src/main/java/org/apache/camel/model/SetOutHeaderDefinition.java index 22b812e..ccc71ae 100644 --- a/camel-core/src/main/java/org/apache/camel/model/SetOutHeaderDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/SetOutHeaderDefinition.java @@ -25,6 +25,7 @@ import org.apache.camel.Expression; import org.apache.camel.Processor; import org.apache.camel.builder.ProcessorBuilder; import org.apache.camel.model.language.ExpressionDefinition; +import org.apache.camel.spi.Label; import org.apache.camel.spi.Required; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.ObjectHelper; @@ -34,6 +35,7 @@ import org.apache.camel.util.ObjectHelper; * * @deprecated not really needed, will be removed in the future */ +@Label("EIP,transformation") @XmlRootElement(name = "setOutHeader") @XmlAccessorType(XmlAccessType.FIELD) @Deprecated http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/SetPropertyDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/SetPropertyDefinition.java b/camel-core/src/main/java/org/apache/camel/model/SetPropertyDefinition.java index 69f3fbb..2b40650 100644 --- a/camel-core/src/main/java/org/apache/camel/model/SetPropertyDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/SetPropertyDefinition.java @@ -26,6 +26,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.ExpressionBuilder; import org.apache.camel.model.language.ExpressionDefinition; import org.apache.camel.processor.SetPropertyProcessor; +import org.apache.camel.spi.Label; import org.apache.camel.spi.Required; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.ObjectHelper; @@ -33,6 +34,7 @@ import org.apache.camel.util.ObjectHelper; /** * Represents an XML <setProperty/> element */ +@Label("EIP,transformation") @XmlRootElement(name = "setProperty") @XmlAccessorType(XmlAccessType.FIELD) public class SetPropertyDefinition extends NoOutputExpressionNode { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java b/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java index dd44e80..e9151b8 100644 --- a/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java @@ -17,6 +17,7 @@ package org.apache.camel.model; import java.util.Comparator; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; @@ -26,14 +27,15 @@ import javax.xml.bind.annotation.XmlTransient; import org.apache.camel.Expression; import org.apache.camel.Processor; import org.apache.camel.processor.SortProcessor; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.ObjectHelper; - import static org.apache.camel.builder.ExpressionBuilder.bodyExpression; /** * Represents an XML <sort/> element */ +@Label("EIP,routing") @XmlRootElement(name = "sort") @XmlAccessorType(XmlAccessType.FIELD) public class SortDefinition<T> extends NoOutputExpressionNode { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java b/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java index c1386f7..d121e1d 100644 --- a/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java @@ -32,6 +32,7 @@ import org.apache.camel.processor.CamelInternalProcessor; import org.apache.camel.processor.Splitter; import org.apache.camel.processor.aggregate.AggregationStrategy; import org.apache.camel.processor.aggregate.AggregationStrategyBeanAdapter; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.CamelContextHelper; @@ -40,6 +41,7 @@ import org.apache.camel.util.CamelContextHelper; * * @version */ +@Label("EIP,routing") @XmlRootElement(name = "split") @XmlAccessorType(XmlAccessType.FIELD) public class SplitDefinition extends ExpressionNode implements ExecutorServiceAwareDefinition<SplitDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/StopDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/StopDefinition.java b/camel-core/src/main/java/org/apache/camel/model/StopDefinition.java index c0713e7..7daac02 100644 --- a/camel-core/src/main/java/org/apache/camel/model/StopDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/StopDefinition.java @@ -22,6 +22,7 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.Processor; import org.apache.camel.processor.StopProcessor; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; /** @@ -29,6 +30,7 @@ import org.apache.camel.spi.RouteContext; * * @version */ +@Label("EIP,routing") @XmlRootElement(name = "stop") @XmlAccessorType(XmlAccessType.FIELD) public class StopDefinition extends NoOutputDefinition<StopDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java index f8a4c3d..63a3f07 100644 --- a/camel-core/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java @@ -18,6 +18,7 @@ package org.apache.camel.model; import java.util.concurrent.RejectedExecutionHandler; import java.util.concurrent.TimeUnit; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; @@ -26,13 +27,15 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.apache.camel.ThreadPoolRejectedPolicy; import org.apache.camel.builder.xml.TimeUnitAdapter; -import org.apache.camel.spi.ThreadPoolProfile; +import org.apache.camel.spi.Label; + /** * Represents an XML <threadPoolProfile/> element * * @version */ +@Label("configuration") @XmlRootElement(name = "threadPoolProfile") @XmlAccessorType(XmlAccessType.FIELD) public class ThreadPoolProfileDefinition extends OptionalIdentifiedDefinition<ThreadPoolProfileDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java index b08bb79..3d357c6 100644 --- a/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java @@ -35,6 +35,7 @@ import org.apache.camel.builder.xml.TimeUnitAdapter; import org.apache.camel.processor.Pipeline; import org.apache.camel.processor.ThreadsProcessor; import org.apache.camel.spi.ExecutorServiceManager; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; import org.apache.camel.spi.ThreadPoolProfile; @@ -43,6 +44,7 @@ import org.apache.camel.spi.ThreadPoolProfile; * * @version */ +@Label("EIP,routing") @XmlRootElement(name = "threads") @XmlAccessorType(XmlAccessType.FIELD) public class ThreadsDefinition extends OutputDefinition<ThreadsDefinition> implements ExecutorServiceAwareDefinition<ThreadsDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java index 62d4d99..2daf572 100644 --- a/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java @@ -18,6 +18,7 @@ package org.apache.camel.model; import java.util.concurrent.ExecutorService; import java.util.concurrent.ScheduledExecutorService; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; @@ -28,6 +29,7 @@ import org.apache.camel.Expression; import org.apache.camel.Processor; import org.apache.camel.builder.ExpressionBuilder; import org.apache.camel.processor.Throttler; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.ObjectHelper; @@ -36,6 +38,7 @@ import org.apache.camel.util.ObjectHelper; * * @version */ +@Label("EIP,routing") @XmlRootElement(name = "throttle") @XmlAccessorType(XmlAccessType.FIELD) public class ThrottleDefinition extends ExpressionNode implements ExecutorServiceAwareDefinition<ThrottleDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java index 2369715..d15dcef 100644 --- a/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java @@ -24,12 +24,14 @@ import javax.xml.bind.annotation.XmlTransient; import org.apache.camel.Processor; import org.apache.camel.processor.ThrowExceptionProcessor; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.ObjectHelper; /** * Represents an XML <throwException/> element */ +@Label("EIP,errorHandler") @XmlRootElement(name = "throwException") @XmlAccessorType(XmlAccessType.FIELD) public class ThrowExceptionDefinition extends NoOutputDefinition<ThrowExceptionDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/ToDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/ToDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ToDefinition.java index dc4936b..08db19f 100644 --- a/camel-core/src/main/java/org/apache/camel/model/ToDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/ToDefinition.java @@ -23,12 +23,14 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.Endpoint; import org.apache.camel.ExchangePattern; +import org.apache.camel.spi.Label; /** * Represents an XML <to/> element * * @version */ +@Label("EIP,routing") @XmlRootElement(name = "to") @XmlAccessorType(XmlAccessType.FIELD) public class ToDefinition extends SendDefinition<ToDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java b/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java index ed856c5..4f282c2 100644 --- a/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java @@ -18,6 +18,7 @@ package org.apache.camel.model; import java.lang.reflect.Method; import java.util.Map; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; @@ -29,6 +30,7 @@ import org.apache.camel.Processor; import org.apache.camel.RuntimeCamelException; import org.apache.camel.Service; import org.apache.camel.processor.WrapProcessor; +import org.apache.camel.spi.Label; import org.apache.camel.spi.Policy; import org.apache.camel.spi.RouteContext; import org.apache.camel.spi.TransactedPolicy; @@ -42,6 +44,7 @@ import org.slf4j.LoggerFactory; * * @version */ +@Label("EIP,routing") @XmlRootElement(name = "transacted") @XmlAccessorType(XmlAccessType.FIELD) public class TransactedDefinition extends OutputDefinition<TransactedDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/TransformDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/TransformDefinition.java b/camel-core/src/main/java/org/apache/camel/model/TransformDefinition.java index 39805bc..d7a3047 100644 --- a/camel-core/src/main/java/org/apache/camel/model/TransformDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/TransformDefinition.java @@ -29,7 +29,7 @@ import org.apache.camel.spi.RouteContext; /** * Represents an XML <transform/> element */ -@Label("transformation") +@Label("EIP,transformation") @XmlRootElement(name = "transform") @XmlAccessorType(XmlAccessType.FIELD) public class TransformDefinition extends NoOutputExpressionNode { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java b/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java index 60ba0d6..97ac5b5 100644 --- a/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; @@ -30,6 +31,7 @@ import org.apache.camel.Predicate; import org.apache.camel.Processor; import org.apache.camel.builder.ExpressionBuilder; import org.apache.camel.processor.TryProcessor; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.ExpressionToPredicateAdapter; @@ -38,6 +40,7 @@ import org.apache.camel.util.ExpressionToPredicateAdapter; * * @version */ +@Label("EIP,errorHandler") @XmlRootElement(name = "doTry") @XmlAccessorType(XmlAccessType.FIELD) public class TryDefinition extends OutputDefinition<TryDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java b/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java index 96f6f4f..f4c8b43 100644 --- a/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java @@ -67,7 +67,7 @@ import org.apache.camel.spi.RouteContext; * * @version */ -@Label("transformation") +@Label("EIP,transformation") @XmlRootElement(name = "unmarshal") @XmlAccessorType(XmlAccessType.FIELD) public class UnmarshalDefinition extends NoOutputDefinition<UnmarshalDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/ValidateDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/ValidateDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ValidateDefinition.java index f2702b9..ee99d76 100644 --- a/camel-core/src/main/java/org/apache/camel/model/ValidateDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/ValidateDefinition.java @@ -22,6 +22,7 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.Predicate; import org.apache.camel.processor.validation.PredicateValidatingProcessor; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; /** @@ -29,6 +30,7 @@ import org.apache.camel.spi.RouteContext; * * @version */ +@Label("EIP,transformation") @XmlRootElement(name = "validate") @XmlAccessorType(XmlAccessType.FIELD) public class ValidateDefinition extends NoOutputExpressionNode { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java b/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java index b98a007..fe71473 100644 --- a/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java @@ -21,6 +21,7 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.Predicate; import org.apache.camel.model.language.ExpressionDefinition; import org.apache.camel.processor.FilterProcessor; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; /** @@ -28,6 +29,7 @@ import org.apache.camel.spi.RouteContext; * * @version */ +@Label("EIP,routing") @XmlRootElement(name = "when") public class WhenDefinition extends ExpressionNode { http://git-wip-us.apache.org/repos/asf/camel/blob/ddd0d8e2/camel-core/src/main/java/org/apache/camel/model/WhenSkipSendToEndpointDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/WhenSkipSendToEndpointDefinition.java b/camel-core/src/main/java/org/apache/camel/model/WhenSkipSendToEndpointDefinition.java index d276d06..9037d1e 100644 --- a/camel-core/src/main/java/org/apache/camel/model/WhenSkipSendToEndpointDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/WhenSkipSendToEndpointDefinition.java @@ -16,13 +16,15 @@ */ package org.apache.camel.model; +import javax.xml.bind.annotation.XmlRootElement; + import org.apache.camel.Exchange; import org.apache.camel.Predicate; +import org.apache.camel.spi.Label; import org.apache.camel.spi.RouteContext; -/** - * - */ +@Label("EIP,routing") +@XmlRootElement(name = "whenSkipSendToEndpoint") public class WhenSkipSendToEndpointDefinition extends WhenDefinition { @Override
