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 <claus.ib...@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>
...
