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:51 UTC

[camel] 03/04: CAMEL-13657: Use name instead of headerName, propertyName in XML DSL to make it simpler and more natural.

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&amp;valueClass=org.apache.camel.component.gora.generated.Pageview&amp;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&amp;valueClass=org.apache.camel.component.gora.generated.Pageview&amp;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&amp;valueClass=org.apache.camel.component.gora.generated.Pageview&amp;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&amp;valueClass=org.apache.camel.component.gora.generated.Pageview&amp;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&amp;valueClass=org.apache.camel.component.gora.generated.Pageview&amp;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&amp;family=myfamily&amp;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&amp;family=myfamily&amp;qualifier=myqualifier&amp;family2=myfamily&amp;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&amp;family=myfamily&amp;qualifier=myqualifier&amp;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&amp;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&amp;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>