http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/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 ec187ac..b5fb5b2 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 @@ -26,14 +26,14 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.apache.camel.ThreadPoolRejectedPolicy; import org.apache.camel.builder.xml.TimeUnitAdapter; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * To configure thread pools * * @version */ -@Label("configuration") +@Metadata(label = "configuration") @XmlRootElement(name = "threadPoolProfile") @XmlAccessorType(XmlAccessType.FIELD) public class ThreadPoolProfileDefinition extends OptionalIdentifiedDefinition<ThreadPoolProfileDefinition> {
http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/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 a4e9e5d..065be28 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 @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.ExecutorService; import java.util.concurrent.TimeUnit; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; @@ -35,7 +34,6 @@ 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.Metadata; import org.apache.camel.spi.RouteContext; import org.apache.camel.spi.ThreadPoolProfile; @@ -45,7 +43,7 @@ import org.apache.camel.spi.ThreadPoolProfile; * * @version */ -@Label("eip,routing") +@Metadata(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/111acdf3/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 cd7131f..f9f7457 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 @@ -29,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.Throttler; -import org.apache.camel.spi.Label; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.ObjectHelper; @@ -39,7 +38,7 @@ import org.apache.camel.util.ObjectHelper; * * @version */ -@Label("eip,routing") +@Metadata(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/111acdf3/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 651c56e..9b15f9c 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,14 +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.Metadata; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.ObjectHelper; /** * Throws an exception */ -@Label("eip,errorHandler") +@Metadata(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/111acdf3/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 e372fc8..aa89600 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,14 +23,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; /** * Sends the message to an endpoint * * @version */ -@Label("eip,routing") +@Metadata(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/111acdf3/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 41170a5..c0ea837 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,7 +18,6 @@ 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; @@ -30,7 +29,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.Metadata; import org.apache.camel.spi.Policy; import org.apache.camel.spi.RouteContext; import org.apache.camel.spi.TransactedPolicy; @@ -44,7 +43,7 @@ import org.slf4j.LoggerFactory; * * @version */ -@Label("eip,routing") +@Metadata(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/111acdf3/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 225bba6..5ee8dd4 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 @@ -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.TransformProcessor; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; import org.apache.camel.spi.RouteContext; /** * Transforms the message body based on an expression */ -@Label("eip,transformation") +@Metadata(label = "eip,transformation") @XmlRootElement(name = "transform") @XmlAccessorType(XmlAccessType.FIELD) public class TransformDefinition extends NoOutputExpressionNode { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/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 a974d55..e42417c 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,7 +20,6 @@ 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; @@ -31,7 +30,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.Metadata; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.ExpressionToPredicateAdapter; @@ -40,7 +39,7 @@ import org.apache.camel.util.ExpressionToPredicateAdapter; * * @version */ -@Label("eip,errorHandler") +@Metadata(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/111acdf3/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 8ced831..8efeda3 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 @@ -59,7 +59,7 @@ import org.apache.camel.model.dataformat.ZipDataFormat; import org.apache.camel.model.dataformat.ZipFileDataFormat; import org.apache.camel.processor.UnmarshalProcessor; 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 = "unmarshal") @XmlAccessorType(XmlAccessType.FIELD) public class UnmarshalDefinition extends NoOutputDefinition<UnmarshalDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/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 2f102e1..4126de5 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 @@ -23,7 +23,7 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.Predicate; import org.apache.camel.model.language.ExpressionDefinition; import org.apache.camel.processor.validation.PredicateValidatingProcessor; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; import org.apache.camel.spi.RouteContext; /** @@ -31,7 +31,7 @@ import org.apache.camel.spi.RouteContext; * * @version */ -@Label("eip,transformation") +@Metadata(label = "eip,transformation") @XmlRootElement(name = "validate") @XmlAccessorType(XmlAccessType.FIELD) public class ValidateDefinition extends NoOutputExpressionNode { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/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 3ab297d..e0f1494 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,7 +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.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 = "when") public class WhenDefinition extends ExpressionNode { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/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 09fa17b..a49c1ba 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 @@ -21,13 +21,13 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.Exchange; import org.apache.camel.Predicate; 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; /** * Predicate to determine if the message should be sent or not to the endpoint, when using interceptSentToEndpoint. */ -@Label("eip,routing") +@Metadata(label = "eip,routing") @XmlRootElement(name = "whenSkipSendToEndpoint") public class WhenSkipSendToEndpointDefinition extends WhenDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java b/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java index 4ff69c4..d975e79 100644 --- a/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java @@ -34,7 +34,6 @@ import org.apache.camel.Processor; import org.apache.camel.Producer; import org.apache.camel.processor.CamelInternalProcessor; import org.apache.camel.processor.WireTapProcessor; -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 +41,7 @@ import org.apache.camel.util.CamelContextHelper; /** * Routes a copy of a message (or creates a new message) to a secondary destination while continue routing the original message. */ -@Label("eip,management") +@Metadata(label = "eip,management") @XmlRootElement(name = "wireTap") @XmlAccessorType(XmlAccessType.FIELD) public class WireTapDefinition<Type extends ProcessorDefinition<Type>> extends NoOutputDefinition<WireTapDefinition<Type>> http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java b/camel-core/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java index 4ad9362..f3bd223 100644 --- a/camel-core/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java +++ b/camel-core/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java @@ -21,13 +21,12 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.camel.spi.Label; import org.apache.camel.spi.Metadata; /** * Configures batch-processing resequence eip. */ -@Label("configuration") +@Metadata(label = "configuration") @XmlRootElement(name = "batch-config") @XmlAccessorType(XmlAccessType.FIELD) public class BatchResequencerConfig extends ResequencerConfig { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/config/PropertiesDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/config/PropertiesDefinition.java b/camel-core/src/main/java/org/apache/camel/model/config/PropertiesDefinition.java index 8600d7d..c48807a 100644 --- a/camel-core/src/main/java/org/apache/camel/model/config/PropertiesDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/config/PropertiesDefinition.java @@ -24,12 +24,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; /** * A series of key value pair */ -@Label("configuration") +@Metadata(label = "configuration") @XmlRootElement(name = "properties") @XmlAccessorType(XmlAccessType.FIELD) public class PropertiesDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/config/PropertyDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/config/PropertyDefinition.java b/camel-core/src/main/java/org/apache/camel/model/config/PropertyDefinition.java index 055204b..832420b 100644 --- a/camel-core/src/main/java/org/apache/camel/model/config/PropertyDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/config/PropertyDefinition.java @@ -21,12 +21,12 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * A key value pair */ -@Label("configuration") +@Metadata(label = "configuration") @XmlRootElement(name = "property") @XmlAccessorType(XmlAccessType.FIELD) public class PropertyDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/config/ResequencerConfig.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/config/ResequencerConfig.java b/camel-core/src/main/java/org/apache/camel/model/config/ResequencerConfig.java index 5d8042b..5e55445 100644 --- a/camel-core/src/main/java/org/apache/camel/model/config/ResequencerConfig.java +++ b/camel-core/src/main/java/org/apache/camel/model/config/ResequencerConfig.java @@ -20,8 +20,6 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlType; -import org.apache.camel.spi.Label; - @XmlType(name = "resequencerConfig") @XmlAccessorType(XmlAccessType.FIELD) public abstract class ResequencerConfig { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java b/camel-core/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java index df01ce8..0bfbe8c 100644 --- a/camel-core/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java +++ b/camel-core/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java @@ -24,13 +24,12 @@ import javax.xml.bind.annotation.XmlTransient; import org.apache.camel.processor.resequencer.DefaultExchangeComparator; import org.apache.camel.processor.resequencer.ExpressionResultComparator; -import org.apache.camel.spi.Label; import org.apache.camel.spi.Metadata; /** * Configures stream-processing resequence eip. */ -@Label("configuration") +@Metadata(label = "configuration") @XmlRootElement(name = "stream-config") @XmlAccessorType(XmlAccessType.FIELD) public class StreamResequencerConfig extends ResequencerConfig { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/dataformat/AvroDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/AvroDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/AvroDataFormat.java index 9cdfd9f..67c1db1 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/AvroDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/AvroDataFormat.java @@ -25,14 +25,14 @@ import javax.xml.bind.annotation.XmlTransient; import org.apache.camel.CamelContext; import org.apache.camel.model.DataFormatDefinition; import org.apache.camel.spi.DataFormat; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * Avro data format * * @version */ -@Label("dataformat,transformation") +@Metadata(label = "dataformat,transformation") @XmlRootElement(name = "avro") @XmlAccessorType(XmlAccessType.FIELD) public class AvroDataFormat extends DataFormatDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/dataformat/BarcodeDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/BarcodeDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/BarcodeDataFormat.java index 57a0530..556e047 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/BarcodeDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/BarcodeDataFormat.java @@ -24,14 +24,14 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.CamelContext; import org.apache.camel.model.DataFormatDefinition; import org.apache.camel.spi.DataFormat; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * Barcode data format * * @version */ -@Label("dataformat,transformation") +@Metadata(label = "dataformat,transformation") @XmlRootElement(name = "barcode") @XmlAccessorType(XmlAccessType.FIELD) public class BarcodeDataFormat extends DataFormatDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/dataformat/Base64DataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/Base64DataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/Base64DataFormat.java index e6975be..1a36124 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/Base64DataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/Base64DataFormat.java @@ -24,7 +24,6 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.CamelContext; import org.apache.camel.model.DataFormatDefinition; import org.apache.camel.spi.DataFormat; -import org.apache.camel.spi.Label; import org.apache.camel.spi.Metadata; /** @@ -32,7 +31,7 @@ import org.apache.camel.spi.Metadata; * * @version */ -@Label("dataformat,transformation") +@Metadata(label = "dataformat,transformation") @XmlRootElement(name = "base64") @XmlAccessorType(XmlAccessType.FIELD) public class Base64DataFormat extends DataFormatDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java index 6c200b8..c2f2b79 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java @@ -24,14 +24,14 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.CamelContext; import org.apache.camel.model.DataFormatDefinition; import org.apache.camel.spi.DataFormat; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * BeanIO data format * * @version */ -@Label("dataformat,transformation") +@Metadata(label = "dataformat,transformation") @XmlRootElement(name = "beanio") @XmlAccessorType(XmlAccessType.FIELD) public class BeanioDataFormat extends DataFormatDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java index 4b6e2a8..71187f4 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java @@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlTransient; import org.apache.camel.CamelContext; import org.apache.camel.model.DataFormatDefinition; 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.ObjectHelper; @@ -34,7 +34,7 @@ import org.apache.camel.util.ObjectHelper; * * @version */ -@Label("dataformat,transformation") +@Metadata(label = "dataformat,transformation") @XmlRootElement(name = "bindy") @XmlAccessorType(XmlAccessType.FIELD) public class BindyDataFormat extends DataFormatDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/dataformat/CastorDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/CastorDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/CastorDataFormat.java index 7c049b3..2be0924 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/CastorDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/CastorDataFormat.java @@ -24,7 +24,6 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.CamelContext; import org.apache.camel.model.DataFormatDefinition; import org.apache.camel.spi.DataFormat; -import org.apache.camel.spi.Label; import org.apache.camel.spi.Metadata; /** @@ -32,7 +31,7 @@ import org.apache.camel.spi.Metadata; * * @version */ -@Label("dataformat,transformation") +@Metadata(label = "dataformat,transformation") @XmlRootElement(name = "castor") @XmlAccessorType(XmlAccessType.FIELD) public class CastorDataFormat extends DataFormatDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/dataformat/CryptoDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/CryptoDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/CryptoDataFormat.java index d00130b..1c22d8c 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/CryptoDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/CryptoDataFormat.java @@ -26,7 +26,6 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.CamelContext; import org.apache.camel.model.DataFormatDefinition; 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.CamelContextHelper; @@ -37,7 +36,7 @@ import org.apache.camel.util.ObjectHelper; * * @version */ -@Label("dataformat,transformation") +@Metadata(label = "dataformat,transformation") @XmlRootElement(name = "crypto") @XmlAccessorType(XmlAccessType.FIELD) public class CryptoDataFormat extends DataFormatDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java index f6c3c9b..0f7308b 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java @@ -26,14 +26,14 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.CamelContext; import org.apache.camel.model.DataFormatDefinition; import org.apache.camel.spi.DataFormat; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; import org.apache.camel.util.CamelContextHelper; import org.apache.camel.util.ObjectHelper; /** * CSV data format */ -@Label("dataformat,transformation") +@Metadata(label = "dataformat,transformation") @XmlRootElement(name = "csv") @XmlAccessorType(XmlAccessType.FIELD) public class CsvDataFormat extends DataFormatDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/dataformat/CustomDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/CustomDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/CustomDataFormat.java index 1250711..86cbebc 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/CustomDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/CustomDataFormat.java @@ -23,7 +23,7 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.model.DataFormatDefinition; import org.apache.camel.spi.DataFormat; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; import org.apache.camel.spi.RouteContext; /** @@ -31,7 +31,7 @@ import org.apache.camel.spi.RouteContext; * * @version */ -@Label("dataformat,transformation") +@Metadata(label = "dataformat,transformation") @XmlRootElement(name = "customDataFormat") @XmlAccessorType(XmlAccessType.FIELD) public class CustomDataFormat extends DataFormatDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java index 812b756..bb53675 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java @@ -26,12 +26,12 @@ import javax.xml.bind.annotation.XmlElements; import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.model.DataFormatDefinition; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * To configure data formats */ -@Label("dataformat,transformation") +@Metadata(label = "dataformat,transformation") @XmlRootElement(name = "dataFormats") @XmlAccessorType(XmlAccessType.FIELD) public class DataFormatsDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java index 3d2d4c4..3285583 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java @@ -24,7 +24,6 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.CamelContext; import org.apache.camel.model.DataFormatDefinition; 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.CamelContextHelper; @@ -33,7 +32,7 @@ import org.apache.camel.util.ObjectHelper; /** * Flatpack data format */ -@Label("dataformat,transformation") +@Metadata(label = "dataformat,transformation") @XmlRootElement(name = "flatpack") @XmlAccessorType(XmlAccessType.FIELD) public class FlatpackDataFormat extends DataFormatDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/dataformat/GzipDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/GzipDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/GzipDataFormat.java index 392ba32..a1cf134 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/GzipDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/GzipDataFormat.java @@ -20,7 +20,7 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.model.DataFormatDefinition; import org.apache.camel.spi.DataFormat; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; import org.apache.camel.spi.RouteContext; /** @@ -28,7 +28,7 @@ import org.apache.camel.spi.RouteContext; * * @version */ -@Label("dataformat,transformation") +@Metadata(label = "dataformat,transformation") @XmlRootElement(name = "gzip") public class GzipDataFormat extends DataFormatDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java index 3ac4c82..729c940 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java @@ -25,7 +25,6 @@ import javax.xml.bind.annotation.XmlTransient; import org.apache.camel.CamelContext; import org.apache.camel.model.DataFormatDefinition; import org.apache.camel.spi.DataFormat; -import org.apache.camel.spi.Label; import org.apache.camel.spi.Metadata; /** @@ -33,7 +32,7 @@ import org.apache.camel.spi.Metadata; * * @version */ -@Label("dataformat,transformation,hl7") +@Metadata(label = "dataformat,transformation,hl7") @XmlRootElement(name = "hl7") @XmlAccessorType(XmlAccessType.FIELD) public class HL7DataFormat extends DataFormatDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/dataformat/IcalDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/IcalDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/IcalDataFormat.java index eb7d63a..16ca1c6 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/IcalDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/IcalDataFormat.java @@ -24,14 +24,14 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.CamelContext; import org.apache.camel.model.DataFormatDefinition; import org.apache.camel.spi.DataFormat; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * iCal data format * * @version */ -@Label("dataformat,transformation") +@Metadata(label = "dataformat,transformation") @XmlRootElement(name = "ical") @XmlAccessorType(XmlAccessType.FIELD) public class IcalDataFormat extends DataFormatDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java index 54d90f1..577992e 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java @@ -25,7 +25,7 @@ import javax.xml.namespace.QName; import org.apache.camel.CamelContext; import org.apache.camel.model.DataFormatDefinition; import org.apache.camel.spi.DataFormat; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; import org.apache.camel.util.ObjectHelper; /** @@ -33,7 +33,7 @@ import org.apache.camel.util.ObjectHelper; * * @version */ -@Label("dataformat,transformation") +@Metadata(label = "dataformat,transformation") @XmlRootElement(name = "jaxb") @XmlAccessorType(XmlAccessType.FIELD) public class JaxbDataFormat extends DataFormatDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/dataformat/JibxDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/JibxDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/JibxDataFormat.java index 15da316..30a1bab 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/JibxDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/JibxDataFormat.java @@ -25,14 +25,14 @@ import javax.xml.bind.annotation.XmlTransient; import org.apache.camel.CamelContext; import org.apache.camel.model.DataFormatDefinition; 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.ObjectHelper; /** * JiBX data format */ -@Label("dataformat,transformation") +@Metadata(label = "dataformat,transformation") @XmlRootElement(name = "jibx") @XmlAccessorType(XmlAccessType.NONE) public class JibxDataFormat extends DataFormatDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java index 7da7622..242bf0b 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java @@ -25,7 +25,6 @@ import javax.xml.bind.annotation.XmlTransient; import org.apache.camel.CamelContext; import org.apache.camel.model.DataFormatDefinition; 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.ObjectHelper; @@ -35,7 +34,7 @@ import org.apache.camel.util.ObjectHelper; * * @version */ -@Label("dataformat,transformation") +@Metadata(label = "dataformat,transformation") @XmlRootElement(name = "json") @XmlAccessorType(XmlAccessType.FIELD) public class JsonDataFormat extends DataFormatDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/dataformat/PGPDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/PGPDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/PGPDataFormat.java index e9f257b..0f592e4 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/PGPDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/PGPDataFormat.java @@ -24,13 +24,12 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.CamelContext; import org.apache.camel.model.DataFormatDefinition; import org.apache.camel.spi.DataFormat; -import org.apache.camel.spi.Label; import org.apache.camel.spi.Metadata; /** * PGP data format */ -@Label("dataformat,transformation") +@Metadata(label = "dataformat,transformation") @XmlRootElement(name = "pgp") @XmlAccessorType(XmlAccessType.FIELD) public class PGPDataFormat extends DataFormatDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java index 1880ef5..3c973c8 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java @@ -25,14 +25,14 @@ import javax.xml.bind.annotation.XmlTransient; import org.apache.camel.CamelContext; import org.apache.camel.model.DataFormatDefinition; import org.apache.camel.spi.DataFormat; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * Google protobuf data format * * @version */ -@Label("dataformat,transformation") +@Metadata(label = "dataformat,transformation") @XmlRootElement(name = "protobuf") @XmlAccessorType(XmlAccessType.FIELD) public class ProtobufDataFormat extends DataFormatDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/dataformat/RssDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/RssDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/RssDataFormat.java index 3ecdf2c..8beb53e 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/RssDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/RssDataFormat.java @@ -21,12 +21,12 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.model.DataFormatDefinition; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * RSS data format */ -@Label("dataformat,transformation") +@Metadata(label = "dataformat,transformation") @XmlRootElement(name = "rss") @XmlAccessorType(XmlAccessType.FIELD) public class RssDataFormat extends DataFormatDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/dataformat/SerializationDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/SerializationDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/SerializationDataFormat.java index e448cf0..0fe4707 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/SerializationDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/SerializationDataFormat.java @@ -20,7 +20,7 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.model.DataFormatDefinition; import org.apache.camel.spi.DataFormat; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; import org.apache.camel.spi.RouteContext; /** @@ -28,7 +28,7 @@ import org.apache.camel.spi.RouteContext; * * @version */ -@Label("dataformat,transformation") +@Metadata(label = "dataformat,transformation") @XmlRootElement(name = "serialization") public class SerializationDataFormat extends DataFormatDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java index e0cb3a7..b7477ec 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java @@ -25,13 +25,12 @@ import javax.xml.bind.annotation.XmlTransient; import org.apache.camel.CamelContext; import org.apache.camel.model.DataFormatDefinition; import org.apache.camel.spi.DataFormat; -import org.apache.camel.spi.Label; import org.apache.camel.spi.Metadata; /** * SOAP data format */ -@Label("dataformat,transformation") +@Metadata(label = "dataformat,transformation") @XmlRootElement(name = "soapjaxb") @XmlAccessorType(XmlAccessType.FIELD) public class SoapJaxbDataFormat extends DataFormatDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/dataformat/StringDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/StringDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/StringDataFormat.java index 50c2c19..81a4923 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/StringDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/StringDataFormat.java @@ -23,7 +23,7 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.model.DataFormatDefinition; import org.apache.camel.spi.DataFormat; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; import org.apache.camel.spi.RouteContext; /** @@ -31,7 +31,7 @@ import org.apache.camel.spi.RouteContext; * * @version */ -@Label("dataformat,transformation") +@Metadata(label = "dataformat,transformation") @XmlRootElement(name = "string") @XmlAccessorType(XmlAccessType.FIELD) public class StringDataFormat extends DataFormatDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/dataformat/SyslogDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/SyslogDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/SyslogDataFormat.java index 3ccb45a..02ed09f 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/SyslogDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/SyslogDataFormat.java @@ -21,14 +21,14 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.model.DataFormatDefinition; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * Syslog data format * * @version */ -@Label("dataformat,transformation") +@Metadata(label = "dataformat,transformation") @XmlRootElement(name = "syslog") @XmlAccessorType(XmlAccessType.FIELD) public class SyslogDataFormat extends DataFormatDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java index 2ac4477..52538bf 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java @@ -27,14 +27,14 @@ import org.w3c.dom.Node; import org.apache.camel.CamelContext; import org.apache.camel.model.DataFormatDefinition; 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.ObjectHelper; /** * Tidymark (wellformed HTML) data format */ -@Label("dataformat,transformation") +@Metadata(label = "dataformat,transformation") @XmlRootElement(name = "tidyMarkup") @XmlAccessorType(XmlAccessType.FIELD) public class TidyMarkupDataFormat extends DataFormatDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java index 30cc981..dd66c46 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java @@ -18,7 +18,6 @@ package org.apache.camel.model.dataformat; import java.util.ArrayList; import java.util.List; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; @@ -27,13 +26,12 @@ import javax.xml.bind.annotation.XmlElementRef; import org.apache.camel.CamelContext; import org.apache.camel.model.DataFormatDefinition; import org.apache.camel.spi.DataFormat; -import org.apache.camel.spi.Label; import org.apache.camel.spi.Metadata; /** * Represents the common parts of all uniVocity {@link org.apache.camel.spi.DataFormat} parsers. */ -@Label("dataformat,transformation") +@Metadata(label = "dataformat,transformation") @XmlAccessorType(XmlAccessType.FIELD) public abstract class UniVocityAbstractDataFormat extends DataFormatDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java index 38d9848..a549114 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java @@ -23,13 +23,12 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.CamelContext; import org.apache.camel.spi.DataFormat; -import org.apache.camel.spi.Label; import org.apache.camel.spi.Metadata; /** * UniVocity CSV data format */ -@Label("dataformat,transformation") +@Metadata(label = "dataformat,transformation") @XmlRootElement(name = "univocity-csv") @XmlAccessorType(XmlAccessType.FIELD) public class UniVocityCsvDataFormat extends UniVocityAbstractDataFormat { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityFixedWidthDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityFixedWidthDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityFixedWidthDataFormat.java index dbb0967..5217fdf 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityFixedWidthDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityFixedWidthDataFormat.java @@ -23,13 +23,12 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.CamelContext; import org.apache.camel.spi.DataFormat; -import org.apache.camel.spi.Label; import org.apache.camel.spi.Metadata; /** * UniVocity fixed-width data format */ -@Label("dataformat,transformation") +@Metadata(label = "dataformat,transformation") @XmlRootElement(name = "univocity-fixed") @XmlAccessorType(XmlAccessType.FIELD) public class UniVocityFixedWidthDataFormat extends UniVocityAbstractDataFormat { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityHeader.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityHeader.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityHeader.java index d3a0c32..269d053 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityHeader.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityHeader.java @@ -22,12 +22,12 @@ 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 configure headers for UniVocity data formats. */ -@Label("dataformat,transformation") +@Metadata(label = "dataformat,transformation") @XmlRootElement(name = "univocity-header") @XmlAccessorType(XmlAccessType.FIELD) public class UniVocityHeader { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java index bd70593..52ed41d 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java @@ -23,13 +23,12 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.CamelContext; import org.apache.camel.spi.DataFormat; -import org.apache.camel.spi.Label; import org.apache.camel.spi.Metadata; /** * UniVocity TSV data format */ -@Label("dataformat,transformation") +@Metadata(label = "dataformat,transformation") @XmlRootElement(name = "univocity-tsv") @XmlAccessorType(XmlAccessType.FIELD) public class UniVocityTsvDataFormat extends UniVocityAbstractDataFormat { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLBeansDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLBeansDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLBeansDataFormat.java index 7d198de..606284a 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLBeansDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLBeansDataFormat.java @@ -22,14 +22,14 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.model.DataFormatDefinition; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * XMLBeans data format * * @version */ -@Label("dataformat,transformation") +@Metadata(label = "dataformat,transformation") @XmlRootElement(name = "xmlBeans") @XmlAccessorType(XmlAccessType.FIELD) public class XMLBeansDataFormat extends DataFormatDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java index 68999fa..a53ea1d 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java @@ -27,7 +27,6 @@ import javax.xml.bind.annotation.XmlTransient; import org.apache.camel.CamelContext; import org.apache.camel.model.DataFormatDefinition; import org.apache.camel.spi.DataFormat; -import org.apache.camel.spi.Label; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.NamespaceAware; import org.apache.camel.util.jsse.KeyStoreParameters; @@ -35,7 +34,7 @@ import org.apache.camel.util.jsse.KeyStoreParameters; /** * xml-security data format */ -@Label("dataformat,transformation") +@Metadata(label = "dataformat,transformation") @XmlRootElement(name = "secureXML") @XmlAccessorType(XmlAccessType.FIELD) public class XMLSecurityDataFormat extends DataFormatDefinition implements NamespaceAware { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java index 0a90c0a..a75406c 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java @@ -22,7 +22,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; @@ -36,7 +35,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.apache.camel.CamelContext; import org.apache.camel.model.DataFormatDefinition; 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.CamelContextHelper; import org.apache.camel.util.ObjectHelper; @@ -46,7 +45,7 @@ import org.apache.camel.util.ObjectHelper; * * @version */ -@Label("dataformat,transformation") +@Metadata(label = "dataformat,transformation") @XmlRootElement(name = "xstream") @XmlAccessorType(XmlAccessType.NONE) public class XStreamDataFormat extends DataFormatDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlJsonDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlJsonDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlJsonDataFormat.java index c5a6242..9f85f8a 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlJsonDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlJsonDataFormat.java @@ -19,7 +19,6 @@ package org.apache.camel.model.dataformat; import java.util.Arrays; 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; @@ -29,14 +28,14 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.CamelContext; import org.apache.camel.model.DataFormatDefinition; import org.apache.camel.spi.DataFormat; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * xml-json data format * * @version */ -@Label("dataformat,transformation") +@Metadata(label = "dataformat,transformation") @XmlRootElement(name = "xmljson") @XmlAccessorType(XmlAccessType.FIELD) public class XmlJsonDataFormat extends DataFormatDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlRpcDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlRpcDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlRpcDataFormat.java index 2bcc7a6..3bd1c4e 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlRpcDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlRpcDataFormat.java @@ -24,12 +24,12 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.CamelContext; import org.apache.camel.model.DataFormatDefinition; import org.apache.camel.spi.DataFormat; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * xml-rpc data format */ -@Label("dataformat,transformation") +@Metadata(label = "dataformat,transformation") @XmlRootElement(name = "xmlrpc") @XmlAccessorType(XmlAccessType.FIELD) public class XmlRpcDataFormat extends DataFormatDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipDataFormat.java index 1795c3f..47f1092 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipDataFormat.java @@ -24,14 +24,13 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.model.DataFormatDefinition; import org.apache.camel.spi.DataFormat; -import org.apache.camel.spi.Label; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.RouteContext; /** * zip data format (not for zip files) */ -@Label("dataformat,transformation") +@Metadata(label = "dataformat,transformation") @XmlRootElement(name = "zip") @XmlAccessorType(XmlAccessType.FIELD) public class ZipDataFormat extends DataFormatDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java index a982c86..6eeda09 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java @@ -24,12 +24,12 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.CamelContext; import org.apache.camel.model.DataFormatDefinition; import org.apache.camel.spi.DataFormat; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * zip-file data format */ -@Label("dataformat,transformation") +@Metadata(label = "dataformat,transformation") // TODO: use zipfile as name in Camel 3.0 @XmlRootElement(name = "zipFile") @XmlAccessorType(XmlAccessType.FIELD) http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/language/ConstantExpression.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/language/ConstantExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/ConstantExpression.java index aa34e72..1f2e48f 100644 --- a/camel-core/src/main/java/org/apache/camel/model/language/ConstantExpression.java +++ b/camel-core/src/main/java/org/apache/camel/model/language/ConstantExpression.java @@ -20,12 +20,12 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * For expressions and predicates using a constant */ -@Label("language") +@Metadata(label = "language") @XmlRootElement(name = "constant") @XmlAccessorType(XmlAccessType.FIELD) public class ConstantExpression extends ExpressionDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/language/ELExpression.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/language/ELExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/ELExpression.java index ae5e666..5f41858 100644 --- a/camel-core/src/main/java/org/apache/camel/model/language/ELExpression.java +++ b/camel-core/src/main/java/org/apache/camel/model/language/ELExpression.java @@ -20,14 +20,14 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * For EL expressions and predicates * * @version */ -@Label("language") +@Metadata(label = "language") @XmlRootElement(name = "el") @XmlAccessorType(XmlAccessType.FIELD) public class ELExpression extends ExpressionDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java b/camel-core/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java index 904697d..aeb40ac 100644 --- a/camel-core/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java @@ -17,7 +17,6 @@ package org.apache.camel.model.language; import java.util.List; - 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.CamelContext; import org.apache.camel.Exchange; import org.apache.camel.Expression; import org.apache.camel.Predicate; -import org.apache.camel.spi.Label; import org.apache.camel.spi.Language; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.Required; @@ -48,7 +46,7 @@ import org.apache.camel.util.ObjectHelper; * * @version */ -@Label("language") +@Metadata(label = "language") @XmlRootElement @XmlType(name = "expression") // must be named expression @XmlAccessorType(XmlAccessType.FIELD) http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/language/GroovyExpression.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/language/GroovyExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/GroovyExpression.java index dc513d9..b7359e9 100644 --- a/camel-core/src/main/java/org/apache/camel/model/language/GroovyExpression.java +++ b/camel-core/src/main/java/org/apache/camel/model/language/GroovyExpression.java @@ -20,14 +20,14 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * For Groovy expressions and predicates * * @version */ -@Label("language") +@Metadata(label = "language") @XmlRootElement(name = "groovy") @XmlAccessorType(XmlAccessType.FIELD) public class GroovyExpression extends ExpressionDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/language/HeaderExpression.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/language/HeaderExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/HeaderExpression.java index 6c7a47a..a23a9a1 100644 --- a/camel-core/src/main/java/org/apache/camel/model/language/HeaderExpression.java +++ b/camel-core/src/main/java/org/apache/camel/model/language/HeaderExpression.java @@ -20,14 +20,14 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * An expression which extracts the named header * * @version */ -@Label("language") +@Metadata(label = "language") @XmlRootElement(name = "header") @XmlAccessorType(XmlAccessType.FIELD) public class HeaderExpression extends ExpressionDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/language/JXPathExpression.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/language/JXPathExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/JXPathExpression.java index 95b7a37..a2b99ed 100644 --- a/camel-core/src/main/java/org/apache/camel/model/language/JXPathExpression.java +++ b/camel-core/src/main/java/org/apache/camel/model/language/JXPathExpression.java @@ -24,14 +24,14 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.CamelContext; import org.apache.camel.Expression; import org.apache.camel.Predicate; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * For JXPath expressions and predicates * * @version */ -@Label("language") +@Metadata(label = "language") @XmlRootElement(name = "jxpath") @XmlAccessorType(XmlAccessType.FIELD) public class JXPathExpression extends ExpressionDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java index 8c956d9..20429be 100644 --- a/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java +++ b/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java @@ -20,14 +20,14 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * For JavaScript expressions and predicates * * @version */ -@Label("language") +@Metadata(label = "language") @XmlRootElement(name = "javaScript") @XmlAccessorType(XmlAccessType.FIELD) public class JavaScriptExpression extends ExpressionDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/language/JsonPathExpression.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/language/JsonPathExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/JsonPathExpression.java index 51855ab..57e673a 100644 --- a/camel-core/src/main/java/org/apache/camel/model/language/JsonPathExpression.java +++ b/camel-core/src/main/java/org/apache/camel/model/language/JsonPathExpression.java @@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlTransient; import org.apache.camel.CamelContext; import org.apache.camel.Expression; import org.apache.camel.Predicate; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; import org.apache.camel.util.ObjectHelper; /** @@ -33,7 +33,7 @@ import org.apache.camel.util.ObjectHelper; * * @version */ -@Label("language") +@Metadata(label = "language") @XmlRootElement(name = "jsonpath") @XmlAccessorType(XmlAccessType.FIELD) public class JsonPathExpression extends ExpressionDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/language/LanguageExpression.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/language/LanguageExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/LanguageExpression.java index 18101e4..c367aa0 100644 --- a/camel-core/src/main/java/org/apache/camel/model/language/LanguageExpression.java +++ b/camel-core/src/main/java/org/apache/camel/model/language/LanguageExpression.java @@ -21,7 +21,7 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * Represents a parameterised language expression which can support any language @@ -29,7 +29,7 @@ import org.apache.camel.spi.Label; * * @version */ -@Label("language") +@Metadata(label = "language") @XmlRootElement(name = "language") @XmlAccessorType(XmlAccessType.FIELD) public class LanguageExpression extends ExpressionDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java index 900a91f..5334f33 100644 --- a/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java +++ b/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java @@ -33,7 +33,7 @@ import org.apache.camel.component.bean.ConstantStaticTypeBeanHolder; import org.apache.camel.component.bean.MethodNotFoundException; import org.apache.camel.component.bean.RegistryBean; import org.apache.camel.language.bean.BeanExpression; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.OgnlHelper; @@ -42,7 +42,7 @@ import org.apache.camel.util.OgnlHelper; * * @version */ -@Label("language") +@Metadata(label = "language") @XmlRootElement(name = "method") @XmlAccessorType(XmlAccessType.FIELD) public class MethodCallExpression extends ExpressionDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java index c450c22..f470f5f 100644 --- a/camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java +++ b/camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java @@ -20,14 +20,14 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * For MVEL expressions and predicates * * @version */ -@Label("language") +@Metadata(label = "language") @XmlRootElement(name = "mvel") @XmlAccessorType(XmlAccessType.FIELD) public class MvelExpression extends ExpressionDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java index 2a1110f..f3d9eb6 100644 --- a/camel-core/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java +++ b/camel-core/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java @@ -17,7 +17,6 @@ package org.apache.camel.model.language; import java.util.Map; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlTransient; http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/language/OgnlExpression.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/language/OgnlExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/OgnlExpression.java index 55794a6..9b3fce4 100644 --- a/camel-core/src/main/java/org/apache/camel/model/language/OgnlExpression.java +++ b/camel-core/src/main/java/org/apache/camel/model/language/OgnlExpression.java @@ -20,14 +20,14 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * For OGNL expressions and predicates * * @version */ -@Label("language") +@Metadata(label = "language") @XmlRootElement(name = "ognl") @XmlAccessorType(XmlAccessType.FIELD) public class OgnlExpression extends ExpressionDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/language/PhpExpression.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/language/PhpExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/PhpExpression.java index 7410fbb..7009a0c 100644 --- a/camel-core/src/main/java/org/apache/camel/model/language/PhpExpression.java +++ b/camel-core/src/main/java/org/apache/camel/model/language/PhpExpression.java @@ -20,14 +20,14 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * For PHP expressions and predicates * * @version */ -@Label("language") +@Metadata(label = "language") @XmlRootElement(name = "php") @XmlAccessorType(XmlAccessType.FIELD) public class PhpExpression extends ExpressionDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/language/PropertyExpression.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/language/PropertyExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/PropertyExpression.java index c1f38ff..96a5cdd 100644 --- a/camel-core/src/main/java/org/apache/camel/model/language/PropertyExpression.java +++ b/camel-core/src/main/java/org/apache/camel/model/language/PropertyExpression.java @@ -20,14 +20,14 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * An expression which extracts the named exchange property * * @version */ -@Label("language") +@Metadata(label = "language") @XmlRootElement(name = "property") @XmlAccessorType(XmlAccessType.FIELD) public class PropertyExpression extends ExpressionDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/language/PythonExpression.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/language/PythonExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/PythonExpression.java index f06cbe9..bf3904b 100644 --- a/camel-core/src/main/java/org/apache/camel/model/language/PythonExpression.java +++ b/camel-core/src/main/java/org/apache/camel/model/language/PythonExpression.java @@ -20,14 +20,14 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * For Python expressions and predicates * * @version */ -@Label("language") +@Metadata(label = "language") @XmlRootElement(name = "python") @XmlAccessorType(XmlAccessType.FIELD) public class PythonExpression extends ExpressionDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/language/RefExpression.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/language/RefExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/RefExpression.java index 9876e57..98a22c4 100644 --- a/camel-core/src/main/java/org/apache/camel/model/language/RefExpression.java +++ b/camel-core/src/main/java/org/apache/camel/model/language/RefExpression.java @@ -20,12 +20,12 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * For using a custom expression */ -@Label("language") +@Metadata(label = "language") @XmlRootElement(name = "ref") @XmlAccessorType(XmlAccessType.FIELD) public class RefExpression extends ExpressionDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/language/RubyExpression.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/language/RubyExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/RubyExpression.java index c22dd62..fd46d70 100644 --- a/camel-core/src/main/java/org/apache/camel/model/language/RubyExpression.java +++ b/camel-core/src/main/java/org/apache/camel/model/language/RubyExpression.java @@ -20,14 +20,14 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * For Ruby expressions and predicates * * @version */ -@Label("language") +@Metadata(label = "language") @XmlRootElement(name = "ruby") @XmlAccessorType(XmlAccessType.FIELD) public class RubyExpression extends ExpressionDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/language/SimpleExpression.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/language/SimpleExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/SimpleExpression.java index 3d684f4..4adb219 100644 --- a/camel-core/src/main/java/org/apache/camel/model/language/SimpleExpression.java +++ b/camel-core/src/main/java/org/apache/camel/model/language/SimpleExpression.java @@ -26,7 +26,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.Expression; import org.apache.camel.Predicate; import org.apache.camel.builder.SimpleBuilder; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; import org.apache.camel.util.ObjectHelper; /** @@ -34,7 +34,7 @@ import org.apache.camel.util.ObjectHelper; * * @version */ -@Label("language") +@Metadata(label = "language") @XmlRootElement(name = "simple") @XmlAccessorType(XmlAccessType.FIELD) public class SimpleExpression extends ExpressionDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/language/SpELExpression.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/language/SpELExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/SpELExpression.java index 92a6b86..ce7f901 100644 --- a/camel-core/src/main/java/org/apache/camel/model/language/SpELExpression.java +++ b/camel-core/src/main/java/org/apache/camel/model/language/SpELExpression.java @@ -20,14 +20,14 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * For Spring Expression Language (SpEL) expressions and predicates * * @version */ -@Label("language") +@Metadata(label = "language") @XmlRootElement(name = "spel") @XmlAccessorType(XmlAccessType.FIELD) public class SpELExpression extends ExpressionDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/language/SqlExpression.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/language/SqlExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/SqlExpression.java index 907c242..e4ade94 100644 --- a/camel-core/src/main/java/org/apache/camel/model/language/SqlExpression.java +++ b/camel-core/src/main/java/org/apache/camel/model/language/SqlExpression.java @@ -20,14 +20,14 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * For SQL expressions and predicates * * @version */ -@Label("language") +@Metadata(label = "language") @XmlRootElement(name = "sql") @XmlAccessorType(XmlAccessType.FIELD) public class SqlExpression extends ExpressionDefinition {
