Repository: camel
Updated Branches:
  refs/heads/doc-table [created] bb3764e39


http://git-wip-us.apache.org/repos/asf/camel/blob/bb3764e3/components/camel-xmlsecurity/src/main/docs/xmlsecurity-component.adoc
----------------------------------------------------------------------
diff --git 
a/components/camel-xmlsecurity/src/main/docs/xmlsecurity-component.adoc 
b/components/camel-xmlsecurity/src/main/docs/xmlsecurity-component.adoc
index 1e3bab5..e1ebcd0 100644
--- a/components/camel-xmlsecurity/src/main/docs/xmlsecurity-component.adoc
+++ b/components/camel-xmlsecurity/src/main/docs/xmlsecurity-component.adoc
@@ -229,15 +229,12 @@ The XML Security component supports 3 options which are 
listed below.
 
 
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,6,1,1",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
- 4+^s| advanced
-| signerConfiguration |  | XmlSignerConfiguration | To use a shared 
XmlSignerConfiguration configuration to use as base for configuring endpoints.
-
-| verifierConfiguration |  | XmlVerifierConfiguration | To use a shared 
XmlVerifierConfiguration configuration to use as base for configuring endpoints.
-
-| resolvePropertyPlaceholders | true | boolean | Whether the component should 
resolve property placeholders on itself when starting. Only properties which 
are of String type can use property placeholders.
+| Name | Description | Default | Type
+| **signerConfiguration** (advanced) | To use a shared XmlSignerConfiguration 
configuration to use as base for configuring endpoints. |   | 
XmlSignerConfiguration
+| **verifierConfiguration** (advanced) | To use a shared 
XmlVerifierConfiguration configuration to use as base for configuring 
endpoints. |   | XmlVerifier Configuration
+| **resolvePropertyPlaceholders** (advanced) | Whether the component should 
resolve property placeholders on itself when starting. Only properties which 
are of String type can use property placeholders. | true  | boolean
 |=======================================================================
 // component options: END
 
@@ -258,88 +255,53 @@ with the following path and query parameters:
 
 #### Path Parameters (2 parameters):
 
-[width="100%",cols="2,1,1m,6",options="header"]
+[width="100%",cols="2,6,1,1",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-| command |  | XmlCommand | *Required* Whether to sign or verify.
-| name |  | String | *Required* The name part in the URI can be chosen by the 
user to distinguish between different signer/verifier endpoints within the 
camel context.
+| Name | Description | Default | Type
+| **command** | *Required* Whether to sign or verify. |  | XmlCommand
+| **name** | *Required* The name part in the URI can be chosen by the user to 
distinguish between different signer/verifier endpoints within the camel 
context. |  | String
 |=======================================================================
 
 #### Query Parameters (35 parameters):
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,6,1,1",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
- 4+^s| common
-| baseUri |  | String | You can set a base URI which is used in the URI 
dereferencing. Relative URIs are then concatenated with the base URI.
-
-| clearHeaders | true | Boolean | Determines if the XML signature specific 
headers be cleared after signing and verification. Defaults to true.
-
-| cryptoContextProperties |  | Map | Sets the crypto context properties. See 
link XMLCryptoContextsetProperty(String Object). Possible properties are 
defined in XMLSignContext an XMLValidateContext (see Supported Properties). The 
following properties are set by default to the value link BooleanTRUE for the 
XML validation. If you want to switch these features off you must set the 
property value to link BooleanFALSE. org.jcp.xml.dsig.validateManifests 
javax.xml.crypto.dsig.cacheReference
-
-| disallowDoctypeDecl | true | Boolean | Disallows that the incoming XML 
document contains DTD DOCTYPE declaration. The default value is link 
BooleanTRUE.
-
-| omitXmlDeclaration | false | Boolean | Indicator whether the XML declaration 
in the outgoing message body should be omitted. Default value is false. Can be 
overwritten by the header link XmlSignatureConstantsHEADER_OMIT_XML_DECLARATION.
-
-| outputXmlEncoding |  | String | The character encoding of the resulting 
signed XML document. If null then the encoding of the original XML document is 
used.
-
-| schemaResourceUri |  | String | Classpath to the XML Schema. Must be 
specified in the detached XML Signature case for determining the ID attributes 
might be set in the enveloped and enveloping case. If set then the XML document 
is validated with the specified XML schema. The schema resource URI can be 
overwritten by the header link XmlSignatureConstantsHEADER_SCHEMA_RESOURCE_URI.
- 4+^s| advanced
-| synchronous | false | boolean | Sets whether synchronous processing should 
be strictly used or Camel is allowed to use asynchronous processing (if 
supported).
-
-| uriDereferencer |  | URIDereferencer | If you want to restrict the remote 
access via reference URIs you can set an own dereferencer. Optional parameter. 
If not set the provider default dereferencer is used which can resolve URI 
fragments HTTP file and XPpointer URIs. Attention: The implementation is 
provider dependent!
- 4+^s| sign
-| addKeyInfoReference | true | Boolean | In order to protect the KeyInfo 
element from tampering you can add a reference to the signed info element so 
that it is protected via the signature value. The default value is true. Only 
relevant when a KeyInfo is returned by KeyAccessor. and link KeyInfogetId() is 
not null.
-
-| canonicalizationMethod | http://www.w3.org/TR/2001/REC-xml-c14n-20010315 | 
AlgorithmMethod | Canonicalization method used to canonicalize the SignedInfo 
element before the digest is calculated. You can use the helper methods 
XmlSignatureHelper.getCanonicalizationMethod(String algorithm) or 
getCanonicalizationMethod(String algorithm List inclusiveNamespacePrefixes) to 
create a canonicalization method.
-
-| contentObjectId |  | String | Sets the content object Id attribute value. By 
default a UUID is generated. If you set the null value then a new UUID will be 
generated. Only used in the enveloping case.
-
-| contentReferenceType |  | String | Type of the content reference. The 
default value is null. This value can be overwritten by the header link 
XmlSignatureConstantsHEADER_CONTENT_REFERENCE_TYPE.
-
-| contentReferenceUri |  | String | Reference URI for the content to be 
signed. Only used in the enveloped case. If the reference URI contains an ID 
attribute value then the resource schema URI ( link 
setSchemaResourceUri(String)) must also be set because the schema validator 
will then find out which attributes are ID attributes. Will be ignored in the 
enveloping or detached case.
-
-| digestAlgorithm |  | String | Digest algorithm URI. Optional parameter. This 
digest algorithm is used for calculating the digest of the input message. If 
this digest algorithm is not specified then the digest algorithm is calculated 
from the signature algorithm. Example: http://www.w3.org/2001/04/xmlencsha256
-
-| keyAccessor |  | KeyAccessor | For the signing process a private key is 
necessary. You specify a key accessor bean which provides this private key. The 
key accessor bean must implement the KeyAccessor interface. The package 
org.apache.camel.component.xmlsecurity.api contains the default implementation 
class DefaultKeyAccessor which reads the private key from a Java keystore.
-
-| parentLocalName |  | String | Local name of the parent element to which the 
XML signature element will be added. Only relevant for enveloped XML signature. 
Alternatively you can also use link setParentXpath(XPathFilterParameterSpec). 
Default value is null. The value must be null for enveloping and detached XML 
signature. This parameter or the parameter link 
setParentXpath(XPathFilterParameterSpec) for enveloped signature and the 
parameter link setXpathsToIdAttributes(List) for detached signature must not be 
set in the same configuration. If the parameters parentXpath and 
parentLocalName are specified in the same configuration then an exception is 
thrown.
-
-| parentNamespace |  | String | Namespace of the parent element to which the 
XML signature element will be added.
-
-| parentXpath |  | XPathFilterParameterSpec | Sets the XPath to find the 
parent node in the enveloped case. Either you specify the parent node via this 
method or the local name and namespace of the parent with the methods link 
setParentLocalName(String) and link setParentNamespace(String). Default value 
is null. The value must be null for enveloping and detached XML signature. If 
the parameters parentXpath and parentLocalName are specified in the same 
configuration then an exception is thrown.
-
-| plainText | false | Boolean | Indicator whether the message body contains 
plain text. The default value is false indicating that the message body 
contains XML. The value can be overwritten by the header link 
XmlSignatureConstantsHEADER_MESSAGE_IS_PLAIN_TEXT.
-
-| plainTextEncoding | UTF-8 | String | Encoding of the plain text. Only 
relevant if the message body is plain text (see parameter link plainText. 
Default value is UTF-8.
-
-| prefixForXmlSignatureNamespace | ds | String | Namespace prefix for the XML 
signature namespace http://www.w3.org/2000/09/xmldsig. Default value is ds. If 
null or an empty value is set then no prefix is used for the XML signature 
namespace. See best practice 
http://www.w3.org/TR/xmldsig-bestpractices/signing-xml- without-namespaces
-
-| properties |  | XmlSignatureProperties | For adding additional References 
and Objects to the XML signature which contain additional properties you can 
provide a bean which implements the XmlSignatureProperties interface.
-
-| signatureAlgorithm | http://www.w3.org/2000/09/xmldsig#rsa-sha1 | String | 
Signature algorithm. Default value is http://www.w3.org/2000/09/xmldsigrsa-sha1.
-
-| signatureId |  | String | Sets the signature Id. If this parameter is not 
set (null value) then a unique ID is generated for the signature ID (default). 
If this parameter is set to (empty string) then no Id attribute is created in 
the signature element.
-
-| transformMethods |  | List | Transforms which are executed on the message 
body before the digest is calculated. By default C14n is added and in the case 
of enveloped signature (see option parentLocalName) also 
http://www.w3.org/2000/09/xmldsigenveloped-signature is added at position 0 of 
the list. Use methods in XmlSignatureHelper to create the transform methods.
-
-| xpathsToIdAttributes |  | List | Define the elements which are signed in the 
detached case via XPATH expressions to ID attributes (attributes of type ID). 
For each element found via the XPATH expression a detached signature is created 
whose reference URI contains the corresponding attribute value (preceded by 
''). The signature becomes the last sibling of the signed element. Elements 
with deeper hierarchy level are signed first. You can also set the XPATH list 
dynamically via the header link 
XmlSignatureConstantsHEADER_XPATHS_TO_ID_ATTRIBUTES. The parameter link 
setParentLocalName(String) or link setParentXpath(XPathFilterParameterSpec) for 
enveloped signature and this parameter for detached signature must not be set 
in the same configuration.
- 4+^s| verify
-| keySelector |  | KeySelector | Provides the key for validating the XML 
signature.
-
-| outputNodeSearch |  | String | Sets the output node search value for 
determining the node from the XML signature document which shall be set to the 
output message body. The class of the value depends on the type of the output 
node search. The output node search is forwarded to XmlSignature2Message.
-
-| outputNodeSearchType | Default | String | Determines the search type for 
determining the output node which is serialized into the output message bodyF. 
See link setOutputNodeSearch(Object). The supported default search types you 
can find in DefaultXmlSignature2Message.
-
-| removeSignatureElements | false | Boolean | Indicator whether the XML 
signature elements (elements with local name Signature and namesapce 
http://www.w3.org/2000/09/xmldsig) shall be removed from the document set to 
the output message. Normally this is only necessary if the XML signature is 
enveloped. The default value is link BooleanFALSE. This parameter is forwarded 
to XmlSignature2Message. This indicator has no effect if the output node search 
is of type link DefaultXmlSignature2MessageOUTPUT_NODE_SEARCH_TYPE_DEFAULT.F
-
-| secureValidation | true | Boolean | Enables secure validation. If true then 
secure validation is enabled.
-
-| validationFailedHandler |  | ValidationFailedHandler | Handles the different 
validation failed situations. The default implementation throws specific 
exceptions for the different situations (All exceptions have the package name 
org.apache.camel.component.xmlsecurity.api and are a sub-class of 
XmlSignatureInvalidException. If the signature value validation fails a 
XmlSignatureInvalidValueException is thrown. If a reference validation fails a 
XmlSignatureInvalidContentHashException is thrown. For more detailed 
information see the JavaDoc.
-
-| xmlSignature2Message |  | XmlSignature2Message | Bean which maps the XML 
signature to the output-message after the validation. How this mapping should 
be done can be configured by the options outputNodeSearchType outputNodeSearch 
and removeSignatureElements. The default implementation offers three 
possibilities which are related to the three output node search types Default 
ElementName and XPath. The default implementation determines a node which is 
then serialized and set to the body of the output message If the search type is 
ElementName then the output node (which must be in this case an element) is 
determined by the local name and namespace defined in the search value (see 
option outputNodeSearch). If the search type is XPath then the output node is 
determined by the XPath specified in the search value (in this case the output 
node can be of type Element TextNode or Document). If the output node search 
type is Default then the following rules apply: In the enveloped XML signat
 ure case (there is a reference with URI= and transform 
http://www.w3.org/2000/09/xmldsigenveloped-signature) the incoming XML document 
without the Signature element is set to the output message body. In the 
non-enveloped XML signature case the message body is determined from a 
referenced Object; this is explained in more detail in chapter Output Node 
Determination in Enveloping XML Signature Case.
-
-| xmlSignatureChecker |  | XmlSignatureChecker | This interface allows the 
application to check the XML signature before the validation is executed. This 
step is recommended in 
http://www.w3.org/TR/xmldsig-bestpractices/check-what-is-signed
+| Name | Description | Default | Type
+| **baseUri** (common) | You can set a base URI which is used in the URI 
dereferencing. Relative URIs are then concatenated with the base URI. |  | 
String
+| **clearHeaders** (common) | Determines if the XML signature specific headers 
be cleared after signing and verification. Defaults to true. | true | Boolean
+| **cryptoContextProperties** (common) | Sets the crypto context properties. 
See link XMLCryptoContextsetProperty(String Object). Possible properties are 
defined in XMLSignContext an XMLValidateContext (see Supported Properties). The 
following properties are set by default to the value link BooleanTRUE for the 
XML validation. If you want to switch these features off you must set the 
property value to link BooleanFALSE. org.jcp.xml.dsig.validateManifests 
javax.xml.crypto.dsig.cacheReference |  | Map
+| **disallowDoctypeDecl** (common) | Disallows that the incoming XML document 
contains DTD DOCTYPE declaration. The default value is link BooleanTRUE. | true 
| Boolean
+| **omitXmlDeclaration** (common) | Indicator whether the XML declaration in 
the outgoing message body should be omitted. Default value is false. Can be 
overwritten by the header link 
XmlSignatureConstantsHEADER_OMIT_XML_DECLARATION. | false | Boolean
+| **outputXmlEncoding** (common) | The character encoding of the resulting 
signed XML document. If null then the encoding of the original XML document is 
used. |  | String
+| **schemaResourceUri** (common) | Classpath to the XML Schema. Must be 
specified in the detached XML Signature case for determining the ID attributes 
might be set in the enveloped and enveloping case. If set then the XML document 
is validated with the specified XML schema. The schema resource URI can be 
overwritten by the header link XmlSignatureConstantsHEADER_SCHEMA_RESOURCE_URI. 
|  | String
+| **synchronous** (advanced) | Sets whether synchronous processing should be 
strictly used or Camel is allowed to use asynchronous processing (if 
supported). | false | boolean
+| **uriDereferencer** (advanced) | If you want to restrict the remote access 
via reference URIs you can set an own dereferencer. Optional parameter. If not 
set the provider default dereferencer is used which can resolve URI fragments 
HTTP file and XPpointer URIs. Attention: The implementation is provider 
dependent! |  | URIDereferencer
+| **addKeyInfoReference** (sign) | In order to protect the KeyInfo element 
from tampering you can add a reference to the signed info element so that it is 
protected via the signature value. The default value is true. Only relevant 
when a KeyInfo is returned by KeyAccessor. and link KeyInfogetId() is not null. 
| true | Boolean
+| **canonicalizationMethod** (sign) | Canonicalization method used to 
canonicalize the SignedInfo element before the digest is calculated. You can 
use the helper methods XmlSignatureHelper.getCanonicalizationMethod(String 
algorithm) or getCanonicalizationMethod(String algorithm List 
inclusiveNamespacePrefixes) to create a canonicalization method. | 
http://www.w3.org/TR/2001/REC-xml-c14n-20010315 | AlgorithmMethod
+| **contentObjectId** (sign) | Sets the content object Id attribute value. By 
default a UUID is generated. If you set the null value then a new UUID will be 
generated. Only used in the enveloping case. |  | String
+| **contentReferenceType** (sign) | Type of the content reference. The default 
value is null. This value can be overwritten by the header link 
XmlSignatureConstantsHEADER_CONTENT_REFERENCE_TYPE. |  | String
+| **contentReferenceUri** (sign) | Reference URI for the content to be signed. 
Only used in the enveloped case. If the reference URI contains an ID attribute 
value then the resource schema URI ( link setSchemaResourceUri(String)) must 
also be set because the schema validator will then find out which attributes 
are ID attributes. Will be ignored in the enveloping or detached case. |  | 
String
+| **digestAlgorithm** (sign) | Digest algorithm URI. Optional parameter. This 
digest algorithm is used for calculating the digest of the input message. If 
this digest algorithm is not specified then the digest algorithm is calculated 
from the signature algorithm. Example: http://www.w3.org/2001/04/xmlencsha256 | 
 | String
+| **keyAccessor** (sign) | For the signing process a private key is necessary. 
You specify a key accessor bean which provides this private key. The key 
accessor bean must implement the KeyAccessor interface. The package 
org.apache.camel.component.xmlsecurity.api contains the default implementation 
class DefaultKeyAccessor which reads the private key from a Java keystore. |  | 
KeyAccessor
+| **parentLocalName** (sign) | Local name of the parent element to which the 
XML signature element will be added. Only relevant for enveloped XML signature. 
Alternatively you can also use link setParentXpath(XPathFilterParameterSpec). 
Default value is null. The value must be null for enveloping and detached XML 
signature. This parameter or the parameter link 
setParentXpath(XPathFilterParameterSpec) for enveloped signature and the 
parameter link setXpathsToIdAttributes(List) for detached signature must not be 
set in the same configuration. If the parameters parentXpath and 
parentLocalName are specified in the same configuration then an exception is 
thrown. |  | String
+| **parentNamespace** (sign) | Namespace of the parent element to which the 
XML signature element will be added. |  | String
+| **parentXpath** (sign) | Sets the XPath to find the parent node in the 
enveloped case. Either you specify the parent node via this method or the local 
name and namespace of the parent with the methods link 
setParentLocalName(String) and link setParentNamespace(String). Default value 
is null. The value must be null for enveloping and detached XML signature. If 
the parameters parentXpath and parentLocalName are specified in the same 
configuration then an exception is thrown. |  | XPathFilterParameter Spec
+| **plainText** (sign) | Indicator whether the message body contains plain 
text. The default value is false indicating that the message body contains XML. 
The value can be overwritten by the header link 
XmlSignatureConstantsHEADER_MESSAGE_IS_PLAIN_TEXT. | false | Boolean
+| **plainTextEncoding** (sign) | Encoding of the plain text. Only relevant if 
the message body is plain text (see parameter link plainText. Default value is 
UTF-8. | UTF-8 | String
+| **prefixForXmlSignature Namespace** (sign) | Namespace prefix for the XML 
signature namespace http://www.w3.org/2000/09/xmldsig. Default value is ds. If 
null or an empty value is set then no prefix is used for the XML signature 
namespace. See best practice 
http://www.w3.org/TR/xmldsig-bestpractices/signing-xml- without-namespaces | ds 
| String
+| **properties** (sign) | For adding additional References and Objects to the 
XML signature which contain additional properties you can provide a bean which 
implements the XmlSignatureProperties interface. |  | XmlSignatureProperties
+| **signatureAlgorithm** (sign) | Signature algorithm. Default value is 
http://www.w3.org/2000/09/xmldsigrsa-sha1. | 
http://www.w3.org/2000/09/xmldsig#rsa-sha1 | String
+| **signatureId** (sign) | Sets the signature Id. If this parameter is not set 
(null value) then a unique ID is generated for the signature ID (default). If 
this parameter is set to (empty string) then no Id attribute is created in the 
signature element. |  | String
+| **transformMethods** (sign) | Transforms which are executed on the message 
body before the digest is calculated. By default C14n is added and in the case 
of enveloped signature (see option parentLocalName) also 
http://www.w3.org/2000/09/xmldsigenveloped-signature is added at position 0 of 
the list. Use methods in XmlSignatureHelper to create the transform methods. |  
| List
+| **xpathsToIdAttributes** (sign) | Define the elements which are signed in 
the detached case via XPATH expressions to ID attributes (attributes of type 
ID). For each element found via the XPATH expression a detached signature is 
created whose reference URI contains the corresponding attribute value 
(preceded by ''). The signature becomes the last sibling of the signed element. 
Elements with deeper hierarchy level are signed first. You can also set the 
XPATH list dynamically via the header link 
XmlSignatureConstantsHEADER_XPATHS_TO_ID_ATTRIBUTES. The parameter link 
setParentLocalName(String) or link setParentXpath(XPathFilterParameterSpec) for 
enveloped signature and this parameter for detached signature must not be set 
in the same configuration. |  | List
+| **keySelector** (verify) | Provides the key for validating the XML 
signature. |  | KeySelector
+| **outputNodeSearch** (verify) | Sets the output node search value for 
determining the node from the XML signature document which shall be set to the 
output message body. The class of the value depends on the type of the output 
node search. The output node search is forwarded to XmlSignature2Message. |  | 
String
+| **outputNodeSearchType** (verify) | Determines the search type for 
determining the output node which is serialized into the output message bodyF. 
See link setOutputNodeSearch(Object). The supported default search types you 
can find in DefaultXmlSignature2Message. | Default | String
+| **removeSignatureElements** (verify) | Indicator whether the XML signature 
elements (elements with local name Signature and namesapce 
http://www.w3.org/2000/09/xmldsig) shall be removed from the document set to 
the output message. Normally this is only necessary if the XML signature is 
enveloped. The default value is link BooleanFALSE. This parameter is forwarded 
to XmlSignature2Message. This indicator has no effect if the output node search 
is of type link DefaultXmlSignature2MessageOUTPUT_NODE_SEARCH_TYPE_DEFAULT.F | 
false | Boolean
+| **secureValidation** (verify) | Enables secure validation. If true then 
secure validation is enabled. | true | Boolean
+| **validationFailedHandler** (verify) | Handles the different validation 
failed situations. The default implementation throws specific exceptions for 
the different situations (All exceptions have the package name 
org.apache.camel.component.xmlsecurity.api and are a sub-class of 
XmlSignatureInvalidException. If the signature value validation fails a 
XmlSignatureInvalidValueException is thrown. If a reference validation fails a 
XmlSignatureInvalidContentHashException is thrown. For more detailed 
information see the JavaDoc. |  | ValidationFailedHandler
+| **xmlSignature2Message** (verify) | Bean which maps the XML signature to the 
output-message after the validation. How this mapping should be done can be 
configured by the options outputNodeSearchType outputNodeSearch and 
removeSignatureElements. The default implementation offers three possibilities 
which are related to the three output node search types Default ElementName and 
XPath. The default implementation determines a node which is then serialized 
and set to the body of the output message If the search type is ElementName 
then the output node (which must be in this case an element) is determined by 
the local name and namespace defined in the search value (see option 
outputNodeSearch). If the search type is XPath then the output node is 
determined by the XPath specified in the search value (in this case the output 
node can be of type Element TextNode or Document). If the output node search 
type is Default then the following rules apply: In the enveloped XML signature 
case (the
 re is a reference with URI= and transform 
http://www.w3.org/2000/09/xmldsigenveloped-signature) the incoming XML document 
without the Signature element is set to the output message body. In the 
non-enveloped XML signature case the message body is determined from a 
referenced Object; this is explained in more detail in chapter Output Node 
Determination in Enveloping XML Signature Case. |  | XmlSignature2Message
+| **xmlSignatureChecker** (verify) | This interface allows the application to 
check the XML signature before the validation is executed. This step is 
recommended in http://www.w3.org/TR/xmldsig-bestpractices/check-what-is-signed 
|  | XmlSignatureChecker
 |=======================================================================
 // endpoint options: END
 

http://git-wip-us.apache.org/repos/asf/camel/blob/bb3764e3/components/camel-xmpp/src/main/docs/xmpp-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-xmpp/src/main/docs/xmpp-component.adoc 
b/components/camel-xmpp/src/main/docs/xmpp-component.adoc
index 6ec9458..549bc21 100644
--- a/components/camel-xmpp/src/main/docs/xmpp-component.adoc
+++ b/components/camel-xmpp/src/main/docs/xmpp-component.adoc
@@ -51,55 +51,37 @@ with the following path and query parameters:
 
 #### Path Parameters (3 parameters):
 
-[width="100%",cols="2,1,1m,6",options="header"]
+[width="100%",cols="2,6,1,1",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-| host |  | String | *Required* Hostname for the chat server
-| port |  | int | *Required* Port number for the chat server
-| participant |  | String | JID (Jabber ID) of person to receive messages. 
room parameter has precedence over participant.
+| Name | Description | Default | Type
+| **host** | *Required* Hostname for the chat server |  | String
+| **port** | *Required* Port number for the chat server |  | int
+| **participant** | JID (Jabber ID) of person to receive messages. room 
parameter has precedence over participant. |  | String
 |=======================================================================
 
 #### Query Parameters (18 parameters):
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,6,1,1",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-
-| login | true | boolean | Whether to login the user.
-
-| nickname |  | String | Use nickname when joining room. If room is specified 
and nickname is not user will be used for the nickname.
-
-| pubsub | false | boolean | Accept pubsub packets on input default is false
-
-| room |  | String | If this option is specified the component will connect to 
MUC (Multi User Chat). Usually the domain name for MUC is different from the 
login domain. For example if you are supermanjabber.org and want to join the 
krypton room then the room URL is kryptonconference.jabber.org. Note the 
conference part. It is not a requirement to provide the full room JID. If the 
room parameter does not contain the symbol the domain part will be discovered 
and added by Camel
-
-| serviceName |  | String | The name of the service you are connecting to. For 
Google Talk this would be gmail.com.
-
-| testConnectionOnStartup | true | boolean | Specifies whether to test the 
connection on startup. This is used to ensure that the XMPP client has a valid 
connection to the XMPP server when the route starts. Camel throws an exception 
on startup if a connection cannot be established. When this option is set to 
false Camel will attempt to establish a lazy connection when needed by a 
producer and will poll for a consumer connection until the connection is 
established. Default is true.
- 4+^s| common (advanced)
-| createAccount | false | boolean | If true an attempt to create an account 
will be made. Default is false.
-
-| resource | Camel | String | XMPP resource. The default is Camel.
- 4+^s| consumer
-| bridgeErrorHandler | false | boolean | Allows for bridging the consumer to 
the Camel routing Error Handler which mean any exceptions occurred while the 
consumer is trying to pickup incoming messages or the likes will now be 
processed as a message and handled by the routing Error Handler. By default the 
consumer will use the org.apache.camel.spi.ExceptionHandler to deal with 
exceptions that will be logged at WARN or ERROR level and ignored.
-
-| connectionPollDelay | 10 | int | The amount of time in seconds between polls 
(in seconds) to verify the health of the XMPP connection or between attempts to 
establish an initial consumer connection. Camel will try to re-establish a 
connection if it has become inactive. Default is 10 seconds.
-
-| doc | false | boolean | Set a doc header on the IN message containing a 
Document form of the incoming packet; default is true if presence or pubsub are 
true otherwise false
- 4+^s| consumer (advanced)
-| exceptionHandler |  | ExceptionHandler | To let the consumer use a custom 
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this 
options is not in use. By default the consumer will deal with exceptions that 
will be logged at WARN or ERROR level and ignored.
-
-| exchangePattern |  | ExchangePattern | Sets the exchange pattern when the 
consumer creates an exchange.
- 4+^s| advanced
-| connectionConfig |  | ConnectionConfiguration | To use an existing 
connection configuration
-
-| synchronous | false | boolean | Sets whether synchronous processing should 
be strictly used or Camel is allowed to use asynchronous processing (if 
supported).
- 4+^s| filter
-| headerFilterStrategy |  | HeaderFilterStrategy | To use a custom 
HeaderFilterStrategy to filter header to and from Camel message.
- 4+^s| security
-| password |  | String | Password for login
-
-| user |  | String | User name (without server name). If not specified 
anonymous login will be attempted.
+| Name | Description | Default | Type
+| **login** (common) | Whether to login the user. | true | boolean
+| **nickname** (common) | Use nickname when joining room. If room is specified 
and nickname is not user will be used for the nickname. |  | String
+| **pubsub** (common) | Accept pubsub packets on input default is false | 
false | boolean
+| **room** (common) | If this option is specified the component will connect 
to MUC (Multi User Chat). Usually the domain name for MUC is different from the 
login domain. For example if you are supermanjabber.org and want to join the 
krypton room then the room URL is kryptonconference.jabber.org. Note the 
conference part. It is not a requirement to provide the full room JID. If the 
room parameter does not contain the symbol the domain part will be discovered 
and added by Camel |  | String
+| **serviceName** (common) | The name of the service you are connecting to. 
For Google Talk this would be gmail.com. |  | String
+| **testConnectionOnStartup** (common) | Specifies whether to test the 
connection on startup. This is used to ensure that the XMPP client has a valid 
connection to the XMPP server when the route starts. Camel throws an exception 
on startup if a connection cannot be established. When this option is set to 
false Camel will attempt to establish a lazy connection when needed by a 
producer and will poll for a consumer connection until the connection is 
established. Default is true. | true | boolean
+| **createAccount** (common) | If true an attempt to create an account will be 
made. Default is false. | false | boolean
+| **resource** (common) | XMPP resource. The default is Camel. | Camel | String
+| **bridgeErrorHandler** (consumer) | Allows for bridging the consumer to the 
Camel routing Error Handler which mean any exceptions occurred while the 
consumer is trying to pickup incoming messages or the likes will now be 
processed as a message and handled by the routing Error Handler. By default the 
consumer will use the org.apache.camel.spi.ExceptionHandler to deal with 
exceptions that will be logged at WARN or ERROR level and ignored. | false | 
boolean
+| **connectionPollDelay** (consumer) | The amount of time in seconds between 
polls (in seconds) to verify the health of the XMPP connection or between 
attempts to establish an initial consumer connection. Camel will try to 
re-establish a connection if it has become inactive. Default is 10 seconds. | 
10 | int
+| **doc** (consumer) | Set a doc header on the IN message containing a 
Document form of the incoming packet; default is true if presence or pubsub are 
true otherwise false | false | boolean
+| **exceptionHandler** (consumer) | To let the consumer use a custom 
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this 
options is not in use. By default the consumer will deal with exceptions that 
will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
+| **exchangePattern** (consumer) | Sets the exchange pattern when the consumer 
creates an exchange. |  | ExchangePattern
+| **connectionConfig** (advanced) | To use an existing connection 
configuration |  | ConnectionConfiguration
+| **synchronous** (advanced) | Sets whether synchronous processing should be 
strictly used or Camel is allowed to use asynchronous processing (if 
supported). | false | boolean
+| **headerFilterStrategy** (filter) | To use a custom HeaderFilterStrategy to 
filter header to and from Camel message. |  | HeaderFilterStrategy
+| **password** (security) | Password for login |  | String
+| **user** (security) | User name (without server name). If not specified 
anonymous login will be attempted. |  | String
 |=======================================================================
 // endpoint options: END
 

http://git-wip-us.apache.org/repos/asf/camel/blob/bb3764e3/components/camel-yammer/src/main/docs/yammer-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/main/docs/yammer-component.adoc 
b/components/camel-yammer/src/main/docs/yammer-component.adoc
index 8133145..1a967f8 100644
--- a/components/camel-yammer/src/main/docs/yammer-component.adoc
+++ b/components/camel-yammer/src/main/docs/yammer-component.adoc
@@ -45,19 +45,14 @@ The Yammer component supports 5 options which are listed 
below.
 
 
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,6,1,1",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
- 4+^s| security
-| consumerKey |  | String | The consumer key
-
-| consumerSecret |  | String | The consumer secret
-
-| accessToken |  | String | The access token
- 4+^s| advanced
-| config |  | YammerConfiguration | To use a shared yammer configuration
-
-| resolvePropertyPlaceholders | true | boolean | Whether the component should 
resolve property placeholders on itself when starting. Only properties which 
are of String type can use property placeholders.
+| Name | Description | Default | Type
+| **consumerKey** (security) | The consumer key |   | String
+| **consumerSecret** (security) | The consumer secret |   | String
+| **accessToken** (security) | The access token |   | String
+| **config** (advanced) | To use a shared yammer configuration |   | 
YammerConfiguration
+| **resolvePropertyPlaceholders** (advanced) | Whether the component should 
resolve property placeholders on itself when starting. Only properties which 
are of String type can use property placeholders. | true  | boolean
 |=======================================================================
 // component options: END
 
@@ -79,73 +74,45 @@ with the following path and query parameters:
 
 #### Path Parameters (1 parameters):
 
-[width="100%",cols="2,1,1m,6",options="header"]
+[width="100%",cols="2,6,1,1",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-| function |  | YammerFunctionType | *Required* The function to use
+| Name | Description | Default | Type
+| **function** | *Required* The function to use |  | YammerFunctionType
 |=======================================================================
 
 #### Query Parameters (28 parameters):
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,6,1,1",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-
-| useJson | false | boolean | Set to true if you want to use raw JSON rather 
than converting to POJOs.
- 4+^s| consumer
-| bridgeErrorHandler | false | boolean | Allows for bridging the consumer to 
the Camel routing Error Handler which mean any exceptions occurred while the 
consumer is trying to pickup incoming messages or the likes will now be 
processed as a message and handled by the routing Error Handler. By default the 
consumer will use the org.apache.camel.spi.ExceptionHandler to deal with 
exceptions that will be logged at WARN or ERROR level and ignored.
-
-| delay | 5000 | long | Delay between polling in millis
-
-| limit | -1 | int | Return only the specified number of messages. Works for 
threaded=true and threaded=extended.
-
-| newerThan | -1 | int | Returns messages newer than the message ID specified 
as a numeric string. This should be used when polling for new messages. If 
you're looking at messages and the most recent message returned is 3516 you can 
make a request with the parameter newerThan=3516 to ensure that you do not get 
duplicate copies of messages already on your page.
-
-| olderThan | -1 | int | Returns messages older than the message ID specified 
as a numeric string. This is useful for paginating messages. For example if 
you're currently viewing 20 messages and the oldest is number 2912 you could 
append olderThan=2912 to your request to get the 20 messages prior to those 
you're seeing.
-
-| sendEmptyMessageWhenIdle | false | boolean | If the polling consumer did not 
poll any files you can enable this option to send an empty message (no body) 
instead.
-
-| threaded |  | String | threaded=true will only return the first message in 
each thread. This parameter is intended for apps which display message threads 
collapsed. threaded=extended will return the thread starter messages in order 
of most recently active as well as the two most recent messages as they are 
viewed in the default view on the Yammer web interface.
-
-| userId |  | String | The user id
- 4+^s| consumer (advanced)
-| exceptionHandler |  | ExceptionHandler | To let the consumer use a custom 
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this 
options is not in use. By default the consumer will deal with exceptions that 
will be logged at WARN or ERROR level and ignored.
-
-| exchangePattern |  | ExchangePattern | Sets the exchange pattern when the 
consumer creates an exchange.
-
-| pollStrategy |  | PollingConsumerPollStrategy | A pluggable 
org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your 
custom implementation to control error handling usually occurred during the 
poll operation before an Exchange have been created and being routed in Camel.
- 4+^s| advanced
-| synchronous | false | boolean | Sets whether synchronous processing should 
be strictly used or Camel is allowed to use asynchronous processing (if 
supported).
- 4+^s| scheduler
-| backoffErrorThreshold |  | int | The number of subsequent error polls 
(failed due some error) that should happen before the backoffMultipler should 
kick-in.
-
-| backoffIdleThreshold |  | int | The number of subsequent idle polls that 
should happen before the backoffMultipler should kick-in.
-
-| backoffMultiplier |  | int | To let the scheduled polling consumer backoff 
if there has been a number of subsequent idles/errors in a row. The multiplier 
is then the number of polls that will be skipped before the next actual attempt 
is happening again. When this option is in use then backoffIdleThreshold and/or 
backoffErrorThreshold must also be configured.
-
-| greedy | false | boolean | If greedy is enabled then the 
ScheduledPollConsumer will run immediately again if the previous run polled 1 
or more messages.
-
-| initialDelay | 1000 | long | Milliseconds before the first poll starts. You 
can also specify time values using units such as 60s (60 seconds) 5m30s (5 
minutes and 30 seconds) and 1h (1 hour).
-
-| runLoggingLevel | TRACE | LoggingLevel | The consumer logs a start/complete 
log line when it polls. This option allows you to configure the logging level 
for that.
-
-| scheduledExecutorService |  | ScheduledExecutorService | Allows for 
configuring a custom/shared thread pool to use for the consumer. By default 
each consumer has its own single threaded thread pool.
-
-| scheduler | none | ScheduledPollConsumerScheduler | To use a cron scheduler 
from either camel-spring or camel-quartz2 component
-
-| schedulerProperties |  | Map | To configure additional properties when using 
a custom scheduler or any of the Quartz2 Spring based scheduler.
-
-| startScheduler | true | boolean | Whether the scheduler should be auto 
started.
-
-| timeUnit | MILLISECONDS | TimeUnit | Time unit for initialDelay and delay 
options.
-
-| useFixedDelay | true | boolean | Controls if fixed delay or fixed rate is 
used. See ScheduledExecutorService in JDK for details.
- 4+^s| security
-| accessToken |  | String | *Required* The access token
-
-| consumerKey |  | String | *Required* The consumer key
-
-| consumerSecret |  | String | *Required* The consumer secret
+| Name | Description | Default | Type
+| **useJson** (common) | Set to true if you want to use raw JSON rather than 
converting to POJOs. | false | boolean
+| **bridgeErrorHandler** (consumer) | Allows for bridging the consumer to the 
Camel routing Error Handler which mean any exceptions occurred while the 
consumer is trying to pickup incoming messages or the likes will now be 
processed as a message and handled by the routing Error Handler. By default the 
consumer will use the org.apache.camel.spi.ExceptionHandler to deal with 
exceptions that will be logged at WARN or ERROR level and ignored. | false | 
boolean
+| **delay** (consumer) | Delay between polling in millis | 5000 | long
+| **limit** (consumer) | Return only the specified number of messages. Works 
for threaded=true and threaded=extended. | -1 | int
+| **newerThan** (consumer) | Returns messages newer than the message ID 
specified as a numeric string. This should be used when polling for new 
messages. If you're looking at messages and the most recent message returned is 
3516 you can make a request with the parameter newerThan=3516 to ensure that 
you do not get duplicate copies of messages already on your page. | -1 | int
+| **olderThan** (consumer) | Returns messages older than the message ID 
specified as a numeric string. This is useful for paginating messages. For 
example if you're currently viewing 20 messages and the oldest is number 2912 
you could append olderThan=2912 to your request to get the 20 messages prior to 
those you're seeing. | -1 | int
+| **sendEmptyMessageWhenIdle** (consumer) | If the polling consumer did not 
poll any files you can enable this option to send an empty message (no body) 
instead. | false | boolean
+| **threaded** (consumer) | threaded=true will only return the first message 
in each thread. This parameter is intended for apps which display message 
threads collapsed. threaded=extended will return the thread starter messages in 
order of most recently active as well as the two most recent messages as they 
are viewed in the default view on the Yammer web interface. |  | String
+| **userId** (consumer) | The user id |  | String
+| **exceptionHandler** (consumer) | To let the consumer use a custom 
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this 
options is not in use. By default the consumer will deal with exceptions that 
will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
+| **exchangePattern** (consumer) | Sets the exchange pattern when the consumer 
creates an exchange. |  | ExchangePattern
+| **pollStrategy** (consumer) | A pluggable 
org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your 
custom implementation to control error handling usually occurred during the 
poll operation before an Exchange have been created and being routed in Camel. 
|  | PollingConsumerPoll Strategy
+| **synchronous** (advanced) | Sets whether synchronous processing should be 
strictly used or Camel is allowed to use asynchronous processing (if 
supported). | false | boolean
+| **backoffErrorThreshold** (scheduler) | The number of subsequent error polls 
(failed due some error) that should happen before the backoffMultipler should 
kick-in. |  | int
+| **backoffIdleThreshold** (scheduler) | The number of subsequent idle polls 
that should happen before the backoffMultipler should kick-in. |  | int
+| **backoffMultiplier** (scheduler) | To let the scheduled polling consumer 
backoff if there has been a number of subsequent idles/errors in a row. The 
multiplier is then the number of polls that will be skipped before the next 
actual attempt is happening again. When this option is in use then 
backoffIdleThreshold and/or backoffErrorThreshold must also be configured. |  | 
int
+| **greedy** (scheduler) | If greedy is enabled then the ScheduledPollConsumer 
will run immediately again if the previous run polled 1 or more messages. | 
false | boolean
+| **initialDelay** (scheduler) | Milliseconds before the first poll starts. 
You can also specify time values using units such as 60s (60 seconds) 5m30s (5 
minutes and 30 seconds) and 1h (1 hour). | 1000 | long
+| **runLoggingLevel** (scheduler) | The consumer logs a start/complete log 
line when it polls. This option allows you to configure the logging level for 
that. | TRACE | LoggingLevel
+| **scheduledExecutorService** (scheduler) | Allows for configuring a 
custom/shared thread pool to use for the consumer. By default each consumer has 
its own single threaded thread pool. |  | ScheduledExecutor Service
+| **scheduler** (scheduler) | To use a cron scheduler from either camel-spring 
or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
+| **schedulerProperties** (scheduler) | To configure additional properties 
when using a custom scheduler or any of the Quartz2 Spring based scheduler. |  
| Map
+| **startScheduler** (scheduler) | Whether the scheduler should be auto 
started. | true | boolean
+| **timeUnit** (scheduler) | Time unit for initialDelay and delay options. | 
MILLISECONDS | TimeUnit
+| **useFixedDelay** (scheduler) | Controls if fixed delay or fixed rate is 
used. See ScheduledExecutorService in JDK for details. | true | boolean
+| **accessToken** (security) | *Required* The access token |  | String
+| **consumerKey** (security) | *Required* The consumer key |  | String
+| **consumerSecret** (security) | *Required* The consumer secret |  | String
 |=======================================================================
 // endpoint options: END
 

http://git-wip-us.apache.org/repos/asf/camel/blob/bb3764e3/components/camel-zookeeper-master/src/main/docs/zookeeper-master-component.adoc
----------------------------------------------------------------------
diff --git 
a/components/camel-zookeeper-master/src/main/docs/zookeeper-master-component.adoc
 
b/components/camel-zookeeper-master/src/main/docs/zookeeper-master-component.adoc
index 24e9923..4e95acf 100644
--- 
a/components/camel-zookeeper-master/src/main/docs/zookeeper-master-component.adoc
+++ 
b/components/camel-zookeeper-master/src/main/docs/zookeeper-master-component.adoc
@@ -37,23 +37,16 @@ The ZooKeeper Master component supports 7 options which are 
listed below.
 
 
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,6,1,1",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
- 4+^s| consumer
-| containerIdFactory |  | ContainerIdFactory | To use a custom 
ContainerIdFactory for creating container ids.
-
-| zkRoot | /camel/zookeepermaster/clusters/master | String | The root path to 
use in zookeeper where information is stored which nodes are master/slave etc. 
Will by default use: /camel/zookeepermaster/clusters/master
- 4+^s| advanced
-| curator |  | CuratorFramework | To use a custom configured CuratorFramework 
as connection to zookeeper ensemble.
- 4+^s| consumer
-| maximumConnectionTimeout | 10000 | int | Timeout in millis to use when 
connecting to the zookeeper ensemble
-
-| zooKeeperUrl | localhost:2181 | String | The url for the zookeeper ensemble
- 4+^s| security
-| zooKeeperPassword |  | String | The password to use when connecting to the 
zookeeper ensemble
- 4+^s| advanced
-| resolvePropertyPlaceholders | true | boolean | Whether the component should 
resolve property placeholders on itself when starting. Only properties which 
are of String type can use property placeholders.
+| Name | Description | Default | Type
+| **containerIdFactory** (consumer) | To use a custom ContainerIdFactory for 
creating container ids. |   | ContainerIdFactory
+| **zkRoot** (consumer) | The root path to use in zookeeper where information 
is stored which nodes are master/slave etc. Will by default use: 
/camel/zookeepermaster/clusters/master | /camel/zookeepermaster/clusters/master 
 | String
+| **curator** (advanced) | To use a custom configured CuratorFramework as 
connection to zookeeper ensemble. |   | CuratorFramework
+| **maximumConnectionTimeout** (consumer) | Timeout in millis to use when 
connecting to the zookeeper ensemble | 10000  | int
+| **zooKeeperUrl** (consumer) | The url for the zookeeper ensemble | 
localhost:2181  | String
+| **zooKeeperPassword** (security) | The password to use when connecting to 
the zookeeper ensemble |   | String
+| **resolvePropertyPlaceholders** (advanced) | Whether the component should 
resolve property placeholders on itself when starting. Only properties which 
are of String type can use property placeholders. | true  | boolean
 |=======================================================================
 // component options: END
 
@@ -66,26 +59,22 @@ with the following path and query parameters:
 
 #### Path Parameters (2 parameters):
 
-[width="100%",cols="2,1,1m,6",options="header"]
+[width="100%",cols="2,6,1,1",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-| groupName |  | String | *Required* The name of the cluster group to use
-| consumerEndpointUri |  | String | *Required* The consumer endpoint to use in 
master/slave mode
+| Name | Description | Default | Type
+| **groupName** | *Required* The name of the cluster group to use |  | String
+| **consumerEndpointUri** | *Required* The consumer endpoint to use in 
master/slave mode |  | String
 |=======================================================================
 
 #### Query Parameters (4 parameters):
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,6,1,1",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-
-| bridgeErrorHandler | false | boolean | Allows for bridging the consumer to 
the Camel routing Error Handler which mean any exceptions occurred while the 
consumer is trying to pickup incoming messages or the likes will now be 
processed as a message and handled by the routing Error Handler. By default the 
consumer will use the org.apache.camel.spi.ExceptionHandler to deal with 
exceptions that will be logged at WARN or ERROR level and ignored.
- 4+^s| consumer (advanced)
-| exceptionHandler |  | ExceptionHandler | To let the consumer use a custom 
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this 
options is not in use. By default the consumer will deal with exceptions that 
will be logged at WARN or ERROR level and ignored.
-
-| exchangePattern |  | ExchangePattern | Sets the exchange pattern when the 
consumer creates an exchange.
- 4+^s| advanced
-| synchronous | false | boolean | Sets whether synchronous processing should 
be strictly used or Camel is allowed to use asynchronous processing (if 
supported).
+| Name | Description | Default | Type
+| **bridgeErrorHandler** (consumer) | Allows for bridging the consumer to the 
Camel routing Error Handler which mean any exceptions occurred while the 
consumer is trying to pickup incoming messages or the likes will now be 
processed as a message and handled by the routing Error Handler. By default the 
consumer will use the org.apache.camel.spi.ExceptionHandler to deal with 
exceptions that will be logged at WARN or ERROR level and ignored. | false | 
boolean
+| **exceptionHandler** (consumer) | To let the consumer use a custom 
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this 
options is not in use. By default the consumer will deal with exceptions that 
will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
+| **exchangePattern** (consumer) | Sets the exchange pattern when the consumer 
creates an exchange. |  | ExchangePattern
+| **synchronous** (advanced) | Sets whether synchronous processing should be 
strictly used or Camel is allowed to use asynchronous processing (if 
supported). | false | boolean
 |=======================================================================
 // endpoint options: END
 

http://git-wip-us.apache.org/repos/asf/camel/blob/bb3764e3/components/camel-zookeeper/src/main/docs/zookeeper-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-zookeeper/src/main/docs/zookeeper-component.adoc 
b/components/camel-zookeeper/src/main/docs/zookeeper-component.adoc
index 8a6d74b..35fdf60 100644
--- a/components/camel-zookeeper/src/main/docs/zookeeper-component.adoc
+++ b/components/camel-zookeeper/src/main/docs/zookeeper-component.adoc
@@ -45,13 +45,11 @@ The ZooKeeper component supports 2 options which are listed 
below.
 
 
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,6,1,1",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
- 4+^s| advanced
-| configuration |  | ZooKeeperConfiguration | To use a shared 
ZooKeeperConfiguration
-
-| resolvePropertyPlaceholders | true | boolean | Whether the component should 
resolve property placeholders on itself when starting. Only properties which 
are of String type can use property placeholders.
+| Name | Description | Default | Type
+| **configuration** (advanced) | To use a shared ZooKeeperConfiguration |   | 
ZooKeeperConfiguration
+| **resolvePropertyPlaceholders** (advanced) | Whether the component should 
resolve property placeholders on itself when starting. Only properties which 
are of String type can use property placeholders. | true  | boolean
 |=======================================================================
 // component options: END
 
@@ -64,42 +62,30 @@ with the following path and query parameters:
 
 #### Path Parameters (2 parameters):
 
-[width="100%",cols="2,1,1m,6",options="header"]
+[width="100%",cols="2,6,1,1",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-| serverUrls |  | String | *Required* The zookeeper server hosts (multiple 
servers can be separated by comma)
-| path |  | String | *Required* The node in the ZooKeeper server (aka znode)
+| Name | Description | Default | Type
+| **serverUrls** | *Required* The zookeeper server hosts (multiple servers can 
be separated by comma) |  | String
+| **path** | *Required* The node in the ZooKeeper server (aka znode) |  | 
String
 |=======================================================================
 
 #### Query Parameters (12 parameters):
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,6,1,1",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-
-| awaitExistence | true | boolean | Not in use
-
-| listChildren | false | boolean | Whether the children of the node should be 
listed
-
-| timeout | 5000 | int | The time interval to wait on connection before timing 
out.
- 4+^s| consumer
-| backoff | 5000 | long | The time interval to backoff for after an error 
before retrying.
-
-| bridgeErrorHandler | false | boolean | Allows for bridging the consumer to 
the Camel routing Error Handler which mean any exceptions occurred while the 
consumer is trying to pickup incoming messages or the likes will now be 
processed as a message and handled by the routing Error Handler. By default the 
consumer will use the org.apache.camel.spi.ExceptionHandler to deal with 
exceptions that will be logged at WARN or ERROR level and ignored.
-
-| repeat | false | boolean | Should changes to the znode be 'watched' and 
repeatedly processed.
-
-| sendEmptyMessageOnDelete | true | boolean | Upon the delete of a znode 
should an empty message be send to the consumer
- 4+^s| consumer (advanced)
-| exceptionHandler |  | ExceptionHandler | To let the consumer use a custom 
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this 
options is not in use. By default the consumer will deal with exceptions that 
will be logged at WARN or ERROR level and ignored.
-
-| exchangePattern |  | ExchangePattern | Sets the exchange pattern when the 
consumer creates an exchange.
- 4+^s| producer
-| create | false | boolean | Should the endpoint create the node if it does 
not currently exist.
-
-| createMode | EPHEMERAL | String | The create mode that should be used for 
the newly created node
- 4+^s| advanced
-| synchronous | false | boolean | Sets whether synchronous processing should 
be strictly used or Camel is allowed to use asynchronous processing (if 
supported).
+| Name | Description | Default | Type
+| **awaitExistence** (common) | Not in use | true | boolean
+| **listChildren** (common) | Whether the children of the node should be 
listed | false | boolean
+| **timeout** (common) | The time interval to wait on connection before timing 
out. | 5000 | int
+| **backoff** (consumer) | The time interval to backoff for after an error 
before retrying. | 5000 | long
+| **bridgeErrorHandler** (consumer) | Allows for bridging the consumer to the 
Camel routing Error Handler which mean any exceptions occurred while the 
consumer is trying to pickup incoming messages or the likes will now be 
processed as a message and handled by the routing Error Handler. By default the 
consumer will use the org.apache.camel.spi.ExceptionHandler to deal with 
exceptions that will be logged at WARN or ERROR level and ignored. | false | 
boolean
+| **repeat** (consumer) | Should changes to the znode be 'watched' and 
repeatedly processed. | false | boolean
+| **sendEmptyMessageOnDelete** (consumer) | Upon the delete of a znode should 
an empty message be send to the consumer | true | boolean
+| **exceptionHandler** (consumer) | To let the consumer use a custom 
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this 
options is not in use. By default the consumer will deal with exceptions that 
will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
+| **exchangePattern** (consumer) | Sets the exchange pattern when the consumer 
creates an exchange. |  | ExchangePattern
+| **create** (producer) | Should the endpoint create the node if it does not 
currently exist. | false | boolean
+| **createMode** (producer) | The create mode that should be used for the 
newly created node | EPHEMERAL | String
+| **synchronous** (advanced) | Sets whether synchronous processing should be 
strictly used or Camel is allowed to use asynchronous processing (if 
supported). | false | boolean
 |=======================================================================
 // endpoint options: END
 

http://git-wip-us.apache.org/repos/asf/camel/blob/bb3764e3/platforms/spring-boot/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentConfiguration.java
----------------------------------------------------------------------
diff --git 
a/platforms/spring-boot/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentConfiguration.java
index 878b5ef..f30c727 100644
--- 
a/platforms/spring-boot/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spi.HeaderFilterStrategy;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import 
org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
-import org.springframework.context.ApplicationContext;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.jms.core.JmsOperations;
 import org.springframework.jms.support.converter.MessageConverter;
@@ -527,10 +526,6 @@ public class AMQPComponentConfiguration {
     @NestedConfigurationProperty
     private JmsKeyFormatStrategy jmsKeyFormatStrategy;
     /**
-     * Sets the Spring ApplicationContext to use
-     */
-    private ApplicationContext applicationContext;
-    /**
      * To use a custom QueueBrowseStrategy when browsing queues
      */
     @NestedConfigurationProperty
@@ -1132,14 +1127,6 @@ public class AMQPComponentConfiguration {
         this.jmsKeyFormatStrategy = jmsKeyFormatStrategy;
     }
 
-    public ApplicationContext getApplicationContext() {
-        return applicationContext;
-    }
-
-    public void setApplicationContext(ApplicationContext applicationContext) {
-        this.applicationContext = applicationContext;
-    }
-
     public QueueBrowseStrategy getQueueBrowseStrategy() {
         return queueBrowseStrategy;
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/bb3764e3/platforms/spring-boot/components-starter/camel-spring-starter/src/main/java/org/apache/camel/component/event/springboot/EventComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git 
a/platforms/spring-boot/components-starter/camel-spring-starter/src/main/java/org/apache/camel/component/event/springboot/EventComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-spring-starter/src/main/java/org/apache/camel/component/event/springboot/EventComponentAutoConfiguration.java
index 817e9f7..62b26a0 100644
--- 
a/platforms/spring-boot/components-starter/camel-spring-starter/src/main/java/org/apache/camel/component/event/springboot/EventComponentAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-spring-starter/src/main/java/org/apache/camel/component/event/springboot/EventComponentAutoConfiguration.java
@@ -16,11 +16,8 @@
  */
 package org.apache.camel.component.event.springboot;
 
-import java.util.HashMap;
-import java.util.Map;
 import org.apache.camel.CamelContext;
 import org.apache.camel.component.event.EventComponent;
-import org.apache.camel.util.IntrospectionSupport;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionMessage;
 import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
@@ -29,7 +26,6 @@ import 
org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import 
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.SpringBootCondition;
 import org.springframework.boot.bind.RelaxedPropertyResolver;
-import 
org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ConditionContext;
 import org.springframework.context.annotation.Conditional;
@@ -44,42 +40,16 @@ import org.springframework.core.type.AnnotatedTypeMetadata;
 @ConditionalOnBean(type = 
"org.apache.camel.spring.boot.CamelAutoConfiguration")
 @Conditional(EventComponentAutoConfiguration.Condition.class)
 @AutoConfigureAfter(name = 
"org.apache.camel.spring.boot.CamelAutoConfiguration")
-@EnableConfigurationProperties(EventComponentConfiguration.class)
 public class EventComponentAutoConfiguration {
 
     @Lazy
     @Bean(name = "spring-event-component")
     @ConditionalOnClass(CamelContext.class)
     @ConditionalOnMissingBean(EventComponent.class)
-    public EventComponent configureEventComponent(CamelContext camelContext,
-            EventComponentConfiguration configuration) throws Exception {
+    public EventComponent configureEventComponent(CamelContext camelContext)
+            throws Exception {
         EventComponent component = new EventComponent();
         component.setCamelContext(camelContext);
-        Map<String, Object> parameters = new HashMap<>();
-        IntrospectionSupport.getProperties(configuration, parameters, null,
-                false);
-        for (Map.Entry<String, Object> entry : parameters.entrySet()) {
-            Object value = entry.getValue();
-            Class<?> paramClass = value.getClass();
-            if (paramClass.getName().endsWith("NestedConfiguration")) {
-                Class nestedClass = null;
-                try {
-                    nestedClass = (Class) paramClass.getDeclaredField(
-                            "CAMEL_NESTED_CLASS").get(null);
-                    HashMap<String, Object> nestedParameters = new HashMap<>();
-                    IntrospectionSupport.getProperties(value, nestedParameters,
-                            null, false);
-                    Object nestedProperty = nestedClass.newInstance();
-                    IntrospectionSupport.setProperties(camelContext,
-                            camelContext.getTypeConverter(), nestedProperty,
-                            nestedParameters);
-                    entry.setValue(nestedProperty);
-                } catch (NoSuchFieldException e) {
-                }
-            }
-        }
-        IntrospectionSupport.setProperties(camelContext,
-                camelContext.getTypeConverter(), component, parameters);
         return component;
     }
 

Reply via email to