CAMEL-7999: Remove @Label and use @Metadata instead for eip documentation.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/111acdf3 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/111acdf3 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/111acdf3 Branch: refs/heads/master Commit: 111acdf35a9f47c1ff3a0ad9361773c0c9974182 Parents: f0391af Author: Claus Ibsen <[email protected]> Authored: Wed Jan 21 13:48:50 2015 +0100 Committer: Claus Ibsen <[email protected]> Committed: Wed Jan 21 13:48:50 2015 +0100 ---------------------------------------------------------------------- .../org/apache/camel/model/AOPDefinition.java | 5 +-- .../apache/camel/model/AggregateDefinition.java | 4 +- .../org/apache/camel/model/BeanDefinition.java | 4 +- .../org/apache/camel/model/CatchDefinition.java | 4 +- .../apache/camel/model/ChoiceDefinition.java | 5 +-- .../camel/model/ContextScanDefinition.java | 4 +- .../camel/model/ConvertBodyDefinition.java | 4 +- .../camel/model/DataFormatDefinition.java | 4 +- .../org/apache/camel/model/DelayDefinition.java | 4 +- .../camel/model/DescriptionDefinition.java | 4 +- .../camel/model/DynamicRouterDefinition.java | 3 +- .../apache/camel/model/EnrichDefinition.java | 4 +- .../apache/camel/model/FilterDefinition.java | 4 +- .../apache/camel/model/FinallyDefinition.java | 4 +- .../org/apache/camel/model/FromDefinition.java | 4 +- .../model/IdempotentConsumerDefinition.java | 3 +- .../apache/camel/model/InOnlyDefinition.java | 4 +- .../org/apache/camel/model/InOutDefinition.java | 4 +- .../apache/camel/model/InterceptDefinition.java | 5 +-- .../camel/model/InterceptFromDefinition.java | 4 +- .../InterceptSendToEndpointDefinition.java | 4 +- .../camel/model/LoadBalanceDefinition.java | 5 +-- .../camel/model/LoadBalancerDefinition.java | 5 +-- .../org/apache/camel/model/LogDefinition.java | 4 +- .../org/apache/camel/model/LoopDefinition.java | 4 +- .../apache/camel/model/MarshalDefinition.java | 4 +- .../apache/camel/model/MulticastDefinition.java | 4 +- .../camel/model/OnCompletionDefinition.java | 3 +- .../camel/model/OnExceptionDefinition.java | 4 +- .../OptimisticLockRetryPolicyDefinition.java | 3 +- .../apache/camel/model/OtherwiseDefinition.java | 5 +-- .../apache/camel/model/OutputDefinition.java | 5 +-- .../camel/model/PackageScanDefinition.java | 4 +- .../apache/camel/model/PipelineDefinition.java | 4 +- .../apache/camel/model/PolicyDefinition.java | 4 +- .../camel/model/PollEnrichDefinition.java | 3 +- .../apache/camel/model/ProcessDefinition.java | 4 +- .../camel/model/ProcessorDefinitionHelper.java | 1 - .../camel/model/RecipientListDefinition.java | 3 +- .../camel/model/RedeliveryPolicyDefinition.java | 4 +- .../camel/model/RemoveHeaderDefinition.java | 4 +- .../camel/model/RemoveHeadersDefinition.java | 4 +- .../camel/model/RemovePropertiesDefinition.java | 4 +- .../camel/model/RemovePropertyDefinition.java | 4 +- .../camel/model/ResequenceDefinition.java | 5 +-- .../camel/model/RestContextRefDefinition.java | 4 +- .../apache/camel/model/RollbackDefinition.java | 4 +- .../camel/model/RouteBuilderDefinition.java | 4 +- .../org/apache/camel/model/RouteContainer.java | 1 - .../camel/model/RouteContextRefDefinition.java | 5 +-- .../org/apache/camel/model/RouteDefinition.java | 4 +- .../apache/camel/model/RoutesDefinition.java | 5 +-- .../camel/model/RoutingSlipDefinition.java | 4 +- .../apache/camel/model/SamplingDefinition.java | 4 +- .../apache/camel/model/SetBodyDefinition.java | 4 +- .../model/SetExchangePatternDefinition.java | 4 +- .../camel/model/SetFaultBodyDefinition.java | 4 +- .../apache/camel/model/SetHeaderDefinition.java | 4 +- .../camel/model/SetOutHeaderDefinition.java | 4 +- .../camel/model/SetPropertyDefinition.java | 4 +- .../org/apache/camel/model/SortDefinition.java | 6 +-- .../org/apache/camel/model/SplitDefinition.java | 3 +- .../org/apache/camel/model/StopDefinition.java | 4 +- .../model/ThreadPoolProfileDefinition.java | 4 +- .../apache/camel/model/ThreadsDefinition.java | 4 +- .../apache/camel/model/ThrottleDefinition.java | 3 +- .../camel/model/ThrowExceptionDefinition.java | 4 +- .../org/apache/camel/model/ToDefinition.java | 4 +- .../camel/model/TransactedDefinition.java | 5 +-- .../apache/camel/model/TransformDefinition.java | 4 +- .../org/apache/camel/model/TryDefinition.java | 5 +-- .../apache/camel/model/UnmarshalDefinition.java | 4 +- .../apache/camel/model/ValidateDefinition.java | 4 +- .../org/apache/camel/model/WhenDefinition.java | 4 +- .../model/WhenSkipSendToEndpointDefinition.java | 4 +- .../apache/camel/model/WireTapDefinition.java | 3 +- .../model/config/BatchResequencerConfig.java | 3 +- .../model/config/PropertiesDefinition.java | 4 +- .../camel/model/config/PropertyDefinition.java | 4 +- .../camel/model/config/ResequencerConfig.java | 2 - .../model/config/StreamResequencerConfig.java | 3 +- .../camel/model/dataformat/AvroDataFormat.java | 4 +- .../model/dataformat/BarcodeDataFormat.java | 4 +- .../model/dataformat/Base64DataFormat.java | 3 +- .../model/dataformat/BeanioDataFormat.java | 4 +- .../camel/model/dataformat/BindyDataFormat.java | 4 +- .../model/dataformat/CastorDataFormat.java | 3 +- .../model/dataformat/CryptoDataFormat.java | 3 +- .../camel/model/dataformat/CsvDataFormat.java | 4 +- .../model/dataformat/CustomDataFormat.java | 4 +- .../model/dataformat/DataFormatsDefinition.java | 4 +- .../model/dataformat/FlatpackDataFormat.java | 3 +- .../camel/model/dataformat/GzipDataFormat.java | 4 +- .../camel/model/dataformat/HL7DataFormat.java | 3 +- .../camel/model/dataformat/IcalDataFormat.java | 4 +- .../camel/model/dataformat/JaxbDataFormat.java | 4 +- .../camel/model/dataformat/JibxDataFormat.java | 4 +- .../camel/model/dataformat/JsonDataFormat.java | 3 +- .../camel/model/dataformat/PGPDataFormat.java | 3 +- .../model/dataformat/ProtobufDataFormat.java | 4 +- .../camel/model/dataformat/RssDataFormat.java | 4 +- .../dataformat/SerializationDataFormat.java | 4 +- .../model/dataformat/SoapJaxbDataFormat.java | 3 +- .../model/dataformat/StringDataFormat.java | 4 +- .../model/dataformat/SyslogDataFormat.java | 4 +- .../model/dataformat/TidyMarkupDataFormat.java | 4 +- .../dataformat/UniVocityAbstractDataFormat.java | 4 +- .../dataformat/UniVocityCsvDataFormat.java | 3 +- .../UniVocityFixedWidthDataFormat.java | 3 +- .../camel/model/dataformat/UniVocityHeader.java | 4 +- .../dataformat/UniVocityTsvDataFormat.java | 3 +- .../model/dataformat/XMLBeansDataFormat.java | 4 +- .../model/dataformat/XMLSecurityDataFormat.java | 3 +- .../model/dataformat/XStreamDataFormat.java | 5 +-- .../model/dataformat/XmlJsonDataFormat.java | 5 +-- .../model/dataformat/XmlRpcDataFormat.java | 4 +- .../camel/model/dataformat/ZipDataFormat.java | 3 +- .../model/dataformat/ZipFileDataFormat.java | 4 +- .../model/language/ConstantExpression.java | 4 +- .../camel/model/language/ELExpression.java | 4 +- .../model/language/ExpressionDefinition.java | 4 +- .../camel/model/language/GroovyExpression.java | 4 +- .../camel/model/language/HeaderExpression.java | 4 +- .../camel/model/language/JXPathExpression.java | 4 +- .../model/language/JavaScriptExpression.java | 4 +- .../model/language/JsonPathExpression.java | 4 +- .../model/language/LanguageExpression.java | 4 +- .../model/language/MethodCallExpression.java | 4 +- .../camel/model/language/MvelExpression.java | 4 +- .../language/NamespaceAwareExpression.java | 1 - .../camel/model/language/OgnlExpression.java | 4 +- .../camel/model/language/PhpExpression.java | 4 +- .../model/language/PropertyExpression.java | 4 +- .../camel/model/language/PythonExpression.java | 4 +- .../camel/model/language/RefExpression.java | 4 +- .../camel/model/language/RubyExpression.java | 4 +- .../camel/model/language/SimpleExpression.java | 4 +- .../camel/model/language/SpELExpression.java | 4 +- .../camel/model/language/SqlExpression.java | 4 +- .../camel/model/language/TerserExpression.java | 4 +- .../model/language/TokenizerExpression.java | 4 +- .../camel/model/language/VtdXmlExpression.java | 4 +- .../model/language/XMLTokenizerExpression.java | 4 +- .../camel/model/language/XPathExpression.java | 4 +- .../camel/model/language/XQueryExpression.java | 4 +- .../CircuitBreakerLoadBalancerDefinition.java | 5 +-- .../CustomLoadBalancerDefinition.java | 4 +- .../FailoverLoadBalancerDefinition.java | 4 +- .../RandomLoadBalancerDefinition.java | 4 +- .../RoundRobinLoadBalancerDefinition.java | 4 +- .../StickyLoadBalancerDefinition.java | 4 +- .../TopicLoadBalancerDefinition.java | 4 +- .../WeightedLoadBalancerDefinition.java | 3 +- .../camel/model/rest/DeleteVerbDefinition.java | 4 +- .../camel/model/rest/GetVerbDefinition.java | 4 +- .../camel/model/rest/HeadVerbDefinition.java | 4 +- .../camel/model/rest/PostVerbDefinition.java | 4 +- .../camel/model/rest/PutVerbDefinition.java | 4 +- .../camel/model/rest/RestBindingDefinition.java | 3 +- .../camel/model/rest/RestBindingMode.java | 4 +- .../model/rest/RestConfigurationDefinition.java | 3 +- .../apache/camel/model/rest/RestDefinition.java | 3 +- .../camel/model/rest/RestHostNameResolver.java | 4 +- .../model/rest/RestPropertyDefinition.java | 4 +- .../camel/model/rest/RestsDefinition.java | 4 +- .../apache/camel/model/rest/VerbDefinition.java | 3 +- .../camel/tools/apt/EipAnnotationProcessor.java | 10 ++--- .../tools/apt/EndpointAnnotationProcessor.java | 2 - .../main/java/org/apache/camel/spi/Label.java | 45 -------------------- 169 files changed, 290 insertions(+), 408 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/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 f096a82..9e71200 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,7 +18,6 @@ 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; @@ -26,7 +25,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.Metadata; import org.apache.camel.spi.RouteContext; /** @@ -36,7 +35,7 @@ import org.apache.camel.spi.RouteContext; * {@link org.apache.camel.spi.InterceptStrategy} to do AOP in Camel. * @version */ -@Label("eip,intercepting") +@Metadata(label = "eip,intercepting") @XmlRootElement(name = "aop") @XmlAccessorType(XmlAccessType.FIELD) @Deprecated http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/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 f9865b6..fa23873 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 @@ -41,7 +41,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.Metadata; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.concurrent.SynchronousExecutorService; @@ -50,7 +50,7 @@ import org.apache.camel.util.concurrent.SynchronousExecutorService; * * @version */ -@Label("eip,routing") +@Metadata(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/111acdf3/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 16ca814..0ec6f4d 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,7 +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.Metadata; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.CamelContextHelper; import org.apache.camel.util.ObjectHelper; @@ -41,7 +41,7 @@ import org.apache.camel.util.ObjectHelper; * * @version */ -@Label("eip,endpoints") +@Metadata(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/111acdf3/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 1556218..66f8990 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 @@ -31,7 +31,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.Metadata; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.ExpressionToPredicateAdapter; @@ -40,7 +40,7 @@ import org.apache.camel.util.ExpressionToPredicateAdapter; * * @version */ -@Label("eip,errorHandler") +@Metadata(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/111acdf3/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 13ee739..498e614 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,7 +19,6 @@ 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; @@ -30,7 +29,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.Metadata; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.CollectionStringBuffer; import org.apache.camel.util.ObjectHelper; @@ -40,7 +39,7 @@ import org.apache.camel.util.ObjectHelper; * * @version */ -@Label("eip,routing") +@Metadata(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/111acdf3/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 62a16df..19d1a41 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 @@ -23,12 +23,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; +import org.apache.camel.spi.Metadata; /** * Scans for Java {@link org.apache.camel.builder.RouteBuilder} instances in the context {@link org.apache.camel.spi.Registry}. */ -@Label("configuration") +@Metadata(label = "configuration") @XmlRootElement(name = "contextScan") @XmlAccessorType(XmlAccessType.FIELD) public class ContextScanDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/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 cc0a0c7..a2fbac8 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 @@ -26,14 +26,14 @@ import javax.xml.bind.annotation.XmlTransient; import org.apache.camel.Processor; import org.apache.camel.processor.ConvertBodyProcessor; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; import org.apache.camel.spi.Required; import org.apache.camel.spi.RouteContext; /** * Converts the message body to another type */ -@Label("eip,transformation") +@Metadata(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/111acdf3/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java b/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java index 57c98a7..d8ad895 100644 --- a/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java @@ -23,7 +23,7 @@ import javax.xml.bind.annotation.XmlType; import org.apache.camel.CamelContext; import org.apache.camel.spi.DataFormat; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; @@ -33,7 +33,7 @@ import static org.apache.camel.util.EndpointHelper.isReferenceParameter; /** * Represents a Camel data format */ -@Label("dataformat,transformation") +@Metadata(label = "dataformat,transformation") @XmlType(name = "dataFormat") @XmlAccessorType(XmlAccessType.FIELD) public class DataFormatDefinition extends IdentifiedType { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/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 edff990..22d5a6d 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,7 +18,6 @@ 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; @@ -30,7 +29,6 @@ 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.Metadata; import org.apache.camel.spi.RouteContext; @@ -39,7 +37,7 @@ import org.apache.camel.spi.RouteContext; * * @version */ -@Label("eip,routing") +@Metadata(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/111acdf3/camel-core/src/main/java/org/apache/camel/model/DescriptionDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/DescriptionDefinition.java b/camel-core/src/main/java/org/apache/camel/model/DescriptionDefinition.java index 8caec77..9500d56 100644 --- a/camel-core/src/main/java/org/apache/camel/model/DescriptionDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/DescriptionDefinition.java @@ -22,14 +22,14 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlValue; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * To provide comments about the node. * * @version */ -@Label("configuration") +@Metadata(label = "configuration") @XmlRootElement(name = "description") @XmlAccessorType(XmlAccessType.FIELD) public class DescriptionDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/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 861d348..e82676e 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 @@ -27,14 +27,13 @@ import org.apache.camel.Expression; import org.apache.camel.Processor; import org.apache.camel.model.language.ExpressionDefinition; import org.apache.camel.processor.DynamicRouter; -import org.apache.camel.spi.Label; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.RouteContext; /** * Routes messages based on dynamic rules */ -@Label("eip,routing") +@Metadata(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/111acdf3/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 9ff0a19..74a14df 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 @@ -28,7 +28,7 @@ import org.apache.camel.Processor; import org.apache.camel.processor.Enricher; 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.Metadata; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.ObjectHelper; @@ -37,7 +37,7 @@ import org.apache.camel.util.ObjectHelper; * * @see Enricher */ -@Label("eip,transformation") +@Metadata(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/111acdf3/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 dc3775c..01bcdce 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,7 +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.Metadata; import org.apache.camel.spi.RouteContext; /** @@ -32,7 +32,7 @@ import org.apache.camel.spi.RouteContext; * * @version */ -@Label("eip,routing") +@Metadata(label = "eip,routing") @XmlRootElement(name = "filter") @XmlAccessorType(XmlAccessType.FIELD) public class FilterDefinition extends ExpressionNode { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/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 b9a720e..dfb8bd3 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,7 +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.Metadata; import org.apache.camel.spi.RouteContext; /** @@ -30,7 +30,7 @@ import org.apache.camel.spi.RouteContext; * * @version */ -@Label("eip,errorHandler") +@Metadata(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/111acdf3/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 629cbd5..9b27aa2 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,7 +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.Metadata; import org.apache.camel.spi.Required; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.ObjectHelper; @@ -33,7 +33,7 @@ import org.apache.camel.util.ObjectHelper; * * @version */ -@Label("eip,routing") +@Metadata(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/111acdf3/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 9d4ec2c..15d4fc0 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 @@ -27,7 +27,6 @@ import org.apache.camel.Processor; import org.apache.camel.model.language.ExpressionDefinition; import org.apache.camel.processor.idempotent.IdempotentConsumer; import org.apache.camel.spi.IdempotentRepository; -import org.apache.camel.spi.Label; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.ObjectHelper; @@ -35,7 +34,7 @@ import org.apache.camel.util.ObjectHelper; /** * Filters out duplicate messages */ -@Label("eip,endpoints") +@Metadata(label = "eip,endpoints") @XmlRootElement(name = "idempotentConsumer") @XmlAccessorType(XmlAccessType.FIELD) public class IdempotentConsumerDefinition extends ExpressionNode { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/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 dae558a..ba8a41b 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,14 +22,14 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.Endpoint; import org.apache.camel.ExchangePattern; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * Marks the exchange pattern for the route to one way * * @version */ -@Label("mep") +@Metadata(label = "mep") @XmlRootElement(name = "inOnly") @XmlAccessorType(XmlAccessType.FIELD) public class InOnlyDefinition extends SendDefinition<InOnlyDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/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 c220dfd..1eb9be3 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,14 +22,14 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.Endpoint; import org.apache.camel.ExchangePattern; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * Marks the exchange pattern for the route to request/reply * * @version */ -@Label("mep") +@Metadata(label = "mep") @XmlRootElement(name = "inOut") @XmlAccessorType(XmlAccessType.FIELD) public class InOutDefinition extends SendDefinition<InOutDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/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 495f70c..b53bbb6 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,7 +18,6 @@ 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; @@ -29,7 +28,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.Metadata; import org.apache.camel.spi.RouteContext; /** @@ -37,7 +36,7 @@ import org.apache.camel.spi.RouteContext; * * @version */ -@Label("eip,intercepting") +@Metadata(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/111acdf3/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 6f6a5f5..6853417 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,7 +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.Metadata; import org.apache.camel.spi.RouteContext; import org.apache.camel.support.ExpressionAdapter; @@ -32,7 +32,7 @@ import org.apache.camel.support.ExpressionAdapter; * * @version */ -@Label("eip,intercepting") +@Metadata(label = "eip,intercepting") @XmlRootElement(name = "interceptFrom") @XmlAccessorType(XmlAccessType.FIELD) public class InterceptFromDefinition extends InterceptDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/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 fb40b5b..29dc737 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 @@ -29,7 +29,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.Metadata; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.EndpointHelper; import org.apache.camel.util.URISupport; @@ -39,7 +39,7 @@ import org.apache.camel.util.URISupport; * * @version */ -@Label("eip,intercepting") +@Metadata(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/111acdf3/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 b6eea94..854fc36 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 @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; @@ -49,14 +48,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.Metadata; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.CollectionStringBuffer; /** * Balances message processing among a number of nodes */ -@Label("eip,routing") +@Metadata(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/111acdf3/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 5919e6f..2724126 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,7 +17,6 @@ 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; @@ -27,7 +26,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.Metadata; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; @@ -35,7 +34,7 @@ import org.apache.camel.util.ObjectHelper; /** * Balances message processing among a number of nodes */ -@Label("eip,routing") +@Metadata(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/111acdf3/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 43de2d4..5a05e0d 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 @@ -17,7 +17,6 @@ package org.apache.camel.model; import java.util.Map; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; @@ -28,7 +27,6 @@ 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.Metadata; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.CamelContextHelper; @@ -42,7 +40,7 @@ import org.slf4j.LoggerFactory; * * @version */ -@Label("eip,management") +@Metadata(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/111acdf3/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 3a592ff..57918a1 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,7 +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.Metadata; import org.apache.camel.spi.RouteContext; /** @@ -33,7 +33,7 @@ import org.apache.camel.spi.RouteContext; * * @version */ -@Label("eip,routing") +@Metadata(label = "eip,routing") @XmlRootElement(name = "loop") @XmlAccessorType(XmlAccessType.FIELD) public class LoopDefinition extends ExpressionNode { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/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 65ce360..668e0ef 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 @@ -59,7 +59,7 @@ import org.apache.camel.model.dataformat.ZipDataFormat; import org.apache.camel.model.dataformat.ZipFileDataFormat; import org.apache.camel.processor.MarshalProcessor; import org.apache.camel.spi.DataFormat; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; import org.apache.camel.spi.RouteContext; /** @@ -67,7 +67,7 @@ import org.apache.camel.spi.RouteContext; * * @version */ -@Label("eip,transformation") +@Metadata(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/111acdf3/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 44c2fab..c9e958a 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,7 +19,6 @@ 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; @@ -33,7 +32,6 @@ 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.Metadata; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.CamelContextHelper; @@ -43,7 +41,7 @@ import org.apache.camel.util.CamelContextHelper; * * @version */ -@Label("eip,routing") +@Metadata(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/111acdf3/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 8c881a1..6caa2bc 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 @@ -35,7 +35,6 @@ 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.Metadata; import org.apache.camel.spi.RouteContext; @@ -44,7 +43,7 @@ import org.apache.camel.spi.RouteContext; * * @version */ -@Label("eip,routing") +@Metadata(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/111acdf3/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 68f9f71..b89f2d0 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 @@ -41,7 +41,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.Metadata; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.CamelContextHelper; import org.apache.camel.util.ExpressionToPredicateAdapter; @@ -52,7 +52,7 @@ import org.apache.camel.util.ObjectHelper; * * @version */ -@Label("eip, errorHandler") +@Metadata(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/111acdf3/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 5478eec..9592bd4 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,7 +22,6 @@ 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; import org.apache.camel.spi.Metadata; /** @@ -30,7 +29,7 @@ import org.apache.camel.spi.Metadata; * * @version */ -@Label("eip,policy") +@Metadata(label = "eip,policy") @XmlRootElement(name = "optimisticLockRetryPolicy") @XmlAccessorType(XmlAccessType.FIELD) public class OptimisticLockRetryPolicyDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/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 3d9bf61..32df338 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,13 +17,12 @@ 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.Metadata; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.CollectionStringBuffer; @@ -32,7 +31,7 @@ import org.apache.camel.util.CollectionStringBuffer; * * @version */ -@Label("eip,routing") +@Metadata(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/111acdf3/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 fc59488..6272d57 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,20 +18,19 @@ 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; +import org.apache.camel.spi.Metadata; /** * A useful base class for output types * * @version */ -@Label("eip,routing") +@Metadata(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/111acdf3/camel-core/src/main/java/org/apache/camel/model/PackageScanDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/PackageScanDefinition.java b/camel-core/src/main/java/org/apache/camel/model/PackageScanDefinition.java index 859bf63..cd3a64d 100644 --- a/camel-core/src/main/java/org/apache/camel/model/PackageScanDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/PackageScanDefinition.java @@ -23,12 +23,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; +import org.apache.camel.spi.Metadata; /** * Scans for Java {@link org.apache.camel.builder.RouteBuilder} classes in java packages */ -@Label("configuration") +@Metadata(label = "configuration") @XmlRootElement(name = "packageScan") @XmlAccessorType(XmlAccessType.FIELD) public class PackageScanDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/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 5e68d8b..ffe7d39 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,7 +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.Metadata; import org.apache.camel.spi.RouteContext; /** @@ -29,7 +29,7 @@ import org.apache.camel.spi.RouteContext; * * @version */ -@Label("eip,routing") +@Metadata(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/111acdf3/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 60b3090..8563402 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,7 +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.Metadata; import org.apache.camel.spi.Policy; import org.apache.camel.spi.RouteContext; import org.apache.camel.spi.TransactedPolicy; @@ -36,7 +36,7 @@ import org.apache.camel.util.ObjectHelper; * * @version */ -@Label("eip,policy") +@Metadata(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/111acdf3/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 6467ba8..1df5ae7 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 @@ -28,7 +28,6 @@ import org.apache.camel.Processor; import org.apache.camel.processor.PollEnricher; 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.Metadata; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.ObjectHelper; @@ -38,7 +37,7 @@ import org.apache.camel.util.ObjectHelper; * * @see org.apache.camel.processor.Enricher */ -@Label("eip,transformation") +@Metadata(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/111acdf3/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 da17852..16e1237 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,7 +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.Metadata; import org.apache.camel.spi.Required; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.ObjectHelper; @@ -37,7 +37,7 @@ import org.apache.camel.util.ObjectHelper; * * @version */ -@Label("eip,transformation") +@Metadata(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/111acdf3/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java b/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java index 5ba236b..315b35a 100644 --- a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java +++ b/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java @@ -25,7 +25,6 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.ScheduledExecutorService; - import javax.xml.namespace.QName; import org.apache.camel.Exchange; http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/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 4534210..54f814e 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 @@ -35,7 +35,6 @@ 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.Metadata; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.CamelContextHelper; @@ -45,7 +44,7 @@ import org.apache.camel.util.CamelContextHelper; * * @version */ -@Label("eip,routing") +@Metadata(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/111acdf3/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 a8be550..188211b 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,7 +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.spi.Metadata; import org.apache.camel.util.CamelContextHelper; import org.apache.camel.util.ObjectHelper; @@ -33,7 +33,7 @@ import org.apache.camel.util.ObjectHelper; * * @version */ -@Label("eip,policy") +@Metadata(label = "eip,policy") @XmlRootElement(name = "redeliveryPolicy") @XmlAccessorType(XmlAccessType.FIELD) public class RedeliveryPolicyDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/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 8bae696..ce270ee 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,14 +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.Metadata; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.ObjectHelper; /** * Removes a named header from the message */ -@Label("eip,transformation") +@Metadata(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/111acdf3/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 88c193b..d8e5069 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,14 +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.Metadata; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.ObjectHelper; /** * Removes message headers whose name matches a specified pattern */ -@Label("eip,transformation") +@Metadata(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/111acdf3/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 6a7f397..7e997fb 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,14 +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.Metadata; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.ObjectHelper; /** * Removes message exchange properties whose name matches a specified pattern */ -@Label("eip,transformation") +@Metadata(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/111acdf3/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 2859b45..9a10c57 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,14 +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.Metadata; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.ObjectHelper; /** * Removes a named property from the message exchange */ -@Label("eip,transformation") +@Metadata(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/111acdf3/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 ec3b415..3afdc6c 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,7 +18,6 @@ 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; @@ -37,7 +36,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.Metadata; import org.apache.camel.spi.Required; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.CamelContextHelper; @@ -48,7 +47,7 @@ import org.apache.camel.util.ObjectHelper; * * @version */ -@Label("eip,routing") +@Metadata(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/111acdf3/camel-core/src/main/java/org/apache/camel/model/RestContextRefDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/RestContextRefDefinition.java b/camel-core/src/main/java/org/apache/camel/model/RestContextRefDefinition.java index df3b112..776b80e 100644 --- a/camel-core/src/main/java/org/apache/camel/model/RestContextRefDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/RestContextRefDefinition.java @@ -24,14 +24,14 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.CamelContext; import org.apache.camel.model.rest.RestDefinition; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * To refer to an XML file with rest services defined using the rest-dsl * * @version */ -@Label("rest") +@Metadata(label = "rest") @XmlRootElement(name = "restContextRef") @XmlAccessorType(XmlAccessType.FIELD) public class RestContextRefDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/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 492d9f3..db8da7d 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,13 +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.Metadata; import org.apache.camel.spi.RouteContext; /** * Forces a rollback by stopping routing the message */ -@Label("eip,routing") +@Metadata(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/111acdf3/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 a08a789..106f130 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,7 +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.spi.Metadata; import org.apache.camel.util.CamelContextHelper; import org.apache.camel.util.ObjectHelper; @@ -33,7 +33,7 @@ import org.apache.camel.util.ObjectHelper; * * @version */ -@Label("eip,configuration") +@Metadata(label = "eip,configuration") @XmlRootElement(name = "routeBuilder") @XmlAccessorType(XmlAccessType.FIELD) public class RouteBuilderDefinition extends IdentifiedType { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/RouteContainer.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/RouteContainer.java b/camel-core/src/main/java/org/apache/camel/model/RouteContainer.java index 6eeef8d..bbe4cf2 100644 --- a/camel-core/src/main/java/org/apache/camel/model/RouteContainer.java +++ b/camel-core/src/main/java/org/apache/camel/model/RouteContainer.java @@ -17,7 +17,6 @@ package org.apache.camel.model; import java.util.List; - import javax.xml.bind.annotation.XmlElementRef; /** http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/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 2610c02..9b45aea 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,21 +17,20 @@ 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; +import org.apache.camel.spi.Metadata; /** * To refer to an XML file with routes defined using the xml-dsl * * @version */ -@Label("configuration") +@Metadata(label = "configuration") @XmlRootElement(name = "routeContextRef") @XmlAccessorType(XmlAccessType.FIELD) public class RouteContextRefDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/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 f39bcea..5533090 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,7 +21,6 @@ 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; @@ -47,7 +46,6 @@ 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.Metadata; import org.apache.camel.spi.RouteContext; @@ -61,7 +59,7 @@ import org.apache.camel.util.ObjectHelper; * * @version */ -@Label("configuration") +@Metadata(label = "configuration") @XmlRootElement(name = "route") @XmlType(propOrder = {"inputs", "outputs"}) @XmlAccessorType(XmlAccessType.PROPERTY) http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/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 79e2663..c29f8ee 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,7 +18,6 @@ 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; @@ -27,14 +26,14 @@ import javax.xml.bind.annotation.XmlTransient; import org.apache.camel.Endpoint; import org.apache.camel.ErrorHandlerFactory; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * A series of Camel routes * * @version */ -@Label("configuration") +@Metadata(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/111acdf3/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 f2e045f..f57e8e4 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,7 +18,6 @@ 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; @@ -29,14 +28,13 @@ import org.apache.camel.Processor; import org.apache.camel.model.language.ExpressionDefinition; import org.apache.camel.model.language.HeaderExpression; import org.apache.camel.processor.RoutingSlip; -import org.apache.camel.spi.Label; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.RouteContext; /** * Routes a message through a series of steps that are pre-determined (the slip) */ -@Label("eip,routing") +@Metadata(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/111acdf3/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 fb8fa07..fa316b8 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,7 +18,6 @@ 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; @@ -28,7 +27,6 @@ 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.Metadata; import org.apache.camel.spi.RouteContext; @@ -37,7 +35,7 @@ import org.apache.camel.spi.RouteContext; * * @version */ -@Label("eip,management") +@Metadata(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/111acdf3/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 508084f..a3e4543 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 @@ -24,13 +24,13 @@ import org.apache.camel.Expression; import org.apache.camel.Processor; import org.apache.camel.model.language.ExpressionDefinition; import org.apache.camel.processor.SetBodyProcessor; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; import org.apache.camel.spi.RouteContext; /** * Sets the contents of the message body */ -@Label("eip,transformation") +@Metadata(label = "eip,transformation") @XmlRootElement(name = "setBody") @XmlAccessorType(XmlAccessType.FIELD) public class SetBodyDefinition extends NoOutputExpressionNode { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/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 3c1cc00..c6e9cff 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,7 +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.Metadata; import org.apache.camel.spi.RouteContext; /** @@ -33,7 +33,7 @@ import org.apache.camel.spi.RouteContext; * * @version */ -@Label("mep") +@Metadata(label = "mep") @XmlRootElement(name = "setExchangePattern") @XmlAccessorType(XmlAccessType.FIELD) public class SetExchangePatternDefinition extends NoOutputDefinition<SetExchangePatternDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/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 ece3dfc..b57ccc6 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 @@ -24,13 +24,13 @@ 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.Metadata; import org.apache.camel.spi.RouteContext; /** * Sets the contents of a fault message's body */ -@Label("eip,transformation") +@Metadata(label = "eip,transformation") @XmlRootElement(name = "setFaultBody") @XmlAccessorType(XmlAccessType.FIELD) public class SetFaultBodyDefinition extends NoOutputExpressionNode { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/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 be1a45c..13ebb47 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,7 +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.Metadata; import org.apache.camel.spi.Required; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.ObjectHelper; @@ -34,7 +34,7 @@ import org.apache.camel.util.ObjectHelper; /** * Sets the value of a message header */ -@Label("eip,transformation") +@Metadata(label = "eip,transformation") @XmlRootElement(name = "setHeader") @XmlAccessorType(XmlAccessType.FIELD) public class SetHeaderDefinition extends NoOutputExpressionNode { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/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 29835a6..dc405f1 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,7 +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.Metadata; import org.apache.camel.spi.Required; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.ObjectHelper; @@ -35,7 +35,7 @@ import org.apache.camel.util.ObjectHelper; * * @deprecated not really needed, will be removed in the future */ -@Label("eip,transformation") +@Metadata(label = "eip,transformation") @XmlRootElement(name = "setOutHeader") @XmlAccessorType(XmlAccessType.FIELD) @Deprecated http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/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 db9b549..eccb3d2 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,7 +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.Metadata; import org.apache.camel.spi.Required; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.ObjectHelper; @@ -34,7 +34,7 @@ import org.apache.camel.util.ObjectHelper; /** * Sets a named property on the message exchange */ -@Label("eip,transformation") +@Metadata(label = "eip,transformation") @XmlRootElement(name = "setProperty") @XmlAccessorType(XmlAccessType.FIELD) public class SetPropertyDefinition extends NoOutputExpressionNode { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/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 198cd6a..075dafd 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,7 +17,6 @@ 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; @@ -28,15 +27,16 @@ import org.apache.camel.Expression; import org.apache.camel.Processor; import org.apache.camel.model.language.ExpressionDefinition; import org.apache.camel.processor.SortProcessor; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.ObjectHelper; + import static org.apache.camel.builder.ExpressionBuilder.bodyExpression; /** * Sorts the contents of the message */ -@Label("eip,routing") +@Metadata(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/111acdf3/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 697c747..01e4153 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 @@ -31,7 +31,6 @@ 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.Metadata; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.CamelContextHelper; @@ -41,7 +40,7 @@ import org.apache.camel.util.CamelContextHelper; * * @version */ -@Label("eip,routing") +@Metadata(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/111acdf3/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 a8dfb25..e281812 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,7 +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.Metadata; import org.apache.camel.spi.RouteContext; /** @@ -30,7 +30,7 @@ import org.apache.camel.spi.RouteContext; * * @version */ -@Label("eip,routing") +@Metadata(label = "eip,routing") @XmlRootElement(name = "stop") @XmlAccessorType(XmlAccessType.FIELD) public class StopDefinition extends NoOutputDefinition<StopDefinition> {
