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 2016/08/16 09:17:08 UTC

[4/6] camel git commit: CAMEL-9541: Generate readme for dataformat also.

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-http/src/main/docs/http-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-http/src/main/docs/http-component.adoc b/components/camel-http/src/main/docs/http-component.adoc
index 4022639..ee3d24b 100644
--- a/components/camel-http/src/main/docs/http-component.adoc
+++ b/components/camel-http/src/main/docs/http-component.adoc
@@ -118,13 +118,14 @@ Http Options
 
 
 
+
 // component options: START
 The HTTP component supports 6 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | httpClientConfigurer | HttpClientConfigurer | To use the custom HttpClientConfigurer to perform configuration of the HttpClient that will be used.
@@ -144,6 +145,7 @@ The HTTP component supports 6 options which are listed below.
 
 
 
+
 // endpoint options: START
 The HTTP component supports 26 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-http4/src/main/docs/http4-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-http4/src/main/docs/http4-component.adoc b/components/camel-http4/src/main/docs/http4-component.adoc
index 7dd204e..fd17c3b 100644
--- a/components/camel-http4/src/main/docs/http4-component.adoc
+++ b/components/camel-http4/src/main/docs/http4-component.adoc
@@ -55,13 +55,14 @@ Http4 Component Options
 
 
 
+
 // component options: START
 The HTTP4 component supports 13 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | httpClientConfigurer | HttpClientConfigurer | To use the custom HttpClientConfigurer to perform configuration of the HttpClient that will be used.
@@ -89,6 +90,7 @@ The HTTP4 component supports 13 options which are listed below.
 
 
 
+
 // endpoint options: START
 The HTTP4 component supports 32 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-ibatis/src/main/docs/ibatis-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-ibatis/src/main/docs/ibatis-component.adoc b/components/camel-ibatis/src/main/docs/ibatis-component.adoc
index ef532b0..d3dcaf5 100644
--- a/components/camel-ibatis/src/main/docs/ibatis-component.adoc
+++ b/components/camel-ibatis/src/main/docs/ibatis-component.adoc
@@ -58,13 +58,14 @@ Options
 
 
 
+
 // component options: START
 The iBatis component supports 3 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | sqlMapClient | SqlMapClient | To use the given com.ibatis.sqlmap.client.SqlMapClient
@@ -80,6 +81,7 @@ The iBatis component supports 3 options which are listed below.
 
 
 
+
 // endpoint options: START
 The iBatis component supports 28 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-ical/src/main/docs/ical-dataformat.adoc
----------------------------------------------------------------------
diff --git a/components/camel-ical/src/main/docs/ical-dataformat.adoc b/components/camel-ical/src/main/docs/ical-dataformat.adoc
new file mode 100644
index 0000000..121a18c
--- /dev/null
+++ b/components/camel-ical/src/main/docs/ical-dataformat.adoc
@@ -0,0 +1,68 @@
+[[ICal-ICalDataFormat]]
+ICal DataFormat
+~~~~~~~~~~~~~~~
+
+*Available as of Camel 2.11.1*
+
+The *ICal* dataformat is used for working with
+http://en.wikipedia.org/wiki/ICalendar[iCalendar] messages.
+
+A typical iCalendar message looks like:
+
+[source,java]
+----------------------------------------------------------------------
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Events Calendar//iCal4j 1.0//EN
+CALSCALE:GREGORIAN
+BEGIN:VEVENT
+DTSTAMP:20130324T180000Z
+DTSTART:20130401T170000
+DTEND:20130401T210000
+SUMMARY:Progress Meeting
+TZID:America/New_York
+UID:00000000
+ATTENDEE;ROLE=REQ-PARTICIPANT;CN=Developer 1:mailto:dev1@mycompany.com
+ATTENDEE;ROLE=OPT-PARTICIPANT;CN=Developer 2:mailto:dev2@mycompany.com
+END:VEVENT
+END:VCALENDAR
+----------------------------------------------------------------------
+
+[[ICal-BasicUsage]]
+Basic Usage
+^^^^^^^^^^^
+
+To unmarshal and marshal the message shown above, your route will look
+like the following:
+
+[source,java]
+-----------------------------
+from("direct:ical-unmarshal")
+  .unmarshal("ical")
+  .to("mock:unmarshaled")
+  .marshal("ical")
+  .to("mock:marshaled");
+-----------------------------
+
+Maven users will need to add the following dependency to their `pom.xml`
+for this component:
+
+[source,xml]
+------------------------------------------------------------
+<dependency>
+    <groupId>org.apache.camel</groupId>
+    <artifactId>camel-ical</artifactId>
+    <version>x.x.x</version>
+    <!-- use the same version as your Camel core version -->
+</dependency>
+------------------------------------------------------------
+
+[[ICal-SeeAlso]]
+See Also
+^^^^^^^^
+
+* link:configuring-camel.html[Configuring Camel]
+* link:component.html[Component]
+* link:endpoint.html[Endpoint]
+* link:getting-started.html[Getting Started]
+

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-ical/src/main/docs/ical.adoc
----------------------------------------------------------------------
diff --git a/components/camel-ical/src/main/docs/ical.adoc b/components/camel-ical/src/main/docs/ical.adoc
deleted file mode 100644
index 121a18c..0000000
--- a/components/camel-ical/src/main/docs/ical.adoc
+++ /dev/null
@@ -1,68 +0,0 @@
-[[ICal-ICalDataFormat]]
-ICal DataFormat
-~~~~~~~~~~~~~~~
-
-*Available as of Camel 2.11.1*
-
-The *ICal* dataformat is used for working with
-http://en.wikipedia.org/wiki/ICalendar[iCalendar] messages.
-
-A typical iCalendar message looks like:
-
-[source,java]
-----------------------------------------------------------------------
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Events Calendar//iCal4j 1.0//EN
-CALSCALE:GREGORIAN
-BEGIN:VEVENT
-DTSTAMP:20130324T180000Z
-DTSTART:20130401T170000
-DTEND:20130401T210000
-SUMMARY:Progress Meeting
-TZID:America/New_York
-UID:00000000
-ATTENDEE;ROLE=REQ-PARTICIPANT;CN=Developer 1:mailto:dev1@mycompany.com
-ATTENDEE;ROLE=OPT-PARTICIPANT;CN=Developer 2:mailto:dev2@mycompany.com
-END:VEVENT
-END:VCALENDAR
-----------------------------------------------------------------------
-
-[[ICal-BasicUsage]]
-Basic Usage
-^^^^^^^^^^^
-
-To unmarshal and marshal the message shown above, your route will look
-like the following:
-
-[source,java]
------------------------------
-from("direct:ical-unmarshal")
-  .unmarshal("ical")
-  .to("mock:unmarshaled")
-  .marshal("ical")
-  .to("mock:marshaled");
------------------------------
-
-Maven users will need to add the following dependency to their `pom.xml`
-for this component:
-
-[source,xml]
-------------------------------------------------------------
-<dependency>
-    <groupId>org.apache.camel</groupId>
-    <artifactId>camel-ical</artifactId>
-    <version>x.x.x</version>
-    <!-- use the same version as your Camel core version -->
-</dependency>
-------------------------------------------------------------
-
-[[ICal-SeeAlso]]
-See Also
-^^^^^^^^
-
-* link:configuring-camel.html[Configuring Camel]
-* link:component.html[Component]
-* link:endpoint.html[Endpoint]
-* link:getting-started.html[Getting Started]
-

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-jaxb/src/main/docs/jaxb-dataformat.adoc
----------------------------------------------------------------------
diff --git a/components/camel-jaxb/src/main/docs/jaxb-dataformat.adoc b/components/camel-jaxb/src/main/docs/jaxb-dataformat.adoc
new file mode 100644
index 0000000..0e7b449
--- /dev/null
+++ b/components/camel-jaxb/src/main/docs/jaxb-dataformat.adoc
@@ -0,0 +1,307 @@
+[[JAXB-JAXB]]
+JAXB
+~~~~
+
+JAXB is a link:data-format.html[Data Format] which uses the JAXB2 XML
+marshalling standard which is included in Java 6 to unmarshal an XML
+payload into Java objects or to marshal Java objects into an XML
+payload.
+
+[[JAXB-UsingtheJavaDSL]]
+Using the Java DSL
+^^^^^^^^^^^^^^^^^^
+
+For example the following uses a named DataFormat of _jaxb_ which is
+configured with a number of Java package names to initialize the
+http://java.sun.com/javase/6/docs/api/javax/xml/bind/JAXBContext.html[JAXBContext].
+
+[source,java]
+-------------------------------------------------------
+DataFormat jaxb = new JaxbDataFormat("com.acme.model");
+
+from("activemq:My.Queue").
+  unmarshal(jaxb).
+  to("mqseries:Another.Queue");
+-------------------------------------------------------
+
+You can if you prefer use a named reference to a data format which can
+then be defined in your link:registry.html[Registry] such as via your
+link:spring.html[Spring] XML file. e.g.
+
+[source,java]
+-------------------------------
+from("activemq:My.Queue").
+  unmarshal("myJaxbDataType").
+  to("mqseries:Another.Queue");
+-------------------------------
+
+[[JAXB-UsingSpringXML]]
+Using Spring XML
+^^^^^^^^^^^^^^^^
+
+The following example shows how to use JAXB to unmarshal using
+link:spring.html[Spring] configuring the jaxb data type
+
+This example shows how to configure the data type just once and reuse it
+on multiple routes.
+
+*Multiple context paths*
+
+It is possible to use this data format with more than one context path.
+You can specify context path using `:` as separator, for example
+`com.mycompany:com.mycompany2`. Note that this is handled by JAXB
+implementation and might change if you use different vendor than RI.
+
+[[JAXB-Partialmarshalling/unmarshalling]]
+Partial marshalling/unmarshalling
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+*This feature is new to Camel 2.2.0.* +
+ JAXB 2 supports marshalling and unmarshalling XML tree fragments. By
+default JAXB looks for `@XmlRootElement` annotation on given class to
+operate on whole XML tree. This is useful but not always - sometimes
+generated code does not have @XmlRootElement annotation, sometimes you
+need unmarshall only part of tree. +
+ In that case you can use partial unmarshalling. To enable this
+behaviours you need set property `partClass`. Camel will pass this class
+to JAXB's unmarshaler.
+
+For marshalling you have to add `partNamespace` attribute with QName of
+destination namespace. Example of Spring DSL you can find above.
+
+[[JAXB-Fragment]]
+Fragment
+^^^^^^^^
+
+*This feature is new to Camel 2.8.0.* +
+ JaxbDataFormat has new property fragment which can set the the
+`Marshaller.JAXB_FRAGMENT` encoding property on the JAXB Marshaller. If
+you don't want the JAXB Marshaller to generate the XML declaration, you
+can set this option to be true. The default value of this property is
+false.
+
+[[JAXB-IgnoringtheNonXMLCharacter]]
+Ignoring the NonXML Character
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+*This feature is new to Camel 2.2.0.* +
+ JaxbDataFromat supports to ignore the
+http://www.w3.org/TR/2004/REC-xml-20040204/#NT-Char[NonXML Character],
+you just need to set the filterNonXmlChars property to be true,
+JaxbDataFormat will replace the NonXML character with " " when it is
+marshaling or unmarshaling the message. You can also do it by setting
+the link:exchange.html[Exchange] property
+`Exchange.FILTER_NON_XML_CHARS`.
+
+�
+[width="100%",cols="30%,10%,60%",options="header",]
+|=======================================================================
+|   | JDK 1.5 | JDK 1.6+
+
+|Filtering in use |StAX API and implementation |No
+
+|Filtering not in use |StAX API only |No
+|=======================================================================
+
+This feature has been tested with Woodstox 3.2.9 and Sun JDK 1.6 StAX
+implementation.
+
+*New for Camel 2.12.1* +
+ JaxbDataFormat now allows you to customize the XMLStreamWriter used to
+marshal the stream to XML. Using this configuration, you can add your
+own stream writer to completely remove, escape, or replace non-xml
+characters.
+
+[source,java]
+--------------------------------------------------------------------------------------
+   JaxbDataFormat customWriterFormat = new JaxbDataFormat("org.apache.camel.foo.bar");
+  customWriterFormat.setXmlStreamWriterWrapper(new TestXmlStreamWriter());
+--------------------------------------------------------------------------------------
+
+The following example shows using the Spring DSL and also enabling
+Camel's NonXML filtering:
+
+[source,xml]
+------------------------------------------------------------------------------------------------------------------------------
+<bean id="testXmlStreamWriterWrapper" class="org.apache.camel.jaxb.TestXmlStreamWriter"/>
+<jaxb filterNonXmlChars="true"  contextPath="org.apache.camel.foo.bar" xmlStreamWriterWrapper="#testXmlStreamWriterWrapper" />
+------------------------------------------------------------------------------------------------------------------------------
+
+[[JAXB-WorkingwiththeObjectFactory]]
+Working with the ObjectFactory
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+If you use XJC to create the java class from the schema, you will get an
+ObjectFactory for you JAXB context. Since the ObjectFactory uses
+http://java.sun.com/javase/6/docs/api/javax/xml/bind/JAXBElement.html[JAXBElement]
+to hold the reference of the schema and element instance value,
+jaxbDataformat will ignore the JAXBElement by default and you will get
+the element instance value instead of the JAXBElement object form the
+unmarshaled message body.  +
+ If you want to get the JAXBElement object form the unmarshaled message
+body, you need to set the JaxbDataFormat object's ignoreJAXBElement
+property to be false.
+
+[[JAXB-Settingencoding]]
+Setting encoding
+^^^^^^^^^^^^^^^^
+
+You can set the *encoding* option to use when marshalling. Its the
+`Marshaller.JAXB_ENCODING` encoding property on the JAXB Marshaller. +
+ You can setup which encoding to use when you declare the JAXB data
+format. You can also provide the encoding in the
+link:exchange.html[Exchange] property `Exchange.CHARSET_NAME`. This
+property will overrule the encoding set on the JAXB data format.
+
+In this Spring DSL we have defined to use `iso-8859-1` as the encoding:
+
+[[JAXB-Controllingnamespaceprefixmapping]]
+Controlling namespace prefix mapping
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+*Available as of Camel 2.11*
+
+When marshalling using link:jaxb.html[JAXB] or link:soap.html[SOAP] then
+the JAXB implementation will automatic assign namespace prefixes, such
+as ns2, ns3, ns4 etc. To control this mapping, Camel allows you to refer
+to a map which contains the desired mapping.
+
+Notice this requires having JAXB-RI 2.1 or better (from SUN) on the
+classpath, as the mapping functionality is dependent on the
+implementation of JAXB, whether its supported.
+
+For example in Spring XML we can define a Map with the mapping. In the
+mapping file below, we map SOAP to use soap as prefix. While our custom
+namespace "http://www.mycompany.com/foo/2" is not using any prefix.
+
+[source,xml]
+-----------------------------------------------------------------------
+  <util:map id="myMap">
+    <entry key="http://www.w3.org/2003/05/soap-envelope" value="soap"/>
+    <!-- we dont want any prefix for our namespace -->
+    <entry key="http://www.mycompany.com/foo/2" value=""/>
+  </util:map>
+-----------------------------------------------------------------------
+
+To use this in link:jaxb.html[JAXB] or link:soap.html[SOAP] you refer to
+this map, using the `namespacePrefixRef` attribute as shown below. Then
+Camel will lookup in the link:registry.html[Registry] a `java.util.Map`
+with the id "myMap", which was what we defined above.
+
+[source,xml]
+----------------------------------------------------------------------------------------
+  <marshal>
+    <soapjaxb version="1.2" contextPath="com.mycompany.foo" namespacePrefixRef="myMap"/>
+  </marshal>
+----------------------------------------------------------------------------------------
+
+[[JAXB-Schemavalidation]]
+Schema validation
+^^^^^^^^^^^^^^^^^
+
+*Available as of Camel 2.11*
+
+The JAXB link:data-format.html[Data Format] supports validation by
+marshalling and unmarshalling from/to XML. Your can use the prefix
+*classpath:*, *file:* or *http:* to specify how the resource should by
+resolved. You can separate multiple schema files by using the *','*
+character.
+
+*Known issue*
+
+Camel 2.11.0 and 2.11.1 has a known issue by validation multiple
+`Exchange`'s in parallel. See
+https://issues.apache.org/jira/browse/CAMEL-6630[CAMEL-6630]. This is
+fixed with Camel 2.11.2/2.12.0.
+
+Using the Java DSL, you can configure it in the following way:
+
+[source,java]
+-----------------------------------------------------------------------
+JaxbDataFormat jaxbDataFormat = new JaxbDataFormat();
+jaxbDataFormat.setContextPath(Person.class.getPackage().getName());
+jaxbDataFormat.setSchema("classpath:person.xsd,classpath:address.xsd");
+-----------------------------------------------------------------------
+
+You can do the same using the XML DSL:
+
+[source,xml]
+-------------------------------------------------------------------------
+<marshal>
+    <jaxb id="jaxb" schema="classpath:person.xsd,classpath:address.xsd"/>
+</marshal>
+-------------------------------------------------------------------------
+
+Camel will create and pool the underling `SchemaFactory` instances on
+the fly, because the `SchemaFactory` shipped with the JDK is not thread
+safe. +
+ However, if you have a `SchemaFactory` implementation which is thread
+safe, you can configure the JAXB data format to use this one:
+
+[source,java]
+--------------------------------------------------------
+JaxbDataFormat jaxbDataFormat = new JaxbDataFormat();
+jaxbDataFormat.setSchemaFactory(thradSafeSchemaFactory);
+--------------------------------------------------------
+
+[[JAXB-SchemaLocation]]
+Schema Location
+^^^^^^^^^^^^^^^
+
+*Available as of Camel 2.14*
+
+The JAXB�link:data-format.html[Data Format]�supports to specify the
+SchemaLocation when marshaling the XML.�
+
+Using the Java DSL, you can configure it in the following way:
+
+[source,java]
+-------------------------------------------------------------------
+JaxbDataFormat jaxbDataFormat = new JaxbDataFormat();
+jaxbDataFormat.setContextPath(Person.class.getPackage().getName());
+jaxbDataFormat.setSchemaLocation("schema/person.xsd");
+-------------------------------------------------------------------
+
+You can do the same using the XML DSL:
+
+[source,xml]
+--------------------------------------------------------
+<marshal>
+    <jaxb id="jaxb" schemaLocation="schema/person.xsd"/>
+</marshal>
+--------------------------------------------------------
+
+[[JAXB-MarshaldatathatisalreadyXML]]
+Marshal data that is already XML
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+*Available as of Camel 2.14.1*
+
+The JAXB marshaller requires that the message body is JAXB compatible,
+eg its a JAXBElement, eg a java instance that has JAXB annotations, or
+extend JAXBElement. There can be situations where the message body is
+already in XML, eg from a String type. There is a new
+option�`mustBeJAXBElement` you can set to false, to relax this check, so
+the JAXB marshaller only attempts to marshal JAXBElements
+(javax.xml.bind.JAXBIntrospector#isElement returns true). And in those
+situations the marshaller fallbacks to marshal the message body as-is.
+
+[[JAXB-Dependencies]]
+Dependencies
+^^^^^^^^^^^^
+
+To use JAXB in your camel routes you need to add the a dependency on
+*camel-jaxb* which implements this data format.
+
+If you use maven you could just add the following to your pom.xml,
+substituting the version number for the latest & greatest release (see
+link:download.html[the download page for the latest versions]).
+
+[source,java]
+-------------------------------------
+<dependency>
+  <groupId>org.apache.camel</groupId>
+  <artifactId>camel-jaxb</artifactId>
+  <version>x.x.x</version>
+</dependency>
+-------------------------------------

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-jaxb/src/main/docs/jaxb.adoc
----------------------------------------------------------------------
diff --git a/components/camel-jaxb/src/main/docs/jaxb.adoc b/components/camel-jaxb/src/main/docs/jaxb.adoc
deleted file mode 100644
index 0e7b449..0000000
--- a/components/camel-jaxb/src/main/docs/jaxb.adoc
+++ /dev/null
@@ -1,307 +0,0 @@
-[[JAXB-JAXB]]
-JAXB
-~~~~
-
-JAXB is a link:data-format.html[Data Format] which uses the JAXB2 XML
-marshalling standard which is included in Java 6 to unmarshal an XML
-payload into Java objects or to marshal Java objects into an XML
-payload.
-
-[[JAXB-UsingtheJavaDSL]]
-Using the Java DSL
-^^^^^^^^^^^^^^^^^^
-
-For example the following uses a named DataFormat of _jaxb_ which is
-configured with a number of Java package names to initialize the
-http://java.sun.com/javase/6/docs/api/javax/xml/bind/JAXBContext.html[JAXBContext].
-
-[source,java]
--------------------------------------------------------
-DataFormat jaxb = new JaxbDataFormat("com.acme.model");
-
-from("activemq:My.Queue").
-  unmarshal(jaxb).
-  to("mqseries:Another.Queue");
--------------------------------------------------------
-
-You can if you prefer use a named reference to a data format which can
-then be defined in your link:registry.html[Registry] such as via your
-link:spring.html[Spring] XML file. e.g.
-
-[source,java]
--------------------------------
-from("activemq:My.Queue").
-  unmarshal("myJaxbDataType").
-  to("mqseries:Another.Queue");
--------------------------------
-
-[[JAXB-UsingSpringXML]]
-Using Spring XML
-^^^^^^^^^^^^^^^^
-
-The following example shows how to use JAXB to unmarshal using
-link:spring.html[Spring] configuring the jaxb data type
-
-This example shows how to configure the data type just once and reuse it
-on multiple routes.
-
-*Multiple context paths*
-
-It is possible to use this data format with more than one context path.
-You can specify context path using `:` as separator, for example
-`com.mycompany:com.mycompany2`. Note that this is handled by JAXB
-implementation and might change if you use different vendor than RI.
-
-[[JAXB-Partialmarshalling/unmarshalling]]
-Partial marshalling/unmarshalling
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-*This feature is new to Camel 2.2.0.* +
- JAXB 2 supports marshalling and unmarshalling XML tree fragments. By
-default JAXB looks for `@XmlRootElement` annotation on given class to
-operate on whole XML tree. This is useful but not always - sometimes
-generated code does not have @XmlRootElement annotation, sometimes you
-need unmarshall only part of tree. +
- In that case you can use partial unmarshalling. To enable this
-behaviours you need set property `partClass`. Camel will pass this class
-to JAXB's unmarshaler.
-
-For marshalling you have to add `partNamespace` attribute with QName of
-destination namespace. Example of Spring DSL you can find above.
-
-[[JAXB-Fragment]]
-Fragment
-^^^^^^^^
-
-*This feature is new to Camel 2.8.0.* +
- JaxbDataFormat has new property fragment which can set the the
-`Marshaller.JAXB_FRAGMENT` encoding property on the JAXB Marshaller. If
-you don't want the JAXB Marshaller to generate the XML declaration, you
-can set this option to be true. The default value of this property is
-false.
-
-[[JAXB-IgnoringtheNonXMLCharacter]]
-Ignoring the NonXML Character
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-*This feature is new to Camel 2.2.0.* +
- JaxbDataFromat supports to ignore the
-http://www.w3.org/TR/2004/REC-xml-20040204/#NT-Char[NonXML Character],
-you just need to set the filterNonXmlChars property to be true,
-JaxbDataFormat will replace the NonXML character with " " when it is
-marshaling or unmarshaling the message. You can also do it by setting
-the link:exchange.html[Exchange] property
-`Exchange.FILTER_NON_XML_CHARS`.
-
-�
-[width="100%",cols="30%,10%,60%",options="header",]
-|=======================================================================
-|   | JDK 1.5 | JDK 1.6+
-
-|Filtering in use |StAX API and implementation |No
-
-|Filtering not in use |StAX API only |No
-|=======================================================================
-
-This feature has been tested with Woodstox 3.2.9 and Sun JDK 1.6 StAX
-implementation.
-
-*New for Camel 2.12.1* +
- JaxbDataFormat now allows you to customize the XMLStreamWriter used to
-marshal the stream to XML. Using this configuration, you can add your
-own stream writer to completely remove, escape, or replace non-xml
-characters.
-
-[source,java]
---------------------------------------------------------------------------------------
-   JaxbDataFormat customWriterFormat = new JaxbDataFormat("org.apache.camel.foo.bar");
-  customWriterFormat.setXmlStreamWriterWrapper(new TestXmlStreamWriter());
---------------------------------------------------------------------------------------
-
-The following example shows using the Spring DSL and also enabling
-Camel's NonXML filtering:
-
-[source,xml]
-------------------------------------------------------------------------------------------------------------------------------
-<bean id="testXmlStreamWriterWrapper" class="org.apache.camel.jaxb.TestXmlStreamWriter"/>
-<jaxb filterNonXmlChars="true"  contextPath="org.apache.camel.foo.bar" xmlStreamWriterWrapper="#testXmlStreamWriterWrapper" />
-------------------------------------------------------------------------------------------------------------------------------
-
-[[JAXB-WorkingwiththeObjectFactory]]
-Working with the ObjectFactory
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-If you use XJC to create the java class from the schema, you will get an
-ObjectFactory for you JAXB context. Since the ObjectFactory uses
-http://java.sun.com/javase/6/docs/api/javax/xml/bind/JAXBElement.html[JAXBElement]
-to hold the reference of the schema and element instance value,
-jaxbDataformat will ignore the JAXBElement by default and you will get
-the element instance value instead of the JAXBElement object form the
-unmarshaled message body.  +
- If you want to get the JAXBElement object form the unmarshaled message
-body, you need to set the JaxbDataFormat object's ignoreJAXBElement
-property to be false.
-
-[[JAXB-Settingencoding]]
-Setting encoding
-^^^^^^^^^^^^^^^^
-
-You can set the *encoding* option to use when marshalling. Its the
-`Marshaller.JAXB_ENCODING` encoding property on the JAXB Marshaller. +
- You can setup which encoding to use when you declare the JAXB data
-format. You can also provide the encoding in the
-link:exchange.html[Exchange] property `Exchange.CHARSET_NAME`. This
-property will overrule the encoding set on the JAXB data format.
-
-In this Spring DSL we have defined to use `iso-8859-1` as the encoding:
-
-[[JAXB-Controllingnamespaceprefixmapping]]
-Controlling namespace prefix mapping
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-*Available as of Camel 2.11*
-
-When marshalling using link:jaxb.html[JAXB] or link:soap.html[SOAP] then
-the JAXB implementation will automatic assign namespace prefixes, such
-as ns2, ns3, ns4 etc. To control this mapping, Camel allows you to refer
-to a map which contains the desired mapping.
-
-Notice this requires having JAXB-RI 2.1 or better (from SUN) on the
-classpath, as the mapping functionality is dependent on the
-implementation of JAXB, whether its supported.
-
-For example in Spring XML we can define a Map with the mapping. In the
-mapping file below, we map SOAP to use soap as prefix. While our custom
-namespace "http://www.mycompany.com/foo/2" is not using any prefix.
-
-[source,xml]
------------------------------------------------------------------------
-  <util:map id="myMap">
-    <entry key="http://www.w3.org/2003/05/soap-envelope" value="soap"/>
-    <!-- we dont want any prefix for our namespace -->
-    <entry key="http://www.mycompany.com/foo/2" value=""/>
-  </util:map>
------------------------------------------------------------------------
-
-To use this in link:jaxb.html[JAXB] or link:soap.html[SOAP] you refer to
-this map, using the `namespacePrefixRef` attribute as shown below. Then
-Camel will lookup in the link:registry.html[Registry] a `java.util.Map`
-with the id "myMap", which was what we defined above.
-
-[source,xml]
-----------------------------------------------------------------------------------------
-  <marshal>
-    <soapjaxb version="1.2" contextPath="com.mycompany.foo" namespacePrefixRef="myMap"/>
-  </marshal>
-----------------------------------------------------------------------------------------
-
-[[JAXB-Schemavalidation]]
-Schema validation
-^^^^^^^^^^^^^^^^^
-
-*Available as of Camel 2.11*
-
-The JAXB link:data-format.html[Data Format] supports validation by
-marshalling and unmarshalling from/to XML. Your can use the prefix
-*classpath:*, *file:* or *http:* to specify how the resource should by
-resolved. You can separate multiple schema files by using the *','*
-character.
-
-*Known issue*
-
-Camel 2.11.0 and 2.11.1 has a known issue by validation multiple
-`Exchange`'s in parallel. See
-https://issues.apache.org/jira/browse/CAMEL-6630[CAMEL-6630]. This is
-fixed with Camel 2.11.2/2.12.0.
-
-Using the Java DSL, you can configure it in the following way:
-
-[source,java]
------------------------------------------------------------------------
-JaxbDataFormat jaxbDataFormat = new JaxbDataFormat();
-jaxbDataFormat.setContextPath(Person.class.getPackage().getName());
-jaxbDataFormat.setSchema("classpath:person.xsd,classpath:address.xsd");
------------------------------------------------------------------------
-
-You can do the same using the XML DSL:
-
-[source,xml]
--------------------------------------------------------------------------
-<marshal>
-    <jaxb id="jaxb" schema="classpath:person.xsd,classpath:address.xsd"/>
-</marshal>
--------------------------------------------------------------------------
-
-Camel will create and pool the underling `SchemaFactory` instances on
-the fly, because the `SchemaFactory` shipped with the JDK is not thread
-safe. +
- However, if you have a `SchemaFactory` implementation which is thread
-safe, you can configure the JAXB data format to use this one:
-
-[source,java]
---------------------------------------------------------
-JaxbDataFormat jaxbDataFormat = new JaxbDataFormat();
-jaxbDataFormat.setSchemaFactory(thradSafeSchemaFactory);
---------------------------------------------------------
-
-[[JAXB-SchemaLocation]]
-Schema Location
-^^^^^^^^^^^^^^^
-
-*Available as of Camel 2.14*
-
-The JAXB�link:data-format.html[Data Format]�supports to specify the
-SchemaLocation when marshaling the XML.�
-
-Using the Java DSL, you can configure it in the following way:
-
-[source,java]
--------------------------------------------------------------------
-JaxbDataFormat jaxbDataFormat = new JaxbDataFormat();
-jaxbDataFormat.setContextPath(Person.class.getPackage().getName());
-jaxbDataFormat.setSchemaLocation("schema/person.xsd");
--------------------------------------------------------------------
-
-You can do the same using the XML DSL:
-
-[source,xml]
---------------------------------------------------------
-<marshal>
-    <jaxb id="jaxb" schemaLocation="schema/person.xsd"/>
-</marshal>
---------------------------------------------------------
-
-[[JAXB-MarshaldatathatisalreadyXML]]
-Marshal data that is already XML
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-*Available as of Camel 2.14.1*
-
-The JAXB marshaller requires that the message body is JAXB compatible,
-eg its a JAXBElement, eg a java instance that has JAXB annotations, or
-extend JAXBElement. There can be situations where the message body is
-already in XML, eg from a String type. There is a new
-option�`mustBeJAXBElement` you can set to false, to relax this check, so
-the JAXB marshaller only attempts to marshal JAXBElements
-(javax.xml.bind.JAXBIntrospector#isElement returns true). And in those
-situations the marshaller fallbacks to marshal the message body as-is.
-
-[[JAXB-Dependencies]]
-Dependencies
-^^^^^^^^^^^^
-
-To use JAXB in your camel routes you need to add the a dependency on
-*camel-jaxb* which implements this data format.
-
-If you use maven you could just add the following to your pom.xml,
-substituting the version number for the latest & greatest release (see
-link:download.html[the download page for the latest versions]).
-
-[source,java]
--------------------------------------
-<dependency>
-  <groupId>org.apache.camel</groupId>
-  <artifactId>camel-jaxb</artifactId>
-  <version>x.x.x</version>
-</dependency>
--------------------------------------

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-jclouds/src/main/docs/jclouds-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-jclouds/src/main/docs/jclouds-component.adoc b/components/camel-jclouds/src/main/docs/jclouds-component.adoc
index fe18ff4..c281ac2 100644
--- a/components/camel-jclouds/src/main/docs/jclouds-component.adoc
+++ b/components/camel-jclouds/src/main/docs/jclouds-component.adoc
@@ -108,13 +108,14 @@ Blobstore URI Options
 
 
 
+
 // component options: START
 The JClouds component supports 2 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | blobStores | List | To use the given BlobStore which must be configured when using blobstore.
@@ -127,6 +128,7 @@ The JClouds component supports 2 options which are listed below.
 
 
 
+
 // endpoint options: START
 The JClouds component supports 17 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-jdbc/src/main/docs/jdbc-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-jdbc/src/main/docs/jdbc-component.adoc b/components/camel-jdbc/src/main/docs/jdbc-component.adoc
index 42ab2a5..62dfbb3 100644
--- a/components/camel-jdbc/src/main/docs/jdbc-component.adoc
+++ b/components/camel-jdbc/src/main/docs/jdbc-component.adoc
@@ -44,13 +44,14 @@ Options
 
 
 
+
 // component options: START
 The JDBC component supports 1 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | dataSource | DataSource | To use the DataSource instance instead of looking up the data source by name from the registry.
@@ -62,6 +63,7 @@ The JDBC component supports 1 options which are listed below.
 
 
 
+
 // endpoint options: START
 The JDBC component supports 15 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-jetty9/src/main/docs/jetty-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-jetty9/src/main/docs/jetty-component.adoc b/components/camel-jetty9/src/main/docs/jetty-component.adoc
index 5d47d69..03f7a3f 100644
--- a/components/camel-jetty9/src/main/docs/jetty-component.adoc
+++ b/components/camel-jetty9/src/main/docs/jetty-component.adoc
@@ -52,13 +52,14 @@ Options
 
 
 
+
 // component options: START
 The Jetty 9 component supports 30 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | sslKeyPassword | String | The key password which is used to access the certificate's key entry in the keystore (this is the same password that is supplied to the keystore command's -keypass option).
@@ -102,6 +103,7 @@ The Jetty 9 component supports 30 options which are listed below.
 
 
 
+
 // endpoint options: START
 The Jetty 9 component supports 53 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-jgroups/src/main/docs/jgroups-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-jgroups/src/main/docs/jgroups-component.adoc b/components/camel-jgroups/src/main/docs/jgroups-component.adoc
index d6628fe..4f67d1c 100644
--- a/components/camel-jgroups/src/main/docs/jgroups-component.adoc
+++ b/components/camel-jgroups/src/main/docs/jgroups-component.adoc
@@ -53,13 +53,14 @@ Options
 
 
 
+
 // component options: START
 The JGroups component supports 3 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | channel | Channel | Channel to use
@@ -73,6 +74,7 @@ The JGroups component supports 3 options which are listed below.
 
 
 
+
 // endpoint options: START
 The JGroups component supports 7 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-jibx/src/main/docs/jibx-dataformat.adoc
----------------------------------------------------------------------
diff --git a/components/camel-jibx/src/main/docs/jibx-dataformat.adoc b/components/camel-jibx/src/main/docs/jibx-dataformat.adoc
new file mode 100644
index 0000000..a49bf89
--- /dev/null
+++ b/components/camel-jibx/src/main/docs/jibx-dataformat.adoc
@@ -0,0 +1,81 @@
+[[JiBX-JiBX]]
+JiBX
+~~~~
+
+*Available as of Camel 2.6*
+
+JiBX is a link:data-format.html[Data Format] which uses the
+http://jibx.sourceforge.net[JiBX library] to marshal and unmarshal Java
+objects to and from XML.
+
+[source,java]
+-----------------------------------------------------------
+// lets turn Object messages into XML then send to MQSeries
+from("activemq:My.Queue").
+  marshal().jibx().
+  to("mqseries:Another.Queue");
+-----------------------------------------------------------
+
+Please note that marshaling process can recognize the message type at
+the runtime. However while unmarshaling message from XML we need to
+specify target class explicitly.
+
+[source,java]
+-------------------------------------------
+// lets turn XML into PurchaseOrder message
+from("mqseries:Another.Queue").
+  unmarshal().jibx(PurchaseOrder.class).
+  to("activemq:My.Queue");
+-------------------------------------------
+
+[[JiBX-JiBXSpringDSL]]
+JiBX Spring DSL
+^^^^^^^^^^^^^^^
+
+JiBX data format is also supported by Camel Spring DSL.
+
+[source,xml]
+--------------------------------------------------------------------------------------
+<camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
+
+  <!-- Define data formats -->
+  <dataFormats>
+    <jibx id="jibx" unmarshallClass="org.apache.camel.dataformat.jibx.PurchaseOrder"/>
+  </dataFormats>
+
+  <!-- Marshal message to XML -->
+  <route>
+    <from uri="direct:marshal"/>
+    <marshal ref="jibx"/>
+    <to uri="mock:result"/>
+  </route>
+
+  <!-- Unmarshal message from XML -->
+  <route>
+    <from uri="direct:unmarshal"/>
+    <unmarshal ref="jibx"/>
+    <to uri="mock:result"/>
+  </route>
+
+</camelContext>
+--------------------------------------------------------------------------------------
+
+[[JiBX-Dependencies]]
+Dependencies
+^^^^^^^^^^^^
+
+To use JiBX in your camel routes you need to add the a dependency on
+*camel-jibx* which implements this data format.
+
+If you use maven you could just add the following to your pom.xml,
+substituting the version number for the latest & greatest release (see
+link:download.html[the download page for the latest versions]).
+
+[source,xml]
+-------------------------------------
+<dependency>
+  <groupId>org.apache.camel</groupId>
+  <artifactId>camel-jibx</artifactId>
+  <version>2.6.0</version>
+</dependency>
+-------------------------------------

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-jibx/src/main/docs/jibx.adoc
----------------------------------------------------------------------
diff --git a/components/camel-jibx/src/main/docs/jibx.adoc b/components/camel-jibx/src/main/docs/jibx.adoc
deleted file mode 100644
index a49bf89..0000000
--- a/components/camel-jibx/src/main/docs/jibx.adoc
+++ /dev/null
@@ -1,81 +0,0 @@
-[[JiBX-JiBX]]
-JiBX
-~~~~
-
-*Available as of Camel 2.6*
-
-JiBX is a link:data-format.html[Data Format] which uses the
-http://jibx.sourceforge.net[JiBX library] to marshal and unmarshal Java
-objects to and from XML.
-
-[source,java]
------------------------------------------------------------
-// lets turn Object messages into XML then send to MQSeries
-from("activemq:My.Queue").
-  marshal().jibx().
-  to("mqseries:Another.Queue");
------------------------------------------------------------
-
-Please note that marshaling process can recognize the message type at
-the runtime. However while unmarshaling message from XML we need to
-specify target class explicitly.
-
-[source,java]
--------------------------------------------
-// lets turn XML into PurchaseOrder message
-from("mqseries:Another.Queue").
-  unmarshal().jibx(PurchaseOrder.class).
-  to("activemq:My.Queue");
--------------------------------------------
-
-[[JiBX-JiBXSpringDSL]]
-JiBX Spring DSL
-^^^^^^^^^^^^^^^
-
-JiBX data format is also supported by Camel Spring DSL.
-
-[source,xml]
---------------------------------------------------------------------------------------
-<camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
-
-  <!-- Define data formats -->
-  <dataFormats>
-    <jibx id="jibx" unmarshallClass="org.apache.camel.dataformat.jibx.PurchaseOrder"/>
-  </dataFormats>
-
-  <!-- Marshal message to XML -->
-  <route>
-    <from uri="direct:marshal"/>
-    <marshal ref="jibx"/>
-    <to uri="mock:result"/>
-  </route>
-
-  <!-- Unmarshal message from XML -->
-  <route>
-    <from uri="direct:unmarshal"/>
-    <unmarshal ref="jibx"/>
-    <to uri="mock:result"/>
-  </route>
-
-</camelContext>
---------------------------------------------------------------------------------------
-
-[[JiBX-Dependencies]]
-Dependencies
-^^^^^^^^^^^^
-
-To use JiBX in your camel routes you need to add the a dependency on
-*camel-jibx* which implements this data format.
-
-If you use maven you could just add the following to your pom.xml,
-substituting the version number for the latest & greatest release (see
-link:download.html[the download page for the latest versions]).
-
-[source,xml]
--------------------------------------
-<dependency>
-  <groupId>org.apache.camel</groupId>
-  <artifactId>camel-jibx</artifactId>
-  <version>2.6.0</version>
-</dependency>
--------------------------------------

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-jms/src/main/docs/jms-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/main/docs/jms-component.adoc b/components/camel-jms/src/main/docs/jms-component.adoc
index b157a66..7d148f5 100644
--- a/components/camel-jms/src/main/docs/jms-component.adoc
+++ b/components/camel-jms/src/main/docs/jms-component.adoc
@@ -212,13 +212,14 @@ Component options
 
 
 
+
 // component options: START
 The JMS component supports 74 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | configuration | JmsConfiguration | To use a shared JMS configuration
@@ -305,6 +306,7 @@ The JMS component supports 74 options which are listed below.
 
 
 
+
 [[JMS-Endpointoptions]]
 Endpoint options
 ++++++++++++++++

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-jolt/src/main/docs/jolt-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-jolt/src/main/docs/jolt-component.adoc b/components/camel-jolt/src/main/docs/jolt-component.adoc
index 42d5808..e9d03cf 100644
--- a/components/camel-jolt/src/main/docs/jolt-component.adoc
+++ b/components/camel-jolt/src/main/docs/jolt-component.adoc
@@ -45,13 +45,14 @@ Options
 
 
 
+
 // component options: START
 The JOLT component supports 1 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | transform | Transform | Explicitly sets the Transform to use. If not set a Transform specified by the transformDsl will be created
@@ -63,6 +64,7 @@ The JOLT component supports 1 options which are listed below.
 
 
 
+
 // endpoint options: START
 The JOLT component supports 7 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-jpa/src/main/docs/jpa-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-jpa/src/main/docs/jpa-component.adoc b/components/camel-jpa/src/main/docs/jpa-component.adoc
index 5b94672..d716ee6 100644
--- a/components/camel-jpa/src/main/docs/jpa-component.adoc
+++ b/components/camel-jpa/src/main/docs/jpa-component.adoc
@@ -90,13 +90,14 @@ Options
 
 
 
+
 // component options: START
 The JPA component supports 4 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | entityManagerFactory | EntityManagerFactory | To use the EntityManagerFactory. This is strongly recommended to configure.
@@ -113,6 +114,7 @@ The JPA component supports 4 options which are listed below.
 
 
 
+
 // endpoint options: START
 The JPA component supports 42 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-jsch/src/main/docs/scp-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-jsch/src/main/docs/scp-component.adoc b/components/camel-jsch/src/main/docs/scp-component.adoc
index d9a578b..f1620a7 100644
--- a/components/camel-jsch/src/main/docs/scp-component.adoc
+++ b/components/camel-jsch/src/main/docs/scp-component.adoc
@@ -43,13 +43,14 @@ Options
 
 
 
+
 // component options: START
 The SCP component supports 1 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | verboseLogging | boolean | JSCH is verbose logging out of the box. Therefore we turn the logging down to DEBUG logging by default. But setting this option to true turns on the verbose logging again.
@@ -64,6 +65,7 @@ The SCP component supports 1 options which are listed below.
 
 
 
+
 // endpoint options: START
 The SCP component supports 22 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-jt400/src/main/docs/jt400-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-jt400/src/main/docs/jt400-component.adoc b/components/camel-jt400/src/main/docs/jt400-component.adoc
index 1b7fbd7..2a55f11 100644
--- a/components/camel-jt400/src/main/docs/jt400-component.adoc
+++ b/components/camel-jt400/src/main/docs/jt400-component.adoc
@@ -43,13 +43,14 @@ JT400 options
 
 
 
+
 // component options: START
 The JT400 component supports 1 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | connectionPool | AS400ConnectionPool | Returns the default connection pool used by this component.
@@ -63,6 +64,7 @@ The JT400 component supports 1 options which are listed below.
 
 
 
+
 // endpoint options: START
 The JT400 component supports 33 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-kafka/src/main/docs/kafka-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-kafka/src/main/docs/kafka-component.adoc b/components/camel-kafka/src/main/docs/kafka-component.adoc
index 2c015f9..e78e91f 100644
--- a/components/camel-kafka/src/main/docs/kafka-component.adoc
+++ b/components/camel-kafka/src/main/docs/kafka-component.adoc
@@ -61,13 +61,14 @@ Options (Camel 2.16 or older)
 
 
 
+
 // component options: START
 The Kafka component supports 1 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | workerPool | ExecutorService | To use a shared custom worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. If using this option then you must handle the lifecycle of the thread pool to shut the pool down when no longer needed.
@@ -94,6 +95,7 @@ The Kafka component supports 1 options which are listed below.
 
 
 
+
 // endpoint options: START
 The Kafka component supports 77 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-kestrel/src/main/docs/kestrel-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-kestrel/src/main/docs/kestrel-component.adoc b/components/camel-kestrel/src/main/docs/kestrel-component.adoc
index f81c756..a147190 100644
--- a/components/camel-kestrel/src/main/docs/kestrel-component.adoc
+++ b/components/camel-kestrel/src/main/docs/kestrel-component.adoc
@@ -68,13 +68,14 @@ Options
 
 
 
+
 // component options: START
 The Kestrel component supports 4 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | configuration | KestrelConfiguration | To use a shared configured configuration as base for creating new endpoints.
@@ -90,6 +91,7 @@ The Kestrel component supports 4 options which are listed below.
 
 
 
+
 // endpoint options: START
 The Kestrel component supports 8 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-linkedin/camel-linkedin-component/src/main/docs/linkedin-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-linkedin/camel-linkedin-component/src/main/docs/linkedin-component.adoc b/components/camel-linkedin/camel-linkedin-component/src/main/docs/linkedin-component.adoc
index 64312ec..c04a77d 100644
--- a/components/camel-linkedin/camel-linkedin-component/src/main/docs/linkedin-component.adoc
+++ b/components/camel-linkedin/camel-linkedin-component/src/main/docs/linkedin-component.adoc
@@ -56,13 +56,14 @@ LinkedInComponent
 
 
 
+
 // component options: START
 The Linkedin component supports 12 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | configuration | LinkedInConfiguration | To use the shared configuration
@@ -84,6 +85,7 @@ The Linkedin component supports 12 options which are listed below.
 
 
 
+
 // endpoint options: START
 The Linkedin component supports 16 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-lucene/src/main/docs/lucene-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-lucene/src/main/docs/lucene-component.adoc b/components/camel-lucene/src/main/docs/lucene-component.adoc
index 2157901..14e26ef 100644
--- a/components/camel-lucene/src/main/docs/lucene-component.adoc
+++ b/components/camel-lucene/src/main/docs/lucene-component.adoc
@@ -55,13 +55,14 @@ Insert Options
 
 
 
+
 // component options: START
 The Lucene component supports 7 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | config | LuceneConfiguration | To use a shared lucene configuration. Properties of the shared configuration can also be set individually.
@@ -80,6 +81,7 @@ The Lucene component supports 7 options which are listed below.
 
 
 
+
 // endpoint options: START
 The Lucene component supports 8 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-lumberjack/src/main/docs/lumberjack-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-lumberjack/src/main/docs/lumberjack-component.adoc b/components/camel-lumberjack/src/main/docs/lumberjack-component.adoc
index 3b0083a..feb01ec 100644
--- a/components/camel-lumberjack/src/main/docs/lumberjack-component.adoc
+++ b/components/camel-lumberjack/src/main/docs/lumberjack-component.adoc
@@ -41,13 +41,14 @@ Options
 
 
 
+
 // component options: START
 The Lumberjack component supports 1 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | sslContextParameters | SSLContextParameters | Sets the default SSL configuration to use for all the endpoints. You can also configure it directly at the endpoint level.
@@ -60,6 +61,7 @@ The Lumberjack component supports 1 options which are listed below.
 
 
 
+
 // endpoint options: START
 The Lumberjack component supports 7 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-lzf/src/main/docs/lzf-dataformat.adoc
----------------------------------------------------------------------
diff --git a/components/camel-lzf/src/main/docs/lzf-dataformat.adoc b/components/camel-lzf/src/main/docs/lzf-dataformat.adoc
new file mode 100644
index 0000000..34697f4
--- /dev/null
+++ b/components/camel-lzf/src/main/docs/lzf-dataformat.adoc
@@ -0,0 +1,76 @@
+[[LZF-LZFDataFormat]]
+LZF Data Format
+~~~~~~~~~~~~~~~
+
+The
+LZF�https://cwiki.apache.org/confluence/display/CAMEL/Data+Format[Data
+Format]�is a message compression and de-compression format. It uses the
+LZF deflate algorithm.�Messages marshalled using LZF compression can be
+unmarshalled using LZF decompression just prior to being consumed at the
+endpoint. The compression capability is quite useful when you deal with
+large XML and Text based payloads or when you read messages previously
+comressed using LZF algotithm.
+
+[[LZFDataFormat-Options]]
+Options
+^^^^^^^
+
+There are no options provided for this data format.
+
+[width="100%",cols="<25%,<25%,<25%,<25%",options="header",]
+|=======================================================================
+|Name |Type |Default |Description
+|usingParallelCompression |`boolean` |`false`
+|`Enable parallel compressor`�implementation which can encode (compress)
+content using multiple processing cores: concurrent compression works on
+chunk-by-chunk basis (64k max chunk size) so megabyte-sized content can
+be processed very efficiently.
+|=======================================================================
+
+[[LZFDataFormat-Marshal]]
+Marshal
+^^^^^^^
+
+In this example we marshal a regular text/XML payload to a compressed
+payload employing LZF compression format and send it an ActiveMQ queue
+called MY_QUEUE.
+
+[source,java]
+-------------------------------------------------------------------
+from("direct:start").marshal().lzf().to("activemq:queue:MY_QUEUE");
+-------------------------------------------------------------------
+
+[[LZFDataFormat-Unmarshal]]
+Unmarshal
+^^^^^^^^^
+
+In this example we unmarshal�a LZF payload from an ActiveMQ queue called
+MY_QUEUE�to its original format,�and forward it for�processing�to
+the�`UnGZippedMessageProcessor`.
+
+[source,java]
+----------------------------------------------------------------------------------------------
+from("activemq:queue:MY_QUEUE").unmarshal().lzf().process(new UnCompressedMessageProcessor());
+----------------------------------------------------------------------------------------------
+
+[[LZFDataFormat-Dependencies]]
+Dependencies
+^^^^^^^^^^^^
+
+To useLZF compression in your camel routes you need to add a dependency
+on�*camel-lzf*�which implements this data format.
+
+If you use Maven you can just add the following to your�`pom.xml`,
+substituting the version number for the latest & greatest release
+(see�https://cwiki.apache.org/confluence/display/CAMEL/Download[the
+download page for the latest versions]).
+
+[source,xml]
+----------------------------------------------------------
+<dependency>
+  <groupId>org.apache.camel</groupId>
+  <artifactId>camel-lzf</artifactId>
+  <version>x.x.x</version>
+  <!-- use the same version as your Camel core version -->
+</dependency>
+----------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-lzf/src/main/docs/lzf.adoc
----------------------------------------------------------------------
diff --git a/components/camel-lzf/src/main/docs/lzf.adoc b/components/camel-lzf/src/main/docs/lzf.adoc
deleted file mode 100644
index 34697f4..0000000
--- a/components/camel-lzf/src/main/docs/lzf.adoc
+++ /dev/null
@@ -1,76 +0,0 @@
-[[LZF-LZFDataFormat]]
-LZF Data Format
-~~~~~~~~~~~~~~~
-
-The
-LZF�https://cwiki.apache.org/confluence/display/CAMEL/Data+Format[Data
-Format]�is a message compression and de-compression format. It uses the
-LZF deflate algorithm.�Messages marshalled using LZF compression can be
-unmarshalled using LZF decompression just prior to being consumed at the
-endpoint. The compression capability is quite useful when you deal with
-large XML and Text based payloads or when you read messages previously
-comressed using LZF algotithm.
-
-[[LZFDataFormat-Options]]
-Options
-^^^^^^^
-
-There are no options provided for this data format.
-
-[width="100%",cols="<25%,<25%,<25%,<25%",options="header",]
-|=======================================================================
-|Name |Type |Default |Description
-|usingParallelCompression |`boolean` |`false`
-|`Enable parallel compressor`�implementation which can encode (compress)
-content using multiple processing cores: concurrent compression works on
-chunk-by-chunk basis (64k max chunk size) so megabyte-sized content can
-be processed very efficiently.
-|=======================================================================
-
-[[LZFDataFormat-Marshal]]
-Marshal
-^^^^^^^
-
-In this example we marshal a regular text/XML payload to a compressed
-payload employing LZF compression format and send it an ActiveMQ queue
-called MY_QUEUE.
-
-[source,java]
--------------------------------------------------------------------
-from("direct:start").marshal().lzf().to("activemq:queue:MY_QUEUE");
--------------------------------------------------------------------
-
-[[LZFDataFormat-Unmarshal]]
-Unmarshal
-^^^^^^^^^
-
-In this example we unmarshal�a LZF payload from an ActiveMQ queue called
-MY_QUEUE�to its original format,�and forward it for�processing�to
-the�`UnGZippedMessageProcessor`.
-
-[source,java]
-----------------------------------------------------------------------------------------------
-from("activemq:queue:MY_QUEUE").unmarshal().lzf().process(new UnCompressedMessageProcessor());
-----------------------------------------------------------------------------------------------
-
-[[LZFDataFormat-Dependencies]]
-Dependencies
-^^^^^^^^^^^^
-
-To useLZF compression in your camel routes you need to add a dependency
-on�*camel-lzf*�which implements this data format.
-
-If you use Maven you can just add the following to your�`pom.xml`,
-substituting the version number for the latest & greatest release
-(see�https://cwiki.apache.org/confluence/display/CAMEL/Download[the
-download page for the latest versions]).
-
-[source,xml]
-----------------------------------------------------------
-<dependency>
-  <groupId>org.apache.camel</groupId>
-  <artifactId>camel-lzf</artifactId>
-  <version>x.x.x</version>
-  <!-- use the same version as your Camel core version -->
-</dependency>
-----------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-mail/src/main/docs/imap-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-mail/src/main/docs/imap-component.adoc b/components/camel-mail/src/main/docs/imap-component.adoc
index b9e3e34..771c111 100644
--- a/components/camel-mail/src/main/docs/imap-component.adoc
+++ b/components/camel-mail/src/main/docs/imap-component.adoc
@@ -6,13 +6,14 @@ Mail Component IMAP
 
 
 
+
 // component options: START
 The IMAP component supports 38 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | configuration | MailConfiguration | Sets the Mail configuration. Properties of the shared configuration can also be set individually.
@@ -64,6 +65,7 @@ The IMAP component supports 38 options which are listed below.
 
 
 
+
 // endpoint options: START
 The IMAP component supports 63 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-mail/src/main/docs/imaps-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-mail/src/main/docs/imaps-component.adoc b/components/camel-mail/src/main/docs/imaps-component.adoc
index c06e83f..2427820 100644
--- a/components/camel-mail/src/main/docs/imaps-component.adoc
+++ b/components/camel-mail/src/main/docs/imaps-component.adoc
@@ -6,13 +6,14 @@ Mail Component IMAPs
 
 
 
+
 // component options: START
 The IMAPS component supports 38 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | configuration | MailConfiguration | Sets the Mail configuration. Properties of the shared configuration can also be set individually.
@@ -64,6 +65,7 @@ The IMAPS component supports 38 options which are listed below.
 
 
 
+
 // endpoint options: START
 The IMAPS component supports 63 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-mail/src/main/docs/pop3-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-mail/src/main/docs/pop3-component.adoc b/components/camel-mail/src/main/docs/pop3-component.adoc
index 579335c..c291f1b 100644
--- a/components/camel-mail/src/main/docs/pop3-component.adoc
+++ b/components/camel-mail/src/main/docs/pop3-component.adoc
@@ -6,13 +6,14 @@ Mail Component POP3
 
 
 
+
 // component options: START
 The POP3 component supports 38 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | configuration | MailConfiguration | Sets the Mail configuration. Properties of the shared configuration can also be set individually.
@@ -64,6 +65,7 @@ The POP3 component supports 38 options which are listed below.
 
 
 
+
 // endpoint options: START
 The POP3 component supports 63 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-mail/src/main/docs/pop3s-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-mail/src/main/docs/pop3s-component.adoc b/components/camel-mail/src/main/docs/pop3s-component.adoc
index a0ac23c..99172b2 100644
--- a/components/camel-mail/src/main/docs/pop3s-component.adoc
+++ b/components/camel-mail/src/main/docs/pop3s-component.adoc
@@ -6,13 +6,14 @@ Mail Component POP3s
 
 
 
+
 // component options: START
 The POP3S component supports 38 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | configuration | MailConfiguration | Sets the Mail configuration. Properties of the shared configuration can also be set individually.
@@ -64,6 +65,7 @@ The POP3S component supports 38 options which are listed below.
 
 
 
+
 // endpoint options: START
 The POP3S component supports 63 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-mail/src/main/docs/smtp-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-mail/src/main/docs/smtp-component.adoc b/components/camel-mail/src/main/docs/smtp-component.adoc
index b4c577b..b847980 100644
--- a/components/camel-mail/src/main/docs/smtp-component.adoc
+++ b/components/camel-mail/src/main/docs/smtp-component.adoc
@@ -6,13 +6,14 @@ Mail Component SMTP
 
 
 
+
 // component options: START
 The SMTP component supports 38 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | configuration | MailConfiguration | Sets the Mail configuration. Properties of the shared configuration can also be set individually.
@@ -64,6 +65,7 @@ The SMTP component supports 38 options which are listed below.
 
 
 
+
 // endpoint options: START
 The SMTP component supports 63 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-mail/src/main/docs/smtps-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-mail/src/main/docs/smtps-component.adoc b/components/camel-mail/src/main/docs/smtps-component.adoc
index 8badf2d..a02d7f2 100644
--- a/components/camel-mail/src/main/docs/smtps-component.adoc
+++ b/components/camel-mail/src/main/docs/smtps-component.adoc
@@ -6,13 +6,14 @@ Mail Component SMTPs
 
 
 
+
 // component options: START
 The SMTPS component supports 38 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | configuration | MailConfiguration | Sets the Mail configuration. Properties of the shared configuration can also be set individually.
@@ -64,6 +65,7 @@ The SMTPS component supports 38 options which are listed below.
 
 
 
+
 // endpoint options: START
 The SMTPS component supports 63 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-mina/src/main/docs/mina-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-mina/src/main/docs/mina-component.adoc b/components/camel-mina/src/main/docs/mina-component.adoc
index 3feb59c..822e8f2 100644
--- a/components/camel-mina/src/main/docs/mina-component.adoc
+++ b/components/camel-mina/src/main/docs/mina-component.adoc
@@ -66,13 +66,14 @@ Options
 
 
 
+
 // component options: START
 The Mina component supports 21 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | configuration | MinaConfiguration | To use the shared mina configuration. Properties of the shared configuration can also be set individually.
@@ -106,6 +107,7 @@ The Mina component supports 21 options which are listed below.
 
 
 
+
 // endpoint options: START
 The Mina component supports 24 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-mina2/src/main/docs/mina2-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-mina2/src/main/docs/mina2-component.adoc b/components/camel-mina2/src/main/docs/mina2-component.adoc
index 94cfc23..a6d8ad5 100644
--- a/components/camel-mina2/src/main/docs/mina2-component.adoc
+++ b/components/camel-mina2/src/main/docs/mina2-component.adoc
@@ -67,13 +67,14 @@ Options
 
 
 
+
 // component options: START
 The Mina2 component supports 26 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | configuration | Mina2Configuration | To use the shared mina configuration. Properties of the shared configuration can also be set individually.
@@ -112,6 +113,7 @@ The Mina2 component supports 26 options which are listed below.
 
 
 
+
 // endpoint options: START
 The Mina2 component supports 29 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-mqtt/src/main/docs/mqtt-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-mqtt/src/main/docs/mqtt-component.adoc b/components/camel-mqtt/src/main/docs/mqtt-component.adoc
index 83bcadb..c59af20 100644
--- a/components/camel-mqtt/src/main/docs/mqtt-component.adoc
+++ b/components/camel-mqtt/src/main/docs/mqtt-component.adoc
@@ -39,13 +39,14 @@ Options
 
 
 
+
 // component options: START
 The MQTT component supports 3 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | host | String | The URI of the MQTT broker to connect too - this component also supports SSL - e.g. ssl://127.0.0.1:8883
@@ -59,6 +60,7 @@ The MQTT component supports 3 options which are listed below.
 
 
 
+
 // endpoint options: START
 The MQTT component supports 39 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-msv/src/main/docs/msv-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-msv/src/main/docs/msv-component.adoc b/components/camel-msv/src/main/docs/msv-component.adoc
index b241cfe..0720e48 100644
--- a/components/camel-msv/src/main/docs/msv-component.adoc
+++ b/components/camel-msv/src/main/docs/msv-component.adoc
@@ -53,13 +53,14 @@ Options
 
 
 
+
 // component options: START
 The MSV component supports 2 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | schemaFactory | SchemaFactory | To use the javax.xml.validation.SchemaFactory.
@@ -72,6 +73,7 @@ The MSV component supports 2 options which are listed below.
 
 
 
+
 // endpoint options: START
 The MSV component supports 13 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-mustache/src/main/docs/mustache-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-mustache/src/main/docs/mustache-component.adoc b/components/camel-mustache/src/main/docs/mustache-component.adoc
index 77266d9..9df8638 100644
--- a/components/camel-mustache/src/main/docs/mustache-component.adoc
+++ b/components/camel-mustache/src/main/docs/mustache-component.adoc
@@ -44,13 +44,14 @@ Options
 
 {% raw %}
 
+
 // component options: START
 The Mustache component supports 1 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | mustacheFactory | MustacheFactory | To use a custom MustacheFactory
@@ -64,6 +65,7 @@ The Mustache component supports 1 options which are listed below.
 
 
 
+
 // endpoint options: START
 The Mustache component supports 7 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-mybatis/src/main/docs/mybatis-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-mybatis/src/main/docs/mybatis-component.adoc b/components/camel-mybatis/src/main/docs/mybatis-component.adoc
index 613c87f..f2571bf 100644
--- a/components/camel-mybatis/src/main/docs/mybatis-component.adoc
+++ b/components/camel-mybatis/src/main/docs/mybatis-component.adoc
@@ -48,13 +48,14 @@ Options
 
 
 
+
 // component options: START
 The MyBatis component supports 2 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | sqlSessionFactory | SqlSessionFactory | To use the SqlSessionFactory
@@ -67,6 +68,7 @@ The MyBatis component supports 2 options which are listed below.
 
 
 
+
 // endpoint options: START
 The MyBatis component supports 29 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-nagios/src/main/docs/nagios-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-nagios/src/main/docs/nagios-component.adoc b/components/camel-nagios/src/main/docs/nagios-component.adoc
index b2aa95b..3626b36 100644
--- a/components/camel-nagios/src/main/docs/nagios-component.adoc
+++ b/components/camel-nagios/src/main/docs/nagios-component.adoc
@@ -42,13 +42,14 @@ Options
 
 
 
+
 // component options: START
 The Nagios component supports 7 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | configuration | NagiosConfiguration | To use a shared configuraiton. Properties of the shared configuration can also be set individually.
@@ -67,6 +68,7 @@ The Nagios component supports 7 options which are listed below.
 
 
 
+
 // endpoint options: START
 The Nagios component supports 9 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-netty-http/src/main/docs/netty-http-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-netty-http/src/main/docs/netty-http-component.adoc b/components/camel-netty-http/src/main/docs/netty-http-component.adoc
index c8191c4..17dcfdd 100644
--- a/components/camel-netty-http/src/main/docs/netty-http-component.adoc
+++ b/components/camel-netty-http/src/main/docs/netty-http-component.adoc
@@ -80,13 +80,14 @@ options related to UDP transport.
 
 
 
+
 // component options: START
 The Netty HTTP component supports 68 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | nettyHttpBinding | NettyHttpBinding | To use a custom org.apache.camel.component.netty.http.NettyHttpBinding for binding to/from Netty and Camel Message API.
@@ -167,6 +168,7 @@ The Netty HTTP component supports 68 options which are listed below.
 
 
 
+
 // endpoint options: START
 The Netty HTTP component supports 82 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-netty/src/main/docs/netty-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-netty/src/main/docs/netty-component.adoc b/components/camel-netty/src/main/docs/netty-component.adoc
index 6e64ea3..50ad393 100644
--- a/components/camel-netty/src/main/docs/netty-component.adoc
+++ b/components/camel-netty/src/main/docs/netty-component.adoc
@@ -60,13 +60,14 @@ Options
 
 
 
+
 // component options: START
 The Netty component supports 65 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | configuration | NettyConfiguration | To use the NettyConfiguration as configuration when creating endpoints. Properties of the shared configuration can also be set individually.
@@ -144,6 +145,7 @@ The Netty component supports 65 options which are listed below.
 
 
 
+
 // endpoint options: START
 The Netty component supports 70 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc b/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc
index 74909e5..592eb70 100644
--- a/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc
+++ b/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc
@@ -79,13 +79,14 @@ related to UDP transport.
 
 
 
+
 // component options: START
 The Netty4 HTTP component supports 72 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | nettyHttpBinding | NettyHttpBinding | To use a custom org.apache.camel.component.netty4.http.NettyHttpBinding for binding to/from Netty and Camel Message API.
@@ -172,6 +173,7 @@ The Netty4 HTTP component supports 72 options which are listed below.
 
 
 
+
 // endpoint options: START
 The Netty4 HTTP component supports 81 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-netty4/src/main/docs/netty4-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/main/docs/netty4-component.adoc b/components/camel-netty4/src/main/docs/netty4-component.adoc
index d039a6e..864d445 100644
--- a/components/camel-netty4/src/main/docs/netty4-component.adoc
+++ b/components/camel-netty4/src/main/docs/netty4-component.adoc
@@ -57,13 +57,14 @@ Options
 
 
 
+
 // component options: START
 The Netty4 component supports 69 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | maximumPoolSize | int | The thread pool size for the EventExecutorGroup if its in use. The default value is 16.
@@ -148,6 +149,7 @@ The Netty4 component supports 69 options which are listed below.
 
 
 
+
 // endpoint options: START
 The Netty4 component supports 73 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc b/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc
index b062775..8e477e6 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc
+++ b/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc
@@ -47,13 +47,14 @@ Olingo2 Options
 
 
 
+
 // component options: START
 The Olingo2 component supports 11 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | configuration | Olingo2Configuration | To use the shared configuration. Properties of the shared configuration can also be set individually.
@@ -75,6 +76,7 @@ The Olingo2 component supports 11 options which are listed below.
 
 
 
+
 // endpoint options: START
 The Olingo2 component supports 15 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-openshift/src/main/docs/openshift-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-openshift/src/main/docs/openshift-component.adoc b/components/camel-openshift/src/main/docs/openshift-component.adoc
index 4c869b6..f8ba7c7 100644
--- a/components/camel-openshift/src/main/docs/openshift-component.adoc
+++ b/components/camel-openshift/src/main/docs/openshift-component.adoc
@@ -37,13 +37,14 @@ Options
 ^^^^^^^
 
 
+
 // component options: START
 The OpenShift component supports 4 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | username | String | The username to login to openshift server.
@@ -56,6 +57,7 @@ The OpenShift component supports 4 options which are listed below.
 
 
 
+
 // endpoint options: START
 The OpenShift component supports 27 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-paho/src/main/docs/paho-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-paho/src/main/docs/paho-component.adoc b/components/camel-paho/src/main/docs/paho-component.adoc
index 51daab7..a182056 100644
--- a/components/camel-paho/src/main/docs/paho-component.adoc
+++ b/components/camel-paho/src/main/docs/paho-component.adoc
@@ -125,13 +125,14 @@ Paho Options
 ^^^^^^^^^^^^
 
 
+
 // component options: START
 The Paho component supports 3 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | brokerUrl | String | The URL of the MQTT broker.
@@ -143,6 +144,7 @@ The Paho component supports 3 options which are listed below.
 
 
 
+
 // endpoint options: START
 The Paho component supports 12 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-paxlogging/src/main/docs/paxlogging-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-paxlogging/src/main/docs/paxlogging-component.adoc b/components/camel-paxlogging/src/main/docs/paxlogging-component.adoc
index 994b751..1ff6de8 100644
--- a/components/camel-paxlogging/src/main/docs/paxlogging-component.adoc
+++ b/components/camel-paxlogging/src/main/docs/paxlogging-component.adoc
@@ -43,13 +43,14 @@ URI options
 ^^^^^^^^^^^
 
 
+
 // component options: START
 The OSGi PAX Logging component supports 1 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | bundleContext | BundleContext | The OSGi BundleContext is automatic injected by Camel
@@ -59,6 +60,7 @@ The OSGi PAX Logging component supports 1 options which are listed below.
 
 
 
+
 // endpoint options: START
 The OSGi PAX Logging component supports 5 endpoint options which are listed below: