You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2019/06/28 13:18:48 UTC
[camel] branch master updated (e38709e -> a2d2b18)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from e38709e Polished
new 77a127c CAMEL-13657: Use name instead of headerName, propertyName in XML DSL to make it simpler and more natural.
new 6ad3352 CAMEL-13657: Use name instead of headerName, propertyName in XML DSL to make it simpler and more natural.
new 90e1cd8 CAMEL-13657: Use name instead of headerName, propertyName in XML DSL to make it simpler and more natural.
new a2d2b18 CAMEL-13657: Use name instead of headerName, propertyName in XML DSL to make it simpler and more natural.
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
MIGRATION.md | 15 +++++++
.../camel-ahc/src/main/docs/ahc-component.adoc | 2 +-
.../src/test/resources/camel-context-multiples.xml | 2 +-
.../crypto/SpringCryptoDataFormatTest.xml | 4 +-
.../component/cxf/jaxrs/CxfOperationException.xml | 2 +-
.../cxf/transport/CxfRsCamelTransport.xml | 8 ++--
.../camel-gora/src/main/docs/gora-component.adoc | 16 ++++----
.../main/docs/hazelcast-atomicvalue-component.adoc | 10 ++---
.../src/main/docs/hazelcast-map-component.adoc | 16 ++++----
.../main/docs/hazelcast-multimap-component.adoc | 8 ++--
.../docs/hazelcast-replicatedmap-component.adoc | 6 +--
.../main/docs/hazelcast-ringbuffer-component.adoc | 2 +-
.../camel-hazelcast/src/main/docs/hazelcast.adoc | 12 +++---
.../spring/test-camel-context-atomicnumber.xml | 14 +++----
...l-context-hazelcast-instance-name-reference.xml | 4 +-
...-camel-context-hazelcast-instance-reference.xml | 4 +-
.../META-INF/spring/test-camel-context-map.xml | 24 +++++------
.../spring/test-camel-context-multimap.xml | 14 +++----
.../spring/test-camel-context-replicatedmap.xml | 12 +++---
.../spring/test-camel-context-ringbuffer.xml | 10 ++---
.../camel-hbase/src/main/docs/hbase-component.adoc | 32 +++++++--------
.../camel-http4/src/main/docs/http4-component.adoc | 2 +-
.../camel-iota/src/main/docs/iota-component.adoc | 18 ++++-----
.../src/test/resources/blobstore-test.xml | 4 +-
.../src/main/docs/jsonpath-language.adoc | 2 +-
.../src/main/docs/properties-component.adoc | 4 +-
.../camel-solr/src/main/docs/solr-component.adoc | 8 ++--
.../SpringPropertiesAfterTransactedDSL2Test.xml | 2 +-
.../SpringPropertiesAfterTransactedDSLTest.xml | 2 +-
.../SpringSimpleFileNameWithQuoteTest-context.xml | 2 +-
.../SpringPropertiesAvailableEverywhereTest.xml | 2 +-
.../issues/SpringRenameFileOnCommitIssueTest.xml | 2 +-
.../processor/ClaimCheckEipPushPopBodyTest.xml | 2 +-
.../ClaimCheckEipPushPopHeadersPatternTest.xml | 2 +-
.../processor/ClaimCheckEipPushPopHeadersTest.xml | 2 +-
.../ClaimCheckEipPushPopRemoveHeaderTest.xml | 6 +--
.../RouteWithConstantFieldFromExchangeFailTest.xml | 2 +-
.../RouteWithConstantFieldFromExchangeTest.xml | 2 +-
.../spring/processor/SpringMethodCallTest.xml | 4 +-
...RecipientListParallelOptionalPropertiesTest.xml | 2 +-
.../camel/spring/processor/SpringRouteStopTest.xml | 2 +-
.../processor/SpringSetHeaderTest-context.xml | 2 +-
.../SpringSetHeaderWithConstantTest-context.xml | 2 +-
.../SpringSetHeaderXPathResultTypeTest.xml | 4 +-
.../processor/SpringSimpleResultTypeRouteTest.xml | 8 ++--
.../spring/processor/SpringTraceTest-context.xml | 2 +-
.../SpringTraceUsingPropertyTest-context.xml | 2 +-
.../processor/SpringWireTapNewExchangeTest.xml | 4 +-
.../apache/camel/spring/processor/aggregator.xml | 2 +-
.../apache/camel/spring/processor/removeHeader.xml | 2 +-
.../processor/removePropertiesWithExclusion.xml | 6 +--
.../processor/removePropertiesWithoutExclusion.xml | 4 +-
.../camel/spring/processor/removeProperty.xml | 2 +-
.../spring/processor/setHeaderNameDynamic.xml | 2 +-
.../apache/camel/spring/processor/setProperty.xml | 2 +-
.../spring/processor/setPropertyNameDynamic.xml | 2 +-
.../properties-location-element-implicit-test.xml | 6 +--
.../properties-location-element-optional-test.xml | 6 +--
.../blueprint/properties-location-element-test.xml | 6 +--
...SpringPropertiesLocationElementTest-context.xml | 6 +--
.../camel-xslt/src/main/docs/xslt-component.adoc | 2 +-
.../src/main/docs/zookeeper-component.adoc | 2 +-
.../src/main/docs/constant-language.adoc | 2 +-
core/camel-base/src/main/docs/simple-language.adoc | 6 +--
.../src/main/docs/eips/claimCheck-eip.adoc | 2 +-
.../src/main/docs/eips/setHeader-eip.adoc | 2 +-
.../src/main/docs/eips/setProperty-eip.adoc | 4 +-
.../apache/camel/model/SetHeaderDefinition.java | 26 ++++++------
.../apache/camel/model/SetPropertyDefinition.java | 26 ++++++------
.../org/apache/camel/reifier/SetHeaderReifier.java | 4 +-
.../apache/camel/reifier/SetPropertyReifier.java | 4 +-
.../java/org/apache/camel/model/XmlParseTest.java | 4 +-
.../util/DumpModelAsXmlRouteExpressionTest.java | 2 +-
.../org/apache/camel/impl/route4_error.xml | 2 +-
.../resources/org/apache/camel/impl/route4_ok.xml | 2 +-
.../resources/org/apache/camel/model/setHeader.xml | 2 +-
.../org/apache/camel/model/setHeaderToConstant.xml | 2 +-
.../modules/ROOT/pages/ahc-component.adoc | 2 +-
.../modules/ROOT/pages/gora-component.adoc | 16 ++++----
.../pages/hazelcast-atomicvalue-component.adoc | 10 ++---
.../ROOT/pages/hazelcast-map-component.adoc | 16 ++++----
.../ROOT/pages/hazelcast-multimap-component.adoc | 8 ++--
.../pages/hazelcast-replicatedmap-component.adoc | 6 +--
.../ROOT/pages/hazelcast-ringbuffer-component.adoc | 2 +-
docs/components/modules/ROOT/pages/hazelcast.adoc | 12 +++---
.../modules/ROOT/pages/hbase-component.adoc | 32 +++++++--------
.../modules/ROOT/pages/http4-component.adoc | 2 +-
.../modules/ROOT/pages/iota-component.adoc | 18 ++++-----
.../modules/ROOT/pages/jsonpath-language.adoc | 2 +-
.../modules/ROOT/pages/properties-component.adoc | 4 +-
.../modules/ROOT/pages/solr-component.adoc | 8 ++--
.../modules/ROOT/pages/xslt-component.adoc | 2 +-
.../modules/ROOT/pages/zookeeper-component.adoc | 2 +-
.../modules/ROOT/pages/claimCheck-eip.adoc | 2 +-
.../modules/ROOT/pages/constant-language.adoc | 2 +-
...-avoid-sending-some-or-all-message-headers.adoc | 4 +-
.../modules/ROOT/pages/oncompletion.adoc | 2 +-
.../modules/ROOT/pages/setHeader-eip.adoc | 2 +-
.../modules/ROOT/pages/setProperty-eip.adoc | 4 +-
.../modules/ROOT/pages/simple-language.adoc | 6 +--
.../ROOT/pages/using-propertyplaceholder.adoc | 6 +--
.../resources/META-INF/spring/camel-context.xml | 46 +++++++++++-----------
.../resources/META-INF/spring/camel-context.xml | 4 +-
.../META-INF/spring/camel-context-mina1.xml | 2 +-
.../META-INF/spring/camel-context-mina2.xml | 2 +-
.../resources/META-INF/spring/camel-context.xml | 2 +-
.../main/resources/OSGI-INF/blueprint/camel.xml | 2 +-
.../blueprint/CxfPayloadProviderRouterBeans.xml | 4 +-
.../greeter/JettyRecipientListCxfIssueTest.xml | 2 +-
.../jetty/JettySpringFailoverRoundRobinTest.xml | 4 +-
110 files changed, 353 insertions(+), 338 deletions(-)
[camel] 01/04: CAMEL-13657: Use name instead of headerName,
propertyName in XML DSL to make it simpler and more natural.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 77a127c03626ef2073e3feff13b6f9a3275b864b
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Jun 28 14:25:55 2019 +0200
CAMEL-13657: Use name instead of headerName, propertyName in XML DSL to make it simpler and more natural.
---
.../apache/camel/model/SetHeaderDefinition.java | 26 +++++++++++-----------
.../apache/camel/model/SetPropertyDefinition.java | 26 +++++++++++-----------
.../org/apache/camel/reifier/SetHeaderReifier.java | 4 ++--
.../apache/camel/reifier/SetPropertyReifier.java | 4 ++--
.../java/org/apache/camel/model/XmlParseTest.java | 4 ++--
.../util/DumpModelAsXmlRouteExpressionTest.java | 2 +-
.../org/apache/camel/impl/route4_error.xml | 2 +-
.../resources/org/apache/camel/impl/route4_ok.xml | 2 +-
.../resources/org/apache/camel/model/setHeader.xml | 2 +-
.../org/apache/camel/model/setHeaderToConstant.xml | 2 +-
10 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/SetHeaderDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/SetHeaderDefinition.java
index f54a84b..a43c09a 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/SetHeaderDefinition.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/SetHeaderDefinition.java
@@ -34,29 +34,29 @@ import org.apache.camel.spi.Metadata;
@XmlAccessorType(XmlAccessType.FIELD)
public class SetHeaderDefinition extends ExpressionNode {
@XmlAttribute(required = true)
- private String headerName;
+ private String name;
public SetHeaderDefinition() {
}
- public SetHeaderDefinition(String headerName, ExpressionDefinition expression) {
+ public SetHeaderDefinition(String name, ExpressionDefinition expression) {
super(expression);
- setHeaderName(headerName);
+ setName(name);
}
- public SetHeaderDefinition(String headerName, Expression expression) {
+ public SetHeaderDefinition(String name, Expression expression) {
super(expression);
- setHeaderName(headerName);
+ setName(name);
}
- public SetHeaderDefinition(String headerName, String value) {
+ public SetHeaderDefinition(String name, String value) {
super(ExpressionBuilder.constantExpression(value));
- setHeaderName(headerName);
+ setName(name);
}
@Override
public String toString() {
- return "SetHeader[" + getHeaderName() + ", " + getExpression() + "]";
+ return "SetHeader[" + getName() + ", " + getExpression() + "]";
}
@Override
@@ -66,7 +66,7 @@ public class SetHeaderDefinition extends ExpressionNode {
@Override
public String getLabel() {
- return "setHeader[" + getHeaderName() + "]";
+ return "setHeader[" + getName() + "]";
}
/**
@@ -84,12 +84,12 @@ public class SetHeaderDefinition extends ExpressionNode {
* The <tt>simple</tt> language can be used to define a dynamic evaluated header name to be used.
* Otherwise a constant name will be used.
*/
- public void setHeaderName(String headerName) {
- this.headerName = headerName;
+ public void setName(String name) {
+ this.name = name;
}
- public String getHeaderName() {
- return headerName;
+ public String getName() {
+ return name;
}
}
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/SetPropertyDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/SetPropertyDefinition.java
index c2b91d7..e1c5e5c 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/SetPropertyDefinition.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/SetPropertyDefinition.java
@@ -34,29 +34,29 @@ import org.apache.camel.spi.Metadata;
@XmlAccessorType(XmlAccessType.FIELD)
public class SetPropertyDefinition extends ExpressionNode {
@XmlAttribute(required = true)
- private String propertyName;
+ private String name;
public SetPropertyDefinition() {
}
- public SetPropertyDefinition(String propertyName, ExpressionDefinition expression) {
+ public SetPropertyDefinition(String name, ExpressionDefinition expression) {
super(expression);
- setPropertyName(propertyName);
+ setName(name);
}
- public SetPropertyDefinition(String propertyName, Expression expression) {
+ public SetPropertyDefinition(String name, Expression expression) {
super(expression);
- setPropertyName(propertyName);
+ setName(name);
}
- public SetPropertyDefinition(String propertyName, String value) {
+ public SetPropertyDefinition(String name, String value) {
super(ExpressionBuilder.constantExpression(value));
- setPropertyName(propertyName);
+ setName(name);
}
@Override
public String toString() {
- return "SetProperty[" + getPropertyName() + ", " + getExpression() + "]";
+ return "SetProperty[" + getName() + ", " + getExpression() + "]";
}
@Override
@@ -66,7 +66,7 @@ public class SetPropertyDefinition extends ExpressionNode {
@Override
public String getLabel() {
- return "setProperty[" + getPropertyName() + "]";
+ return "setProperty[" + getName() + "]";
}
/**
@@ -84,12 +84,12 @@ public class SetPropertyDefinition extends ExpressionNode {
* The <tt>simple</tt> language can be used to define a dynamic evaluated exchange property name to be used.
* Otherwise a constant name will be used.
*/
- public void setPropertyName(String propertyName) {
- this.propertyName = propertyName;
+ public void setName(String name) {
+ this.name = name;
}
- public String getPropertyName() {
- return propertyName;
+ public String getName() {
+ return name;
}
}
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/SetHeaderReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/SetHeaderReifier.java
index c7935c9..5f611a2b 100644
--- a/core/camel-core/src/main/java/org/apache/camel/reifier/SetHeaderReifier.java
+++ b/core/camel-core/src/main/java/org/apache/camel/reifier/SetHeaderReifier.java
@@ -33,9 +33,9 @@ class SetHeaderReifier extends ExpressionReifier<SetHeaderDefinition> {
@Override
public Processor createProcessor(RouteContext routeContext) throws Exception {
- ObjectHelper.notNull(definition.getHeaderName(), "headerName");
+ ObjectHelper.notNull(definition.getName(), "headerName");
Expression expr = definition.getExpression().createExpression(routeContext);
- Expression nameExpr = ExpressionBuilder.parseSimpleOrFallbackToConstantExpression(definition.getHeaderName(), routeContext.getCamelContext());
+ Expression nameExpr = ExpressionBuilder.parseSimpleOrFallbackToConstantExpression(definition.getName(), routeContext.getCamelContext());
return new SetHeaderProcessor(nameExpr, expr);
}
}
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/SetPropertyReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/SetPropertyReifier.java
index 5f7fded..d048457 100644
--- a/core/camel-core/src/main/java/org/apache/camel/reifier/SetPropertyReifier.java
+++ b/core/camel-core/src/main/java/org/apache/camel/reifier/SetPropertyReifier.java
@@ -33,9 +33,9 @@ class SetPropertyReifier extends ExpressionReifier<SetPropertyDefinition> {
@Override
public Processor createProcessor(RouteContext routeContext) throws Exception {
- ObjectHelper.notNull(definition.getPropertyName(), "propertyName", this);
+ ObjectHelper.notNull(definition.getName(), "propertyName", this);
Expression expr = definition.getExpression().createExpression(routeContext);
- Expression nameExpr = ExpressionBuilder.parseSimpleOrFallbackToConstantExpression(definition.getPropertyName(), routeContext.getCamelContext());
+ Expression nameExpr = ExpressionBuilder.parseSimpleOrFallbackToConstantExpression(definition.getName(), routeContext.getCamelContext());
return new SetPropertyProcessor(nameExpr, expr);
}
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java b/core/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java
index 4c2a383..7ee1301 100644
--- a/core/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java
@@ -133,7 +133,7 @@ public class XmlParseTest extends XmlTestSupport {
RouteDefinition route = assertOneRoute("setHeader.xml");
assertFrom(route, "seda:a");
SetHeaderDefinition node = assertNthProcessorInstanceOf(SetHeaderDefinition.class, route, 0);
- assertEquals("oldBodyValue", node.getHeaderName());
+ assertEquals("oldBodyValue", node.getName());
assertExpression(node.getExpression(), "simple", "body");
assertChildTo(route, "mock:b", 1);
}
@@ -143,7 +143,7 @@ public class XmlParseTest extends XmlTestSupport {
RouteDefinition route = assertOneRoute("setHeaderToConstant.xml");
assertFrom(route, "seda:a");
SetHeaderDefinition node = assertNthProcessorInstanceOf(SetHeaderDefinition.class, route, 0);
- assertEquals("theHeader", node.getHeaderName());
+ assertEquals("theHeader", node.getName());
assertExpression(node.getExpression(), "constant", "a value");
assertChildTo(route, "mock:b", 1);
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlRouteExpressionTest.java b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlRouteExpressionTest.java
index dfc5b69..75e007f 100644
--- a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlRouteExpressionTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlRouteExpressionTest.java
@@ -68,7 +68,7 @@ public class DumpModelAsXmlRouteExpressionTest extends ContextTestSupport {
assertNotNull(xml);
log.info(xml);
- assertTrue(xml.contains("<setHeader headerName=\"foo\""));
+ assertTrue(xml.contains("<setHeader name=\"foo\""));
assertTrue(xml.contains("<method ref=\"myCoolBean\"/>"));
}
diff --git a/core/camel-core/src/test/resources/org/apache/camel/impl/route4_error.xml b/core/camel-core/src/test/resources/org/apache/camel/impl/route4_error.xml
index 95be73e..a079a62 100644
--- a/core/camel-core/src/test/resources/org/apache/camel/impl/route4_error.xml
+++ b/core/camel-core/src/test/resources/org/apache/camel/impl/route4_error.xml
@@ -19,7 +19,7 @@
-->
<route id="foo" xmlns="http://camel.apache.org/schema/spring">
<from uri="direct:start"/>
- <setHeader headerName="failureHeader">
+ <setHeader name="failureHeader">
<simpl>${eaders.error}</simpl> <!-- it is an error -->
</setHeader>
<to uri="mock:foo"/>
diff --git a/core/camel-core/src/test/resources/org/apache/camel/impl/route4_ok.xml b/core/camel-core/src/test/resources/org/apache/camel/impl/route4_ok.xml
index 125d939..2905eef 100644
--- a/core/camel-core/src/test/resources/org/apache/camel/impl/route4_ok.xml
+++ b/core/camel-core/src/test/resources/org/apache/camel/impl/route4_ok.xml
@@ -19,7 +19,7 @@
-->
<route id="foo" xmlns="http://camel.apache.org/schema/spring">
<from uri="direct:start"/>
- <setHeader headerName="failureHeader">
+ <setHeader name="failureHeader">
<simple>${headers.error}</simple> <!-- it is an error -->
</setHeader>
<to uri="mock:foo"/>
diff --git a/core/camel-core/src/test/resources/org/apache/camel/model/setHeader.xml b/core/camel-core/src/test/resources/org/apache/camel/model/setHeader.xml
index 776897f..6d364f4 100644
--- a/core/camel-core/src/test/resources/org/apache/camel/model/setHeader.xml
+++ b/core/camel-core/src/test/resources/org/apache/camel/model/setHeader.xml
@@ -20,7 +20,7 @@
<routes id="camel" xmlns="http://camel.apache.org/schema/spring">
<route>
<from uri="seda:a"/>
- <setHeader headerName="oldBodyValue">
+ <setHeader name="oldBodyValue">
<simple>body</simple>
</setHeader>
<to uri="mock:b"/>
diff --git a/core/camel-core/src/test/resources/org/apache/camel/model/setHeaderToConstant.xml b/core/camel-core/src/test/resources/org/apache/camel/model/setHeaderToConstant.xml
index e71bf9a..24f5619 100644
--- a/core/camel-core/src/test/resources/org/apache/camel/model/setHeaderToConstant.xml
+++ b/core/camel-core/src/test/resources/org/apache/camel/model/setHeaderToConstant.xml
@@ -20,7 +20,7 @@
<routes id="camel" xmlns="http://camel.apache.org/schema/spring">
<route>
<from uri="seda:a"/>
- <setHeader headerName="theHeader">
+ <setHeader name="theHeader">
<constant>a value</constant>
</setHeader>
<to uri="mock:b"/>
[camel] 02/04: CAMEL-13657: Use name instead of headerName,
propertyName in XML DSL to make it simpler and more natural.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6ad33520fb92b8e4f3ed18a671f557d252be8b6d
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Jun 28 14:32:59 2019 +0200
CAMEL-13657: Use name instead of headerName, propertyName in XML DSL to make it simpler and more natural.
---
.../camel-ahc/src/main/docs/ahc-component.adoc | 2 +-
.../src/test/resources/camel-context-multiples.xml | 2 +-
.../crypto/SpringCryptoDataFormatTest.xml | 4 +--
.../component/cxf/jaxrs/CxfOperationException.xml | 2 +-
.../cxf/transport/CxfRsCamelTransport.xml | 8 +++---
.../camel-gora/src/main/docs/gora-component.adoc | 16 +++++------
.../main/docs/hazelcast-atomicvalue-component.adoc | 10 +++----
.../src/main/docs/hazelcast-map-component.adoc | 16 +++++------
.../main/docs/hazelcast-multimap-component.adoc | 8 +++---
.../docs/hazelcast-replicatedmap-component.adoc | 6 ++--
.../main/docs/hazelcast-ringbuffer-component.adoc | 2 +-
.../camel-hazelcast/src/main/docs/hazelcast.adoc | 12 ++++----
.../spring/test-camel-context-atomicnumber.xml | 14 +++++-----
...l-context-hazelcast-instance-name-reference.xml | 4 +--
...-camel-context-hazelcast-instance-reference.xml | 4 +--
.../META-INF/spring/test-camel-context-map.xml | 24 ++++++++--------
.../spring/test-camel-context-multimap.xml | 14 +++++-----
.../spring/test-camel-context-replicatedmap.xml | 12 ++++----
.../spring/test-camel-context-ringbuffer.xml | 10 +++----
.../camel-hbase/src/main/docs/hbase-component.adoc | 32 +++++++++++-----------
.../camel-http4/src/main/docs/http4-component.adoc | 2 +-
.../camel-iota/src/main/docs/iota-component.adoc | 18 ++++++------
.../src/test/resources/blobstore-test.xml | 4 +--
.../src/main/docs/jsonpath-language.adoc | 2 +-
.../src/main/docs/properties-component.adoc | 4 +--
.../camel-solr/src/main/docs/solr-component.adoc | 8 +++---
.../SpringPropertiesAfterTransactedDSL2Test.xml | 2 +-
.../SpringPropertiesAfterTransactedDSLTest.xml | 2 +-
.../SpringSimpleFileNameWithQuoteTest-context.xml | 2 +-
.../SpringPropertiesAvailableEverywhereTest.xml | 2 +-
.../issues/SpringRenameFileOnCommitIssueTest.xml | 2 +-
.../processor/ClaimCheckEipPushPopBodyTest.xml | 2 +-
.../ClaimCheckEipPushPopHeadersPatternTest.xml | 2 +-
.../processor/ClaimCheckEipPushPopHeadersTest.xml | 2 +-
.../ClaimCheckEipPushPopRemoveHeaderTest.xml | 6 ++--
.../RouteWithConstantFieldFromExchangeFailTest.xml | 2 +-
.../RouteWithConstantFieldFromExchangeTest.xml | 2 +-
.../spring/processor/SpringMethodCallTest.xml | 4 +--
...RecipientListParallelOptionalPropertiesTest.xml | 2 +-
.../camel/spring/processor/SpringRouteStopTest.xml | 2 +-
.../processor/SpringSetHeaderTest-context.xml | 2 +-
.../SpringSetHeaderWithConstantTest-context.xml | 2 +-
.../SpringSetHeaderXPathResultTypeTest.xml | 4 +--
.../processor/SpringSimpleResultTypeRouteTest.xml | 8 +++---
.../spring/processor/SpringTraceTest-context.xml | 2 +-
.../SpringTraceUsingPropertyTest-context.xml | 2 +-
.../processor/SpringWireTapNewExchangeTest.xml | 4 +--
.../apache/camel/spring/processor/aggregator.xml | 2 +-
.../apache/camel/spring/processor/removeHeader.xml | 2 +-
.../processor/removePropertiesWithExclusion.xml | 6 ++--
.../processor/removePropertiesWithoutExclusion.xml | 4 +--
.../camel/spring/processor/removeProperty.xml | 2 +-
.../spring/processor/setHeaderNameDynamic.xml | 2 +-
.../apache/camel/spring/processor/setProperty.xml | 2 +-
.../spring/processor/setPropertyNameDynamic.xml | 2 +-
.../properties-location-element-implicit-test.xml | 6 ++--
.../properties-location-element-optional-test.xml | 6 ++--
.../blueprint/properties-location-element-test.xml | 6 ++--
...SpringPropertiesLocationElementTest-context.xml | 6 ++--
.../camel-xslt/src/main/docs/xslt-component.adoc | 2 +-
.../src/main/docs/zookeeper-component.adoc | 2 +-
core/camel-base/src/main/docs/simple-language.adoc | 2 +-
.../src/main/docs/eips/setProperty-eip.adoc | 4 +--
.../modules/ROOT/pages/setProperty-eip.adoc | 4 +--
.../modules/ROOT/pages/simple-language.adoc | 2 +-
65 files changed, 180 insertions(+), 180 deletions(-)
diff --git a/components/camel-ahc/src/main/docs/ahc-component.adoc b/components/camel-ahc/src/main/docs/ahc-component.adoc
index bd44369..a0b25f3 100644
--- a/components/camel-ahc/src/main/docs/ahc-component.adoc
+++ b/components/camel-ahc/src/main/docs/ahc-component.adoc
@@ -320,7 +320,7 @@ And the equivalent Spring sample:
<camelContext xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
<from uri="direct:start"/>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>POST</constant>
</setHeader>
<to uri="ahc:http://www.google.com"/>
diff --git a/components/camel-cdi/src/test/resources/camel-context-multiples.xml b/components/camel-cdi/src/test/resources/camel-context-multiples.xml
index e4c6e11..b9052a2 100644
--- a/components/camel-cdi/src/test/resources/camel-context-multiples.xml
+++ b/components/camel-cdi/src/test/resources/camel-context-multiples.xml
@@ -25,7 +25,7 @@
<camelContext id="first" xmlns="http://camel.apache.org/schema/spring">
<route id="first-route">
<from uri="direct:inbound"/>
- <setHeader headerName="context">
+ <setHeader name="context">
<constant>first</constant>
</setHeader>
<to uri="mock:outbound"/>
diff --git a/components/camel-crypto/src/test/resources/org/apache/camel/component/crypto/SpringCryptoDataFormatTest.xml b/components/camel-crypto/src/test/resources/org/apache/camel/component/crypto/SpringCryptoDataFormatTest.xml
index ebb87df..0701aa0 100644
--- a/components/camel-crypto/src/test/resources/org/apache/camel/component/crypto/SpringCryptoDataFormatTest.xml
+++ b/components/camel-crypto/src/test/resources/org/apache/camel/component/crypto/SpringCryptoDataFormatTest.xml
@@ -119,7 +119,7 @@
<route>
<from uri="direct:key-in-header-encrypt" />
<marshal><custom ref="nokey" /></marshal>
- <setHeader headerName="CamelCryptoKey">
+ <setHeader name="CamelCryptoKey">
<constant />
</setHeader>
<to uri="mock:encrypted" />
@@ -128,7 +128,7 @@
<route>
<from uri="direct:key-in-header-decrypt" />
<unmarshal><custom ref="nokey" /></unmarshal>
- <setHeader headerName="CamelCryptoKey">
+ <setHeader name="CamelCryptoKey">
<constant />
</setHeader>
<to uri="mock:unencrypted" />
diff --git a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfOperationException.xml b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfOperationException.xml
index abbf90f..0712088 100644
--- a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfOperationException.xml
+++ b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfOperationException.xml
@@ -57,7 +57,7 @@
<route>
<from uri="cxfrs://bean://rsServer"/>
<!-- We can remove this configure as the CXFRS producer is using the HttpAPI by default -->
- <setHeader headerName="CamelCxfRsUsingHttpAPI">
+ <setHeader name="CamelCxfRsUsingHttpAPI">
<constant>True</constant>
</setHeader>
<to uri="cxfrs://bean://rsClient"/>
diff --git a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/transport/CxfRsCamelTransport.xml b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/transport/CxfRsCamelTransport.xml
index 317b541..4a2a3fc 100644
--- a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/transport/CxfRsCamelTransport.xml
+++ b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/transport/CxfRsCamelTransport.xml
@@ -47,16 +47,16 @@
<route>
<from uri="direct:input" />
<!-- using HttpClientAPI -->
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>GET</constant>
</setHeader>
- <setHeader headerName="Content-Type">
+ <setHeader name="Content-Type">
<constant>text/plain</constant>
</setHeader>
- <setHeader headerName="CamelHttpPath">
+ <setHeader name="CamelHttpPath">
<simple>/greeting/hello/${body}</simple>
</setHeader>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>GET</constant>
</setHeader>
<inOut uri="cxfrs:bean:rsClient" />
diff --git a/components/camel-gora/src/main/docs/gora-component.adoc b/components/camel-gora/src/main/docs/gora-component.adoc
index 3e65b81..5e6703c 100644
--- a/components/camel-gora/src/main/docs/gora-component.adoc
+++ b/components/camel-gora/src/main/docs/gora-component.adoc
@@ -230,7 +230,7 @@ datastore._
[source,xml]
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-<setHeader headerName="GoraOperation">
+<setHeader name="GoraOperation">
<constant>CreateSchema</constant>
</setHeader>
<to uri="gora:foobar?keyClass=java.lang.Long&valueClass=org.apache.camel.component.gora.generated.Pageview&dataStoreClass=org.apache.gora.hbase.store.HBaseStore"/>
@@ -240,7 +240,7 @@ datastore._
[source,xml]
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-<setHeader headerName="GoraOperation">
+<setHeader name="GoraOperation">
<constant>SchemaExists</constant>
</setHeader>
<to uri="gora:foobar?keyClass=java.lang.Long&valueClass=org.apache.camel.component.gora.generated.Pageview&dataStoreClass=org.apache.gora.hbase.store.HBaseStore"/>
@@ -250,10 +250,10 @@ datastore._
[source,xml]
------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-<setHeader headerName="GoraOperation">
+<setHeader name="GoraOperation">
<constant>put</constant>
</setHeader>
-<setHeader headerName="GoraKey">
+<setHeader name="GoraKey">
<constant>22222</constant>
</setHeader>
<to uri="gora:foo?keyClass=java.lang.Long&valueClass=org.apache.camel.component.gora.generated.Pageview&dataStoreClass=org.apache.gora.hbase.store.HBaseStore"/>
@@ -263,10 +263,10 @@ datastore._
[source,xml]
------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-<setHeader headerName="GoraOperation">
+<setHeader name="GoraOperation">
<constant>GET</constant>
</setHeader>
-<setHeader headerName="GoraKey">
+<setHeader name="GoraKey">
<constant>10101</constant>
</setHeader>
<to uri="gora:bar?keyClass=java.lang.Long&valueClass=org.apache.camel.component.gora.generated.Pageview&dataStoreClass=org.apache.gora.hbase.store.HBaseStore"/>
@@ -276,10 +276,10 @@ datastore._
[source,xml]
------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-<setHeader headerName="GoraOperation">
+<setHeader name="GoraOperation">
<constant>DELETE</constant>
</setHeader>
-<setHeader headerName="GoraKey">
+<setHeader name="GoraKey">
<constant>22222</constant>
</setHeader>
<to uri="gora:bar?keyClass=java.lang.Long&valueClass=org.apache.camel.component.gora.generated.Pageview&dataStoreClass=org.apache.gora.hbase.store.HBaseStore"/>
diff --git a/components/camel-hazelcast/src/main/docs/hazelcast-atomicvalue-component.adoc b/components/camel-hazelcast/src/main/docs/hazelcast-atomicvalue-component.adoc
index f167648..bd69fda 100644
--- a/components/camel-hazelcast/src/main/docs/hazelcast-atomicvalue-component.adoc
+++ b/components/camel-hazelcast/src/main/docs/hazelcast-atomicvalue-component.adoc
@@ -135,7 +135,7 @@ Spring DSL:
-----------------------------------------------------------------------------------------------
<route>
<from uri="direct:set" />
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader name="hazelcast.operation.type">
<constant>setvalue</constant>
</setHeader>
<to uri="hazelcast-atomicvalue:foo" />
@@ -162,7 +162,7 @@ Spring DSL:
-----------------------------------------------------------------------------------------------
<route>
<from uri="direct:get" />
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader name="hazelcast.operation.type">
<constant>get</constant>
</setHeader>
<to uri="hazelcast-atomicvalue:foo" />
@@ -189,7 +189,7 @@ Spring DSL:
-----------------------------------------------------------------------------------------------
<route>
<from uri="direct:increment" />
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader name="hazelcast.operation.type">
<constant>increment</constant>
</setHeader>
<to uri="hazelcast-atomicvalue:foo" />
@@ -216,7 +216,7 @@ Spring DSL:
-----------------------------------------------------------------------------------------------
<route>
<from uri="direct:decrement" />
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader name="hazelcast.operation.type">
<constant>decrement</constant>
</setHeader>
<to uri="hazelcast-atomicvalue:foo" />
@@ -243,7 +243,7 @@ Spring DSL:
-----------------------------------------------------------------------------------------------
<route>
<from uri="direct:destroy" />
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader name="hazelcast.operation.type">
<constant>destroy</constant>
</setHeader>
<to uri="hazelcast-atomicvalue:foo" />
diff --git a/components/camel-hazelcast/src/main/docs/hazelcast-map-component.adoc b/components/camel-hazelcast/src/main/docs/hazelcast-map-component.adoc
index 18a4825..518d68e 100644
--- a/components/camel-hazelcast/src/main/docs/hazelcast-map-component.adoc
+++ b/components/camel-hazelcast/src/main/docs/hazelcast-map-component.adoc
@@ -171,7 +171,7 @@ Spring DSL:
-----------------------------------------------------------------------------------------------
<route>
<from uri="direct:put" />
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader name="hazelcast.operation.type">
<constant>put</constant>
</setHeader>
<to uri="hazelcast-map:foo" />
@@ -197,13 +197,13 @@ Spring DSL:
-----------------------------------------------------------------------------------------------
<route>
<from uri="direct:put" />
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader name="hazelcast.operation.type">
<constant>put</constant>
</setHeader>
- <setHeader headerName="HazelcastConstants.TTL_VALUE">
+ <setHeader name="HazelcastConstants.TTL_VALUE">
<simple resultType="java.lang.Long">1</simple>
</setHeader>
- <setHeader headerName="HazelcastConstants.TTL_UNIT">
+ <setHeader name="HazelcastConstants.TTL_UNIT">
<simple resultType="java.util.concurrent.TimeUnit">TimeUnit.MINUTES</simple>
</setHeader>
<to uri="hazelcast-map:foo" />
@@ -229,7 +229,7 @@ Spring DSL:
-----------------------------------------------------------------------------------------------
<route>
<from uri="direct:get" />
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader name="hazelcast.operation.type">
<constant>get</constant>
</setHeader>
<to uri="hazelcast-map:foo" />
@@ -254,7 +254,7 @@ Spring DSL:
-----------------------------------------------------------------------------------------------
<route>
<from uri="direct:update" />
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader name="hazelcast.operation.type">
<constant>update</constant>
</setHeader>
<to uri="hazelcast-map:foo" />
@@ -278,7 +278,7 @@ Spring DSL:
-----------------------------------------------------------------------------------------------
<route>
<from uri="direct:delete" />
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader name="hazelcast.operation.type">
<constant>delete</constant>
</setHeader>
<to uri="hazelcast-map:foo" />
@@ -303,7 +303,7 @@ Spring DSL:
-----------------------------------------------------------------------------------------------
<route>
<from uri="direct:query" />
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader name="hazelcast.operation.type">
<constant>query</constant>
</setHeader>
<to uri="hazelcast-map:foo" />
diff --git a/components/camel-hazelcast/src/main/docs/hazelcast-multimap-component.adoc b/components/camel-hazelcast/src/main/docs/hazelcast-multimap-component.adoc
index ff15f8e..214612a 100644
--- a/components/camel-hazelcast/src/main/docs/hazelcast-multimap-component.adoc
+++ b/components/camel-hazelcast/src/main/docs/hazelcast-multimap-component.adoc
@@ -138,7 +138,7 @@ Spring DSL:
<route>
<from uri="direct:put" />
<log message="put.."/>
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader name="hazelcast.operation.type">
<constant>put</constant>
</setHeader>
<to uri="hazelcast-multimap:foo" />
@@ -163,7 +163,7 @@ Spring DSL:
<route>
<from uri="direct:removevalue" />
<log message="removevalue..."/>
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader name="hazelcast.operation.type">
<constant>removevalue</constant>
</setHeader>
<to uri="hazelcast-multimap:foo" />
@@ -194,7 +194,7 @@ Spring DSL:
<route>
<from uri="direct:get" />
<log message="get.."/>
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader name="hazelcast.operation.type">
<constant>get</constant>
</setHeader>
<to uri="hazelcast-multimap:foo" />
@@ -220,7 +220,7 @@ Spring DSL:
<route>
<from uri="direct:delete" />
<log message="delete.."/>
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader name="hazelcast.operation.type">
<constant>delete</constant>
</setHeader>
<to uri="hazelcast-multimap:foo" />
diff --git a/components/camel-hazelcast/src/main/docs/hazelcast-replicatedmap-component.adoc b/components/camel-hazelcast/src/main/docs/hazelcast-replicatedmap-component.adoc
index 96e63b4..5c130fd 100644
--- a/components/camel-hazelcast/src/main/docs/hazelcast-replicatedmap-component.adoc
+++ b/components/camel-hazelcast/src/main/docs/hazelcast-replicatedmap-component.adoc
@@ -141,7 +141,7 @@ Spring DSL:
<route>
<from uri="direct:put" />
<log message="put.."/>
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader name="hazelcast.operation.type">
<constant>put</constant>
</setHeader>
<to uri="hazelcast-replicatedmap:foo" />
@@ -167,7 +167,7 @@ Spring DSL:
<route>
<from uri="direct:get" />
<log message="get.."/>
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader name="hazelcast.operation.type">
<constant>get</constant>
</setHeader>
<to uri="hazelcast-replicatedmap:foo" />
@@ -193,7 +193,7 @@ Spring DSL:
<route>
<from uri="direct:delete" />
<log message="delete.."/>
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader name="hazelcast.operation.type">
<constant>delete</constant>
</setHeader>
<to uri="hazelcast-replicatedmap:foo" />
diff --git a/components/camel-hazelcast/src/main/docs/hazelcast-ringbuffer-component.adoc b/components/camel-hazelcast/src/main/docs/hazelcast-ringbuffer-component.adoc
index 412dcf5..fc4b70a 100644
--- a/components/camel-hazelcast/src/main/docs/hazelcast-ringbuffer-component.adoc
+++ b/components/camel-hazelcast/src/main/docs/hazelcast-ringbuffer-component.adoc
@@ -136,7 +136,7 @@ Spring DSL:
<route>
<from uri="direct:put" />
<log message="put.."/>
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader name="hazelcast.operation.type">
<constant>add</constant>
</setHeader>
<to uri="hazelcast-ringbuffer:foo" />
diff --git a/components/camel-hazelcast/src/main/docs/hazelcast.adoc b/components/camel-hazelcast/src/main/docs/hazelcast.adoc
index 91d39ee..98a9da5 100644
--- a/components/camel-hazelcast/src/main/docs/hazelcast.adoc
+++ b/components/camel-hazelcast/src/main/docs/hazelcast.adoc
@@ -65,7 +65,7 @@ See followings for each component usage:
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route id="testHazelcastInstanceBeanRefPut">
<from uri="direct:testHazelcastInstanceBeanRefPut"/>
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>put</constant>
</setHeader>
<to uri="hazelcast-map:testmap?hazelcastInstanceName=HZ.INSTANCE"/>
@@ -73,7 +73,7 @@ See followings for each component usage:
<route id="testHazelcastInstanceBeanRefGet">
<from uri="direct:testHazelcastInstanceBeanRefGet" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>get</constant>
</setHeader>
<to uri="hazelcast-map:testmap?hazelcastInstanceName=HZ.INSTANCE"/>
@@ -95,7 +95,7 @@ See followings for each component usage:
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route id="testHazelcastInstanceBeanRefPut">
<from uri="direct:testHazelcastInstanceBeanRefPut"/>
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>put</constant>
</setHeader>
<to uri="hazelcast-map:testmap?hazelcastInstance=#hazelcastInstance"/>
@@ -103,7 +103,7 @@ See followings for each component usage:
<route id="testHazelcastInstanceBeanRefGet">
<from uri="direct:testHazelcastInstanceBeanRefGet" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>get</constant>
</setHeader>
<to uri="hazelcast-map:testmap?hazelcastInstance=#hazelcastInstance"/>
@@ -147,7 +147,7 @@ to reference the service in the hazelcast endpoint.
<camelContext xmlns="http://camel.apache.org/schema/blueprint">
<route id="testHazelcastInstanceBeanRefPut">
<from uri="direct:testHazelcastInstanceBeanRefPut"/>
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>put</constant>
</setHeader>
<to uri="hazelcast-map:testmap?hazelcastInstance=#hazelcastInstance"/>
@@ -155,7 +155,7 @@ to reference the service in the hazelcast endpoint.
<route id="testHazelcastInstanceBeanRefGet">
<from uri="direct:testHazelcastInstanceBeanRefGet" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>get</constant>
</setHeader>
<to uri="hazelcast-map:testmap?hazelcastInstance=#hazelcastInstance"/>
diff --git a/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-atomicnumber.xml b/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-atomicnumber.xml
index fa84ed7..943beac 100644
--- a/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-atomicnumber.xml
+++ b/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-atomicnumber.xml
@@ -27,7 +27,7 @@
<route>
<from uri="direct:set" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>setvalue</constant>
</setHeader>
<to uri="hazelcast-atomicvalue:foo" />
@@ -35,7 +35,7 @@
<route>
<from uri="direct:get" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>get</constant>
</setHeader>
<to uri="hazelcast-atomicvalue:foo" />
@@ -43,7 +43,7 @@
<route>
<from uri="direct:increment" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>increment</constant>
</setHeader>
<to uri="hazelcast-atomicvalue:foo" />
@@ -51,7 +51,7 @@
<route>
<from uri="direct:decrement" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>decrement</constant>
</setHeader>
<to uri="hazelcast-atomicvalue:foo" />
@@ -59,7 +59,7 @@
<route>
<from uri="direct:compareAndSet" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>compareAndSet</constant>
</setHeader>
<to uri="hazelcast-atomicvalue:foo" />
@@ -67,7 +67,7 @@
<route>
<from uri="direct:getAndAdd" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>getAndAdd</constant>
</setHeader>
<to uri="hazelcast-atomicvalue:foo" />
@@ -75,7 +75,7 @@
<route>
<from uri="direct:destroy" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>destroy</constant>
</setHeader>
<to uri="hazelcast-atomicvalue:foo" />
diff --git a/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-hazelcast-instance-name-reference.xml b/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-hazelcast-instance-name-reference.xml
index 2d0ba79..5532f06 100644
--- a/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-hazelcast-instance-name-reference.xml
+++ b/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-hazelcast-instance-name-reference.xml
@@ -37,7 +37,7 @@
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route id="testHazelcastInstanceBeanRefPut">
<from uri="direct:testHazelcastInstanceBeanRefPut"/>
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>put</constant>
</setHeader>
<to uri="hazelcast-map:testmap?hazelcastInstanceName=HZ.INSTANCE"/>
@@ -45,7 +45,7 @@
<route id="testHazelcastInstanceBeanRefGet">
<from uri="direct:testHazelcastInstanceBeanRefGet" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>get</constant>
</setHeader>
<to uri="hazelcast-map:testmap?hazelcastInstanceName=HZ.INSTANCE"/>
diff --git a/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-hazelcast-instance-reference.xml b/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-hazelcast-instance-reference.xml
index 50b912a..0c3efb1 100644
--- a/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-hazelcast-instance-reference.xml
+++ b/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-hazelcast-instance-reference.xml
@@ -36,7 +36,7 @@
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route id="testHazelcastInstanceBeanRefPut">
<from uri="direct:testHazelcastInstanceBeanRefPut"/>
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>put</constant>
</setHeader>
<to uri="hazelcast-map:testmap?hazelcastInstance=#hazelcastInstance"/>
@@ -44,7 +44,7 @@
<route id="testHazelcastInstanceBeanRefGet">
<from uri="direct:testHazelcastInstanceBeanRefGet" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>get</constant>
</setHeader>
<to uri="hazelcast-map:testmap?hazelcastInstance=#hazelcastInstance"/>
diff --git a/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-map.xml b/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-map.xml
index 1b3b155..2a7c63d 100644
--- a/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-map.xml
+++ b/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-map.xml
@@ -27,7 +27,7 @@
<route>
<from uri="direct:put" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>put</constant>
</setHeader>
<to uri="hazelcast-map:foo" />
@@ -35,7 +35,7 @@
<route>
<from uri="direct:update" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>update</constant>
</setHeader>
<to uri="hazelcast-map:foo" />
@@ -43,7 +43,7 @@
<route>
<from uri="direct:get" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>get</constant>
</setHeader>
<to uri="hazelcast-map:foo" />
@@ -52,7 +52,7 @@
<route>
<from uri="direct:delete" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>delete</constant>
</setHeader>
<to uri="hazelcast-map:foo" />
@@ -60,7 +60,7 @@
<route>
<from uri="direct:query" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>query</constant>
</setHeader>
<to uri="hazelcast-map:foo" />
@@ -69,7 +69,7 @@
<route>
<from uri="direct:putIfAbsent" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>putIfAbsent</constant>
</setHeader>
<to uri="hazelcast-map:foo" />
@@ -77,7 +77,7 @@
<route>
<from uri="direct:getAll" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>getAll</constant>
</setHeader>
<to uri="hazelcast-map:foo" />
@@ -86,7 +86,7 @@
<route>
<from uri="direct:clear" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>clear</constant>
</setHeader>
<to uri="hazelcast-map:foo" />
@@ -94,7 +94,7 @@
<route>
<from uri="direct:evict" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>evict</constant>
</setHeader>
<to uri="hazelcast-map:foo" />
@@ -103,7 +103,7 @@
<route>
<from uri="direct:evictAll" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>evictAll</constant>
</setHeader>
<to uri="hazelcast-map:foo" />
@@ -112,7 +112,7 @@
<route>
<from uri="direct:containsKey" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>containsKey</constant>
</setHeader>
<to uri="hazelcast-map:foo" />
@@ -121,7 +121,7 @@
<route>
<from uri="direct:containsValue" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>containsValue</constant>
</setHeader>
<to uri="hazelcast-map:foo" />
diff --git a/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-multimap.xml b/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-multimap.xml
index 7f80997..27abadc 100644
--- a/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-multimap.xml
+++ b/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-multimap.xml
@@ -27,7 +27,7 @@
<route>
<from uri="direct:put" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>put</constant>
</setHeader>
<to uri="hazelcast-multimap:bar" />
@@ -35,7 +35,7 @@
<route>
<from uri="direct:removevalue" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>removevalue</constant>
</setHeader>
<to uri="hazelcast-multimap:bar" />
@@ -43,7 +43,7 @@
<route>
<from uri="direct:get" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>get</constant>
</setHeader>
<to uri="hazelcast-multimap:bar" />
@@ -52,7 +52,7 @@
<route>
<from uri="direct:delete" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>delete</constant>
</setHeader>
<to uri="hazelcast-multimap:bar" />
@@ -60,7 +60,7 @@
<route>
<from uri="direct:valueCount" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>valueCount</constant>
</setHeader>
<to uri="hazelcast-multimap:bar" />
@@ -68,7 +68,7 @@
<route>
<from uri="direct:containsKey" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>containsKey</constant>
</setHeader>
<to uri="hazelcast-multimap:bar" />
@@ -77,7 +77,7 @@
<route>
<from uri="direct:containsValue" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>containsValue</constant>
</setHeader>
<to uri="hazelcast-multimap:bar" />
diff --git a/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-replicatedmap.xml b/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-replicatedmap.xml
index 568c59f..7210640 100644
--- a/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-replicatedmap.xml
+++ b/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-replicatedmap.xml
@@ -27,7 +27,7 @@
<route>
<from uri="direct:put" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>put</constant>
</setHeader>
<to uri="hazelcast-replicatedmap:bar" />
@@ -35,7 +35,7 @@
<route>
<from uri="direct:get" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>get</constant>
</setHeader>
<to uri="hazelcast-replicatedmap:bar" />
@@ -44,7 +44,7 @@
<route>
<from uri="direct:delete" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>delete</constant>
</setHeader>
<to uri="hazelcast-replicatedmap:bar" />
@@ -52,7 +52,7 @@
<route>
<from uri="direct:clear" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>clear</constant>
</setHeader>
<to uri="hazelcast-replicatedmap:bar" />
@@ -60,7 +60,7 @@
<route>
<from uri="direct:containsKey" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>containsKey</constant>
</setHeader>
<to uri="hazelcast-replicatedmap:bar" />
@@ -69,7 +69,7 @@
<route>
<from uri="direct:containsValue" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>containsValue</constant>
</setHeader>
<to uri="hazelcast-replicatedmap:bar" />
diff --git a/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-ringbuffer.xml b/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-ringbuffer.xml
index 27ac4d5..df7d610 100644
--- a/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-ringbuffer.xml
+++ b/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-ringbuffer.xml
@@ -27,7 +27,7 @@
<route>
<from uri="direct:add" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>add</constant>
</setHeader>
<to uri="hazelcast-ringbuffer:foo" />
@@ -35,7 +35,7 @@
<route>
<from uri="direct:readonceHead" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>readonceHead</constant>
</setHeader>
<to uri="hazelcast-ringbuffer:foo" />
@@ -43,7 +43,7 @@
<route>
<from uri="direct:readonceTail" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>readonceTail</constant>
</setHeader>
<to uri="hazelcast-ringbuffer:foo" />
@@ -51,7 +51,7 @@
<route>
<from uri="direct:capacity" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>capacity</constant>
</setHeader>
<to uri="hazelcast-ringbuffer:foo" />
@@ -59,7 +59,7 @@
<route>
<from uri="direct:remainingCapacity" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>remainingCapacity</constant>
</setHeader>
<to uri="hazelcast-ringbuffer:foo" />
diff --git a/components/camel-hbase/src/main/docs/hbase-component.adoc b/components/camel-hbase/src/main/docs/hbase-component.adoc
index 953ed2c..4930e8f 100644
--- a/components/camel-hbase/src/main/docs/hbase-component.adoc
+++ b/components/camel-hbase/src/main/docs/hbase-component.adoc
@@ -216,11 +216,11 @@ would be to store part of the message body to specified HBase column.
<route>
<from uri="direct:in"/>
<!-- Set the HBase Row -->
- <setHeader headerName="CamelHBaseRowId">
+ <setHeader name="CamelHBaseRowId">
<el>${in.body.id}</el>
</setHeader>
<!-- Set the HBase Value -->
- <setHeader headerName="CamelHBaseValue">
+ <setHeader name="CamelHBaseValue">
<el>${in.body.value}</el>
</setHeader>
<to uri="hbase:mytable?operation=CamelHBasePut&family=myfamily&qualifier=myqualifier"/>
@@ -240,19 +240,19 @@ does not have the number 1.
<route>
<from uri="direct:in"/>
<!-- Set the HBase Row 1st column -->
- <setHeader headerName="CamelHBaseRowId">
+ <setHeader name="CamelHBaseRowId">
<el>${in.body.id}</el>
</setHeader>
<!-- Set the HBase Row 2nd column -->
- <setHeader headerName="CamelHBaseRowId2">
+ <setHeader name="CamelHBaseRowId2">
<el>${in.body.id}</el>
</setHeader>
<!-- Set the HBase Value for 1st column -->
- <setHeader headerName="CamelHBaseValue">
+ <setHeader name="CamelHBaseValue">
<el>${in.body.value}</el>
</setHeader>
<!-- Set the HBase Value for 2nd column -->
- <setHeader headerName="CamelHBaseValue2">
+ <setHeader name="CamelHBaseValue2">
<el>${in.body.othervalue}</el>
</setHeader>
<to uri="hbase:mytable?operation=CamelHBasePut&family=myfamily&qualifier=myqualifier&family2=myfamily&qualifier2=myqualifier2"/>
@@ -276,7 +276,7 @@ message headers.
<route>
<from uri="direct:in"/>
<!-- Set the HBase Row of the Get -->
- <setHeader headerName="CamelHBaseRowId">
+ <setHeader name="CamelHBaseRowId">
<el>${in.body.id}</el>
</setHeader>
<to uri="hbase:mytable?operation=CamelHBaseGet&family=myfamily&qualifier=myqualifier&valueType=java.lang.Long"/>
@@ -298,7 +298,7 @@ specified is one or more rows as part of the message headers.
<route>
<from uri="direct:in"/>
<!-- Set the HBase Row of the Get -->
- <setHeader headerName="CamelHBaseRowId">
+ <setHeader name="CamelHBaseRowId">
<el>${in.body.id}</el>
</setHeader>
<to uri="hbase:mytable?operation=CamelHBaseDelete"/>
@@ -341,29 +341,29 @@ can make use of the ModelAwareColumnMatchingFilter as shown below.
<route>
<from uri="direct:scan"/>
<!-- Set the Criteria -->
- <setHeader headerName="CamelHBaseFamily">
+ <setHeader name="CamelHBaseFamily">
<constant>name</constant>
</setHeader>
- <setHeader headerName="CamelHBaseQualifier">
+ <setHeader name="CamelHBaseQualifier">
<constant>first</constant>
</setHeader>
- <setHeader headerName="CamelHBaseValue">
+ <setHeader name="CamelHBaseValue">
<el>in.body.firstName</el>
</setHeader>
- <setHeader headerName="CamelHBaseFamily2">
+ <setHeader name="CamelHBaseFamily2">
<constant>name</constant>
</setHeader>
- <setHeader headerName="CamelHBaseQualifier2">
+ <setHeader name="CamelHBaseQualifier2">
<constant>last</constant>
</setHeader>
- <setHeader headerName="CamelHBaseValue2">
+ <setHeader name="CamelHBaseValue2">
<el>in.body.lastName</el>
</setHeader>
<!-- Set additional fields that you want to be return by skipping value -->
- <setHeader headerName="CamelHBaseFamily3">
+ <setHeader name="CamelHBaseFamily3">
<constant>address</constant>
</setHeader>
- <setHeader headerName="CamelHBaseQualifier3">
+ <setHeader name="CamelHBaseQualifier3">
<constant>country</constant>
</setHeader>
<to uri="hbase:mytable?operation=CamelHBaseScan&filters=#myFilterList"/>
diff --git a/components/camel-http4/src/main/docs/http4-component.adoc b/components/camel-http4/src/main/docs/http4-component.adoc
index a698396..1f4684a 100644
--- a/components/camel-http4/src/main/docs/http4-component.adoc
+++ b/components/camel-http4/src/main/docs/http4-component.adoc
@@ -422,7 +422,7 @@ And the equivalent Spring sample:
<camelContext xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
<from uri="direct:start"/>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>POST</constant>
</setHeader>
<to uri="http4://www.google.com"/>
diff --git a/components/camel-iota/src/main/docs/iota-component.adoc b/components/camel-iota/src/main/docs/iota-component.adoc
index 5ccb6ba..7d727ed 100644
--- a/components/camel-iota/src/main/docs/iota-component.adoc
+++ b/components/camel-iota/src/main/docs/iota-component.adoc
@@ -122,16 +122,16 @@ The following route defined in Spring XML send a message to tangle
<setMessage>
<constant>Hello world!</constant>
</setMessage>
- <setHeader headerName="CamelIOTASeed">
+ <setHeader name="CamelIOTASeed">
<constant>MYSEEDHERE</constant>
</setHeader>
- <setHeader headerName="CamelIOTAValue">
+ <setHeader name="CamelIOTAValue">
<constant>1</constant>
</setHeader>
- <setHeader headerName="CamelIOTAToAddress">
+ <setHeader name="CamelIOTAToAddress">
<constant>RECIPIENTADDRESS</constant>
</setHeader>
- <setHeader headerName="CamelIOTAToAddress">
+ <setHeader name="CamelIOTAToAddress">
<constant>RECIPIENTADDRESS</constant>
</setHeader>
@@ -148,10 +148,10 @@ The following route defined in Spring XML create a new address
---------------------------------------------------------------------------------------------------------------------------
<route>
<from uri="direct:start" />
- <setHeader headerName="CamelIOTASeed">
+ <setHeader name="CamelIOTASeed">
<constant>MYSEEDHERE</constant>
</setHeader>
- <setHeader headerName="CamelIOTAAddressIndex">
+ <setHeader name="CamelIOTAAddressIndex">
<constant>1</constant>
</setHeader>
@@ -168,13 +168,13 @@ The following route defined in Spring XML retrieve transfers data
---------------------------------------------------------------------------------------------------------------------------
<route>
<from uri="direct:start" />
- <setHeader headerName="CamelIOTASeed">
+ <setHeader name="CamelIOTASeed">
<constant>MYSEEDHERE</constant>
</setHeader>
- <setHeader headerName="CamelIOTAAddressStartIndex">
+ <setHeader name="CamelIOTAAddressStartIndex">
<constant>1</constant>
</setHeader>
- <setHeader headerName="CamelIOTAAddressEndIndex">
+ <setHeader name="CamelIOTAAddressEndIndex">
<constant>10</constant>
</setHeader>
diff --git a/components/camel-jclouds/src/test/resources/blobstore-test.xml b/components/camel-jclouds/src/test/resources/blobstore-test.xml
index a2ef0e6..8db929f 100644
--- a/components/camel-jclouds/src/test/resources/blobstore-test.xml
+++ b/components/camel-jclouds/src/test/resources/blobstore-test.xml
@@ -26,10 +26,10 @@
<route>
<from uri="direct:start"/>
- <setHeader headerName="CamelJcloudsBlobName">
+ <setHeader name="CamelJcloudsBlobName">
<constant>testName</constant>
</setHeader>
- <setHeader headerName="CamelJcloudsContainerName">
+ <setHeader name="CamelJcloudsContainerName">
<constant>foo</constant>
</setHeader>
<to uri="jclouds:blobstore:transient"/>
diff --git a/components/camel-jsonpath/src/main/docs/jsonpath-language.adoc b/components/camel-jsonpath/src/main/docs/jsonpath-language.adoc
index bc49192..6903a91 100644
--- a/components/camel-jsonpath/src/main/docs/jsonpath-language.adoc
+++ b/components/camel-jsonpath/src/main/docs/jsonpath-language.adoc
@@ -344,7 +344,7 @@ The same example in XML DSL would be:
----
<route>
<from uri="direct:start"/>
- <setHeader headerName="numberOfBooks">
+ <setHeader name="numberOfBooks">
<jsonpath headerName="books" resultType="int">$..store.book.length()</jsonpath>
</transform>
<to uri="mock:result"/>
diff --git a/components/camel-properties/src/main/docs/properties-component.adoc b/components/camel-properties/src/main/docs/properties-component.adoc
index 54b7194..e357c01 100644
--- a/components/camel-properties/src/main/docs/properties-component.adoc
+++ b/components/camel-properties/src/main/docs/properties-component.adoc
@@ -785,7 +785,7 @@ take care. For example:
[source,xml]
----
-<setHeader headerName="Exchange.FILE_NAME">
+<setHeader name="Exchange.FILE_NAME">
<simple>{{file.rootdir}}/${in.header.CamelFileName}</simple>
</setHeader>
----
@@ -795,7 +795,7 @@ to indicate using the <<simple-language,Simple>> language in Camel.
[source,xml]
----
-<setHeader headerName="Exchange.FILE_NAME">
+<setHeader name="Exchange.FILE_NAME">
<simple>{{file.rootdir}}/$simple{in.header.CamelFileName}</simple>
</setHeader>
----
diff --git a/components/camel-solr/src/main/docs/solr-component.adoc b/components/camel-solr/src/main/docs/solr-component.adoc
index ade35b1..408ab7a 100644
--- a/components/camel-solr/src/main/docs/solr-component.adoc
+++ b/components/camel-solr/src/main/docs/solr-component.adoc
@@ -189,24 +189,24 @@ from("direct:commit")
------------------------------------------
<route>
<from uri="direct:insert"/>
- <setHeader headerName="SolrOperation">
+ <setHeader name="SolrOperation">
<constant>INSERT</constant>
</setHeader>
- <setHeader headerName="SolrField.id">
+ <setHeader name="SolrField.id">
<simple>${body}</simple>
</setHeader>
<to uri="solr://localhost:8983/solr"/>
</route>
<route>
<from uri="direct:delete"/>
- <setHeader headerName="SolrOperation">
+ <setHeader name="SolrOperation">
<constant>DELETE_BY_ID</constant>
</setHeader>
<to uri="solr://localhost:8983/solr"/>
</route>
<route>
<from uri="direct:commit"/>
- <setHeader headerName="SolrOperation">
+ <setHeader name="SolrOperation">
<constant>COMMIT</constant>
</setHeader>
<to uri="solr://localhost:8983/solr"/>
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesAfterTransactedDSL2Test.xml b/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesAfterTransactedDSL2Test.xml
index 0ea9109..281ebbfe 100644
--- a/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesAfterTransactedDSL2Test.xml
+++ b/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesAfterTransactedDSL2Test.xml
@@ -34,7 +34,7 @@
<route>
<from uri="direct:transactedHeader" />
<transacted />
- <setHeader headerName="myHeader">
+ <setHeader name="myHeader">
<constant>{{mydsl}}</constant>
</setHeader>
<to uri="mock:transactedHeader" />
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesAfterTransactedDSLTest.xml b/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesAfterTransactedDSLTest.xml
index b5d9ae3..9d0316b 100644
--- a/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesAfterTransactedDSLTest.xml
+++ b/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesAfterTransactedDSLTest.xml
@@ -31,7 +31,7 @@
<route>
<from uri="direct:transactedHeader" />
<transacted />
- <setHeader headerName="myHeader">
+ <setHeader name="myHeader">
<constant>{{mydsl}}</constant>
</setHeader>
<to uri="mock:transactedHeader" />
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/file/SpringSimpleFileNameWithQuoteTest-context.xml b/components/camel-spring/src/test/resources/org/apache/camel/spring/file/SpringSimpleFileNameWithQuoteTest-context.xml
index f9e30e7..1e1b87a 100644
--- a/components/camel-spring/src/test/resources/org/apache/camel/spring/file/SpringSimpleFileNameWithQuoteTest-context.xml
+++ b/components/camel-spring/src/test/resources/org/apache/camel/spring/file/SpringSimpleFileNameWithQuoteTest-context.xml
@@ -27,7 +27,7 @@
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route>
<from uri="file://target/foo?initialDelay=0&delay=10"/>
- <setHeader headerName="foo">
+ <setHeader name="foo">
<simple>"${file:name}" abc</simple>
</setHeader>
<to uri="mock:result"/>
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringPropertiesAvailableEverywhereTest.xml b/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringPropertiesAvailableEverywhereTest.xml
index d6c69c4..c7eded6 100644
--- a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringPropertiesAvailableEverywhereTest.xml
+++ b/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringPropertiesAvailableEverywhereTest.xml
@@ -37,7 +37,7 @@
<route>
<from uri="direct:header-start"/>
- <setHeader headerName="foo">
+ <setHeader name="foo">
<simple>{{foo}}</simple>
</setHeader>
<choice>
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringRenameFileOnCommitIssueTest.xml b/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringRenameFileOnCommitIssueTest.xml
index 1b849cf..c30d56c 100644
--- a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringRenameFileOnCommitIssueTest.xml
+++ b/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringRenameFileOnCommitIssueTest.xml
@@ -28,7 +28,7 @@
<camelContext trace="true" xmlns="http://camel.apache.org/schema/spring">
<route>
<from uri="file://target/renameissue?initialDelay=0&delay=10&noop=false"/>
- <setProperty propertyName="PartitionID">
+ <setProperty name="PartitionID">
<xpath>//persons/person[1]/@name</xpath>
</setProperty>
<convertBodyTo type="String"/>
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipPushPopBodyTest.xml b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipPushPopBodyTest.xml
index d6c53ad..33a2672 100644
--- a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipPushPopBodyTest.xml
+++ b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipPushPopBodyTest.xml
@@ -32,7 +32,7 @@
<transform>
<constant>Bye World</constant>
</transform>
- <setHeader headerName="foo">
+ <setHeader name="foo">
<constant>456</constant>
</setHeader>
<to uri="mock:b"/>
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipPushPopHeadersPatternTest.xml b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipPushPopHeadersPatternTest.xml
index 6efad19..34eaa11 100644
--- a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipPushPopHeadersPatternTest.xml
+++ b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipPushPopHeadersPatternTest.xml
@@ -32,7 +32,7 @@
<transform>
<constant>Bye World</constant>
</transform>
- <setHeader headerName="foo">
+ <setHeader name="foo">
<constant>456</constant>
</setHeader>
<removeHeader headerName="bar"/>
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipPushPopHeadersTest.xml b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipPushPopHeadersTest.xml
index a0deac7..4c4db6a 100644
--- a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipPushPopHeadersTest.xml
+++ b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipPushPopHeadersTest.xml
@@ -32,7 +32,7 @@
<transform>
<constant>Bye World</constant>
</transform>
- <setHeader headerName="foo">
+ <setHeader name="foo">
<constant>456</constant>
</setHeader>
<to uri="mock:b"/>
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipPushPopRemoveHeaderTest.xml b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipPushPopRemoveHeaderTest.xml
index 752f2d1..94d6e34 100644
--- a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipPushPopRemoveHeaderTest.xml
+++ b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipPushPopRemoveHeaderTest.xml
@@ -27,7 +27,7 @@
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route>
<from uri="direct:start"/>
- <setHeader headerName="bar">
+ <setHeader name="bar">
<constant>Moes</constant>
</setHeader>
<to uri="mock:a"/>
@@ -35,10 +35,10 @@
<transform>
<constant>Bye World</constant>
</transform>
- <setHeader headerName="foo">
+ <setHeader name="foo">
<constant>456</constant>
</setHeader>
- <setHeader headerName="bar">
+ <setHeader name="bar">
<constant>Jacks</constant>
</setHeader>
<to uri="mock:b"/>
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/RouteWithConstantFieldFromExchangeFailTest.xml b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/RouteWithConstantFieldFromExchangeFailTest.xml
index bb6c9c8..38787e3 100644
--- a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/RouteWithConstantFieldFromExchangeFailTest.xml
+++ b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/RouteWithConstantFieldFromExchangeFailTest.xml
@@ -27,7 +27,7 @@
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route>
<from uri="direct:bar"/>
- <setHeader headerName="Exchange.XXX">
+ <setHeader name="Exchange.XXX">
<constant>bar</constant>
</setHeader>
<to uri="mock:bar"/>
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/RouteWithConstantFieldFromExchangeTest.xml b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/RouteWithConstantFieldFromExchangeTest.xml
index c3183fc..4e54fc7 100644
--- a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/RouteWithConstantFieldFromExchangeTest.xml
+++ b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/RouteWithConstantFieldFromExchangeTest.xml
@@ -29,7 +29,7 @@
<route>
<from uri="direct:start"/>
<!-- we can refer to constant fields from Exchange like we do in Java DSL -->
- <setHeader headerName="Exchange.FILE_NAME">
+ <setHeader name="Exchange.FILE_NAME">
<constant>foo.txt</constant>
</setHeader>
<to uri="mock:result"/>
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringMethodCallTest.xml b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringMethodCallTest.xml
index 1e9479e..6a2bbba 100644
--- a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringMethodCallTest.xml
+++ b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringMethodCallTest.xml
@@ -29,7 +29,7 @@
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route>
<from uri="direct:start"/>
- <setHeader headerName="foo">
+ <setHeader name="foo">
<method beanType="org.apache.camel.spring.processor.MyCoolBean"/>
</setHeader>
<to uri="mock:result"/>
@@ -37,7 +37,7 @@
<route>
<from uri="direct:ref"/>
- <setHeader headerName="foo">
+ <setHeader name="foo">
<method ref="coolBean"/>
</setHeader>
<to uri="mock:ref"/>
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringRecipientListParallelOptionalPropertiesTest.xml b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringRecipientListParallelOptionalPropertiesTest.xml
index 7aa48d1..7c6ce42 100644
--- a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringRecipientListParallelOptionalPropertiesTest.xml
+++ b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringRecipientListParallelOptionalPropertiesTest.xml
@@ -40,7 +40,7 @@
<route>
<from uri="direct:a"/>
- <setHeader headerName="foo" prop:headerName="theRealHeader">
+ <setHeader name="foo" prop:headerName="theRealHeader">
<constant>1000</constant>
</setHeader>
<delay>
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringRouteStopTest.xml b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringRouteStopTest.xml
index 448f67f..8e3e4fe 100644
--- a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringRouteStopTest.xml
+++ b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringRouteStopTest.xml
@@ -48,7 +48,7 @@
<from uri="direct:foo"/>
<to uri="mock:foo"/>
<!-- you can also set the Exchange#ROUTE_STOP property on Exchange to true -->
- <setProperty propertyName="CamelRouteStop">
+ <setProperty name="CamelRouteStop">
<constant>true</constant>
</setProperty>
<to uri="mock:result"/>
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSetHeaderTest-context.xml b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSetHeaderTest-context.xml
index 018c275..911a8b8 100644
--- a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSetHeaderTest-context.xml
+++ b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSetHeaderTest-context.xml
@@ -28,7 +28,7 @@
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route>
<from uri="seda:a"/>
- <setHeader headerName="oldBodyValue">
+ <setHeader name="oldBodyValue">
<simple>${body}</simple>
</setHeader>
<to uri="mock:b"/>
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSetHeaderWithConstantTest-context.xml b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSetHeaderWithConstantTest-context.xml
index 39f9105..411ec9e 100644
--- a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSetHeaderWithConstantTest-context.xml
+++ b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSetHeaderWithConstantTest-context.xml
@@ -28,7 +28,7 @@
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route>
<from uri="seda:a"/>
- <setHeader headerName="theHeader">
+ <setHeader name="theHeader">
<constant>the value</constant>
</setHeader>
<to uri="mock:b"/>
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSetHeaderXPathResultTypeTest.xml b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSetHeaderXPathResultTypeTest.xml
index 9508d2b..ee91c8b 100644
--- a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSetHeaderXPathResultTypeTest.xml
+++ b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSetHeaderXPathResultTypeTest.xml
@@ -28,11 +28,11 @@
<route>
<from uri="direct:start"/>
<!-- is there a hello tag in the body -->
- <setHeader headerName="foo">
+ <setHeader name="foo">
<xpath resultType="java.lang.Boolean">/hello</xpath>
</setHeader>
<!-- is there a bye tag in the body -->
- <setHeader headerName="bar">
+ <setHeader name="bar">
<!-- use Boolean shorthand to test we use Camel class resolver, and not JAXB -->
<xpath resultType="Boolean">/bye</xpath>
</setHeader>
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSimpleResultTypeRouteTest.xml b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSimpleResultTypeRouteTest.xml
index 7935b5f..bca969e 100644
--- a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSimpleResultTypeRouteTest.xml
+++ b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSimpleResultTypeRouteTest.xml
@@ -28,12 +28,12 @@
<!-- START SNIPPET: e1 -->
<route>
<from uri="direct:foo"/>
- <setHeader headerName="cool">
+ <setHeader name="cool">
<!-- use resultType to indicate that the type should be a java.lang.Boolean -->
<simple resultType="java.lang.Boolean">true</simple>
</setHeader>
<!-- here we have no result type, so the type would be java.lang.String -->
- <setHeader headerName="fail">
+ <setHeader name="fail">
<simple>true</simple>
</setHeader>
<to uri="mock:foo"/>
@@ -42,10 +42,10 @@
<route>
<from uri="direct:bar"/>
- <setHeader headerName="cool">
+ <setHeader name="cool">
<simple resultType="java.lang.Boolean">true</simple>
</setHeader>
- <setHeader headerName="fail">
+ <setHeader name="fail">
<simple>true</simple>
</setHeader>
<to uri="mock:bar"/>
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringTraceTest-context.xml b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringTraceTest-context.xml
index 9e23843..c6aff1b 100644
--- a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringTraceTest-context.xml
+++ b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringTraceTest-context.xml
@@ -30,7 +30,7 @@
<route>
<from uri="direct:start"/>
- <setHeader headerName="someHeader">
+ <setHeader name="someHeader">
<simple>${in.body} World!</simple>
</setHeader>
<to uri="mock:result"/>
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringTraceUsingPropertyTest-context.xml b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringTraceUsingPropertyTest-context.xml
index 92b1f63..8a8392d 100644
--- a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringTraceUsingPropertyTest-context.xml
+++ b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringTraceUsingPropertyTest-context.xml
@@ -32,7 +32,7 @@
<route>
<from uri="direct:start"/>
- <setHeader headerName="{{foo.header}}">
+ <setHeader name="{{foo.header}}">
<simple>${in.body} World!</simple>
</setHeader>
<to uri="mock:result"/>
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringWireTapNewExchangeTest.xml b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringWireTapNewExchangeTest.xml
index a04d314..6c60365 100644
--- a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringWireTapNewExchangeTest.xml
+++ b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringWireTapNewExchangeTest.xml
@@ -33,8 +33,8 @@
<wireTap uri="direct:tap">
<!-- create the new tap message body and headers -->
<body><constant>Bye World</constant></body>
- <setHeader headerName="id"><constant>123</constant></setHeader>
- <setHeader headerName="date"><simple>${date:now:yyyyMMdd}</simple></setHeader>
+ <setHeader name="id"><constant>123</constant></setHeader>
+ <setHeader name="date"><simple>${date:now:yyyyMMdd}</simple></setHeader>
</wireTap>
<!-- here we continue routing the original message -->
<to uri="mock:result"/>
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml
index 8d96bbd..5628cf7 100644
--- a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml
+++ b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml
@@ -39,7 +39,7 @@
<route>
<from uri="seda:header"/>
- <setHeader headerName="visited">
+ <setHeader name="visited">
<constant>true</constant>
</setHeader>
<aggregate strategyRef="latestAggregationStrategy" completionTimeout="1000">
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/removeHeader.xml b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/removeHeader.xml
index 772dfeb..ab1a8c4 100644
--- a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/removeHeader.xml
+++ b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/removeHeader.xml
@@ -27,7 +27,7 @@
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route>
<from uri="direct:start"/>
- <setHeader headerName="foo">
+ <setHeader name="foo">
<constant>bar</constant>
</setHeader>
<to uri="mock:mid"/>
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/removePropertiesWithExclusion.xml b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/removePropertiesWithExclusion.xml
index f74f354..2df9c75 100644
--- a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/removePropertiesWithExclusion.xml
+++ b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/removePropertiesWithExclusion.xml
@@ -27,13 +27,13 @@
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route>
<from uri="direct:start"/>
- <setProperty propertyName="foo">
+ <setProperty name="foo">
<constant>bar</constant>
</setProperty>
- <setProperty propertyName="fee">
+ <setProperty name="fee">
<constant>bar1</constant>
</setProperty>
- <setProperty propertyName="fiu">
+ <setProperty name="fiu">
<constant>bar2</constant>
</setProperty>
<to uri="mock:mid"/>
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/removePropertiesWithoutExclusion.xml b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/removePropertiesWithoutExclusion.xml
index 79349a3..702976b 100644
--- a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/removePropertiesWithoutExclusion.xml
+++ b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/removePropertiesWithoutExclusion.xml
@@ -27,10 +27,10 @@
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route>
<from uri="direct:start"/>
- <setProperty propertyName="foo">
+ <setProperty name="foo">
<constant>bar</constant>
</setProperty>
- <setProperty propertyName="fee">
+ <setProperty name="fee">
<constant>bar1</constant>
</setProperty>
<to uri="mock:mid"/>
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/removeProperty.xml b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/removeProperty.xml
index 2826ba6..b58335e 100644
--- a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/removeProperty.xml
+++ b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/removeProperty.xml
@@ -27,7 +27,7 @@
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route>
<from uri="direct:start"/>
- <setProperty propertyName="foo">
+ <setProperty name="foo">
<constant>bar</constant>
</setProperty>
<to uri="mock:mid"/>
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/setHeaderNameDynamic.xml b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/setHeaderNameDynamic.xml
index d2ea76f9..f1e8242 100644
--- a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/setHeaderNameDynamic.xml
+++ b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/setHeaderNameDynamic.xml
@@ -28,7 +28,7 @@
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route>
<from uri="direct:start"/>
- <setHeader headerName="$simple{type:org.apache.camel.spring.processor.SpringSetPropertyNameDynamicTest$TestConstans.EXCHANGE_PROP_TX_FAILED}">
+ <setHeader name="$simple{type:org.apache.camel.spring.processor.SpringSetPropertyNameDynamicTest$TestConstans.EXCHANGE_PROP_TX_FAILED}">
<simple>${type:java.lang.Boolean.TRUE}</simple>
</setHeader>
<to uri="mock:end"/>
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/setProperty.xml b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/setProperty.xml
index 8a11278..381983d 100644
--- a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/setProperty.xml
+++ b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/setProperty.xml
@@ -28,7 +28,7 @@
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route>
<from uri="direct:start"/>
- <setProperty propertyName="foo">
+ <setProperty name="foo">
<constant>bar</constant>
</setProperty>
<to uri="mock:end"/>
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/setPropertyNameDynamic.xml b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/setPropertyNameDynamic.xml
index 1021dad..aa64345 100644
--- a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/setPropertyNameDynamic.xml
+++ b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/setPropertyNameDynamic.xml
@@ -28,7 +28,7 @@
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route>
<from uri="direct:start"/>
- <setProperty propertyName="$simple{type:org.apache.camel.spring.processor.SpringSetPropertyNameDynamicTest$TestConstans.EXCHANGE_PROP_TX_FAILED}">
+ <setProperty name="$simple{type:org.apache.camel.spring.processor.SpringSetPropertyNameDynamicTest$TestConstans.EXCHANGE_PROP_TX_FAILED}">
<simple>${type:java.lang.Boolean.TRUE}</simple>
</setProperty>
<to uri="mock:end"/>
diff --git a/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/properties-location-element-implicit-test.xml b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/properties-location-element-implicit-test.xml
index bcf1958..41454c2 100644
--- a/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/properties-location-element-implicit-test.xml
+++ b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/properties-location-element-implicit-test.xml
@@ -40,13 +40,13 @@
<route>
<from uri="direct:start"/>
- <setHeader headerName="property-1">
+ <setHeader name="property-1">
<constant>{{property-key-1}}</constant>
</setHeader>
- <setHeader headerName="property-2">
+ <setHeader name="property-2">
<constant>{{property-key-2}}</constant>
</setHeader>
- <setHeader headerName="cm">
+ <setHeader name="cm">
<constant>{{cm-key}}</constant>
</setHeader>
<to uri="mock:result"/>
diff --git a/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/properties-location-element-optional-test.xml b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/properties-location-element-optional-test.xml
index e6904c3..b2eae17 100644
--- a/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/properties-location-element-optional-test.xml
+++ b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/properties-location-element-optional-test.xml
@@ -41,13 +41,13 @@
<route>
<from uri="direct:start"/>
- <setHeader headerName="property-1">
+ <setHeader name="property-1">
<constant>{{property-key-1}}</constant>
</setHeader>
- <setHeader headerName="property-2">
+ <setHeader name="property-2">
<constant>{{property-key-2}}</constant>
</setHeader>
- <setHeader headerName="cm">
+ <setHeader name="cm">
<constant>{{cm-key}}</constant>
</setHeader>
<to uri="mock:result"/>
diff --git a/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/properties-location-element-test.xml b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/properties-location-element-test.xml
index 37c70db..0d666b5 100644
--- a/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/properties-location-element-test.xml
+++ b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/properties-location-element-test.xml
@@ -40,13 +40,13 @@
<route>
<from uri="direct:start"/>
- <setHeader headerName="property-1">
+ <setHeader name="property-1">
<constant>{{property-key-1}}</constant>
</setHeader>
- <setHeader headerName="property-2">
+ <setHeader name="property-2">
<constant>{{property-key-2}}</constant>
</setHeader>
- <setHeader headerName="cm">
+ <setHeader name="cm">
<constant>{{cm-key}}</constant>
</setHeader>
<to uri="mock:result"/>
diff --git a/components/camel-test-spring/src/test/resources/org/apache/camel/test/spring/CamelSpringPropertiesLocationElementTest-context.xml b/components/camel-test-spring/src/test/resources/org/apache/camel/test/spring/CamelSpringPropertiesLocationElementTest-context.xml
index 23319ce..2692b73 100644
--- a/components/camel-test-spring/src/test/resources/org/apache/camel/test/spring/CamelSpringPropertiesLocationElementTest-context.xml
+++ b/components/camel-test-spring/src/test/resources/org/apache/camel/test/spring/CamelSpringPropertiesLocationElementTest-context.xml
@@ -32,13 +32,13 @@
<route>
<from uri="direct:start"/>
- <setHeader headerName="property-1">
+ <setHeader name="property-1">
<constant>{{property-key-1}}</constant>
</setHeader>
- <setHeader headerName="property-2">
+ <setHeader name="property-2">
<constant>{{property-key-2}}</constant>
</setHeader>
- <setHeader headerName="property-3">
+ <setHeader name="property-3">
<constant>{{property-key-3}}</constant>
</setHeader>
<to uri="mock:result"/>
diff --git a/components/camel-xslt/src/main/docs/xslt-component.adoc b/components/camel-xslt/src/main/docs/xslt-component.adoc
index 2ec0fc3..7aa81b3 100644
--- a/components/camel-xslt/src/main/docs/xslt-component.adoc
+++ b/components/camel-xslt/src/main/docs/xslt-component.adoc
@@ -172,7 +172,7 @@ To make the parameters useable, you will need to declare them.
[source,xml]
----
-<setHeader headerName="myParam"><constant>42</constant></setHeader>
+<setHeader name="myParam"><constant>42</constant></setHeader>
<to uri="xslt:MyTransform.xsl"/>
----
diff --git a/components/camel-zookeeper/src/main/docs/zookeeper-component.adoc b/components/camel-zookeeper/src/main/docs/zookeeper-component.adoc
index 3438120..dbd9414 100644
--- a/components/camel-zookeeper/src/main/docs/zookeeper-component.adoc
+++ b/components/camel-zookeeper/src/main/docs/zookeeper-component.adoc
@@ -264,7 +264,7 @@ or equivalently:
----
<route>
<from uri="direct:delete-znode" />
- <setHeader headerName="CamelZookeeperOperation">
+ <setHeader name="CamelZookeeperOperation">
<constant>DELETE</constant>
</setHeader>
<to uri="zookeeper://localhost:39913/somepath/somenode" />
diff --git a/core/camel-base/src/main/docs/simple-language.adoc b/core/camel-base/src/main/docs/simple-language.adoc
index 1183d46..da32629 100644
--- a/core/camel-base/src/main/docs/simple-language.adoc
+++ b/core/camel-base/src/main/docs/simple-language.adoc
@@ -886,7 +886,7 @@ You can set a spring bean into an exchange property as shown below:
...
<route>
...
- <setProperty propertyName="monitoring.message">
+ <setProperty name="monitoring.message">
<simple>ref:myBeanId</simple>
</setProperty>
...
diff --git a/core/camel-core/src/main/docs/eips/setProperty-eip.adoc b/core/camel-core/src/main/docs/eips/setProperty-eip.adoc
index 3e547d7..1977ab2 100644
--- a/core/camel-core/src/main/docs/eips/setProperty-eip.adoc
+++ b/core/camel-core/src/main/docs/eips/setProperty-eip.adoc
@@ -11,7 +11,7 @@ The Set Property EIP supports 1 options which are listed below:
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *propertyName* | *Required* Name of exchange property to set a new value. The simple language can be used to define a dynamic evaluated exchange property name to be used. Otherwise a constant name will be used. | | String
+| *name* | *Required* Name of exchange property to set a new value. The simple language can be used to define a dynamic evaluated exchange property name to be used. Otherwise a constant name will be used. | | String
|===
// eip options: END
@@ -38,7 +38,7 @@ And the same example using XML:
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route>
<from uri="direct:a"/>
- <setProperty propertyName="myProperty">
+ <setProperty name="myProperty">
<constant>test</constant>
</setProperty>
<to uri="direct:b"/>
diff --git a/docs/user-manual/modules/ROOT/pages/setProperty-eip.adoc b/docs/user-manual/modules/ROOT/pages/setProperty-eip.adoc
index 3e547d7..1977ab2 100644
--- a/docs/user-manual/modules/ROOT/pages/setProperty-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/setProperty-eip.adoc
@@ -11,7 +11,7 @@ The Set Property EIP supports 1 options which are listed below:
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *propertyName* | *Required* Name of exchange property to set a new value. The simple language can be used to define a dynamic evaluated exchange property name to be used. Otherwise a constant name will be used. | | String
+| *name* | *Required* Name of exchange property to set a new value. The simple language can be used to define a dynamic evaluated exchange property name to be used. Otherwise a constant name will be used. | | String
|===
// eip options: END
@@ -38,7 +38,7 @@ And the same example using XML:
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route>
<from uri="direct:a"/>
- <setProperty propertyName="myProperty">
+ <setProperty name="myProperty">
<constant>test</constant>
</setProperty>
<to uri="direct:b"/>
diff --git a/docs/user-manual/modules/ROOT/pages/simple-language.adoc b/docs/user-manual/modules/ROOT/pages/simple-language.adoc
index 1183d46..da32629 100644
--- a/docs/user-manual/modules/ROOT/pages/simple-language.adoc
+++ b/docs/user-manual/modules/ROOT/pages/simple-language.adoc
@@ -886,7 +886,7 @@ You can set a spring bean into an exchange property as shown below:
...
<route>
...
- <setProperty propertyName="monitoring.message">
+ <setProperty name="monitoring.message">
<simple>ref:myBeanId</simple>
</setProperty>
...
[camel] 04/04: CAMEL-13657: Use name instead of headerName,
propertyName in XML DSL to make it simpler and more natural.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a2d2b181be68e67f7a91f76b7598a407d1b0a9b1
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Jun 28 14:36:49 2019 +0200
CAMEL-13657: Use name instead of headerName, propertyName in XML DSL to make it simpler and more natural.
---
MIGRATION.md | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/MIGRATION.md b/MIGRATION.md
index 66250d0..2e075da 100644
--- a/MIGRATION.md
+++ b/MIGRATION.md
@@ -107,6 +107,21 @@ We have also renamed `camel-jetty9` to `camel-jetty`.
The properties component will now use OS environment variables as perferred value. This means you can set an OS environment variable which will override any property values that has been set in property files, JVM system properties etc. You can configure this with the `environmentVariableMode` option on the properties component.
+### <setHeader> and <setProperty> in XML DSL
+
+We have renamed the attribute `headerName` and `propertyName` in the XML DSL for the `<setHeader>` and `<setProperty`> EIPs, to be just `name`.
+
+So migrate
+
+ <setHeader headerName="foo"><simple>Hello ${body}</simple></setHeader>
+
+To
+
+ <setHeader name="foo"><simple>Hello ${body}</simple></setHeader>
+
+And the same for `<setProperty>`.
+
+
### javax.script
The `camel-script` component has been removed and there is no support for javax.script, which is also deprecated in the JDK and to be removed from Java 11 onwards.
[camel] 03/04: CAMEL-13657: Use name instead of headerName,
propertyName in XML DSL to make it simpler and more natural.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 90e1cd83f5332107227ee60dfeb9fd84d9ba44cb
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Jun 28 14:34:39 2019 +0200
CAMEL-13657: Use name instead of headerName, propertyName in XML DSL to make it simpler and more natural.
---
.../src/main/docs/constant-language.adoc | 2 +-
core/camel-base/src/main/docs/simple-language.adoc | 4 +-
.../src/main/docs/eips/claimCheck-eip.adoc | 2 +-
.../src/main/docs/eips/setHeader-eip.adoc | 2 +-
.../modules/ROOT/pages/ahc-component.adoc | 2 +-
.../modules/ROOT/pages/gora-component.adoc | 16 ++++----
.../pages/hazelcast-atomicvalue-component.adoc | 10 ++---
.../ROOT/pages/hazelcast-map-component.adoc | 16 ++++----
.../ROOT/pages/hazelcast-multimap-component.adoc | 8 ++--
.../pages/hazelcast-replicatedmap-component.adoc | 6 +--
.../ROOT/pages/hazelcast-ringbuffer-component.adoc | 2 +-
docs/components/modules/ROOT/pages/hazelcast.adoc | 12 +++---
.../modules/ROOT/pages/hbase-component.adoc | 32 +++++++--------
.../modules/ROOT/pages/http4-component.adoc | 2 +-
.../modules/ROOT/pages/iota-component.adoc | 18 ++++-----
.../modules/ROOT/pages/jsonpath-language.adoc | 2 +-
.../modules/ROOT/pages/properties-component.adoc | 4 +-
.../modules/ROOT/pages/solr-component.adoc | 8 ++--
.../modules/ROOT/pages/xslt-component.adoc | 2 +-
.../modules/ROOT/pages/zookeeper-component.adoc | 2 +-
.../modules/ROOT/pages/claimCheck-eip.adoc | 2 +-
.../modules/ROOT/pages/constant-language.adoc | 2 +-
...-avoid-sending-some-or-all-message-headers.adoc | 4 +-
.../modules/ROOT/pages/oncompletion.adoc | 2 +-
.../modules/ROOT/pages/setHeader-eip.adoc | 2 +-
.../modules/ROOT/pages/simple-language.adoc | 4 +-
.../ROOT/pages/using-propertyplaceholder.adoc | 6 +--
.../resources/META-INF/spring/camel-context.xml | 46 +++++++++++-----------
.../resources/META-INF/spring/camel-context.xml | 4 +-
.../META-INF/spring/camel-context-mina1.xml | 2 +-
.../META-INF/spring/camel-context-mina2.xml | 2 +-
.../resources/META-INF/spring/camel-context.xml | 2 +-
.../main/resources/OSGI-INF/blueprint/camel.xml | 2 +-
.../blueprint/CxfPayloadProviderRouterBeans.xml | 4 +-
.../greeter/JettyRecipientListCxfIssueTest.xml | 2 +-
.../jetty/JettySpringFailoverRoundRobinTest.xml | 4 +-
36 files changed, 121 insertions(+), 121 deletions(-)
diff --git a/core/camel-base/src/main/docs/constant-language.adoc b/core/camel-base/src/main/docs/constant-language.adoc
index 80b4530..1a6ffb4 100644
--- a/core/camel-base/src/main/docs/constant-language.adoc
+++ b/core/camel-base/src/main/docs/constant-language.adoc
@@ -34,7 +34,7 @@ expression like:
----
<route>
<from uri="seda:a"/>
- <setHeader headerName="theHeader">
+ <setHeader name="theHeader">
<constant>the value</constant>
</setHeader>
<to uri="mock:b"/>
diff --git a/core/camel-base/src/main/docs/simple-language.adoc b/core/camel-base/src/main/docs/simple-language.adoc
index da32629..af1b5ae 100644
--- a/core/camel-base/src/main/docs/simple-language.adoc
+++ b/core/camel-base/src/main/docs/simple-language.adoc
@@ -801,7 +801,7 @@ You can nest functions, such as shown below:
[source,xml]
----
-<setHeader headerName="myHeader">
+<setHeader name="myHeader">
<simple>${properties:${header.someKey}}</simple>
</setHeader>
----
@@ -858,7 +858,7 @@ And in XML DSL
[source,xml]
----
-<setHeader headerName="cool">
+<setHeader name="cool">
<!-- use resultType to indicate that the type should be a java.lang.Boolean -->
<simple resultType="java.lang.Boolean">true</simple>
</setHeader>
diff --git a/core/camel-core/src/main/docs/eips/claimCheck-eip.adoc b/core/camel-core/src/main/docs/eips/claimCheck-eip.adoc
index 2643bfb..fac6c66 100644
--- a/core/camel-core/src/main/docs/eips/claimCheck-eip.adoc
+++ b/core/camel-core/src/main/docs/eips/claimCheck-eip.adoc
@@ -260,7 +260,7 @@ The last example shows how to use the `filter` option where we only want to get
<transform>
<constant>Bye World</constant>
</transform>
- <setHeader headerName="foo">
+ <setHeader name="foo">
<constant>456</constant>
</setHeader>
<removeHeader headerName="bar"/>
diff --git a/core/camel-core/src/main/docs/eips/setHeader-eip.adoc b/core/camel-core/src/main/docs/eips/setHeader-eip.adoc
index 936671a..f8d3d85 100644
--- a/core/camel-core/src/main/docs/eips/setHeader-eip.adoc
+++ b/core/camel-core/src/main/docs/eips/setHeader-eip.adoc
@@ -38,7 +38,7 @@ And the same example using XML:
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route>
<from uri="direct:a"/>
- <setHeader headerName="myHeader">
+ <setHeader name="myHeader">
<constant>test</constant>
</setHeader>
<to uri="direct:b"/>
diff --git a/docs/components/modules/ROOT/pages/ahc-component.adoc b/docs/components/modules/ROOT/pages/ahc-component.adoc
index bd44369..a0b25f3 100644
--- a/docs/components/modules/ROOT/pages/ahc-component.adoc
+++ b/docs/components/modules/ROOT/pages/ahc-component.adoc
@@ -320,7 +320,7 @@ And the equivalent Spring sample:
<camelContext xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
<from uri="direct:start"/>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>POST</constant>
</setHeader>
<to uri="ahc:http://www.google.com"/>
diff --git a/docs/components/modules/ROOT/pages/gora-component.adoc b/docs/components/modules/ROOT/pages/gora-component.adoc
index 3e65b81..5e6703c 100644
--- a/docs/components/modules/ROOT/pages/gora-component.adoc
+++ b/docs/components/modules/ROOT/pages/gora-component.adoc
@@ -230,7 +230,7 @@ datastore._
[source,xml]
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-<setHeader headerName="GoraOperation">
+<setHeader name="GoraOperation">
<constant>CreateSchema</constant>
</setHeader>
<to uri="gora:foobar?keyClass=java.lang.Long&valueClass=org.apache.camel.component.gora.generated.Pageview&dataStoreClass=org.apache.gora.hbase.store.HBaseStore"/>
@@ -240,7 +240,7 @@ datastore._
[source,xml]
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-<setHeader headerName="GoraOperation">
+<setHeader name="GoraOperation">
<constant>SchemaExists</constant>
</setHeader>
<to uri="gora:foobar?keyClass=java.lang.Long&valueClass=org.apache.camel.component.gora.generated.Pageview&dataStoreClass=org.apache.gora.hbase.store.HBaseStore"/>
@@ -250,10 +250,10 @@ datastore._
[source,xml]
------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-<setHeader headerName="GoraOperation">
+<setHeader name="GoraOperation">
<constant>put</constant>
</setHeader>
-<setHeader headerName="GoraKey">
+<setHeader name="GoraKey">
<constant>22222</constant>
</setHeader>
<to uri="gora:foo?keyClass=java.lang.Long&valueClass=org.apache.camel.component.gora.generated.Pageview&dataStoreClass=org.apache.gora.hbase.store.HBaseStore"/>
@@ -263,10 +263,10 @@ datastore._
[source,xml]
------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-<setHeader headerName="GoraOperation">
+<setHeader name="GoraOperation">
<constant>GET</constant>
</setHeader>
-<setHeader headerName="GoraKey">
+<setHeader name="GoraKey">
<constant>10101</constant>
</setHeader>
<to uri="gora:bar?keyClass=java.lang.Long&valueClass=org.apache.camel.component.gora.generated.Pageview&dataStoreClass=org.apache.gora.hbase.store.HBaseStore"/>
@@ -276,10 +276,10 @@ datastore._
[source,xml]
------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-<setHeader headerName="GoraOperation">
+<setHeader name="GoraOperation">
<constant>DELETE</constant>
</setHeader>
-<setHeader headerName="GoraKey">
+<setHeader name="GoraKey">
<constant>22222</constant>
</setHeader>
<to uri="gora:bar?keyClass=java.lang.Long&valueClass=org.apache.camel.component.gora.generated.Pageview&dataStoreClass=org.apache.gora.hbase.store.HBaseStore"/>
diff --git a/docs/components/modules/ROOT/pages/hazelcast-atomicvalue-component.adoc b/docs/components/modules/ROOT/pages/hazelcast-atomicvalue-component.adoc
index f167648..bd69fda 100644
--- a/docs/components/modules/ROOT/pages/hazelcast-atomicvalue-component.adoc
+++ b/docs/components/modules/ROOT/pages/hazelcast-atomicvalue-component.adoc
@@ -135,7 +135,7 @@ Spring DSL:
-----------------------------------------------------------------------------------------------
<route>
<from uri="direct:set" />
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader name="hazelcast.operation.type">
<constant>setvalue</constant>
</setHeader>
<to uri="hazelcast-atomicvalue:foo" />
@@ -162,7 +162,7 @@ Spring DSL:
-----------------------------------------------------------------------------------------------
<route>
<from uri="direct:get" />
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader name="hazelcast.operation.type">
<constant>get</constant>
</setHeader>
<to uri="hazelcast-atomicvalue:foo" />
@@ -189,7 +189,7 @@ Spring DSL:
-----------------------------------------------------------------------------------------------
<route>
<from uri="direct:increment" />
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader name="hazelcast.operation.type">
<constant>increment</constant>
</setHeader>
<to uri="hazelcast-atomicvalue:foo" />
@@ -216,7 +216,7 @@ Spring DSL:
-----------------------------------------------------------------------------------------------
<route>
<from uri="direct:decrement" />
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader name="hazelcast.operation.type">
<constant>decrement</constant>
</setHeader>
<to uri="hazelcast-atomicvalue:foo" />
@@ -243,7 +243,7 @@ Spring DSL:
-----------------------------------------------------------------------------------------------
<route>
<from uri="direct:destroy" />
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader name="hazelcast.operation.type">
<constant>destroy</constant>
</setHeader>
<to uri="hazelcast-atomicvalue:foo" />
diff --git a/docs/components/modules/ROOT/pages/hazelcast-map-component.adoc b/docs/components/modules/ROOT/pages/hazelcast-map-component.adoc
index 18a4825..518d68e 100644
--- a/docs/components/modules/ROOT/pages/hazelcast-map-component.adoc
+++ b/docs/components/modules/ROOT/pages/hazelcast-map-component.adoc
@@ -171,7 +171,7 @@ Spring DSL:
-----------------------------------------------------------------------------------------------
<route>
<from uri="direct:put" />
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader name="hazelcast.operation.type">
<constant>put</constant>
</setHeader>
<to uri="hazelcast-map:foo" />
@@ -197,13 +197,13 @@ Spring DSL:
-----------------------------------------------------------------------------------------------
<route>
<from uri="direct:put" />
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader name="hazelcast.operation.type">
<constant>put</constant>
</setHeader>
- <setHeader headerName="HazelcastConstants.TTL_VALUE">
+ <setHeader name="HazelcastConstants.TTL_VALUE">
<simple resultType="java.lang.Long">1</simple>
</setHeader>
- <setHeader headerName="HazelcastConstants.TTL_UNIT">
+ <setHeader name="HazelcastConstants.TTL_UNIT">
<simple resultType="java.util.concurrent.TimeUnit">TimeUnit.MINUTES</simple>
</setHeader>
<to uri="hazelcast-map:foo" />
@@ -229,7 +229,7 @@ Spring DSL:
-----------------------------------------------------------------------------------------------
<route>
<from uri="direct:get" />
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader name="hazelcast.operation.type">
<constant>get</constant>
</setHeader>
<to uri="hazelcast-map:foo" />
@@ -254,7 +254,7 @@ Spring DSL:
-----------------------------------------------------------------------------------------------
<route>
<from uri="direct:update" />
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader name="hazelcast.operation.type">
<constant>update</constant>
</setHeader>
<to uri="hazelcast-map:foo" />
@@ -278,7 +278,7 @@ Spring DSL:
-----------------------------------------------------------------------------------------------
<route>
<from uri="direct:delete" />
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader name="hazelcast.operation.type">
<constant>delete</constant>
</setHeader>
<to uri="hazelcast-map:foo" />
@@ -303,7 +303,7 @@ Spring DSL:
-----------------------------------------------------------------------------------------------
<route>
<from uri="direct:query" />
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader name="hazelcast.operation.type">
<constant>query</constant>
</setHeader>
<to uri="hazelcast-map:foo" />
diff --git a/docs/components/modules/ROOT/pages/hazelcast-multimap-component.adoc b/docs/components/modules/ROOT/pages/hazelcast-multimap-component.adoc
index ff15f8e..214612a 100644
--- a/docs/components/modules/ROOT/pages/hazelcast-multimap-component.adoc
+++ b/docs/components/modules/ROOT/pages/hazelcast-multimap-component.adoc
@@ -138,7 +138,7 @@ Spring DSL:
<route>
<from uri="direct:put" />
<log message="put.."/>
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader name="hazelcast.operation.type">
<constant>put</constant>
</setHeader>
<to uri="hazelcast-multimap:foo" />
@@ -163,7 +163,7 @@ Spring DSL:
<route>
<from uri="direct:removevalue" />
<log message="removevalue..."/>
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader name="hazelcast.operation.type">
<constant>removevalue</constant>
</setHeader>
<to uri="hazelcast-multimap:foo" />
@@ -194,7 +194,7 @@ Spring DSL:
<route>
<from uri="direct:get" />
<log message="get.."/>
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader name="hazelcast.operation.type">
<constant>get</constant>
</setHeader>
<to uri="hazelcast-multimap:foo" />
@@ -220,7 +220,7 @@ Spring DSL:
<route>
<from uri="direct:delete" />
<log message="delete.."/>
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader name="hazelcast.operation.type">
<constant>delete</constant>
</setHeader>
<to uri="hazelcast-multimap:foo" />
diff --git a/docs/components/modules/ROOT/pages/hazelcast-replicatedmap-component.adoc b/docs/components/modules/ROOT/pages/hazelcast-replicatedmap-component.adoc
index 96e63b4..5c130fd 100644
--- a/docs/components/modules/ROOT/pages/hazelcast-replicatedmap-component.adoc
+++ b/docs/components/modules/ROOT/pages/hazelcast-replicatedmap-component.adoc
@@ -141,7 +141,7 @@ Spring DSL:
<route>
<from uri="direct:put" />
<log message="put.."/>
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader name="hazelcast.operation.type">
<constant>put</constant>
</setHeader>
<to uri="hazelcast-replicatedmap:foo" />
@@ -167,7 +167,7 @@ Spring DSL:
<route>
<from uri="direct:get" />
<log message="get.."/>
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader name="hazelcast.operation.type">
<constant>get</constant>
</setHeader>
<to uri="hazelcast-replicatedmap:foo" />
@@ -193,7 +193,7 @@ Spring DSL:
<route>
<from uri="direct:delete" />
<log message="delete.."/>
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader name="hazelcast.operation.type">
<constant>delete</constant>
</setHeader>
<to uri="hazelcast-replicatedmap:foo" />
diff --git a/docs/components/modules/ROOT/pages/hazelcast-ringbuffer-component.adoc b/docs/components/modules/ROOT/pages/hazelcast-ringbuffer-component.adoc
index 412dcf5..fc4b70a 100644
--- a/docs/components/modules/ROOT/pages/hazelcast-ringbuffer-component.adoc
+++ b/docs/components/modules/ROOT/pages/hazelcast-ringbuffer-component.adoc
@@ -136,7 +136,7 @@ Spring DSL:
<route>
<from uri="direct:put" />
<log message="put.."/>
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader name="hazelcast.operation.type">
<constant>add</constant>
</setHeader>
<to uri="hazelcast-ringbuffer:foo" />
diff --git a/docs/components/modules/ROOT/pages/hazelcast.adoc b/docs/components/modules/ROOT/pages/hazelcast.adoc
index 91d39ee..98a9da5 100644
--- a/docs/components/modules/ROOT/pages/hazelcast.adoc
+++ b/docs/components/modules/ROOT/pages/hazelcast.adoc
@@ -65,7 +65,7 @@ See followings for each component usage:
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route id="testHazelcastInstanceBeanRefPut">
<from uri="direct:testHazelcastInstanceBeanRefPut"/>
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>put</constant>
</setHeader>
<to uri="hazelcast-map:testmap?hazelcastInstanceName=HZ.INSTANCE"/>
@@ -73,7 +73,7 @@ See followings for each component usage:
<route id="testHazelcastInstanceBeanRefGet">
<from uri="direct:testHazelcastInstanceBeanRefGet" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>get</constant>
</setHeader>
<to uri="hazelcast-map:testmap?hazelcastInstanceName=HZ.INSTANCE"/>
@@ -95,7 +95,7 @@ See followings for each component usage:
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route id="testHazelcastInstanceBeanRefPut">
<from uri="direct:testHazelcastInstanceBeanRefPut"/>
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>put</constant>
</setHeader>
<to uri="hazelcast-map:testmap?hazelcastInstance=#hazelcastInstance"/>
@@ -103,7 +103,7 @@ See followings for each component usage:
<route id="testHazelcastInstanceBeanRefGet">
<from uri="direct:testHazelcastInstanceBeanRefGet" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>get</constant>
</setHeader>
<to uri="hazelcast-map:testmap?hazelcastInstance=#hazelcastInstance"/>
@@ -147,7 +147,7 @@ to reference the service in the hazelcast endpoint.
<camelContext xmlns="http://camel.apache.org/schema/blueprint">
<route id="testHazelcastInstanceBeanRefPut">
<from uri="direct:testHazelcastInstanceBeanRefPut"/>
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>put</constant>
</setHeader>
<to uri="hazelcast-map:testmap?hazelcastInstance=#hazelcastInstance"/>
@@ -155,7 +155,7 @@ to reference the service in the hazelcast endpoint.
<route id="testHazelcastInstanceBeanRefGet">
<from uri="direct:testHazelcastInstanceBeanRefGet" />
- <setHeader headerName="CamelHazelcastOperationType">
+ <setHeader name="CamelHazelcastOperationType">
<constant>get</constant>
</setHeader>
<to uri="hazelcast-map:testmap?hazelcastInstance=#hazelcastInstance"/>
diff --git a/docs/components/modules/ROOT/pages/hbase-component.adoc b/docs/components/modules/ROOT/pages/hbase-component.adoc
index 953ed2c..4930e8f 100644
--- a/docs/components/modules/ROOT/pages/hbase-component.adoc
+++ b/docs/components/modules/ROOT/pages/hbase-component.adoc
@@ -216,11 +216,11 @@ would be to store part of the message body to specified HBase column.
<route>
<from uri="direct:in"/>
<!-- Set the HBase Row -->
- <setHeader headerName="CamelHBaseRowId">
+ <setHeader name="CamelHBaseRowId">
<el>${in.body.id}</el>
</setHeader>
<!-- Set the HBase Value -->
- <setHeader headerName="CamelHBaseValue">
+ <setHeader name="CamelHBaseValue">
<el>${in.body.value}</el>
</setHeader>
<to uri="hbase:mytable?operation=CamelHBasePut&family=myfamily&qualifier=myqualifier"/>
@@ -240,19 +240,19 @@ does not have the number 1.
<route>
<from uri="direct:in"/>
<!-- Set the HBase Row 1st column -->
- <setHeader headerName="CamelHBaseRowId">
+ <setHeader name="CamelHBaseRowId">
<el>${in.body.id}</el>
</setHeader>
<!-- Set the HBase Row 2nd column -->
- <setHeader headerName="CamelHBaseRowId2">
+ <setHeader name="CamelHBaseRowId2">
<el>${in.body.id}</el>
</setHeader>
<!-- Set the HBase Value for 1st column -->
- <setHeader headerName="CamelHBaseValue">
+ <setHeader name="CamelHBaseValue">
<el>${in.body.value}</el>
</setHeader>
<!-- Set the HBase Value for 2nd column -->
- <setHeader headerName="CamelHBaseValue2">
+ <setHeader name="CamelHBaseValue2">
<el>${in.body.othervalue}</el>
</setHeader>
<to uri="hbase:mytable?operation=CamelHBasePut&family=myfamily&qualifier=myqualifier&family2=myfamily&qualifier2=myqualifier2"/>
@@ -276,7 +276,7 @@ message headers.
<route>
<from uri="direct:in"/>
<!-- Set the HBase Row of the Get -->
- <setHeader headerName="CamelHBaseRowId">
+ <setHeader name="CamelHBaseRowId">
<el>${in.body.id}</el>
</setHeader>
<to uri="hbase:mytable?operation=CamelHBaseGet&family=myfamily&qualifier=myqualifier&valueType=java.lang.Long"/>
@@ -298,7 +298,7 @@ specified is one or more rows as part of the message headers.
<route>
<from uri="direct:in"/>
<!-- Set the HBase Row of the Get -->
- <setHeader headerName="CamelHBaseRowId">
+ <setHeader name="CamelHBaseRowId">
<el>${in.body.id}</el>
</setHeader>
<to uri="hbase:mytable?operation=CamelHBaseDelete"/>
@@ -341,29 +341,29 @@ can make use of the ModelAwareColumnMatchingFilter as shown below.
<route>
<from uri="direct:scan"/>
<!-- Set the Criteria -->
- <setHeader headerName="CamelHBaseFamily">
+ <setHeader name="CamelHBaseFamily">
<constant>name</constant>
</setHeader>
- <setHeader headerName="CamelHBaseQualifier">
+ <setHeader name="CamelHBaseQualifier">
<constant>first</constant>
</setHeader>
- <setHeader headerName="CamelHBaseValue">
+ <setHeader name="CamelHBaseValue">
<el>in.body.firstName</el>
</setHeader>
- <setHeader headerName="CamelHBaseFamily2">
+ <setHeader name="CamelHBaseFamily2">
<constant>name</constant>
</setHeader>
- <setHeader headerName="CamelHBaseQualifier2">
+ <setHeader name="CamelHBaseQualifier2">
<constant>last</constant>
</setHeader>
- <setHeader headerName="CamelHBaseValue2">
+ <setHeader name="CamelHBaseValue2">
<el>in.body.lastName</el>
</setHeader>
<!-- Set additional fields that you want to be return by skipping value -->
- <setHeader headerName="CamelHBaseFamily3">
+ <setHeader name="CamelHBaseFamily3">
<constant>address</constant>
</setHeader>
- <setHeader headerName="CamelHBaseQualifier3">
+ <setHeader name="CamelHBaseQualifier3">
<constant>country</constant>
</setHeader>
<to uri="hbase:mytable?operation=CamelHBaseScan&filters=#myFilterList"/>
diff --git a/docs/components/modules/ROOT/pages/http4-component.adoc b/docs/components/modules/ROOT/pages/http4-component.adoc
index a698396..1f4684a 100644
--- a/docs/components/modules/ROOT/pages/http4-component.adoc
+++ b/docs/components/modules/ROOT/pages/http4-component.adoc
@@ -422,7 +422,7 @@ And the equivalent Spring sample:
<camelContext xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
<from uri="direct:start"/>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>POST</constant>
</setHeader>
<to uri="http4://www.google.com"/>
diff --git a/docs/components/modules/ROOT/pages/iota-component.adoc b/docs/components/modules/ROOT/pages/iota-component.adoc
index 5ccb6ba..7d727ed 100644
--- a/docs/components/modules/ROOT/pages/iota-component.adoc
+++ b/docs/components/modules/ROOT/pages/iota-component.adoc
@@ -122,16 +122,16 @@ The following route defined in Spring XML send a message to tangle
<setMessage>
<constant>Hello world!</constant>
</setMessage>
- <setHeader headerName="CamelIOTASeed">
+ <setHeader name="CamelIOTASeed">
<constant>MYSEEDHERE</constant>
</setHeader>
- <setHeader headerName="CamelIOTAValue">
+ <setHeader name="CamelIOTAValue">
<constant>1</constant>
</setHeader>
- <setHeader headerName="CamelIOTAToAddress">
+ <setHeader name="CamelIOTAToAddress">
<constant>RECIPIENTADDRESS</constant>
</setHeader>
- <setHeader headerName="CamelIOTAToAddress">
+ <setHeader name="CamelIOTAToAddress">
<constant>RECIPIENTADDRESS</constant>
</setHeader>
@@ -148,10 +148,10 @@ The following route defined in Spring XML create a new address
---------------------------------------------------------------------------------------------------------------------------
<route>
<from uri="direct:start" />
- <setHeader headerName="CamelIOTASeed">
+ <setHeader name="CamelIOTASeed">
<constant>MYSEEDHERE</constant>
</setHeader>
- <setHeader headerName="CamelIOTAAddressIndex">
+ <setHeader name="CamelIOTAAddressIndex">
<constant>1</constant>
</setHeader>
@@ -168,13 +168,13 @@ The following route defined in Spring XML retrieve transfers data
---------------------------------------------------------------------------------------------------------------------------
<route>
<from uri="direct:start" />
- <setHeader headerName="CamelIOTASeed">
+ <setHeader name="CamelIOTASeed">
<constant>MYSEEDHERE</constant>
</setHeader>
- <setHeader headerName="CamelIOTAAddressStartIndex">
+ <setHeader name="CamelIOTAAddressStartIndex">
<constant>1</constant>
</setHeader>
- <setHeader headerName="CamelIOTAAddressEndIndex">
+ <setHeader name="CamelIOTAAddressEndIndex">
<constant>10</constant>
</setHeader>
diff --git a/docs/components/modules/ROOT/pages/jsonpath-language.adoc b/docs/components/modules/ROOT/pages/jsonpath-language.adoc
index bc49192..6903a91 100644
--- a/docs/components/modules/ROOT/pages/jsonpath-language.adoc
+++ b/docs/components/modules/ROOT/pages/jsonpath-language.adoc
@@ -344,7 +344,7 @@ The same example in XML DSL would be:
----
<route>
<from uri="direct:start"/>
- <setHeader headerName="numberOfBooks">
+ <setHeader name="numberOfBooks">
<jsonpath headerName="books" resultType="int">$..store.book.length()</jsonpath>
</transform>
<to uri="mock:result"/>
diff --git a/docs/components/modules/ROOT/pages/properties-component.adoc b/docs/components/modules/ROOT/pages/properties-component.adoc
index 54b7194..e357c01 100644
--- a/docs/components/modules/ROOT/pages/properties-component.adoc
+++ b/docs/components/modules/ROOT/pages/properties-component.adoc
@@ -785,7 +785,7 @@ take care. For example:
[source,xml]
----
-<setHeader headerName="Exchange.FILE_NAME">
+<setHeader name="Exchange.FILE_NAME">
<simple>{{file.rootdir}}/${in.header.CamelFileName}</simple>
</setHeader>
----
@@ -795,7 +795,7 @@ to indicate using the <<simple-language,Simple>> language in Camel.
[source,xml]
----
-<setHeader headerName="Exchange.FILE_NAME">
+<setHeader name="Exchange.FILE_NAME">
<simple>{{file.rootdir}}/$simple{in.header.CamelFileName}</simple>
</setHeader>
----
diff --git a/docs/components/modules/ROOT/pages/solr-component.adoc b/docs/components/modules/ROOT/pages/solr-component.adoc
index ade35b1..408ab7a 100644
--- a/docs/components/modules/ROOT/pages/solr-component.adoc
+++ b/docs/components/modules/ROOT/pages/solr-component.adoc
@@ -189,24 +189,24 @@ from("direct:commit")
------------------------------------------
<route>
<from uri="direct:insert"/>
- <setHeader headerName="SolrOperation">
+ <setHeader name="SolrOperation">
<constant>INSERT</constant>
</setHeader>
- <setHeader headerName="SolrField.id">
+ <setHeader name="SolrField.id">
<simple>${body}</simple>
</setHeader>
<to uri="solr://localhost:8983/solr"/>
</route>
<route>
<from uri="direct:delete"/>
- <setHeader headerName="SolrOperation">
+ <setHeader name="SolrOperation">
<constant>DELETE_BY_ID</constant>
</setHeader>
<to uri="solr://localhost:8983/solr"/>
</route>
<route>
<from uri="direct:commit"/>
- <setHeader headerName="SolrOperation">
+ <setHeader name="SolrOperation">
<constant>COMMIT</constant>
</setHeader>
<to uri="solr://localhost:8983/solr"/>
diff --git a/docs/components/modules/ROOT/pages/xslt-component.adoc b/docs/components/modules/ROOT/pages/xslt-component.adoc
index 2ec0fc3..7aa81b3 100644
--- a/docs/components/modules/ROOT/pages/xslt-component.adoc
+++ b/docs/components/modules/ROOT/pages/xslt-component.adoc
@@ -172,7 +172,7 @@ To make the parameters useable, you will need to declare them.
[source,xml]
----
-<setHeader headerName="myParam"><constant>42</constant></setHeader>
+<setHeader name="myParam"><constant>42</constant></setHeader>
<to uri="xslt:MyTransform.xsl"/>
----
diff --git a/docs/components/modules/ROOT/pages/zookeeper-component.adoc b/docs/components/modules/ROOT/pages/zookeeper-component.adoc
index 3438120..dbd9414 100644
--- a/docs/components/modules/ROOT/pages/zookeeper-component.adoc
+++ b/docs/components/modules/ROOT/pages/zookeeper-component.adoc
@@ -264,7 +264,7 @@ or equivalently:
----
<route>
<from uri="direct:delete-znode" />
- <setHeader headerName="CamelZookeeperOperation">
+ <setHeader name="CamelZookeeperOperation">
<constant>DELETE</constant>
</setHeader>
<to uri="zookeeper://localhost:39913/somepath/somenode" />
diff --git a/docs/user-manual/modules/ROOT/pages/claimCheck-eip.adoc b/docs/user-manual/modules/ROOT/pages/claimCheck-eip.adoc
index 2643bfb..fac6c66 100644
--- a/docs/user-manual/modules/ROOT/pages/claimCheck-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/claimCheck-eip.adoc
@@ -260,7 +260,7 @@ The last example shows how to use the `filter` option where we only want to get
<transform>
<constant>Bye World</constant>
</transform>
- <setHeader headerName="foo">
+ <setHeader name="foo">
<constant>456</constant>
</setHeader>
<removeHeader headerName="bar"/>
diff --git a/docs/user-manual/modules/ROOT/pages/constant-language.adoc b/docs/user-manual/modules/ROOT/pages/constant-language.adoc
index 80b4530..1a6ffb4 100644
--- a/docs/user-manual/modules/ROOT/pages/constant-language.adoc
+++ b/docs/user-manual/modules/ROOT/pages/constant-language.adoc
@@ -34,7 +34,7 @@ expression like:
----
<route>
<from uri="seda:a"/>
- <setHeader headerName="theHeader">
+ <setHeader name="theHeader">
<constant>the value</constant>
</setHeader>
<to uri="mock:b"/>
diff --git a/docs/user-manual/modules/ROOT/pages/faq/how-to-avoid-sending-some-or-all-message-headers.adoc b/docs/user-manual/modules/ROOT/pages/faq/how-to-avoid-sending-some-or-all-message-headers.adoc
index 6e4b4b3..18f703b 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/how-to-avoid-sending-some-or-all-message-headers.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/how-to-avoid-sending-some-or-all-message-headers.adoc
@@ -88,8 +88,8 @@ pattern or a set of header names to be filtered out.
</property>
</bean>
...
-<setHeader headerName="allowedHeaderName"><constant>some metadata</constant></setHeader>
-<setHeader headerName="unwantedHeaderName"><constant>some private data</constant></setHeader>
+<setHeader name="allowedHeaderName"><constant>some metadata</constant></setHeader>
+<setHeader name="unwantedHeaderName"><constant>some private data</constant></setHeader>
<to id="publish" uri="activemq:queue:destinationName?headerFilterStrategy=#myFilter"/>
<log message="${header.unwantedHeaderName}"/>
----
diff --git a/docs/user-manual/modules/ROOT/pages/oncompletion.adoc b/docs/user-manual/modules/ROOT/pages/oncompletion.adoc
index 36d2fbe..effadaa 100644
--- a/docs/user-manual/modules/ROOT/pages/oncompletion.adoc
+++ b/docs/user-manual/modules/ROOT/pages/oncompletion.adoc
@@ -308,7 +308,7 @@ And in XML DSL you set the mode attribute to BeforeConsumer:
[source,java]
------------------------------------------
<onCompletion mode="BeforeConsumer">
- <setHeader headerName="createdBy">
+ <setHeader name="createdBy">
<constant>Someone</constant>
</setHeader>
</onCompletion>
diff --git a/docs/user-manual/modules/ROOT/pages/setHeader-eip.adoc b/docs/user-manual/modules/ROOT/pages/setHeader-eip.adoc
index 936671a..f8d3d85 100644
--- a/docs/user-manual/modules/ROOT/pages/setHeader-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/setHeader-eip.adoc
@@ -38,7 +38,7 @@ And the same example using XML:
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route>
<from uri="direct:a"/>
- <setHeader headerName="myHeader">
+ <setHeader name="myHeader">
<constant>test</constant>
</setHeader>
<to uri="direct:b"/>
diff --git a/docs/user-manual/modules/ROOT/pages/simple-language.adoc b/docs/user-manual/modules/ROOT/pages/simple-language.adoc
index da32629..af1b5ae 100644
--- a/docs/user-manual/modules/ROOT/pages/simple-language.adoc
+++ b/docs/user-manual/modules/ROOT/pages/simple-language.adoc
@@ -801,7 +801,7 @@ You can nest functions, such as shown below:
[source,xml]
----
-<setHeader headerName="myHeader">
+<setHeader name="myHeader">
<simple>${properties:${header.someKey}}</simple>
</setHeader>
----
@@ -858,7 +858,7 @@ And in XML DSL
[source,xml]
----
-<setHeader headerName="cool">
+<setHeader name="cool">
<!-- use resultType to indicate that the type should be a java.lang.Boolean -->
<simple resultType="java.lang.Boolean">true</simple>
</setHeader>
diff --git a/docs/user-manual/modules/ROOT/pages/using-propertyplaceholder.adoc b/docs/user-manual/modules/ROOT/pages/using-propertyplaceholder.adoc
index 8e1a7f9..111f2c9 100644
--- a/docs/user-manual/modules/ROOT/pages/using-propertyplaceholder.adoc
+++ b/docs/user-manual/modules/ROOT/pages/using-propertyplaceholder.adoc
@@ -428,7 +428,7 @@ Example using property placeholders in the attributes of `<camelContext>`:
<template id="camelTemplate" defaultEndpoint="{{foo.cool}}"/>
<route>
<from uri="direct:start"/>
- <setHeader headerName="{{foo.header}}">
+ <setHeader name="{{foo.header}}">
<simple>${in.body} World!</simple>
</setHeader>
<to uri="mock:result"/>
@@ -939,7 +939,7 @@ Example:
[source,xml]
----
-<setHeader headerName="Exchange.FILE_NAME">
+<setHeader name="Exchange.FILE_NAME">
<simple>{{file.rootdir}}/${in.header.CamelFileName}</simple>
</setHeader>
----
@@ -951,7 +951,7 @@ language in Camel.
[source,xml]
----
-<setHeader headerName="Exchange.FILE_NAME">
+<setHeader name="Exchange.FILE_NAME">
<simple>{{file.rootdir}}/$simple{in.header.CamelFileName}</simple>
</setHeader>
----
diff --git a/examples/camel-example-as2/src/main/resources/META-INF/spring/camel-context.xml b/examples/camel-example-as2/src/main/resources/META-INF/spring/camel-context.xml
index ec64c7b..98ff946 100644
--- a/examples/camel-example-as2/src/main/resources/META-INF/spring/camel-context.xml
+++ b/examples/camel-example-as2/src/main/resources/META-INF/spring/camel-context.xml
@@ -69,25 +69,25 @@ UNT+23+00000000000117'
UNZ+1+00000000000778'
</constant>
</transform>
- <setHeader headerName="CamelAS2.ediMessageContentType">
+ <setHeader name="CamelAS2.ediMessageContentType">
<simple resultType="org.apache.http.entity.ContentType">application/edifact;charset=US-ASCII</simple>
</setHeader>
- <setHeader headerName="CamelAS2.ediMessageTransferEncoding">
+ <setHeader name="CamelAS2.ediMessageTransferEncoding">
<constant>7bit</constant>
</setHeader>
- <setHeader headerName="CamelAS2.requestUri">
+ <setHeader name="CamelAS2.requestUri">
<constant>/</constant>
</setHeader>
- <setHeader headerName="CamelAS2.from">
+ <setHeader name="CamelAS2.from">
<constant>mrAS@example.org</constant>
</setHeader>
- <setHeader headerName="CamelAS2.as2From">
+ <setHeader name="CamelAS2.as2From">
<constant>878051556</constant>
</setHeader>
- <setHeader headerName="CamelAS2.as2To">
+ <setHeader name="CamelAS2.as2To">
<constant>878051556</constant>
</setHeader>
- <setHeader headerName="CamelAS2.dispositionNotificationTo">
+ <setHeader name="CamelAS2.dispositionNotificationTo">
<constant>mrAS@example.org</constant>
</setHeader>
<to uri="bean:provision-exchange-message-crypto"/>
@@ -104,10 +104,10 @@ UNZ+1+00000000000778'
</route>
<route id="plain-message-route">
<from uri="direct:plainMessage"/>
- <setHeader headerName="CamelAS2.subject">
+ <setHeader name="CamelAS2.subject">
<constant>AS2 Message Example</constant>
</setHeader>
- <setHeader headerName="CamelAS2.as2MessageStructure">
+ <setHeader name="CamelAS2.as2MessageStructure">
<simple resultType="org.apache.camel.component.as2.api.AS2MessageStructure">PLAIN</simple>
</setHeader>
<to
@@ -115,10 +115,10 @@ UNZ+1+00000000000778'
</route>
<route id="signed-message-route">
<from uri="direct:signedMessage"/>
- <setHeader headerName="CamelAS2.subject">
+ <setHeader name="CamelAS2.subject">
<constant>Signed AS2 Message Example</constant>
</setHeader>
- <setHeader headerName="CamelAS2.as2MessageStructure">
+ <setHeader name="CamelAS2.as2MessageStructure">
<simple resultType="org.apache.camel.component.as2.api.AS2MessageStructure">SIGNED</simple>
</setHeader>
<to
@@ -126,10 +126,10 @@ UNZ+1+00000000000778'
</route>
<route id="enveloped-message-route">
<from uri="direct:envelopedMessage"/>
- <setHeader headerName="CamelAS2.subject">
+ <setHeader name="CamelAS2.subject">
<constant>Enveloped AS2 Message Example</constant>
</setHeader>
- <setHeader headerName="CamelAS2.as2MessageStructure">
+ <setHeader name="CamelAS2.as2MessageStructure">
<simple resultType="org.apache.camel.component.as2.api.AS2MessageStructure">ENCRYPTED</simple>
</setHeader>
<to
@@ -137,10 +137,10 @@ UNZ+1+00000000000778'
</route>
<route id="enveloped-signed-message-route">
<from uri="direct:envelopedSignedMessage"/>
- <setHeader headerName="CamelAS2.subject">
+ <setHeader name="CamelAS2.subject">
<constant>Enveloped and Signed AS2 Message Example</constant>
</setHeader>
- <setHeader headerName="CamelAS2.as2MessageStructure">
+ <setHeader name="CamelAS2.as2MessageStructure">
<simple resultType="org.apache.camel.component.as2.api.AS2MessageStructure">SIGNED_ENCRYPTED</simple>
</setHeader>
<to
@@ -148,10 +148,10 @@ UNZ+1+00000000000778'
</route>
<route id="compressed-plain-message-route">
<from uri="direct:compressedPlainMessage"/>
- <setHeader headerName="CamelAS2.subject">
+ <setHeader name="CamelAS2.subject">
<constant>Compressed AS2 Message Example</constant>
</setHeader>
- <setHeader headerName="CamelAS2.as2MessageStructure">
+ <setHeader name="CamelAS2.as2MessageStructure">
<simple resultType="org.apache.camel.component.as2.api.AS2MessageStructure">PLAIN_COMPRESSED</simple>
</setHeader>
<to
@@ -159,10 +159,10 @@ UNZ+1+00000000000778'
</route>
<route id="compressed-signed-message-route">
<from uri="direct:compressedSignedMessage"/>
- <setHeader headerName="CamelAS2.subject">
+ <setHeader name="CamelAS2.subject">
<constant>Compressed and Signed AS2 Message Example</constant>
</setHeader>
- <setHeader headerName="CamelAS2.as2MessageStructure">
+ <setHeader name="CamelAS2.as2MessageStructure">
<simple resultType="org.apache.camel.component.as2.api.AS2MessageStructure">SIGNED_COMPRESSED</simple>
</setHeader>
<to
@@ -170,10 +170,10 @@ UNZ+1+00000000000778'
</route>
<route id="enveloped-compressed-message-route">
<from uri="direct:envelopedCompressedMessage"/>
- <setHeader headerName="CamelAS2.subject">
+ <setHeader name="CamelAS2.subject">
<constant>Enveloped and Compressed AS2 Message Example</constant>
</setHeader>
- <setHeader headerName="CamelAS2.as2MessageStructure">
+ <setHeader name="CamelAS2.as2MessageStructure">
<simple resultType="org.apache.camel.component.as2.api.AS2MessageStructure">ENCRYPTED_COMPRESSED</simple>
</setHeader>
<to
@@ -181,10 +181,10 @@ UNZ+1+00000000000778'
</route>
<route id="enveloped-compressed-signed-message-route">
<from uri="direct:envelopedCompressedSignedMessage"/>
- <setHeader headerName="CamelAS2.subject">
+ <setHeader name="CamelAS2.subject">
<constant>Enveloped, Compressed and Signed AS2 Message Example</constant>
</setHeader>
- <setHeader headerName="CamelAS2.as2MessageStructure">
+ <setHeader name="CamelAS2.as2MessageStructure">
<simple resultType="org.apache.camel.component.as2.api.AS2MessageStructure">ENCRYPTED_COMPRESSED_SIGNED</simple>
</setHeader>
<to
diff --git a/examples/camel-example-jdbc/src/main/resources/META-INF/spring/camel-context.xml b/examples/camel-example-jdbc/src/main/resources/META-INF/spring/camel-context.xml
index 83940d4..76a26f0 100644
--- a/examples/camel-example-jdbc/src/main/resources/META-INF/spring/camel-context.xml
+++ b/examples/camel-example-jdbc/src/main/resources/META-INF/spring/camel-context.xml
@@ -59,7 +59,7 @@
INSERT INTO CAMEL_TEST(MSG, STATUS) VALUES(:?insertMsg, 'NEW')
</constant>
</setBody>
- <setHeader headerName="CamelRetrieveGeneratedKeys">
+ <setHeader name="CamelRetrieveGeneratedKeys">
<constant>true</constant>
</setHeader>
<to uri="jdbc:dataSource?useHeadersAsParameters=true"/>
@@ -84,7 +84,7 @@
</route>
<route id="query-update-route-part2">
<from uri="direct:updateDone"/>
- <setHeader headerName="camelTestId">
+ <setHeader name="camelTestId">
<simple>${body['ID']}</simple>
</setHeader>
<setBody>
diff --git a/examples/camel-example-loadbalancing/src/main/resources/META-INF/spring/camel-context-mina1.xml b/examples/camel-example-loadbalancing/src/main/resources/META-INF/spring/camel-context-mina1.xml
index fadeb93..ad512ee 100644
--- a/examples/camel-example-loadbalancing/src/main/resources/META-INF/spring/camel-context-mina1.xml
+++ b/examples/camel-example-loadbalancing/src/main/resources/META-INF/spring/camel-context-mina1.xml
@@ -31,7 +31,7 @@
<route id="mina1">
<from uri="mina2:tcp://localhost:9991"/>
- <setHeader headerName="minaServer">
+ <setHeader name="minaServer">
<constant>localhost:9991</constant>
</setHeader>
<bean ref="service" method="updateReport"/>
diff --git a/examples/camel-example-loadbalancing/src/main/resources/META-INF/spring/camel-context-mina2.xml b/examples/camel-example-loadbalancing/src/main/resources/META-INF/spring/camel-context-mina2.xml
index 42c3b53..2dcccd7 100644
--- a/examples/camel-example-loadbalancing/src/main/resources/META-INF/spring/camel-context-mina2.xml
+++ b/examples/camel-example-loadbalancing/src/main/resources/META-INF/spring/camel-context-mina2.xml
@@ -31,7 +31,7 @@
<route id="mina2">
<from uri="mina2:tcp://localhost:9992"/>
- <setHeader headerName="minaServer">
+ <setHeader name="minaServer">
<constant>localhost:9992</constant>
</setHeader>
<bean ref="service" method="updateReport"/>
diff --git a/examples/camel-example-management/src/main/resources/META-INF/spring/camel-context.xml b/examples/camel-example-management/src/main/resources/META-INF/spring/camel-context.xml
index e48a56e..b8ac199 100644
--- a/examples/camel-example-management/src/main/resources/META-INF/spring/camel-context.xml
+++ b/examples/camel-example-management/src/main/resources/META-INF/spring/camel-context.xml
@@ -50,7 +50,7 @@
<constant>10</constant>
</throttle>
<!-- store the stock symbol as a header -->
- <setHeader headerName="symbol">
+ <setHeader name="symbol">
<xpath>/stock/symbol/text()</xpath>
</setHeader>
<!-- send the message to a dynamic to, with the stock symbol as the name of the queue -->
diff --git a/examples/camel-example-swagger-osgi/src/main/resources/OSGI-INF/blueprint/camel.xml b/examples/camel-example-swagger-osgi/src/main/resources/OSGI-INF/blueprint/camel.xml
index 0c92dc8..b3b045a 100644
--- a/examples/camel-example-swagger-osgi/src/main/resources/OSGI-INF/blueprint/camel.xml
+++ b/examples/camel-example-swagger-osgi/src/main/resources/OSGI-INF/blueprint/camel.xml
@@ -67,7 +67,7 @@
<to uri="bean:userService?method=getUser(${header.id})"/>
<filter>
<simple>${body} == null</simple>
- <setHeader headerName="Exchange.HTTP_RESPONSE_CODE">
+ <setHeader name="Exchange.HTTP_RESPONSE_CODE">
<constant>404</constant>
</setHeader>
</filter>
diff --git a/tests/camel-blueprint-cxf-test/src/test/resources/org/apache/camel/test/cxf/blueprint/CxfPayloadProviderRouterBeans.xml b/tests/camel-blueprint-cxf-test/src/test/resources/org/apache/camel/test/cxf/blueprint/CxfPayloadProviderRouterBeans.xml
index 77c031e..bd16a8a 100644
--- a/tests/camel-blueprint-cxf-test/src/test/resources/org/apache/camel/test/cxf/blueprint/CxfPayloadProviderRouterBeans.xml
+++ b/tests/camel-blueprint-cxf-test/src/test/resources/org/apache/camel/test/cxf/blueprint/CxfPayloadProviderRouterBeans.xml
@@ -63,10 +63,10 @@
<camel:camelContext id="camel">
<camel:route>
<camel:from uri="cxf:bean:routerEndpoint?synchronous=true" />
- <camel:setHeader headerName="operationNamespace">
+ <camel:setHeader name="operationNamespace">
<camel:constant>http://camel.apache.org/cxf/jaxws/dispatch</camel:constant>
</camel:setHeader>
- <camel:setHeader headerName="operationName">
+ <camel:setHeader name="operationName">
<camel:constant>Invoke</camel:constant>
</camel:setHeader>
<camel:to uri="cxf:bean:serviceEndpoint?synchronous=true" />
diff --git a/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/JettyRecipientListCxfIssueTest.xml b/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/JettyRecipientListCxfIssueTest.xml
index d4a7d79..5d054dd 100644
--- a/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/JettyRecipientListCxfIssueTest.xml
+++ b/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/JettyRecipientListCxfIssueTest.xml
@@ -62,7 +62,7 @@
<route>
<from uri="jetty:http://0.0.0.0:{{RecipientListCxfTest.port3}}/myapp?matchOnUriPrefix=true&useContinuation=true"/>
<to uri="log:input"/>
- <setHeader headerName="foo">
+ <setHeader name="foo">
<constant>cxf:bean:serviceEndpoint,cxf:bean:serviceEndpoint2</constant>
</setHeader>
<recipientList delimiter=",">
diff --git a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettySpringFailoverRoundRobinTest.xml b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettySpringFailoverRoundRobinTest.xml
index 6a2bd12..cc9c1b0 100644
--- a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettySpringFailoverRoundRobinTest.xml
+++ b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettySpringFailoverRoundRobinTest.xml
@@ -56,14 +56,14 @@
<route>
<from uri="ref:bad"/>
<to uri="mock:bad"/>
- <setHeader headerName="CamelHttpResponseCode"><constant>500</constant></setHeader>
+ <setHeader name="CamelHttpResponseCode"><constant>500</constant></setHeader>
<setBody><constant>Something bad happened</constant></setBody>
</route>
<route>
<from uri="ref:bad2"/>
<to uri="mock:bad2"/>
- <setHeader headerName="CamelHttpResponseCode"><constant>404</constant></setHeader>
+ <setHeader name="CamelHttpResponseCode"><constant>404</constant></setHeader>
<setBody><constant>Not found</constant></setBody>
</route>