You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zr...@apache.org on 2019/07/22 07:14:02 UTC

[camel] branch master updated (bf86722 -> 831e466)

This is an automated email from the ASF dual-hosted git repository.

zregvart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from bf86722  camel-infinispan: move infinispan manger lifecycle from consumer/producer to endpoint
     new 085d28e  fixed incorrect cross references in core/camel-base
     new da3b41e  fixed incorrect cross references in core/camel-core
     new e8c9c80  fixed incorrect cross references in docs/components
     new f4624cb  Fixed cross references in camel/components
     new 90f7fb8  fixed incorrect cross references in docs/user-manual
     new 8e3139e  Regen
     new 870c356  first set of "asciidoctor: WARNING: skipping reference to missing attribute:"  fixed
     new 268d4b6  second set of asciidoctor: WARNING: skipping reference to missing attribute: fixed
     new c42d5c7  copied components from docs/components to camel/components
     new ba72d51  Fixes for CAMEL-13588
     new 1f36432  copied  appropriate .adoc files from usser-manal to camel/core/camel-core
     new 831e466  Revert "Regen"

The 12 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../camel-ahc/src/main/docs/ahc-component.adoc     |  2 +-
 .../camel-asn1/src/main/docs/asn1-dataformat.adoc  |  2 +-
 .../src/main/docs/aws-ddb-component.adoc           |  6 +-
 .../src/main/docs/aws-ddbstream-component.adoc     |  2 +-
 .../src/main/docs/aws-ec2-component.adoc           |  2 +-
 .../src/main/docs/aws-ecs-component.adoc           |  2 +-
 .../src/main/docs/aws-eks-component.adoc           |  2 +-
 .../src/main/docs/aws-iam-component.adoc           |  2 +-
 .../src/main/docs/aws-kinesis-component.adoc       |  2 +-
 .../main/docs/aws-kinesis-firehose-component.adoc  |  2 +-
 .../src/main/docs/aws-kms-component.adoc           |  2 +-
 .../src/main/docs/aws-lambda-component.adoc        |  2 +-
 .../src/main/docs/aws-mq-component.adoc            |  2 +-
 .../src/main/docs/aws-msk-component.adoc           |  2 +-
 .../src/main/docs/aws-s3-component.adoc            |  2 +-
 .../src/main/docs/aws-sdb-component.adoc           |  2 +-
 .../src/main/docs/aws-ses-component.adoc           |  2 +-
 .../src/main/docs/aws-sns-component.adoc           |  2 +-
 .../src/main/docs/aws-sqs-component.adoc           |  2 +-
 .../src/main/docs/aws-swf-component.adoc           |  2 +-
 .../src/main/docs/cometd-component.adoc            |  2 +-
 .../src/main/docs/controlbus-component.adoc        |  4 +-
 .../src/main/docs/crypto-component.adoc            |  2 +-
 .../camel-cxf/src/main/docs/cxf-component.adoc     |  4 +-
 .../src/main/docs/dataformat-component.adoc        |  6 +-
 .../src/main/docs/dataset-component.adoc           |  2 +-
 .../src/main/docs/dataset-test-component.adoc      |  2 +-
 .../main/docs/elasticsearch-rest-component.adoc    |  2 +-
 .../camel-elsql/src/main/docs/elsql-component.adoc |  2 +-
 .../camel-file/src/main/docs/file-component.adoc   | 26 +++---
 .../main/docs/google-bigquery-sql-component.adoc   |  2 +-
 .../camel-grape/src/main/docs/grape-component.adoc |  2 +-
 .../camel-grok/src/main/docs/grok-dataformat.adoc  |  4 +-
 .../src/main/docs/groovy-language.adoc             |  2 +-
 .../src/main/docs/hipchat-component.adoc           |  2 +-
 .../camel-http4/src/main/docs/http4-component.adoc |  2 +-
 .../camel-irc/src/main/docs/irc-component.adoc     |  2 +-
 components/camel-jasypt/src/main/docs/jasypt.adoc  |  2 +-
 .../src/main/docs/jcache-component.adoc            |  2 +-
 .../camel-jetty/src/main/docs/jetty-component.adoc |  4 +-
 .../camel-jms/src/main/docs/jms-component.adoc     |  2 +-
 .../src/main/docs/jsonpath-language.adoc           |  2 +-
 .../camel-kafka/src/main/docs/kafka-component.adoc |  4 +-
 .../src/main/docs/language-component.adoc          |  4 +-
 .../camel-mail/src/main/docs/mail-component.adoc   |  2 +-
 .../camel-mock/src/main/docs/mock-component.adoc   |  2 +-
 .../src/main/docs/netty4-component.adoc            |  2 +-
 .../camel-paho/src/main/docs/paho-component.adoc   |  2 +-
 .../src/main/docs/properties-component.adoc        | 10 +--
 .../src/main/docs/rest-swagger-component.adoc      |  2 +-
 .../camel-rest/src/main/docs/rest-component.adoc   |  4 +-
 .../src/main/docs/restlet-component.adoc           |  2 +-
 .../src/main/docs/xquery-component.adoc            |  2 +-
 .../camel-saxon/src/main/docs/xquery-language.adoc |  2 +-
 .../src/main/docs/servicenow-component.adoc        | 60 +++++++-------
 .../src/main/docs/spring-event-component.adoc      |  2 +-
 components/camel-spring/src/main/docs/spring.adoc  |  8 +-
 .../src/main/docs/testcontainers.adoc              |  4 +-
 .../src/main/docs/univocity-csv-dataformat.adoc    |  2 +-
 .../src/main/docs/univocity-fixed-dataformat.adoc  |  2 +-
 .../src/main/docs/univocity-tsv-dataformat.adoc    |  2 +-
 .../src/main/docs/websocket-component.adoc         |  2 +-
 .../src/main/docs/xmlsecurity-component.adoc       |  2 +-
 .../camel-xpath/src/main/docs/xpath-language.adoc  |  4 +-
 core/camel-base/src/main/docs/file-language.adoc   |  4 +-
 core/camel-base/src/main/docs/simple-language.adoc | 16 ++--
 .../src/main/docs/eips/aggregate-eip.adoc          |  2 +-
 core/camel-core/src/main/docs/eips/bean-eip.adoc   |  6 +-
 .../src/main/docs/eips/content-filter-eip.adoc     |  2 +-
 .../src/main/docs/eips/dynamic-router.adoc         |  6 +-
 core/camel-core/src/main/docs/eips/enrich-eip.adoc |  3 +-
 .../main/docs/eips/eventDrivenConsumer-eip.adoc    |  2 +-
 .../src/main/docs/eips/idempotentConsumer-eip.adoc | 14 ++--
 core/camel-core/src/main/docs/eips/log-eip.adoc    |  4 +-
 .../src/main/docs/eips/requestReply-eip.adoc       |  4 +-
 core/camel-core/src/main/docs/eips/step-eip.adoc   |  2 +-
 core/camel-core/src/main/docs/eips/toD-eip.adoc    |  4 +-
 .../src/main/docs/eips/unmarshal-eip.adoc          |  2 +-
 .../modules/ROOT/pages/ahc-component.adoc          |  2 +-
 .../modules/ROOT/pages/asn1-dataformat.adoc        |  2 +-
 .../modules/ROOT/pages/aws-ddb-component.adoc      |  6 +-
 .../ROOT/pages/aws-ddbstream-component.adoc        |  2 +-
 .../modules/ROOT/pages/aws-ec2-component.adoc      |  2 +-
 .../modules/ROOT/pages/aws-ecs-component.adoc      |  2 +-
 .../modules/ROOT/pages/aws-eks-component.adoc      |  2 +-
 .../modules/ROOT/pages/aws-iam-component.adoc      |  2 +-
 .../modules/ROOT/pages/aws-kinesis-component.adoc  |  2 +-
 .../ROOT/pages/aws-kinesis-firehose-component.adoc |  2 +-
 .../modules/ROOT/pages/aws-kms-component.adoc      |  2 +-
 .../modules/ROOT/pages/aws-lambda-component.adoc   |  2 +-
 .../modules/ROOT/pages/aws-mq-component.adoc       |  2 +-
 .../modules/ROOT/pages/aws-msk-component.adoc      |  2 +-
 .../modules/ROOT/pages/aws-s3-component.adoc       |  2 +-
 .../modules/ROOT/pages/aws-sdb-component.adoc      |  2 +-
 .../modules/ROOT/pages/aws-ses-component.adoc      |  2 +-
 .../modules/ROOT/pages/aws-sns-component.adoc      |  2 +-
 .../modules/ROOT/pages/aws-sqs-component.adoc      |  2 +-
 .../modules/ROOT/pages/aws-swf-component.adoc      |  2 +-
 .../modules/ROOT/pages/cometd-component.adoc       |  2 +-
 .../modules/ROOT/pages/controlbus-component.adoc   |  4 +-
 .../modules/ROOT/pages/crypto-component.adoc       |  2 +-
 .../modules/ROOT/pages/cxf-component.adoc          |  4 +-
 .../modules/ROOT/pages/dataformat-component.adoc   |  6 +-
 .../modules/ROOT/pages/dataset-component.adoc      |  2 +-
 .../modules/ROOT/pages/dataset-test-component.adoc |  2 +-
 .../ROOT/pages/elasticsearch-rest-component.adoc   |  2 +-
 .../modules/ROOT/pages/elsql-component.adoc        |  2 +-
 .../modules/ROOT/pages/file-component.adoc         | 26 +++---
 .../ROOT/pages/google-bigquery-sql-component.adoc  |  2 +-
 .../modules/ROOT/pages/grape-component.adoc        |  2 +-
 .../modules/ROOT/pages/grok-dataformat.adoc        |  4 +-
 .../modules/ROOT/pages/groovy-language.adoc        |  2 +-
 .../modules/ROOT/pages/hipchat-component.adoc      |  2 +-
 .../modules/ROOT/pages/http4-component.adoc        |  2 +-
 .../modules/ROOT/pages/irc-component.adoc          |  2 +-
 docs/components/modules/ROOT/pages/jasypt.adoc     |  2 +-
 .../modules/ROOT/pages/jcache-component.adoc       |  2 +-
 .../modules/ROOT/pages/jetty-component.adoc        |  4 +-
 .../modules/ROOT/pages/jms-component.adoc          |  2 +-
 .../modules/ROOT/pages/jsonpath-language.adoc      |  2 +-
 .../modules/ROOT/pages/kafka-component.adoc        |  4 +-
 .../modules/ROOT/pages/language-component.adoc     |  4 +-
 .../modules/ROOT/pages/mail-component.adoc         |  2 +-
 .../modules/ROOT/pages/mock-component.adoc         |  2 +-
 .../modules/ROOT/pages/netty4-component.adoc       |  2 +-
 .../modules/ROOT/pages/paho-component.adoc         |  2 +-
 .../modules/ROOT/pages/properties-component.adoc   | 10 +--
 .../modules/ROOT/pages/rest-component.adoc         |  4 +-
 .../modules/ROOT/pages/rest-swagger-component.adoc |  2 +-
 .../modules/ROOT/pages/restlet-component.adoc      |  2 +-
 .../modules/ROOT/pages/servicenow-component.adoc   | 60 +++++++-------
 .../modules/ROOT/pages/spring-event-component.adoc |  2 +-
 docs/components/modules/ROOT/pages/spring.adoc     |  8 +-
 .../modules/ROOT/pages/testcontainers.adoc         |  4 +-
 .../ROOT/pages/univocity-csv-dataformat.adoc       |  2 +-
 .../ROOT/pages/univocity-fixed-dataformat.adoc     |  2 +-
 .../ROOT/pages/univocity-tsv-dataformat.adoc       |  2 +-
 .../modules/ROOT/pages/websocket-component.adoc    |  2 +-
 .../modules/ROOT/pages/xmlsecurity-component.adoc  |  2 +-
 .../modules/ROOT/pages/xpath-language.adoc         |  4 +-
 .../modules/ROOT/pages/xquery-component.adoc       |  2 +-
 .../modules/ROOT/pages/xquery-language.adoc        |  2 +-
 .../modules/ROOT/pages/aggregate-eip.adoc          |  2 +-
 docs/user-manual/modules/ROOT/pages/async.adoc     |  4 +-
 .../ROOT/pages/asynchronous-routing-engine.adoc    | 38 ++++-----
 .../modules/ROOT/pages/backlog-tracer.adoc         |  2 +-
 .../modules/ROOT/pages/backlogdebugger.adoc        |  2 +-
 .../modules/ROOT/pages/bam-example.adoc            |  8 +-
 .../modules/ROOT/pages/batch-consumer.adoc         | 20 ++---
 docs/user-manual/modules/ROOT/pages/bean-eip.adoc  |  6 +-
 .../modules/ROOT/pages/bean-integration.adoc       |  6 +-
 .../modules/ROOT/pages/browsable-endpoint.adoc     |  8 +-
 .../ROOT/pages/camel-configuration-utilities.adoc  | 14 ++--
 .../modules/ROOT/pages/configuring-camel.adoc      |  2 +-
 ...ing-route-startup-ordering-and-autostartup.adoc |  2 +-
 .../modules/ROOT/pages/content-filter-eip.adoc     |  2 +-
 .../modules/ROOT/pages/correlation-identifier.adoc |  4 +-
 .../modules/ROOT/pages/data-format.adoc            | 56 ++++++-------
 .../modules/ROOT/pages/dead-letter-channel.adoc    |  2 +-
 docs/user-manual/modules/ROOT/pages/dsl.adoc       |  2 +-
 .../modules/ROOT/pages/dynamic-router.adoc         |  6 +-
 .../user-manual/modules/ROOT/pages/enrich-eip.adoc |  3 +-
 .../pages/enterprise-integration-patterns.adoc     |  2 +-
 .../ROOT/pages/error-handling-in-camel.adoc        |  8 +-
 .../modules/ROOT/pages/event-message.adoc          |  4 +-
 .../ROOT/pages/eventDrivenConsumer-eip.adoc        |  2 +-
 .../modules/ROOT/pages/exception-clause.adoc       |  4 +-
 .../modules/ROOT/pages/exchange-pattern.adoc       |  2 +-
 .../user-manual/modules/ROOT/pages/expression.adoc | 24 +++---
 docs/user-manual/modules/ROOT/pages/faq.adoc       |  4 +-
 ...ption-javaxnamingnoinitialcontextexception.adoc |  2 +-
 ...tion-orgapachecamelnosuchendpointexception.adoc |  2 +-
 .../faq/how-can-i-stop-a-route-from-a-route.adoc   |  4 +-
 .../pages/faq/how-do-i-configure-endpoints.adoc    |  8 +-
 ...ximum-endpoint-cache-size-for-camelcontext.adoc |  2 +-
 ...en-consuming-for-example-from-a-ftp-server.adoc |  4 +-
 .../faq/how-do-i-let-jetty-match-wildcards.adoc    |  4 +-
 ...ow-do-i-make-my-jms-endpoint-transactional.adoc |  4 +-
 ...om-a-certain-point-back-or-an-entire-route.adoc |  2 +-
 ...ify-time-period-in-a-human-friendly-syntax.adoc |  2 +-
 ...h-method-to-use-when-using-beans-in-routes.adoc |  2 +-
 ...spring-property-placeholder-with-camel-xml.adoc |  8 +-
 ...direct-event-seda-and-vm-endpoints-compare.adoc | 10 +--
 ...-do-the-timer-and-quartz-endpoints-compare.adoc |  2 +-
 .../pages/faq/how-does-camel-compare-to-mule.adoc  |  4 +-
 .../how-does-camel-compare-to-servicemix-eip.adoc  |  4 +-
 .../faq/how-does-camel-compare-to-servicemix.adoc  |  4 +-
 .../faq/how-does-camel-compare-to-synapse.adoc     |  2 +-
 ...how-does-camel-look-up-beans-and-endpoints.adoc |  6 +-
 .../faq/how-does-camel-work-with-activemq.adoc     |  6 +-
 .../faq/how-does-camel-work-with-servicemix.adoc   |  2 +-
 .../faq/how-does-the-camel-api-compare-to.adoc     |  8 +-
 ...-avoid-sending-some-or-all-message-headers.adoc |  2 +-
 .../ROOT/pages/faq/is-camel-ioc-friendly.adoc      |  4 +-
 .../modules/ROOT/pages/faq/is-there-an-ide.adoc    |  2 +-
 .../ROOT/pages/faq/running-camel-standalone.adoc   |  2 +-
 ...-activemq-broker-or-in-another-application.adoc |  2 +-
 .../modules/ROOT/pages/faq/what-is-camel.adoc      |  8 +-
 ...se-when-or-otherwise-in-a-java-camel-route.adoc |  2 +-
 ...use-too-many-threads-with-producertemplate.adoc |  4 +-
 ...-does-ftp-component-not-download-any-files.adoc |  2 +-
 ...-file-consumer-use-the-camel-error-handler.adoc |  6 +-
 ...jms-route-only-consume-one-message-at-once.adoc |  4 +-
 .../pages/faq/why-use-multiple-camelcontext.adoc   |  4 +-
 .../modules/ROOT/pages/file-language.adoc          |  4 +-
 .../modules/ROOT/pages/graceful-shutdown.adoc      |  4 +-
 .../modules/ROOT/pages/guaranteed-delivery.adoc    | 12 +--
 .../modules/ROOT/pages/http-session-handling.adoc  |  2 +-
 .../modules/ROOT/pages/idempotentConsumer-eip.adoc | 14 ++--
 docs/user-manual/modules/ROOT/pages/index.adoc     |  8 +-
 docs/user-manual/modules/ROOT/pages/injector.adoc  |  2 +-
 docs/user-manual/modules/ROOT/pages/intercept.adoc |  2 +-
 docs/user-manual/modules/ROOT/pages/jndi.adoc      |  2 +-
 docs/user-manual/modules/ROOT/pages/languages.adoc | 18 ++---
 docs/user-manual/modules/ROOT/pages/log-eip.adoc   |  4 +-
 .../modules/ROOT/pages/message-bus.adoc            |  2 +-
 .../modules/ROOT/pages/message-channel.adoc        |  2 +-
 .../modules/ROOT/pages/message-translator.adoc     |  4 +-
 .../modules/ROOT/pages/point-to-point-channel.adoc | 10 +--
 docs/user-manual/modules/ROOT/pages/predicate.adoc |  2 +-
 .../ROOT/pages/publish-subscribe-channel.adoc      |  8 +-
 .../modules/ROOT/pages/release-guide.adoc          | 94 +++++++++++-----------
 .../modules/ROOT/pages/requestReply-eip.adoc       |  4 +-
 docs/user-manual/modules/ROOT/pages/rest-dsl.adoc  | 20 ++---
 .../modules/ROOT/pages/return-address.adoc         |  2 +-
 .../modules/ROOT/pages/route-policy.adoc           |  4 +-
 .../ROOT/pages/scala-dsl-supported-languages.adoc  |  2 +-
 .../modules/ROOT/pages/scripting-languages.adoc    |  4 +-
 .../modules/ROOT/pages/servlet-tomcat-example.adoc |  6 +-
 .../modules/ROOT/pages/simple-language.adoc        | 16 ++--
 .../modules/ROOT/pages/spring-testing.adoc         | 10 +--
 docs/user-manual/modules/ROOT/pages/spring.adoc    | 10 +--
 docs/user-manual/modules/ROOT/pages/step-eip.adoc  |  2 +-
 .../modules/ROOT/pages/stream-caching.adoc         |  2 +-
 docs/user-manual/modules/ROOT/pages/testing.adoc   | 14 ++--
 .../modules/ROOT/pages/threading-model.adoc        |  2 +-
 docs/user-manual/modules/ROOT/pages/toD-eip.adoc   |  4 +-
 .../modules/ROOT/pages/transactional-client.adoc   |  8 +-
 .../modules/ROOT/pages/try-catch-finally.adoc      |  6 +-
 .../modules/ROOT/pages/unmarshal-eip.adoc          |  2 +-
 .../ROOT/pages/using-propertyplaceholder.adoc      | 10 +--
 docs/user-manual/modules/ROOT/pages/validator.adoc |  2 +-
 .../modules/ROOT/pages/writing-components.adoc     |  2 +-
 .../modules/ROOT/pages/xml-configuration.adoc      |  6 +-
 .../modules/ROOT/pages/xml-reference.adoc          |  2 +-
 245 files changed, 638 insertions(+), 640 deletions(-)


[camel] 11/12: copied appropriate .adoc files from usser-manal to camel/core/camel-core

Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 1f364324752b5fa6e4b57f2d9399bd41067ca519
Author: nayananga@acerubuntu18.04 <na...@gmail.com>
AuthorDate: Sun Jul 21 16:40:46 2019 +0530

    copied  appropriate .adoc files from usser-manal to camel/core/camel-core
---
 core/camel-core/src/main/docs/eips/enrich-eip.adoc | 3 +--
 core/camel-core/src/main/docs/eips/step-eip.adoc   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/camel-core/src/main/docs/eips/enrich-eip.adoc b/core/camel-core/src/main/docs/eips/enrich-eip.adoc
index 2098fff..f5ab883 100644
--- a/core/camel-core/src/main/docs/eips/enrich-eip.adoc
+++ b/core/camel-core/src/main/docs/eips/enrich-eip.adoc
@@ -89,9 +89,8 @@ The other one is `pollEnrich`
 `enrich` uses a Producer to obtain the additional data. It is usually used for Request Reply messaging, for instance to invoke an external web service.
 
 Both `enrich` and `pollEnrich` supports dynamic endpoints that uses an Expression to compute the uri, which allows to use data from the current Exchange.
-====
 
-A little enrich example using Java:
+==== A little enrich example using Java:
 
 [source,java]
 ----
diff --git a/core/camel-core/src/main/docs/eips/step-eip.adoc b/core/camel-core/src/main/docs/eips/step-eip.adoc
index a61726f..459c4a0 100644
--- a/core/camel-core/src/main/docs/eips/step-eip.adoc
+++ b/core/camel-core/src/main/docs/eips/step-eip.adoc
@@ -24,7 +24,7 @@ This means you can monitor your Camel applications and gather statistics at 4-ti
 *** processor(s) level
 
 
-==== JMX Management
+=== JMX Management
 
 Each Step EIP is registered in JMX under the `type=steps` tree, which allows to monitor
 all the steps in the CamelContext. Its also possible to dump statistics in XML format


[camel] 08/12: second set of asciidoctor: WARNING: skipping reference to missing attribute: fixed

Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 268d4b6330a504883ce05b7453b11c1ed9e241f7
Author: nayananga@acerubuntu18.04 <na...@gmail.com>
AuthorDate: Sun Jul 21 02:16:15 2019 +0530

    second set of asciidoctor: WARNING: skipping reference to missing attribute: fixed
---
 .../modules/ROOT/pages/faq/how-do-i-configure-endpoints.adoc            | 2 +-
 .../faq/how-do-i-use-spring-property-placeholder-with-camel-xml.adoc    | 2 +-
 docs/user-manual/modules/ROOT/pages/threading-model.adoc                | 2 +-
 docs/user-manual/modules/ROOT/pages/using-propertyplaceholder.adoc      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-configure-endpoints.adoc b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-configure-endpoints.adoc
index 743d4fe..3f5cf25 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-configure-endpoints.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-configure-endpoints.adoc
@@ -188,7 +188,7 @@ documentation for more details.
 </camelContext>
 ----
 
-And the Camel route now refers to the placeholder using the `{{key}}`
+And the Camel route now refers to the placeholder using the `{\{key\}}`
 notation:
 
 [source,java]
diff --git a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-use-spring-property-placeholder-with-camel-xml.adoc b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-use-spring-property-placeholder-with-camel-xml.adoc
index 69fc8a3..46d3ea4 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-use-spring-property-placeholder-with-camel-xml.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-use-spring-property-placeholder-with-camel-xml.adoc
@@ -1,7 +1,7 @@
 [[HowdoIuseSpringPropertyPlaceholderwithCamelXML-HowdoIuseSpringPropertyPlaceholderwithCamelXML]]
 === How do I use Spring Property Placeholder with Camel XML
 
-We do *NOT* yet support the `${something}` notation inside arbitrary
+We do *NOT* yet support the `$\{something\}` notation inside arbitrary
 Camel XML. For example at the time of writing this is *NOT* supported
 (due Spring limitations).
 
diff --git a/docs/user-manual/modules/ROOT/pages/threading-model.adoc b/docs/user-manual/modules/ROOT/pages/threading-model.adoc
index 32c994a..7713b7e 100644
--- a/docs/user-manual/modules/ROOT/pages/threading-model.adoc
+++ b/docs/user-manual/modules/ROOT/pages/threading-model.adoc
@@ -146,7 +146,7 @@ thread.
 The default pattern is for:
 
 * *Camel 2.9.x or older:*
-`Camel (${camelId}) thread #${counter} - ${name}`
+`Camel ($\{camelId\}) thread #$\{counter\} - $\{name\}`
 * *Camel 2.10 onwards:* `Camel (#camelId#) thread ##counter# - #name#`
 
 Notice we renamed the tokens from Camel 2.10 onwards to not clash with
diff --git a/docs/user-manual/modules/ROOT/pages/using-propertyplaceholder.adoc b/docs/user-manual/modules/ROOT/pages/using-propertyplaceholder.adoc
index b97c58b..97deef0 100644
--- a/docs/user-manual/modules/ROOT/pages/using-propertyplaceholder.adoc
+++ b/docs/user-manual/modules/ROOT/pages/using-propertyplaceholder.adoc
@@ -40,7 +40,7 @@ property component
 ==== Format
 
 The value of a Camel property can be obtained by specifying its key name
-within a property placeholder, using the following format: `{{key}}`
+within a property placeholder, using the following format: `{\{key\}}`
 
 For example:
 ....


[camel] 07/12: first set of "asciidoctor: WARNING: skipping reference to missing attribute:" fixed

Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 870c35648dae15ff9cbbe33fc54ef8878dc0c5bf
Author: nayananga@acerubuntu18.04 <na...@gmail.com>
AuthorDate: Sun Jul 21 01:52:57 2019 +0530

    first set of "asciidoctor: WARNING: skipping reference to missing attribute:"  fixed
---
 .../modules/ROOT/pages/asn1-dataformat.adoc        |  2 +-
 .../modules/ROOT/pages/aws-ddb-component.adoc      |  6 +--
 .../ROOT/pages/aws-ddbstream-component.adoc        |  2 +-
 .../modules/ROOT/pages/aws-ec2-component.adoc      |  2 +-
 .../modules/ROOT/pages/aws-ecs-component.adoc      |  2 +-
 .../modules/ROOT/pages/aws-eks-component.adoc      |  2 +-
 .../modules/ROOT/pages/aws-iam-component.adoc      |  2 +-
 .../modules/ROOT/pages/aws-kinesis-component.adoc  |  2 +-
 .../ROOT/pages/aws-kinesis-firehose-component.adoc |  2 +-
 .../modules/ROOT/pages/aws-kms-component.adoc      |  2 +-
 .../modules/ROOT/pages/aws-lambda-component.adoc   |  2 +-
 .../modules/ROOT/pages/aws-mq-component.adoc       |  2 +-
 .../modules/ROOT/pages/aws-msk-component.adoc      |  2 +-
 .../modules/ROOT/pages/aws-s3-component.adoc       |  2 +-
 .../modules/ROOT/pages/aws-sdb-component.adoc      |  2 +-
 .../modules/ROOT/pages/aws-ses-component.adoc      |  2 +-
 .../modules/ROOT/pages/aws-sns-component.adoc      |  2 +-
 .../modules/ROOT/pages/aws-sqs-component.adoc      |  2 +-
 .../modules/ROOT/pages/aws-swf-component.adoc      |  2 +-
 .../modules/ROOT/pages/cxf-component.adoc          |  4 +-
 .../ROOT/pages/google-bigquery-sql-component.adoc  |  2 +-
 .../modules/ROOT/pages/grok-dataformat.adoc        |  4 +-
 .../modules/ROOT/pages/hipchat-component.adoc      |  2 +-
 docs/components/modules/ROOT/pages/jasypt.adoc     |  2 +-
 .../modules/ROOT/pages/jcache-component.adoc       |  2 +-
 .../modules/ROOT/pages/jsonpath-language.adoc      |  2 +-
 .../modules/ROOT/pages/kafka-component.adoc        |  4 +-
 .../modules/ROOT/pages/properties-component.adoc   |  2 +-
 .../modules/ROOT/pages/rest-component.adoc         |  4 +-
 .../modules/ROOT/pages/rest-swagger-component.adoc |  2 +-
 .../modules/ROOT/pages/restlet-component.adoc      |  2 +-
 .../modules/ROOT/pages/servicenow-component.adoc   | 60 +++++++++++-----------
 .../modules/ROOT/pages/testcontainers.adoc         |  4 +-
 .../modules/ROOT/pages/stream-caching.adoc         |  2 +-
 .../modules/ROOT/pages/threading-model.adoc        |  2 +-
 35 files changed, 71 insertions(+), 71 deletions(-)

diff --git a/docs/components/modules/ROOT/pages/asn1-dataformat.adoc b/docs/components/modules/ROOT/pages/asn1-dataformat.adoc
index 6b2ac84..4e1065a 100644
--- a/docs/components/modules/ROOT/pages/asn1-dataformat.adoc
+++ b/docs/components/modules/ROOT/pages/asn1-dataformat.adoc
@@ -73,7 +73,7 @@ from("direct:unmarshal").unmarshal(asn1).split(body(Iterator.class)).streaming()
 
 In the last example we unmarshal BER file payload to plain old Java Objects using Split EIP. The reason for applying Split EIP is already mentioned in the previous example. Please note and keep in mind that reason. In such example we also need to set the fully qualified name of the class or <YourObject>.class reference through data format.
 The important thing to note here is that your object should have been generated by jasn1 compiler which is a nice tool to generate java object representations of your ASN.1 structure. For the reference usage of jasn1 compiler see [JASN.1 Project Page](https://www.beanit.com/asn1/) and please also see how the compiler is invoked with the help of maven's exec plugin.
-For example, in this data format's unit tests an example ASN.1 structure(TestSMSBerCdr.asn1) is added in `src/test/resources/asn1_structure`. jasn1 compiler is invoked and java object's representations are generated in `${basedir}/target/generated/src/test/java`
+For example, in this data format's unit tests an example ASN.1 structure(TestSMSBerCdr.asn1) is added in `src/test/resources/asn1_structure`. jasn1 compiler is invoked and java object's representations are generated in `$\{basedir\}/target/generated/src/test/java`
 The nice thing about this example, you will get POJO instance at the mock endpoint or at whatever your endpoint is.    
 
 [source,java]
diff --git a/docs/components/modules/ROOT/pages/aws-ddb-component.adoc b/docs/components/modules/ROOT/pages/aws-ddb-component.adoc
index 728a4e6..8c74729 100644
--- a/docs/components/modules/ROOT/pages/aws-ddb-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-ddb-component.adoc
@@ -247,13 +247,13 @@ processed with the current response.
 |=======================================================================
 |Header |Type |Description
 
-|`CamelAwsDdbProvisionedThroughput` |{{ProvisionedThroughputDescription}} |The value of the ProvisionedThroughput property for this table
+|`CamelAwsDdbProvisionedThroughput` |{\{ProvisionedThroughputDescription\}} |The value of the ProvisionedThroughput property for this table
 
 |`CamelAwsDdbCreationDate` |`Date` |Creation DateTime of this table.
 
 |`CamelAwsDdbTableItemCount` |`Long` |Item count for this table.
 
-|`CamelAwsDdbKeySchema` |{{KeySchema}} |The KeySchema that identifies the primary key for this table.
+|`CamelAwsDdbKeySchema` |{\{KeySchema\}} |The KeySchema that identifies the primary key for this table.
 
 
 |`CamelAwsDdbTableName` |`String` |The table name.
@@ -383,7 +383,7 @@ Maven users will need to add the following dependency to their pom.xml.
 </dependency>
 ---------------------------------------
 
-where `\${camel-version}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
 
 ### See Also
 
diff --git a/docs/components/modules/ROOT/pages/aws-ddbstream-component.adoc b/docs/components/modules/ROOT/pages/aws-ddbstream-component.adoc
index 6697a5d..c8d85f9 100644
--- a/docs/components/modules/ROOT/pages/aws-ddbstream-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-ddbstream-component.adoc
@@ -240,7 +240,7 @@ Maven users will need to add the following dependency to their pom.xml.
 </dependency>
 ---------------------------------------
 
-where `\${camel-version}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
 
 ### See Also
 
diff --git a/docs/components/modules/ROOT/pages/aws-ec2-component.adoc b/docs/components/modules/ROOT/pages/aws-ec2-component.adoc
index ffa6bf9..b1ab7c9 100644
--- a/docs/components/modules/ROOT/pages/aws-ec2-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-ec2-component.adoc
@@ -181,7 +181,7 @@ Maven users will need to add the following dependency to their pom.xml.
 </dependency>
 ---------------------------------------
 
-where `\${camel-version}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
 
 ### See Also
 
diff --git a/docs/components/modules/ROOT/pages/aws-ecs-component.adoc b/docs/components/modules/ROOT/pages/aws-ecs-component.adoc
index 9c3dbc7..928aa24 100644
--- a/docs/components/modules/ROOT/pages/aws-ecs-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-ecs-component.adoc
@@ -175,7 +175,7 @@ Maven users will need to add the following dependency to their pom.xml.
 </dependency>
 ---------------------------------------
 
-where `\${camel-version}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
 
 ### See Also
 
diff --git a/docs/components/modules/ROOT/pages/aws-eks-component.adoc b/docs/components/modules/ROOT/pages/aws-eks-component.adoc
index ab0fd55..a33a1ff 100644
--- a/docs/components/modules/ROOT/pages/aws-eks-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-eks-component.adoc
@@ -181,7 +181,7 @@ Maven users will need to add the following dependency to their pom.xml.
 </dependency>
 ---------------------------------------
 
-where `\${camel-version}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
 
 ### See Also
 
diff --git a/docs/components/modules/ROOT/pages/aws-iam-component.adoc b/docs/components/modules/ROOT/pages/aws-iam-component.adoc
index ed93c70..4489a77 100644
--- a/docs/components/modules/ROOT/pages/aws-iam-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-iam-component.adoc
@@ -190,7 +190,7 @@ Maven users will need to add the following dependency to their pom.xml.
 </dependency>
 ---------------------------------------
 
-where `\${camel-version}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
 
 ### See Also
 
diff --git a/docs/components/modules/ROOT/pages/aws-kinesis-component.adoc b/docs/components/modules/ROOT/pages/aws-kinesis-component.adoc
index 6db0f8c4..54daab3 100644
--- a/docs/components/modules/ROOT/pages/aws-kinesis-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-kinesis-component.adoc
@@ -270,7 +270,7 @@ Maven users will need to add the following dependency to their pom.xml.
 </dependency>
 ---------------------------------------
 
-where `\${camel-version}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
 
 ### See Also
 
diff --git a/docs/components/modules/ROOT/pages/aws-kinesis-firehose-component.adoc b/docs/components/modules/ROOT/pages/aws-kinesis-firehose-component.adoc
index cff249c..8423426 100644
--- a/docs/components/modules/ROOT/pages/aws-kinesis-firehose-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-kinesis-firehose-component.adoc
@@ -206,7 +206,7 @@ Maven users will need to add the following dependency to their pom.xml.
 </dependency>
 ---------------------------------------
 
-where `\${camel-version}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
 
 ### See Also
 
diff --git a/docs/components/modules/ROOT/pages/aws-kms-component.adoc b/docs/components/modules/ROOT/pages/aws-kms-component.adoc
index 8df26df..6ae5c2e 100644
--- a/docs/components/modules/ROOT/pages/aws-kms-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-kms-component.adoc
@@ -179,7 +179,7 @@ Maven users will need to add the following dependency to their pom.xml.
 </dependency>
 ---------------------------------------
 
-where `\${camel-version}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
 
 ### See Also
 
diff --git a/docs/components/modules/ROOT/pages/aws-lambda-component.adoc b/docs/components/modules/ROOT/pages/aws-lambda-component.adoc
index 38368b7..35ca291 100644
--- a/docs/components/modules/ROOT/pages/aws-lambda-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-lambda-component.adoc
@@ -241,7 +241,7 @@ Maven users will need to add the following dependency to their pom.xml.
 </dependency>
 ---------------------------------------
 
-where `\${camel-version}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
 
 ### See Also
 
diff --git a/docs/components/modules/ROOT/pages/aws-mq-component.adoc b/docs/components/modules/ROOT/pages/aws-mq-component.adoc
index bb21314..e58c310 100644
--- a/docs/components/modules/ROOT/pages/aws-mq-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-mq-component.adoc
@@ -180,7 +180,7 @@ Maven users will need to add the following dependency to their pom.xml.
 </dependency>
 ---------------------------------------
 
-where `\${camel-version}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
 
 ### See Also
 
diff --git a/docs/components/modules/ROOT/pages/aws-msk-component.adoc b/docs/components/modules/ROOT/pages/aws-msk-component.adoc
index 629ab34..4898489 100644
--- a/docs/components/modules/ROOT/pages/aws-msk-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-msk-component.adoc
@@ -183,7 +183,7 @@ Maven users will need to add the following dependency to their pom.xml.
 </dependency>
 ---------------------------------------
 
-where `\${camel-version}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
 
 ### See Also
 
diff --git a/docs/components/modules/ROOT/pages/aws-s3-component.adoc b/docs/components/modules/ROOT/pages/aws-s3-component.adoc
index 1e1bd99..6bdd541 100644
--- a/docs/components/modules/ROOT/pages/aws-s3-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-s3-component.adoc
@@ -536,7 +536,7 @@ Maven users will need to add the following dependency to their pom.xml.
 </dependency>
 ---------------------------------------
 
-where `\${camel-version}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
 
 ### See Also
 
diff --git a/docs/components/modules/ROOT/pages/aws-sdb-component.adoc b/docs/components/modules/ROOT/pages/aws-sdb-component.adoc
index 7a0c379..02ad976 100644
--- a/docs/components/modules/ROOT/pages/aws-sdb-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-sdb-component.adoc
@@ -255,7 +255,7 @@ Maven users will need to add the following dependency to their pom.xml.
 </dependency>
 ---------------------------------------
 
-where `\${camel-version}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
 
 ### See Also
 
diff --git a/docs/components/modules/ROOT/pages/aws-ses-component.adoc b/docs/components/modules/ROOT/pages/aws-ses-component.adoc
index be3e459..22ea4ad 100644
--- a/docs/components/modules/ROOT/pages/aws-ses-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-ses-component.adoc
@@ -216,7 +216,7 @@ This may be really useful for smarter configuration of the endpoint.
 </dependency>
 ---------------------------------------
 
-where `\${camel-version}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
 
 ### See Also
 
diff --git a/docs/components/modules/ROOT/pages/aws-sns-component.adoc b/docs/components/modules/ROOT/pages/aws-sns-component.adoc
index a66c8ab..3c544af 100644
--- a/docs/components/modules/ROOT/pages/aws-sns-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-sns-component.adoc
@@ -251,7 +251,7 @@ Maven users will need to add the following dependency to their pom.xml.
 </dependency>
 ---------------------------------------
 
-where `\${camel-version}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
 
 ### See Also
 
diff --git a/docs/components/modules/ROOT/pages/aws-sqs-component.adoc b/docs/components/modules/ROOT/pages/aws-sqs-component.adoc
index 97bc970..6033f29 100644
--- a/docs/components/modules/ROOT/pages/aws-sqs-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-sqs-component.adoc
@@ -323,7 +323,7 @@ Maven users will need to add the following dependency to their pom.xml.
 </dependency>
 ---------------------------------------
 
-where `\${camel-version}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
 
 ### JMS-style Selectors
 
diff --git a/docs/components/modules/ROOT/pages/aws-swf-component.adoc b/docs/components/modules/ROOT/pages/aws-swf-component.adoc
index 4f4e8e5..5386501 100644
--- a/docs/components/modules/ROOT/pages/aws-swf-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-swf-component.adoc
@@ -306,7 +306,7 @@ Maven users will need to add the following dependency to their pom.xml.
 </dependency>
 ---------------------------------------
 
-where `\${camel-version}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
 
 ### See Also
 
diff --git a/docs/components/modules/ROOT/pages/cxf-component.adoc b/docs/components/modules/ROOT/pages/cxf-component.adoc
index 38f3e9f..ac9e9d4 100644
--- a/docs/components/modules/ROOT/pages/cxf-component.adoc
+++ b/docs/components/modules/ROOT/pages/cxf-component.adoc
@@ -152,7 +152,7 @@ with the following path and query parameters:
 | *bus* (advanced) | To use a custom configured CXF Bus. |  | Bus
 | *continuationTimeout* (advanced) | This option is used to set the CXF continuation timeout which could be used in CxfConsumer by default when the CXF server is using Jetty or Servlet transport. | 30000 | long
 | *cxfBinding* (advanced) | To use a custom CxfBinding to control the binding between Camel Message and CXF Message. |  | CxfBinding
-| *cxfEndpointConfigurer* (advanced) | This option could apply the implementation of org.apache.camel.component.cxf.CxfEndpointConfigurer which supports to configure the CXF endpoint in programmatic way. User can configure the CXF server and client by implementing configure{ServerClient} method of CxfEndpointConfigurer. |  | CxfEndpointConfigurer
+| *cxfEndpointConfigurer* (advanced) | This option could apply the implementation of org.apache.camel.component.cxf.CxfEndpointConfigurer which supports to configure the CXF endpoint in programmatic way. User can configure the CXF server and client by implementing configure{\ServerClient\} method of CxfEndpointConfigurer. |  | CxfEndpointConfigurer
 | *defaultBus* (advanced) | Will set the default bus when CXF endpoint create a bus by itself | false | boolean
 | *headerFilterStrategy* (advanced) | To use a custom HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *mergeProtocolHeaders* (advanced) | Whether to merge protocol headers. If enabled then propagating headers between Camel and CXF becomes more consistent and similar. For more details see CAMEL-6393. | false | boolean
@@ -450,7 +450,7 @@ which operation you are calling.
 Be sure to include the JAX-WS `schemaLocation` attribute specified on
 the root beans element. This allows CXF to validate the file and is
 required. Also note the namespace declarations at the end of the
-`<cxf:cxfEndpoint/>` tag. These declarations are required because the combined `{namespace}localName` syntax is presently not supported for this tag's
+`<cxf:cxfEndpoint/>` tag. These declarations are required because the combined `\{namespace\}localName` syntax is presently not supported for this tag's
 attribute values.
 
 The `cxf:cxfEndpoint` element supports many additional attributes:
diff --git a/docs/components/modules/ROOT/pages/google-bigquery-sql-component.adoc b/docs/components/modules/ROOT/pages/google-bigquery-sql-component.adoc
index a8d4b0f..007c317 100644
--- a/docs/components/modules/ROOT/pages/google-bigquery-sql-component.adoc
+++ b/docs/components/modules/ROOT/pages/google-bigquery-sql-component.adoc
@@ -60,7 +60,7 @@ Examples:
 --------------------------------------------------------
 where
 
- * parameters in form \${name} are extracted from message headers and formed the translated query
+ * parameters in form $\{name\} are extracted from message headers and formed the translated query
  * parameters in form @name are extracted from body or message headers and sent to Google Bigquery
 
 You can externalize your SQL queries to files in the classpath or file system as shown:
diff --git a/docs/components/modules/ROOT/pages/grok-dataformat.adoc b/docs/components/modules/ROOT/pages/grok-dataformat.adoc
index b1413af..e864b08 100644
--- a/docs/components/modules/ROOT/pages/grok-dataformat.adoc
+++ b/docs/components/modules/ROOT/pages/grok-dataformat.adoc
@@ -100,7 +100,7 @@ The Grok dataformat supports 5 options, which are listed below.
 | pattern |  | String | The grok pattern to match lines of input
 | flattened | false | Boolean | Turns on flattened mode. In flattened mode the exception is thrown when there are multiple pattern matches with same key.
 | allowMultipleMatchesPerLine | true | Boolean | If false, every line of input is matched for pattern only once. Otherwise the line can be scanned multiple times when non-terminal pattern is used.
-| namedOnly | false | Boolean | Whether to capture named expressions only or not (i.e. %{IP:ip} but not \${IP})
+| namedOnly | false | Boolean | Whether to capture named expressions only or not (i.e. %{IP:ip} but not $\{IP\})
 | contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
@@ -131,7 +131,7 @@ The component supports 6 options, which are listed below.
 | *camel.dataformat.grok.content-type-header* | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc. | false | Boolean
 | *camel.dataformat.grok.enabled* | Whether to enable auto configuration of the grok data format. This is enabled by default. |  | Boolean
 | *camel.dataformat.grok.flattened* | Turns on flattened mode. In flattened mode the exception is thrown when there are multiple pattern matches with same key. | false | Boolean
-| *camel.dataformat.grok.named-only* | Whether to capture named expressions only or not (i.e. %{IP:ip} but not \${IP}) | false | Boolean
+| *camel.dataformat.grok.named-only* | Whether to capture named expressions only or not (i.e. %{IP:ip} but not $\{IP\}) | false | Boolean
 | *camel.dataformat.grok.pattern* | The grok pattern to match lines of input |  | String
 |===
 // spring-boot-auto-configure options: END
diff --git a/docs/components/modules/ROOT/pages/hipchat-component.adoc b/docs/components/modules/ROOT/pages/hipchat-component.adoc
index f1cdd59..7b2aca6 100644
--- a/docs/components/modules/ROOT/pages/hipchat-component.adoc
+++ b/docs/components/modules/ROOT/pages/hipchat-component.adoc
@@ -258,4 +258,4 @@ Maven users will need to add the following dependency to their pom.xml.
 </dependency>
 ------------------------------------------
 
-where `\${camel-version}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
diff --git a/docs/components/modules/ROOT/pages/jasypt.adoc b/docs/components/modules/ROOT/pages/jasypt.adoc
index aa4c43f..c8485ff 100644
--- a/docs/components/modules/ROOT/pages/jasypt.adoc
+++ b/docs/components/modules/ROOT/pages/jasypt.adoc
@@ -100,7 +100,7 @@ The idea is then to use those encrypted values in your
 xref:properties-component.adoc[Properties] files. Notice how the password value is
 encrypted and the value has the tokens surrounding `ENC(value here)`
 
-TIP: When running jasypt tooling, if you come across `java.lang.NoClassDefFoundError: org/jasypt/encryption/pbe/StandardPBEStringEncryptor` this means you have to include jasypt{version}.jar in your classpath. Example of adding jar to classpath may be copying jasypt{version}.jar to $JAVA_HOME\jre\lib\ext if you are going to run as `java -jar ...`. The latter may be adding jasypt{version}.jar to classpath using `-cp`, in that case you should provide main class to execute as eg: `java -cp  [...]
+TIP: When running jasypt tooling, if you come across `java.lang.NoClassDefFoundError: org/jasypt/encryption/pbe/StandardPBEStringEncryptor` this means you have to include jasypt\{version\}.jar in your classpath. Example of adding jar to classpath may be copying jasypt\{version\}.jar to $JAVA_HOME\jre\lib\ext if you are going to run as `java -jar ...`. The latter may be adding jasypt\{version\}.jar to classpath using `-cp`, in that case you should provide main class to execute as eg: `jav [...]
 
 
 ### URI Options
diff --git a/docs/components/modules/ROOT/pages/jcache-component.adoc b/docs/components/modules/ROOT/pages/jcache-component.adoc
index 70bdca8..bc1cc13 100644
--- a/docs/components/modules/ROOT/pages/jcache-component.adoc
+++ b/docs/components/modules/ROOT/pages/jcache-component.adoc
@@ -238,7 +238,7 @@ The _.log()_ at the beginning and at the end of the route is always called, but
 
 ## KeyExpression
 
-By default the policy uses the received Exchange body as _key_, so the default expression is like _simple("${body})_.
+By default the policy uses the received Exchange body as _key_, so the default expression is like _simple("$\{body\})_.
  We can set a different Camel Expression as _keyExpression_ which will be evaluated to determine the key.
  For example if we try to find an _order_ by an _orderId_ which is in the message headers,
  set _header("orderId")_ (or _simple("${header.orderId})_ as _keyExpression_.
diff --git a/docs/components/modules/ROOT/pages/jsonpath-language.adoc b/docs/components/modules/ROOT/pages/jsonpath-language.adoc
index e15dd12..72280c2 100644
--- a/docs/components/modules/ROOT/pages/jsonpath-language.adoc
+++ b/docs/components/modules/ROOT/pages/jsonpath-language.adoc
@@ -212,7 +212,7 @@ This option is also available on the `@JsonPath` annotation.
 
 *Available as of Camel 2.18*
 
-Its now possible to inlined Simple language expressions in the JSonPath expression using the simple syntax \${xxx}.
+Its now possible to inlined Simple language expressions in the JSonPath expression using the simple syntax $\{xxx\}.
 An example is shown below:
 
 [source,java]
diff --git a/docs/components/modules/ROOT/pages/kafka-component.adoc b/docs/components/modules/ROOT/pages/kafka-component.adoc
index b404964..35e2b6e 100644
--- a/docs/components/modules/ROOT/pages/kafka-component.adoc
+++ b/docs/components/modules/ROOT/pages/kafka-component.adoc
@@ -153,7 +153,7 @@ with the following path and query parameters:
 | *interceptorClasses* (monitoring) | Sets interceptors for producer or consumers. Producer interceptors have to be classes implementing org.apache.kafka.clients.producer.ProducerInterceptor Consumer interceptors have to be classes implementing org.apache.kafka.clients.consumer.ConsumerInterceptor Note that if you use Producer interceptor on a consumer it will throw a class cast exception in runtime |  | String
 | *kerberosBeforeReloginMin Time* (security) | Login thread sleep time between refresh attempts. | 60000 | Integer
 | *kerberosInitCmd* (security) | Kerberos kinit command path. Default is /usr/bin/kinit | /usr/bin/kinit | String
-| *kerberosPrincipalToLocal Rules* (security) | A list of rules for mapping from principal names to short names (typically operating system usernames). The rules are evaluated in order and the first rule that matches a principal name is used to map it to a short name. Any later rules in the list are ignored. By default, principal names of the form {username}/{hostname}{REALM} are mapped to {username}. For more details on the format please see the security authorization and acls documenta [...]
+| *kerberosPrincipalToLocal Rules* (security) | A list of rules for mapping from principal names to short names (typically operating system usernames). The rules are evaluated in order and the first rule that matches a principal name is used to map it to a short name. Any later rules in the list are ignored. By default, principal names of the form \{username\}/\{hostname\}\{REALM\} are mapped to \{username\}. For more details on the format please see the security authorization and acls d [...]
 | *kerberosRenewJitter* (security) | Percentage of random jitter added to the renewal time. | 0.05 | Double
 | *kerberosRenewWindowFactor* (security) | Login thread will sleep until the specified window factor of time from last refresh to ticket's expiry has been reached, at which time it will try to renew the ticket. | 0.8 | Double
 | *saslJaasConfig* (security) | Expose the kafka sasl.jaas.config parameter Example: org.apache.kafka.common.security.plain.PlainLoginModule required username=USERNAME password=PASSWORD; |  | String
@@ -234,7 +234,7 @@ The component supports 101 options, which are listed below.
 | *camel.component.kafka.configuration.kafka-header-serializer* | Sets custom KafkaHeaderDeserializer for serialization camel headers values to kafka headers values. |  | KafkaHeaderSerializer
 | *camel.component.kafka.configuration.kerberos-before-relogin-min-time* | Login thread sleep time between refresh attempts. | 60000 | Integer
 | *camel.component.kafka.configuration.kerberos-init-cmd* | Kerberos kinit command path. Default is /usr/bin/kinit | /usr/bin/kinit | String
-| *camel.component.kafka.configuration.kerberos-principal-to-local-rules* | A list of rules for mapping from principal names to short names (typically operating system usernames). The rules are evaluated in order and the first rule that matches a principal name is used to map it to a short name. Any later rules in the list are ignored. By default, principal names of the form {username}/{hostname}@{REALM} are mapped to {username}. For more details on the format please see the security aut [...]
+| *camel.component.kafka.configuration.kerberos-principal-to-local-rules* | A list of rules for mapping from principal names to short names (typically operating system usernames). The rules are evaluated in order and the first rule that matches a principal name is used to map it to a short name. Any later rules in the list are ignored. By default, principal names of the form \{username\}/\{hostname\}@\{REALM\} are mapped to \{username\}. For more details on the format please see the secu [...]
 | *camel.component.kafka.configuration.kerberos-renew-jitter* | Percentage of random jitter added to the renewal time. | 0.05 | Double
 | *camel.component.kafka.configuration.kerberos-renew-window-factor* | Login thread will sleep until the specified window factor of time from last refresh to ticket's expiry has been reached, at which time it will try to renew the ticket. | 0.8 | Double
 | *camel.component.kafka.configuration.key* | The record key (or null if no key is specified). If this option has been configured then it take precedence over header {@link KafkaConstants#KEY} |  | String
diff --git a/docs/components/modules/ROOT/pages/properties-component.adoc b/docs/components/modules/ROOT/pages/properties-component.adoc
index 7982075..0764037 100644
--- a/docs/components/modules/ROOT/pages/properties-component.adoc
+++ b/docs/components/modules/ROOT/pages/properties-component.adoc
@@ -157,7 +157,7 @@ property component.
 
 === Syntax
 
-The syntax to use Camel's property placeholder is to use `{{key}}` for
+The syntax to use Camel's property placeholder is to use `{\{key\}}` for
 example `{{file.uri}}` where `file.uri` is the property key.
 
 You can use property placeholders in parts of the endpoint URI's which
diff --git a/docs/components/modules/ROOT/pages/rest-component.adoc b/docs/components/modules/ROOT/pages/rest-component.adoc
index 12e7a2b..9e1032b 100644
--- a/docs/components/modules/ROOT/pages/rest-component.adoc
+++ b/docs/components/modules/ROOT/pages/rest-component.adoc
@@ -183,7 +183,7 @@ from("rest:get:hello:/french/{me}")
 
 You can use the rest component to call REST services like any other Camel component.
 
-For example to call a REST service on using `hello/{me}` you can do
+For example to call a REST service on using `hello/\{me\}` you can do
 
 [source,java]
 ----
@@ -191,7 +191,7 @@ from("direct:start")
   .to("rest:get:hello/{me}");
 ----
 
-And then the dynamic value `{me}` is mapped to Camel message with the same name.
+And then the dynamic value `\{me\}` is mapped to Camel message with the same name.
 So to call this REST service you can send an empty message body and a header as shown:
 
 [source,java]
diff --git a/docs/components/modules/ROOT/pages/rest-swagger-component.adoc b/docs/components/modules/ROOT/pages/rest-swagger-component.adoc
index c23c5f2..ca243bf 100644
--- a/docs/components/modules/ROOT/pages/rest-swagger-component.adoc
+++ b/docs/components/modules/ROOT/pages/rest-swagger-component.adoc
@@ -79,7 +79,7 @@ to message headers you can specify REST operation's parameters as
 endpoint parameters, these will be constant for all subsequent
 invocations so it makes sense to use this feature only for parameters
 that are indeed constant for all invocations -- for example API version
-in path such as `/api/{version}/users/{id}`. 
+in path such as `/api/\{version\}/users/\{id\}`. 
 
 ### Options
 
diff --git a/docs/components/modules/ROOT/pages/restlet-component.adoc b/docs/components/modules/ROOT/pages/restlet-component.adoc
index e24cb61..5a17743 100644
--- a/docs/components/modules/ROOT/pages/restlet-component.adoc
+++ b/docs/components/modules/ROOT/pages/restlet-component.adoc
@@ -113,7 +113,7 @@ with the following path and query parameters:
 | *protocol* | *Required* The protocol to use which is http or https |  | String
 | *host* | *Required* The hostname of the restlet service |  | String
 | *port* | *Required* The port number of the restlet service | 80 | int
-| *uriPattern* | The resource pattern such as /customer/{id} |  | String
+| *uriPattern* | The resource pattern such as /customer/\{id\} |  | String
 |===
 
 
diff --git a/docs/components/modules/ROOT/pages/servicenow-component.adoc b/docs/components/modules/ROOT/pages/servicenow-component.adoc
index 717598c..8c4f794 100644
--- a/docs/components/modules/ROOT/pages/servicenow-component.adoc
+++ b/docs/components/modules/ROOT/pages/servicenow-component.adoc
@@ -295,18 +295,18 @@ The component supports 58 options, which are listed below.
 |===
 | CamelServiceNowResource | CamelServiceNowAction | Method | API URI
 1.5+<.^|TABLE
-| RETRIEVE | GET | /api/now/v1/table/{table_name}/{sys_id}
-| CREATE | POST | /api/now/v1/table/{table_name}
-| MODIFY | PUT | /api/now/v1/table/{table_name}/{sys_id}
-| DELETE | DELETE | /api/now/v1/table/{table_name}/{sys_id}
-| UPDATE | PATCH | /api/now/v1/table/{table_name}/{sys_id}
+| RETRIEVE | GET | /api/now/v1/table/\{table_name\}/\{sys_id\}
+| CREATE | POST | /api/now/v1/table/\{table_name\}
+| MODIFY | PUT | /api/now/v1/table/\{table_name\}/\{sys_id\}
+| DELETE | DELETE | /api/now/v1/table/\{table_name\}/\{sys_id\}
+| UPDATE | PATCH | /api/now/v1/table/\{table_name\}/\{sys_id\}
 
 | AGGREGATE
-| RETRIEVE | GET | /api/now/v1/stats/{table_name}
+| RETRIEVE | GET | /api/now/v1/stats/\{table_name\}
 
 1.2+<.^|IMPORT
-| RETRIEVE | GET | /api/now/import/{table_name}/{sys_id}
-| CREATE | POST | /api/now/import/{table_name}
+| RETRIEVE | GET | /api/now/import/\{table_name\}/\{sys_id\}
+| CREATE | POST | /api/now/import/\{table_name\}
 |===
 
 NOTE: http://wiki.servicenow.com/index.php?title=REST_API#Available_APIs[Fuji REST API Documentation]
@@ -317,24 +317,24 @@ NOTE: http://wiki.servicenow.com/index.php?title=REST_API#Available_APIs[Fuji RE
 |===
 | CamelServiceNowResource | CamelServiceNowAction | CamelServiceNowActionSubject | Method | API URI
 1.5+<.^|TABLE
-| RETRIEVE | | GET | /api/now/v1/table/{table_name}/{sys_id}
-| CREATE | | POST | /api/now/v1/table/{table_name}
-| MODIFY | | PUT | /api/now/v1/table/{table_name}/{sys_id}
-| DELETE | | DELETE | /api/now/v1/table/{table_name}/{sys_id}
-| UPDATE | | PATCH | /api/now/v1/table/{table_name}/{sys_id}
+| RETRIEVE | | GET | /api/now/v1/table/\{table_name\}/\{sys_id\}
+| CREATE | | POST | /api/now/v1/table/\{table_name\}
+| MODIFY | | PUT | /api/now/v1/table/\{table_name\}/\{sys_id\}
+| DELETE | | DELETE | /api/now/v1/table/\{table_name\}/\{sys_id\}
+| UPDATE | | PATCH | /api/now/v1/table/\{table_name\}/\{sys_id\}
 
 | AGGREGATE
-| RETRIEVE | | GET | /api/now/v1/stats/{table_name}
+| RETRIEVE | | GET | /api/now/v1/stats/\{table_name\}
 
 1.2+<.^|IMPORT
-| RETRIEVE | | GET | /api/now/import/{table_name}/{sys_id}
-| CREATE | | POST | /api/now/import/{table_name}
+| RETRIEVE | | GET | /api/now/import/\{table_name\}/\{sys_id\}
+| CREATE | | POST | /api/now/import/\{table_name\}
 
 1.4+<.^|ATTACHMENT
-| RETRIEVE | | GET | /api/now/api/now/attachment/{sys_id}
-| CONTENT | | GET | /api/now/attachment/{sys_id}/file
+| RETRIEVE | | GET | /api/now/api/now/attachment/\{sys_id\}
+| CONTENT | | GET | /api/now/attachment/\{sys_id\}/file
 | UPLOAD | | POST | /api/now/api/now/attachment/file
-| DELETE | | DELETE | /api/now/attachment/{sys_id}
+| DELETE | | DELETE | /api/now/attachment/\{sys_id\}
 
 | SCORECARDS
 | RETRIEVE | PERFORMANCE_ANALYTICS | GET | /api/now/pa/scorecards
@@ -344,26 +344,26 @@ NOTE: http://wiki.servicenow.com/index.php?title=REST_API#Available_APIs[Fuji RE
 | CREATE | IDENTIFY_RECONCILE | POST | /api/now/identifyreconcile
 
 1.2+<.^|SERVICE_CATALOG
-| RETRIEVE | | GET | /sn_sc/servicecatalog/catalogs/{sys_id}
-| RETRIEVE | CATEGORIES |  GET | /sn_sc/servicecatalog/catalogs/{sys_id}/categories
+| RETRIEVE | | GET | /sn_sc/servicecatalog/catalogs/\{sys_id\}
+| RETRIEVE | CATEGORIES |  GET | /sn_sc/servicecatalog/catalogs/\{sys_id\}/categories
 
 1.5+<.^|SERVICE_CATALOG_ITEMS
-| RETRIEVE | | GET | /sn_sc/servicecatalog/items/{sys_id}
-| RETRIEVE | SUBMIT_GUIDE | POST | /sn_sc/servicecatalog/items/{sys_id}/submit_guide
-| RETRIEVE | CHECKOUT_GUIDE | POST | /sn_sc/servicecatalog/items/{sys_id}/checkout_guide
-| CREATE | SUBJECT_CART | POST | /sn_sc/servicecatalog/items/{sys_id}/add_to_cart
-| CREATE | SUBJECT_PRODUCER | POST | /sn_sc/servicecatalog/items/{sys_id}/submit_producer
+| RETRIEVE | | GET | /sn_sc/servicecatalog/items/\{sys_id\}
+| RETRIEVE | SUBMIT_GUIDE | POST | /sn_sc/servicecatalog/items/\{sys_id\}/submit_guide
+| RETRIEVE | CHECKOUT_GUIDE | POST | /sn_sc/servicecatalog/items/\{sys_id\}/checkout_guide
+| CREATE | SUBJECT_CART | POST | /sn_sc/servicecatalog/items/\{sys_id\}/add_to_cart
+| CREATE | SUBJECT_PRODUCER | POST | /sn_sc/servicecatalog/items/\{sys_id\}/submit_producer
 
 1.6+<.^|SERVICE_CATALOG_CARTS
 | RETRIEVE | | GET | /sn_sc/servicecatalog/cart
-| RETRIEVE | DELIVERY_ADDRESS | GET | /sn_sc/servicecatalog/cart/delivery_address/{user_id}
+| RETRIEVE | DELIVERY_ADDRESS | GET | /sn_sc/servicecatalog/cart/delivery_address/\{user_id\}
 | RETRIEVE | CHECKOUT | POST | /sn_sc/servicecatalog/cart/checkout
-| UPDATE | | POST | /sn_sc/servicecatalog/cart/{cart_item_id}
+| UPDATE | | POST | /sn_sc/servicecatalog/cart/\{cart_item_id\}
 | UPDATE | CHECKOUT | POST | /sn_sc/servicecatalog/cart/submit_order
-| DELETE | | DELETE | /sn_sc/servicecatalog/cart/{sys_id}/empty
+| DELETE | | DELETE | /sn_sc/servicecatalog/cart/\{sys_id\}/empty
 
 | SERVICE_CATALOG_CATEGORIES
-| RETRIEVE | | GET | /sn_sc/servicecatalog/categories/{sys_id}
+| RETRIEVE | | GET | /sn_sc/servicecatalog/categories/\{sys_id\}
 
 |===
 
diff --git a/docs/components/modules/ROOT/pages/testcontainers.adoc b/docs/components/modules/ROOT/pages/testcontainers.adoc
index 8cebf7c..73be426 100644
--- a/docs/components/modules/ROOT/pages/testcontainers.adoc
+++ b/docs/components/modules/ROOT/pages/testcontainers.adoc
@@ -77,8 +77,8 @@ You may need to wait for some condition to be satisfied before starting your tes
 
 Camel Testcontainer provides a PropertiesFunction implementation that can be used to:
 
-- retrieve the container host with the following syntax `container:host:${container-name}`
-- retrieve the port mapping with the following syntax `container:port:${exposed-port}@${container-name}`
+- retrieve the container host with the following syntax `container:host:$\{container-name\}`
+- retrieve the port mapping with the following syntax `container:port:$\{exposed-port\}@$\{container-name\}`
 
 [source,java]
 .Example
diff --git a/docs/user-manual/modules/ROOT/pages/stream-caching.adoc b/docs/user-manual/modules/ROOT/pages/stream-caching.adoc
index 0f2387f..fef5ca3 100644
--- a/docs/user-manual/modules/ROOT/pages/stream-caching.adoc
+++ b/docs/user-manual/modules/ROOT/pages/stream-caching.adoc
@@ -246,7 +246,7 @@ The following patterns is supported:
 * `\#symbolicName#` = the OSGi symbolic name (only for OSGi environments)
 * `\#version#` = the OSGi bundle version (only for OSGi environments)
 * `${env:key}` = the environment variable with the key
-* `${key}` = the JVM system property with the key
+* `$\{key\}` = the JVM system property with the key
 
 A couple of examples:
 
diff --git a/docs/user-manual/modules/ROOT/pages/threading-model.adoc b/docs/user-manual/modules/ROOT/pages/threading-model.adoc
index e15c8bc..32c994a 100644
--- a/docs/user-manual/modules/ROOT/pages/threading-model.adoc
+++ b/docs/user-manual/modules/ROOT/pages/threading-model.adoc
@@ -146,7 +146,7 @@ thread.
 The default pattern is for:
 
 * *Camel 2.9.x or older:*
-`Camel (${camelId}) thread #${counter} - ${name`}
+`Camel (${camelId}) thread #${counter} - ${name}`
 * *Camel 2.10 onwards:* `Camel (#camelId#) thread ##counter# - #name#`
 
 Notice we renamed the tokens from Camel 2.10 onwards to not clash with


[camel] 10/12: Fixes for CAMEL-13588

Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit ba72d513e330b438b23f4890dfafbd05065f2450
Author: nayananga@acerubuntu18.04 <na...@gmail.com>
AuthorDate: Sun Jul 21 16:36:01 2019 +0530

    Fixes for CAMEL-13588
---
 .../user-manual/modules/ROOT/pages/enrich-eip.adoc |  3 +-
 .../modules/ROOT/pages/exception-clause.adoc       |  2 +-
 ...tion-orgapachecamelnosuchendpointexception.adoc |  2 +-
 ...ximum-endpoint-cache-size-for-camelcontext.adoc |  2 +-
 ...spring-property-placeholder-with-camel-xml.adoc |  2 +-
 .../modules/ROOT/pages/http-session-handling.adoc  |  2 +-
 docs/user-manual/modules/ROOT/pages/languages.adoc |  4 +-
 docs/user-manual/modules/ROOT/pages/predicate.adoc |  2 +-
 .../modules/ROOT/pages/release-guide.adoc          | 94 +++++++++++-----------
 .../modules/ROOT/pages/route-policy.adoc           |  2 +-
 docs/user-manual/modules/ROOT/pages/spring.adoc    | 10 +--
 docs/user-manual/modules/ROOT/pages/step-eip.adoc  |  2 +-
 .../modules/ROOT/pages/transactional-client.adoc   |  4 +-
 .../modules/ROOT/pages/try-catch-finally.adoc      |  2 +-
 .../ROOT/pages/using-propertyplaceholder.adoc      |  4 +-
 15 files changed, 68 insertions(+), 69 deletions(-)

diff --git a/docs/user-manual/modules/ROOT/pages/enrich-eip.adoc b/docs/user-manual/modules/ROOT/pages/enrich-eip.adoc
index 2098fff..f5ab883 100644
--- a/docs/user-manual/modules/ROOT/pages/enrich-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/enrich-eip.adoc
@@ -89,9 +89,8 @@ The other one is `pollEnrich`
 `enrich` uses a Producer to obtain the additional data. It is usually used for Request Reply messaging, for instance to invoke an external web service.
 
 Both `enrich` and `pollEnrich` supports dynamic endpoints that uses an Expression to compute the uri, which allows to use data from the current Exchange.
-====
 
-A little enrich example using Java:
+==== A little enrich example using Java:
 
 [source,java]
 ----
diff --git a/docs/user-manual/modules/ROOT/pages/exception-clause.adoc b/docs/user-manual/modules/ROOT/pages/exception-clause.adoc
index 860b15a..9f5e0a1 100644
--- a/docs/user-manual/modules/ROOT/pages/exception-clause.adoc
+++ b/docs/user-manual/modules/ROOT/pages/exception-clause.adoc
@@ -332,7 +332,7 @@ using a producer template from Exchange.
 
 *Available as of Camel 1.5*
 
-===== Continued
+==== Continued
 
 See also the section xref:ExceptionClause-HandleandContinueExceptions.adoc[Handle and continue exceptions] below.
 
diff --git a/docs/user-manual/modules/ROOT/pages/faq/exception-orgapachecamelnosuchendpointexception.adoc b/docs/user-manual/modules/ROOT/pages/faq/exception-orgapachecamelnosuchendpointexception.adoc
index 9e66f53..8f3426e 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/exception-orgapachecamelnosuchendpointexception.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/exception-orgapachecamelnosuchendpointexception.adoc
@@ -6,7 +6,7 @@ classpath. The exception detail message will tell you what the missing
 component is. You can solve the issue by adding the required JAR files
 to the classpath.
 
-===== Example:
+==== Example:
 
 If you try to use the definition below without having `camel-jetty.jar` on
 the classpath, you'll run into this exception:
diff --git a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-configure-the-maximum-endpoint-cache-size-for-camelcontext.adoc b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-configure-the-maximum-endpoint-cache-size-for-camelcontext.adoc
index 4f6fabd..f195c17 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-configure-the-maximum-endpoint-cache-size-for-camelcontext.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-configure-the-maximum-endpoint-cache-size-for-camelcontext.adoc
@@ -1,4 +1,4 @@
-[[HowdoIconfigurethemaximumendpointcachesizeforCamelContext-HowdoIconfigurethemaximumendpointcachesizeforCamelContext?]
+[[HowdoIconfigurethemaximumendpointcachesizeforCamelContext-HowdoIconfigurethemaximumendpointcachesizeforCamelContext]]
 === How do I configure the maximum endpoint cache size for CamelContext?
 
 xref:camelcontext.adoc[CamelContext] will by default cache the last 1000
diff --git a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-use-spring-property-placeholder-with-camel-xml.adoc b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-use-spring-property-placeholder-with-camel-xml.adoc
index 46d3ea4..70cc165 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-use-spring-property-placeholder-with-camel-xml.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-use-spring-property-placeholder-with-camel-xml.adoc
@@ -62,7 +62,7 @@ Camel does not yet fully support property placeholders as there is a
 limitation in Spring. See JIRA
 http://jira.springframework.org/browse/SPR-4466[SPR-4466]
 
-===== Bridge Spring and Camel property placeholders
+==== Bridge Spring and Camel property placeholders
 
 From Camel 2.10 onwards you can bridge Spring and Camel property
 placeholders, see xref:using-propertyplaceholder.adoc[Using
diff --git a/docs/user-manual/modules/ROOT/pages/http-session-handling.adoc b/docs/user-manual/modules/ROOT/pages/http-session-handling.adoc
index bfae9d5..e838bda 100644
--- a/docs/user-manual/modules/ROOT/pages/http-session-handling.adoc
+++ b/docs/user-manual/modules/ROOT/pages/http-session-handling.adoc
@@ -1,4 +1,4 @@
-[[HTTP-SessionHandling-SessionScope]]
+[[HTTP-SessionHandling]]
 === HTTP Session Handling
 
 *Available as of Camel 2.19*
diff --git a/docs/user-manual/modules/ROOT/pages/languages.adoc b/docs/user-manual/modules/ROOT/pages/languages.adoc
index a668016..dc2efcf 100644
--- a/docs/user-manual/modules/ROOT/pages/languages.adoc
+++ b/docs/user-manual/modules/ROOT/pages/languages.adoc
@@ -15,9 +15,9 @@ When creating predicates (expressions that evaluate to `true` or
 `false`), you can combine several predicates -- regardless of the
 language they are built with -- by using the `PredicateBuilder` class.
 For more information, see xref:predicate.adoc[Compound Predicates].
-====
 
-The following is the list of currently supported languages:
+
+==== The following is the list of currently supported languages:
 
 * xref:bean-language.adoc[Bean Language] for using Java for expressions
 * xref:constant-language.adoc[Constant]
diff --git a/docs/user-manual/modules/ROOT/pages/predicate.adoc b/docs/user-manual/modules/ROOT/pages/predicate.adoc
index 99475a4..8d95d65 100644
--- a/docs/user-manual/modules/ROOT/pages/predicate.adoc
+++ b/docs/user-manual/modules/ROOT/pages/predicate.adoc
@@ -105,7 +105,7 @@ based on logical operators and comparison operators:
 
 Additionally, with `PredicateBuilder` you can create Regular Expressions
 and use them as predicates, applying them to the result of an
-expression, e.g. `PredicateBuilder.regex(header("foo"), "\d{4}")`
+expression, e.g. `PredicateBuilder.regex(header("foo"), "\d\{4\}")`
 applies the regular expression to the header = foo.
 
 Combining different Expression Languages is also possible, e.g.:
diff --git a/docs/user-manual/modules/ROOT/pages/release-guide.adoc b/docs/user-manual/modules/ROOT/pages/release-guide.adoc
index 0542c44..1554262 100644
--- a/docs/user-manual/modules/ROOT/pages/release-guide.adoc
+++ b/docs/user-manual/modules/ROOT/pages/release-guide.adoc
@@ -80,73 +80,73 @@ http://maven.apache.org/guides/mini/guide-encryption.html[password encryption re
 
 Complete the following steps to create a new Camel release:
 
-1. Grab the latest source from Git and checkout the target branch (`BRANCH_NAME`) to build from:
+. Grab the latest source from Git and checkout the target branch (`BRANCH_NAME`) to build from:
 
-----
-$ git clone https://git-wip-us.apache.org/repos/asf/camel.git
-$ cd camel
-$ git checkout BRANCH_NAME
-----
+  
+  $ git clone https://git-wip-us.apache.org/repos/asf/camel.git
+  $ cd camel
+  $ git checkout BRANCH_NAME
+  
 
-2. Perform a license check with http://creadur.apache.org/rat/apache-rat-plugin[Apache Rat]:
+. Perform a license check with http://creadur.apache.org/rat/apache-rat-plugin[Apache Rat]:
 
-----
-./mvnw -e org.apache.rat:apache-rat-plugin:check
-grep -e ' !?????' target/rat.txt
-----
+  
+  ./mvnw -e org.apache.rat:apache-rat-plugin:check
+  grep -e ' !?????' target/rat.txt
+  
 
-The latter command will provide a list of all files without valid license headers.
-Ideally this list is empty, otherwise fix the issues by adding valid license headers and rerun the above commands before
-proceeding with the next step.
+*  The latter command will provide a list of all files without valid license headers.
+  Ideally this list is empty, otherwise fix the issues by adding valid license headers and rerun the above commands before
+  proceeding with the next step.
 
-3. Do a release dry run to check for problems:
+. Do a release dry run to check for problems:
 
-----
-./mvnw release:prepare -DdryRun -Prelease
-----
+  
+  ./mvnw release:prepare -DdryRun -Prelease
+  
 
-The release plugin will prompt for a release version, an SCM tag and next release version.
+ * The release plugin will prompt for a release version, an SCM tag and next release version.
 
-Use a three digit release version of the form: `MAJOR.MINOR.PATCH`, e.g. `3.0.0`.
+*  Use a three digit release version of the form: `MAJOR.MINOR.PATCH`, e.g. `3.0.0`.
 
-For the tag use a string of the form: `camel-MAJOR.MINOR.PATCH`, e.g. `camel-3.0.0`.
+*  For the tag use a string of the form: `camel-MAJOR.MINOR.PATCH`, e.g. `camel-3.0.0`.
 
-For the next version increase the patch version and append `-SNAPSHOT`, e.g. `3.0.1-SNAPSHOT`.
+*  For the next version increase the patch version and append `-SNAPSHOT`, e.g. `3.0.1-SNAPSHOT`.
 
-Make sure to check the generated signature files:
+* Make sure to check the generated signature files:
 
-----
-$ gpg camel-core/target/camel-core-3.0.0-SNAPSHOT.jar.asc
-gpg: assuming signed data in `camel-core/target/camel-core-3.0.0.jar'
-gpg: Signature made Sat 06 Apr 2019 03:58:01 AM PDT using RSA key ID 5942C049
-gpg: Good signature from "Gregor Zurowski <gz...@apache.org>"
-----
+  
+  $ gpg camel-core/target/camel-core-3.0.0-SNAPSHOT.jar.asc
+  gpg: assuming signed data in `camel-core/target/camel-core-3.0.0.jar'
+  gpg: Signature made Sat 06 Apr 2019 03:58:01 AM PDT using RSA key ID 5942C049
+  gpg: Good signature from "Gregor Zurowski <gz...@apache.org>"
+ 
 
-4. Prepare the release:
+. Prepare the release:
 
-First clean up the dry run results:
+* First clean up the dry run results:
 
-----
-$ ./mvnw release:clean -Prelease
-----
 
-Next prepare the release:
+  $ ./mvnw release:clean -Prelease
 
-----
-$ ./mvnw release:prepare -Prelease
-----
 
-This command will create the tag and update all pom files with the given version number.
+* Next prepare the release:
 
-5. Perform the release and publish to the Apache staging repository:
 
-----
-$ ./mvnw release:perform -Prelease
-----
+  $ ./mvnw release:prepare -Prelease
+
+
+*  This command will create the tag and update all pom files with the given version number.
+
+. Perform the release and publish to the Apache staging repository:
+
+
+  $ ./mvnw release:perform -Prelease
+
 
-6. Close the Apache staging repository:
+. Close the Apache staging repository:
 
-Login to https://repository.apache.org using your Apache LDAP credentials.
+* Login to https://repository.apache.org using your Apache LDAP credentials.
 Click on "Staging Repositories". Then select "org.apache.camel-xxx" in the list of repositories, where xxx represents
 your username and ip.
 Click "Close" on the tool bar above.
@@ -155,9 +155,9 @@ If you are staging multiple releases together, skip this step until you have sta
 Enter the name and version of the artifact being released in the "Description" field and then click "Close".
 This will make it easier to identify it later.
 
-7. Verify staged artifacts:
+. Verify staged artifacts:
 
-If you click on your repository, a tree view will appear below.
+* If you click on your repository, a tree view will appear below.
 You can then browse the contents to ensure the artifacts are as you expect them.
 Pay particular attention to the existence of *.asc (signature) files.
 If the you don't like the content of the repository, right click your repository and choose "Drop".
diff --git a/docs/user-manual/modules/ROOT/pages/route-policy.adoc b/docs/user-manual/modules/ROOT/pages/route-policy.adoc
index 4253ce3..32485eb 100644
--- a/docs/user-manual/modules/ROOT/pages/route-policy.adoc
+++ b/docs/user-manual/modules/ROOT/pages/route-policy.adoc
@@ -88,7 +88,7 @@ again in case it has been suspended.
 |`logger` |`ThrottlingInflightRoutePolicy` |The logger category.
 |===
 
-[[RoutePolicy-ThrottlingInflightRoutePolicy]]
+[[RoutePolicy-ThrottlingInflightRoutePolicy-ComparedToTheThrottlerEIP]]
 ====  ThrottlingInflightRoutePolicy compared to the Throttler EIP
 
 The *`ThrottlingInflightRoutePolicy`* compared to
diff --git a/docs/user-manual/modules/ROOT/pages/spring.adoc b/docs/user-manual/modules/ROOT/pages/spring.adoc
index e60aadc..0f7a782 100644
--- a/docs/user-manual/modules/ROOT/pages/spring.adoc
+++ b/docs/user-manual/modules/ROOT/pages/spring.adoc
@@ -53,7 +53,7 @@ So the XML file looks like this:
     ">
 --------------------------------------------------------------------------------------------------------------
 
-===== Using `camel:` Namespace
+==== Using `camel:` Namespace
 Or you can refer to the camel XSD in the XML declaration:
 ....
 xmlns:camel="http://camel.apache.org/schema/spring"
@@ -83,7 +83,7 @@ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/came
   </camel:camelContext>
 --------------------------------------------------------------------------------------------------------------
 
-===== Advanced Configuration Using Spring
+==== Advanced Configuration Using Spring
 See more details at Advanced configuration of CamelContext using Spring
 
 === Using Java Code
@@ -111,7 +111,7 @@ Will ignore already instantiated classes
 
 The *`<package>`* and *`<packageScan>`* will skip any classes which has already been created by Spring etc. So if you define a route builder as a spring bean tag then that class will be skipped. You can include those beans using *`<routeBuilder ref="theBeanId"/>`* or the *`<contextScan>`* feature.
 
-===== Using `<packageScan>`
+==== Using `<packageScan>`
 
 In Camel 2.0 this has been extended to allow selective inclusion and exclusion of discovered route classes using Ant like path matching. In spring this is specified by adding a *`<packageScan/>`* tag. The tag must contain one or more *`package`* elements (similar to *`1.x`*), and optionally one or more *`includes`* or *`excludes`* elements specifying patterns to be applied to the fully qualified names of the discovered classes. e.g.,
 
@@ -146,7 +146,7 @@ For example:
 *`org.simple.IncludedRoute`*, *`org.simple.Excluded`* but _not_ match
 *`org.simple.PrecludedRoute`*.
 
-===== Using `contextScan`
+==== Using `contextScan`
 
 *Available as of Camel 2.4*
 
@@ -180,7 +180,7 @@ You can also use the ANT style for inclusion and exclusion, as mentioned above i
 
 how do i import routes from other xml files
 
-===== Test Time Exclusion.
+==== Test Time Exclusion.
 At test time it is often desirable to be able to selectively exclude matching routes from being initialized that are not applicable or useful to the test scenario. For instance you might a spring context file *`routes-context.xml`* and three Route builders **`RouteA`, **`RouteB` and *`RouteC`* in the *`org.example.routes`* package. The *`packageScan`* definition would discover all three of these routes and initialize them.
 
 Say *`RouteC`* is not applicable to our test scenario and generates a lot of noise during test. It would be nice to be able to exclude this route from this specific test. The *`SpringTestSupport`* class has been modified to allow this. It provides two methods (*`excludedRoute`* and *`excludedRoutes`*) that may be overridden to exclude a single class or an array of classes.
diff --git a/docs/user-manual/modules/ROOT/pages/step-eip.adoc b/docs/user-manual/modules/ROOT/pages/step-eip.adoc
index a61726f..459c4a0 100644
--- a/docs/user-manual/modules/ROOT/pages/step-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/step-eip.adoc
@@ -24,7 +24,7 @@ This means you can monitor your Camel applications and gather statistics at 4-ti
 *** processor(s) level
 
 
-==== JMX Management
+=== JMX Management
 
 Each Step EIP is registered in JMX under the `type=steps` tree, which allows to monitor
 all the steps in the CamelContext. Its also possible to dump statistics in XML format
diff --git a/docs/user-manual/modules/ROOT/pages/transactional-client.adoc b/docs/user-manual/modules/ROOT/pages/transactional-client.adoc
index 4bed40f..89df425 100644
--- a/docs/user-manual/modules/ROOT/pages/transactional-client.adoc
+++ b/docs/user-manual/modules/ROOT/pages/transactional-client.adoc
@@ -13,7 +13,7 @@ transaction for both inbound and outbound message exchanges. Endpoints
 that support transactions will participate in the current transaction
 context that they are called from.
 
-===== Configuration of Redelivery
+=== Configuration of Redelivery
 
 The redelivery in transacted mode is *not* handled by Camel but by the
 backing system (the transaction manager). In such cases you should
@@ -285,7 +285,7 @@ route as transacted using the *transacted* tag.
     <bean id="myProcessor" class="org.apache.camel.component.jms.tx.JMSTransactionalClientTest$MyProcessor"/>
 ----
 
-===== Transaction error handler
+==== Transaction error handler
 
 When a route is marked as transacted using *transacted* Camel will
 automatic use the
diff --git a/docs/user-manual/modules/ROOT/pages/try-catch-finally.adoc b/docs/user-manual/modules/ROOT/pages/try-catch-finally.adoc
index 4dad4df..98247fe 100644
--- a/docs/user-manual/modules/ROOT/pages/try-catch-finally.adoc
+++ b/docs/user-manual/modules/ROOT/pages/try-catch-finally.adoc
@@ -18,7 +18,7 @@ Notice this document is based on how it works in Camel 2.0. In Camel 1.x
 this feature isn't as powerful and it uses a slight different keyword
 names.
 
-===== Camel error handling is disabled
+==== Camel error handling is disabled
 
 When using `doTry .. doCatch .. doFinally` then the regular Camel
 xref:error-handler.adoc[Error Handler] does not apply. That means any
diff --git a/docs/user-manual/modules/ROOT/pages/using-propertyplaceholder.adoc b/docs/user-manual/modules/ROOT/pages/using-propertyplaceholder.adoc
index 97deef0..2a186ca 100644
--- a/docs/user-manual/modules/ROOT/pages/using-propertyplaceholder.adoc
+++ b/docs/user-manual/modules/ROOT/pages/using-propertyplaceholder.adoc
@@ -15,7 +15,7 @@ xref:faq/how-do-i-use-spring-property-placeholder-with-camel-xml.adoc[How do
 I use Spring Property Placeholder with Camel XML].
 
 [[UsingPropertyPlaceholder-BridgingSpringandCamelPropertyPlaceholders]]
-===== Bridging Spring and Camel Property Placeholders
+==== Bridging Spring and Camel Property Placeholders
 
 From *Camel 2.10*: Spring's property placeholder can be bridged with
 Camel's. See below for more details.
@@ -874,7 +874,7 @@ destination=mock:result
 ----
 
 
-[[UsingPropertyPlaceholder-BridgingSpringandCamelPropertyPlaceholders]]
+[[UsingPropertyPlaceholder-BridgingSpringandCamelPropertyPlaceholders-1]]
 ==== Bridging Spring and Camel Property Placeholders
 
 *Available as of Camel 2.10*


[camel] 03/12: fixed incorrect cross references in docs/components

Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit e8c9c80fe0985207eef300a2914c90edf056ff37
Author: nayananga@acerubuntu18.04 <na...@gmail.com>
AuthorDate: Fri Jul 19 17:24:31 2019 +0530

    fixed incorrect cross references in docs/components
---
 .../modules/ROOT/pages/ahc-component.adoc          |  2 +-
 .../modules/ROOT/pages/cometd-component.adoc       |  2 +-
 .../modules/ROOT/pages/controlbus-component.adoc   |  4 ++--
 .../modules/ROOT/pages/crypto-component.adoc       |  2 +-
 .../modules/ROOT/pages/dataformat-component.adoc   |  6 ++---
 .../modules/ROOT/pages/dataset-component.adoc      |  2 +-
 .../modules/ROOT/pages/dataset-test-component.adoc |  2 +-
 .../ROOT/pages/elasticsearch-rest-component.adoc   |  2 +-
 .../modules/ROOT/pages/elsql-component.adoc        |  2 +-
 .../modules/ROOT/pages/file-component.adoc         | 26 +++++++++++-----------
 .../modules/ROOT/pages/grape-component.adoc        |  2 +-
 .../modules/ROOT/pages/groovy-language.adoc        |  2 +-
 .../modules/ROOT/pages/http4-component.adoc        |  2 +-
 .../modules/ROOT/pages/irc-component.adoc          |  2 +-
 .../modules/ROOT/pages/jetty-component.adoc        |  4 ++--
 .../modules/ROOT/pages/jms-component.adoc          |  2 +-
 .../modules/ROOT/pages/language-component.adoc     |  4 ++--
 .../modules/ROOT/pages/mail-component.adoc         |  2 +-
 .../modules/ROOT/pages/mock-component.adoc         |  2 +-
 .../modules/ROOT/pages/netty4-component.adoc       |  2 +-
 .../modules/ROOT/pages/paho-component.adoc         |  2 +-
 .../modules/ROOT/pages/properties-component.adoc   |  8 +++----
 .../modules/ROOT/pages/spring-event-component.adoc |  2 +-
 docs/components/modules/ROOT/pages/spring.adoc     |  8 +++----
 .../ROOT/pages/univocity-csv-dataformat.adoc       |  2 +-
 .../ROOT/pages/univocity-fixed-dataformat.adoc     |  2 +-
 .../ROOT/pages/univocity-tsv-dataformat.adoc       |  2 +-
 .../modules/ROOT/pages/websocket-component.adoc    |  2 +-
 .../modules/ROOT/pages/xmlsecurity-component.adoc  |  2 +-
 .../modules/ROOT/pages/xpath-language.adoc         |  4 ++--
 .../modules/ROOT/pages/xquery-component.adoc       |  2 +-
 .../modules/ROOT/pages/xquery-language.adoc        |  2 +-
 32 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/docs/components/modules/ROOT/pages/ahc-component.adoc b/docs/components/modules/ROOT/pages/ahc-component.adoc
index 98a9606..5b9e91e 100644
--- a/docs/components/modules/ROOT/pages/ahc-component.adoc
+++ b/docs/components/modules/ROOT/pages/ahc-component.adoc
@@ -421,7 +421,7 @@ from("direct:start")
 Using the JSSE Configuration Utility
 
 The AHC component supports SSL/TLS configuration
-through the xref:camel-configuration-utilities.adoc[Camel JSSE
+through the xref:manual::camel-configuration-utilities.adoc[Camel JSSE
 Configuration Utility].  This utility greatly decreases the amount of
 component specific code you need to write and is configurable at the
 endpoint and component levels.  The following examples demonstrate how
diff --git a/docs/components/modules/ROOT/pages/cometd-component.adoc b/docs/components/modules/ROOT/pages/cometd-component.adoc
index 8130b70..2d05c59 100644
--- a/docs/components/modules/ROOT/pages/cometd-component.adoc
+++ b/docs/components/modules/ROOT/pages/cometd-component.adoc
@@ -183,7 +183,7 @@ http://cometd.org/documentation/howtos/authentication[documented here]
 #### Using the JSSE Configuration Utility
 
 The Cometd component supports SSL/TLS configuration
-through the xref:camel-configuration-utilities.adoc[Camel JSSE
+through the xref:manual::camel-configuration-utilities.adoc[Camel JSSE
 Configuration Utility].  This utility greatly decreases the amount of
 component specific code you need to write and is configurable at the
 endpoint and component levels.  The following examples demonstrate how
diff --git a/docs/components/modules/ROOT/pages/controlbus-component.adoc b/docs/components/modules/ROOT/pages/controlbus-component.adoc
index 0a605aa..cfd64bf 100644
--- a/docs/components/modules/ROOT/pages/controlbus-component.adoc
+++ b/docs/components/modules/ROOT/pages/controlbus-component.adoc
@@ -185,7 +185,7 @@ String xml = template.requestBody("controlbus:route?action=stats", null, String.
 
 === Using Simple language
 
-You can use the xref:simple-language.adoc[Simple] language with the control bus,
+You can use the xref:manual::simple-language.adoc[Simple] language with the control bus,
 for example to stop a specific route, you can send a message to the
 `"controlbus:language:simple"` endpoint containing the following
 message:
@@ -206,7 +206,7 @@ String status = template.requestBody("controlbus:language:simple", "${camelConte
 It's easier to use the `route` command to control lifecycle of
 routes. The `language` command allows you to execute a language script
 that has stronger powers such as xref:groovy-language.adoc[Groovy] or to some
-extend the xref:simple-language.adoc[Simple] language.
+extend the xref:manual::simple-language.adoc[Simple] language.
 
 For example to shutdown Camel itself you can do:
 
diff --git a/docs/components/modules/ROOT/pages/crypto-component.adoc b/docs/components/modules/ROOT/pages/crypto-component.adoc
index b2c76df..5734dbe 100644
--- a/docs/components/modules/ROOT/pages/crypto-component.adoc
+++ b/docs/components/modules/ROOT/pages/crypto-component.adoc
@@ -213,7 +213,7 @@ The component supports 34 options, which are listed below.
 The most basic way to way to sign and verify an exchange is with a
 KeyPair as follows.
 
-The same can be achieved with the xref:spring-xml-extensions.adoc[Spring
+The same can be achieved with the xref:manual::spring-xml-extensions.adoc[Spring
 XML Extensions] using references to keys
 
 #### KeyStores and Aliases.
diff --git a/docs/components/modules/ROOT/pages/dataformat-component.adoc b/docs/components/modules/ROOT/pages/dataformat-component.adoc
index d523fa6..09bce42 100644
--- a/docs/components/modules/ROOT/pages/dataformat-component.adoc
+++ b/docs/components/modules/ROOT/pages/dataformat-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.12*
 
-The Dataformat component allows to use xref:data-format.adoc[Data
+The Dataformat component allows to use xref:manual::data-format.adoc[Data
 Format] as a Camel Component.
 
 === URI format
@@ -15,7 +15,7 @@ dataformat:name:(marshal|unmarshal)[?options]
 
 Where *name* is the name of the Data Format. And
 then followed by the operation which must either be `marshal` or
-`unmarshal`. The options is used for configuring the xref:data-format.adoc[Data
+`unmarshal`. The options is used for configuring the xref:manual::data-format.adoc[Data
 Format] in use. See the Data Format documentation
 for which options it support.
 
@@ -100,7 +100,7 @@ The component supports 3 options, which are listed below.
 
 === Samples
 
-For example to use the xref:jaxb-dataformat.adoc[JAXB] xref:data-format.adoc[Data
+For example to use the xref:jaxb-dataformat.adoc[JAXB] xref:manual::data-format.adoc[Data
 Format] we can do as follows:
 
 [source,java]
diff --git a/docs/components/modules/ROOT/pages/dataset-component.adoc b/docs/components/modules/ROOT/pages/dataset-component.adoc
index 3469c30..290a296 100644
--- a/docs/components/modules/ROOT/pages/dataset-component.adoc
+++ b/docs/components/modules/ROOT/pages/dataset-component.adoc
@@ -8,7 +8,7 @@ notoriously difficult. The xref:mock-component.adoc[Mock], xref:mock-component.a
 and xref:dataset-component.adoc[DataSet] endpoints work great with the
 Camel Testing Framework to simplify your unit and
 integration testing using
-xref:enterprise-integration-patterns.adoc[Enterprise Integration
+xref:manual::enterprise-integration-patterns.adoc[Enterprise Integration
 Patterns] and Camel's large range of Components
 together with the powerful Bean Integration.
 
diff --git a/docs/components/modules/ROOT/pages/dataset-test-component.adoc b/docs/components/modules/ROOT/pages/dataset-test-component.adoc
index 1d88d7ca..da5eb9b 100644
--- a/docs/components/modules/ROOT/pages/dataset-test-component.adoc
+++ b/docs/components/modules/ROOT/pages/dataset-test-component.adoc
@@ -8,7 +8,7 @@ notoriously difficult. The xref:mock-component.adoc[Mock], xref:mock-component.a
 and xref:dataset-component.adoc[DataSet] endpoints work great with the
 Camel Testing Framework to simplify your unit and
 integration testing using
-xref:enterprise-integration-patterns.adoc[Enterprise Integration
+xref:manual::enterprise-integration-patterns.adoc[Enterprise Integration
 Patterns] and Camel's large range of Components
 together with the powerful Bean Integration.
 
diff --git a/docs/components/modules/ROOT/pages/elasticsearch-rest-component.adoc b/docs/components/modules/ROOT/pages/elasticsearch-rest-component.adoc
index 935c7e6..5b691ee 100644
--- a/docs/components/modules/ROOT/pages/elasticsearch-rest-component.adoc
+++ b/docs/components/modules/ROOT/pages/elasticsearch-rest-component.adoc
@@ -303,7 +303,7 @@ try (ElasticsearchScrollRequestIterator response = template.requestBody("direct:
 }
 ----
 
-xref:split-eip.adoc[Split EIP] can also be used.
+xref:manual::split-eip.adoc[Split EIP] can also be used.
 
 [source,java]
 ----
diff --git a/docs/components/modules/ROOT/pages/elsql-component.adoc b/docs/components/modules/ROOT/pages/elsql-component.adoc
index 61c253a..59dfc8c 100644
--- a/docs/components/modules/ROOT/pages/elsql-component.adoc
+++ b/docs/components/modules/ROOT/pages/elsql-component.adoc
@@ -40,7 +40,7 @@ The parameters to the SQL queries are named parameters in the elsql
 mapping files, and maps to corresponding keys from the Camel message, in
 the given precedence:
 
-1. from message body if xref:simple-language.adoc[Simple]
+1. from message body if xref:manual::simple-language.adoc[Simple]
 expression.
 
 2. from message body if its a `java.util.Map`
diff --git a/docs/components/modules/ROOT/pages/file-component.adoc b/docs/components/modules/ROOT/pages/file-component.adoc
index 0878732e..bbbe5a6 100644
--- a/docs/components/modules/ROOT/pages/file-component.adoc
+++ b/docs/components/modules/ROOT/pages/file-component.adoc
@@ -237,7 +237,7 @@ bean completes, and thus the route is completed, the file consumer will
 perform the move operation and move the file to the `.done` sub-folder.
 
 The *move* and the *preMove* options are considered as a directory name
-(though if you use an expression such as xref:file-language.adoc[File Language], or xref:simple-language.adoc[Simple] then the result of the expression
+(though if you use an expression such as xref:manual::file-language.adoc[File Language], or xref:manual::simple-language.adoc[Simple] then the result of the expression
 evaluation is the file name to be used - eg if you set
 
 [source]
@@ -245,7 +245,7 @@ evaluation is the file name to be used - eg if you set
 move=../backup/copy-of-${file:name}
 ----
 
-then that's using the xref:file-language.adoc[File Language] which we
+then that's using the xref:manual::file-language.adoc[File Language] which we
 use return the file name to be used), which can be either relative or
 absolute. If relative, the directory is created as a sub-folder from
 within the folder where the file was consumed.
@@ -283,10 +283,10 @@ processed and after it's processed, it's moved to the `.done` folder.
 
 The *move* and *preMove* options
 are Expression-based, so we have the full power of
-the xref:file-language.adoc[File Language] to do advanced configuration
+the xref:manual::file-language.adoc[File Language] to do advanced configuration
 of the directory and name pattern. +
  Camel will, in fact, internally convert the directory name you enter
-into a xref:file-language.adoc[File Language] expression. So when we
+into a xref:manual::file-language.adoc[File Language] expression. So when we
 enter `move=.done` Camel will convert this into:
 `\${file:parent}/.done/${file:onlyname}`. This is only done if
 Camel detects that you have not provided a $\{ } in the option value
@@ -309,7 +309,7 @@ choice. For example to move the files in an error folder with a
 timestamp you can use
 `moveFailed=/error/${``file:name.noext``}-${date:now:yyyyMMddHHmmssSSS}.${``file:ext`}.
 
-See more examples at xref:file-language.adoc[File Language]
+See more examples at xref:manual::file-language.adoc[File Language]
 
 === Message Headers
 
@@ -323,7 +323,7 @@ The following headers are supported by this component:
 
 |`CamelFileName` |Specifies the name of the file to write (relative to the endpoint
 directory). This name can be a `String`; a `String` with a
-xref:file-language.adoc[File Language] or xref:simple-language.adoc[Simple]
+xref:manual::file-language.adoc[File Language] or xref:manual::simple-language.adoc[Simple]
 expression; or an Expression object. If it's
 `null` then Camel will auto-generate a filename based on the message
 unique ID.
@@ -530,8 +530,8 @@ from("direct:report").to("file:target/reports/?fileName=report.txt");
 === Filename Expression
 
 Filename can be set either using the *expression* option or as a
-string-based xref:file-language.adoc[File Language] expression in the
-`CamelFileName` header. See the xref:file-language.adoc[File Language]
+string-based xref:manual::file-language.adoc[File Language] expression in the
+`CamelFileName` header. See the xref:manual::file-language.adoc[File Language]
 for syntax and samples.
 
 [[File2-Consumingfilesfromfolderswhereothersdropfilesdirectly]]
@@ -814,7 +814,7 @@ today's date as a sub-folder name:
 from("file://inbox?move=backup/${date:now:yyyyMMdd}/${file:name}").to("...");
 ----
 
-See xref:file-language.adoc[File Language] for more samples.
+See xref:manual::file-language.adoc[File Language] for more samples.
 
 === Avoiding reading the same file more than once (idempotent consumer)
 
@@ -1011,7 +1011,7 @@ Registry for a bean with the ID, `mySorter`.
 ==== Sorting using sortBy
 
 Camel supports pluggable sorting strategies. This strategy it to use the
-xref:file-language.adoc[File Language] to configure the sorting. The
+xref:manual::file-language.adoc[File Language] to configure the sorting. The
 `sortBy` option is configured as follows:
 
 [source]
@@ -1035,7 +1035,7 @@ This will sort by file name, you can reverse the order by prefixing
 sortBy=reverse:file:name
 ----
 
-As we have the full power of xref:file-language.adoc[File Language] we
+As we have the full power of xref:manual::file-language.adoc[File Language] we
 can use some of the other parameters, so if we want to sort by file size
 we do:
 
@@ -1079,7 +1079,7 @@ sortBy=file:modified;file:name
 Now there is an issue here, can you spot it? Well the modified timestamp
 of the file is too fine as it will be in milliseconds, but what if we
 want to sort by date only and then subgroup by name? +
- Well as we have the true power of xref:file-language.adoc[File Language] we can use its date command that supports patterns. So this
+ Well as we have the true power of xref:manual::file-language.adoc[File Language] we can use its date command that supports patterns. So this
 can be solved as:
 
 [source]
@@ -1170,6 +1170,6 @@ problems.
 
 === See Also
 
-* xref:file-language.adoc[File Language]
+* xref:manual::file-language.adoc[File Language]
 * FTP
 * Polling Consumer
diff --git a/docs/components/modules/ROOT/pages/grape-component.adoc b/docs/components/modules/ROOT/pages/grape-component.adoc
index 85a9708..5dbdaaa 100644
--- a/docs/components/modules/ROOT/pages/grape-component.adoc
+++ b/docs/components/modules/ROOT/pages/grape-component.adoc
@@ -132,7 +132,7 @@ By default Camel Grape component operates on the String payloads:
 producerTemplate.sendBody("grape:defaultMavenCoordinates", "org.apache.camel/camel-ftp/2.15.2");
 ------------------------------------------------------------------------------------------------
 
-But of course Camel build-in xref:type-converter.adoc[type conversion
+But of course Camel build-in xref:manual::type-converter.adoc[type conversion
 API] can perform the automatic data type transformations for you. In the
 example below Camel automatically converts binary payload into the
 String:
diff --git a/docs/components/modules/ROOT/pages/groovy-language.adoc b/docs/components/modules/ROOT/pages/groovy-language.adoc
index cc62bba..e2c8000 100644
--- a/docs/components/modules/ROOT/pages/groovy-language.adoc
+++ b/docs/components/modules/ROOT/pages/groovy-language.adoc
@@ -6,7 +6,7 @@
 Camel supports http://groovy.codehaus.org/[Groovy] among other
 Scripting Languages to allow an
 Expression or Predicate to be
-used in the DSL or xref:xml-configuration.adoc[Xml
+used in the DSL or xref:manual::xml-configuration.adoc[Xml
 Configuration].
 
 To use a Groovy expression use the following Java code
diff --git a/docs/components/modules/ROOT/pages/http4-component.adoc b/docs/components/modules/ROOT/pages/http4-component.adoc
index 616a67e..a7e188b 100644
--- a/docs/components/modules/ROOT/pages/http4-component.adoc
+++ b/docs/components/modules/ROOT/pages/http4-component.adoc
@@ -565,7 +565,7 @@ behavior.
 Using the JSSE Configuration Utility
 
 The HTTP4 component supports SSL/TLS configuration
-through the xref:camel-configuration-utilities.adoc[Camel JSSE
+through the xref:manual::camel-configuration-utilities.adoc[Camel JSSE
 Configuration Utility].  This utility greatly decreases the amount of
 component specific code you need to write and is configurable at the
 endpoint and component levels.  The following examples demonstrate how
diff --git a/docs/components/modules/ROOT/pages/irc-component.adoc b/docs/components/modules/ROOT/pages/irc-component.adoc
index 7fc0250..a07bfa7 100644
--- a/docs/components/modules/ROOT/pages/irc-component.adoc
+++ b/docs/components/modules/ROOT/pages/irc-component.adoc
@@ -150,7 +150,7 @@ The component supports 4 options, which are listed below.
 #### Using the JSSE Configuration Utility
 
 The IRC component supports SSL/TLS configuration
-through the xref:camel-configuration-utilities.adoc[Camel JSSE
+through the xref:manual::camel-configuration-utilities.adoc[Camel JSSE
 Configuration Utility].  This utility greatly decreases the amount of
 component specific code you need to write and is configurable at the
 endpoint and component levels.  The following examples demonstrate how
diff --git a/docs/components/modules/ROOT/pages/jetty-component.adoc b/docs/components/modules/ROOT/pages/jetty-component.adoc
index e9e7cc5..5476b13 100644
--- a/docs/components/modules/ROOT/pages/jetty-component.adoc
+++ b/docs/components/modules/ROOT/pages/jetty-component.adoc
@@ -283,7 +283,7 @@ Jetty component will copy the HTTP request parameter, `one` to the
 exchange's `in.header`. We can then use the `simple` language to route
 exchanges that contain this header to a specific endpoint and all others
 to another. If we used a language more powerful than
-xref:simple-language.adoc[Simple] (such as xref:el-language.adoc[EL] or
+xref:manual::simple-language.adoc[Simple] (such as xref:el-language.adoc[EL] or
 xref:ognl-language.adoc[OGNL]) we could also test for the parameter value and do
 routing based on the header value as well.
 
@@ -326,7 +326,7 @@ public void process(Exchange exchange) throws Exception {
 Using the JSSE Configuration Utility
 
 The Jetty component supports SSL/TLS configuration
-through the xref:camel-configuration-utilities.adoc[Camel JSSE
+through the xref:manual::camel-configuration-utilities.adoc[Camel JSSE
 Configuration Utility].  This utility greatly decreases the amount of
 component specific code you need to write and is configurable at the
 endpoint and component levels.  The following examples demonstrate how
diff --git a/docs/components/modules/ROOT/pages/jms-component.adoc b/docs/components/modules/ROOT/pages/jms-component.adoc
index aed022e..f8d08ec 100644
--- a/docs/components/modules/ROOT/pages/jms-component.adoc
+++ b/docs/components/modules/ROOT/pages/jms-component.adoc
@@ -692,7 +692,7 @@ the documentation.
 
 Normally, when using xref:jms-component.adoc[JMS] as the transport, it only
 transfers the body and headers as the payload. If you want to use
-xref:jms-component.adoc[JMS] with a xref:dead-letter-channel.adoc[Dead Letter
+xref:jms-component.adoc[JMS] with a xref:manual::dead-letter-channel.adoc[Dead Letter
 Channel], using a JMS queue as the Dead Letter Queue, then normally the
 caused Exception is not stored in the JMS message. You can, however, use
 the `transferExchange` option on the JMS dead letter queue to instruct
diff --git a/docs/components/modules/ROOT/pages/language-component.adoc b/docs/components/modules/ROOT/pages/language-component.adoc
index dc3b08b..a3f0a81 100644
--- a/docs/components/modules/ROOT/pages/language-component.adoc
+++ b/docs/components/modules/ROOT/pages/language-component.adoc
@@ -8,7 +8,7 @@ to an endpoint which executes a script by any of the supported
 Languages in Camel. +
  By having a component to execute language scripts, it allows more
 dynamic routing capabilities. For example by using the
-Routing Slip or xref:dynamic-router.adoc[Dynamic
+Routing Slip or xref:manual::dynamic-router.adoc[Dynamic
 Router] EIPs you can send messages to `language` endpoints where the
 script is dynamic defined as well.
 
@@ -132,7 +132,7 @@ script configured on the endpoint.
 
 === Examples
 
-For example you can use the xref:simple-language.adoc[Simple] language to
+For example you can use the xref:manual::simple-language.adoc[Simple] language to
 Message Translator a message:
 
 In case you want to convert the message body type you can do this as
diff --git a/docs/components/modules/ROOT/pages/mail-component.adoc b/docs/components/modules/ROOT/pages/mail-component.adoc
index 68dccfc..acb8b67 100644
--- a/docs/components/modules/ROOT/pages/mail-component.adoc
+++ b/docs/components/modules/ROOT/pages/mail-component.adoc
@@ -341,7 +341,7 @@ configuration.
 ==== Using the JSSE Configuration Utility
 
 The mail component supports SSL/TLS configuration
-through the xref:camel-configuration-utilities.adoc[Camel JSSE
+through the xref:manual::camel-configuration-utilities.adoc[Camel JSSE
 Configuration Utility].  This utility greatly decreases the amount of
 component specific code you need to write and is configurable at the
 endpoint and component levels.  The following examples demonstrate how
diff --git a/docs/components/modules/ROOT/pages/mock-component.adoc b/docs/components/modules/ROOT/pages/mock-component.adoc
index 5388d43..11c36a5 100644
--- a/docs/components/modules/ROOT/pages/mock-component.adoc
+++ b/docs/components/modules/ROOT/pages/mock-component.adoc
@@ -8,7 +8,7 @@ notoriously difficult. The xref:mock-component.adoc[Mock], xref:mock-component.a
 and xref:dataset-component.adoc[DataSet] endpoints work great with the
 Camel Testing Framework to simplify your unit and
 integration testing using
-xref:enterprise-integration-patterns.adoc[Enterprise Integration
+xref:manual::enterprise-integration-patterns.adoc[Enterprise Integration
 Patterns] and Camel's large range of Components
 together with the powerful Bean Integration.
 
diff --git a/docs/components/modules/ROOT/pages/netty4-component.adoc b/docs/components/modules/ROOT/pages/netty4-component.adoc
index 52d0ea9..40806ba 100644
--- a/docs/components/modules/ROOT/pages/netty4-component.adoc
+++ b/docs/components/modules/ROOT/pages/netty4-component.adoc
@@ -406,7 +406,7 @@ RouteBuilder builder = new RouteBuilder() {
 Using the JSSE Configuration Utility
 
 The Netty component supports SSL/TLS configuration
-through the xref:camel-configuration-utilities.adoc[Camel JSSE
+through the xref:manual::camel-configuration-utilities.adoc[Camel JSSE
 Configuration Utility].  This utility greatly decreases the amount of
 component specific code you need to write and is configurable at the
 endpoint and component levels.  The following examples demonstrate how
diff --git a/docs/components/modules/ROOT/pages/paho-component.adoc b/docs/components/modules/ROOT/pages/paho-component.adoc
index cae5aa4..08bb67a 100644
--- a/docs/components/modules/ROOT/pages/paho-component.adoc
+++ b/docs/components/modules/ROOT/pages/paho-component.adoc
@@ -173,7 +173,7 @@ byte[] payload = "message".getBytes();
 producerTemplate.sendBody("paho:topic", payload);
 ----
 
-But of course Camel build-in xref:type-converter.adoc[type conversion
+But of course Camel build-in xref:manual::type-converter.adoc[type conversion
 API] can perform the automatic data type transformations for you. In the
 example below Camel automatically converts binary payload into `String`
 (and conversely):
diff --git a/docs/components/modules/ROOT/pages/properties-component.adoc b/docs/components/modules/ROOT/pages/properties-component.adoc
index a47fb77..7982075 100644
--- a/docs/components/modules/ROOT/pages/properties-component.adoc
+++ b/docs/components/modules/ROOT/pages/properties-component.adoc
@@ -390,9 +390,9 @@ ProducerTemplate for example:
 template.sendBody("{{cool.start}}", "Hello World");
 ----
 
-=== Example with xref:simple-language.adoc[Simple] language
+=== Example with xref:manual::simple-language.adoc[Simple] language
 
-The xref:simple-language.adoc[Simple] language now also support using property
+The xref:manual::simple-language.adoc[Simple] language now also support using property
 placeholders, for example in the route below:
 
 [source,java]
@@ -655,7 +655,7 @@ placeholder notation with `{{` and `}}`.
 === Clashing Spring property placeholders with Camels Simple language
 
 Take notice when using Spring bridging placeholder then the spring `${ }`
-syntax clashes with the xref:simple-language.adoc[Simple] in Camel, and therefore
+syntax clashes with the xref:manual::simple-language.adoc[Simple] in Camel, and therefore
 take care. For example:
 
 [source,xml]
@@ -666,7 +666,7 @@ take care. For example:
 ----
 
 clashes with Spring property placeholders, and you should use `$simple{ }`
-to indicate using the xref:simple-language.adoc[Simple] language in Camel.
+to indicate using the xref:manual::simple-language.adoc[Simple] language in Camel.
 
 [source,xml]
 ----
diff --git a/docs/components/modules/ROOT/pages/spring-event-component.adoc b/docs/components/modules/ROOT/pages/spring-event-component.adoc
index a166da2..ed628b1 100644
--- a/docs/components/modules/ROOT/pages/spring-event-component.adoc
+++ b/docs/components/modules/ROOT/pages/spring-event-component.adoc
@@ -7,7 +7,7 @@ The Spring Event component provides access to the Spring
 `ApplicationEvent` objects. This allows you to publish
 `ApplicationEvent` objects to a Spring `ApplicationContext` or to
 consume them. You can then use
-xref:enterprise-integration-patterns.adoc[Enterprise Integration
+xref:manual::enterprise-integration-patterns.adoc[Enterprise Integration
 Patterns] to process them such as xref:message-filter.adoc[Message
 Filter].
 
diff --git a/docs/components/modules/ROOT/pages/spring.adoc b/docs/components/modules/ROOT/pages/spring.adoc
index f83baf7..6af9007 100644
--- a/docs/components/modules/ROOT/pages/spring.adoc
+++ b/docs/components/modules/ROOT/pages/spring.adoc
@@ -8,7 +8,7 @@ http://www.springframework.org/[Spring Framework] in a number of ways.
 components like xref:jms-component.adoc[JMS] and xref:jms-component.adoc[JPA]
 * Camel works with Spring 2 XML processing with the
 Xml Configuration
-* Camel Spring XML Schema's is defined at xref:xml-reference.adoc[Xml
+* Camel Spring XML Schema's is defined at xref:manual::xml-reference.adoc[Xml
 Reference]
 * Camel supports a powerful version of xref:spring-remoting.adoc[Spring
 Remoting] which can use powerful routing between the client and server
@@ -24,7 +24,7 @@ instances or the CamelContext instance itself
 and auto-expose Spring beans as components and endpoints.
 * Allows you to reuse the Spring Testing
 framework to simplify your unit and integration testing using
-xref:enterprise-integration-patterns.adoc[Enterprise Integration
+xref:manual::enterprise-integration-patterns.adoc[Enterprise Integration
 Patterns] and Camel's powerful xref:mock-component.adoc[Mock] and
 xref:test-component.adoc[Test] endpoints
 Camel supports Spring Boot using the `camel-spring-boot` component.
@@ -228,7 +228,7 @@ above in the `<packageScan>` documentation.
 
 *Available as of Camel 2.3*
 
-When defining routes in Camel using xref:xml-configuration.adoc[Xml
+When defining routes in Camel using xref:manual::xml-configuration.adoc[Xml
 Configuration] you may want to define some routes in other XML files.
 For example you may have many routes and it may help to maintain the
 application if some of the routes are in separate XML files. You may
@@ -349,7 +349,7 @@ If you want to be injected with the CamelContext
 in your POJO just implement the
 http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/CamelContextAware.html[CamelContextAware
 interface]; then when Spring creates your POJO the CamelContext will be
-injected into your POJO. Also see the xref:bean-integration.adoc[Bean
+injected into your POJO. Also see the xref:manual::bean-integration.adoc[Bean
 Integration] for further injections.
 
 === Integration Testing
diff --git a/docs/components/modules/ROOT/pages/univocity-csv-dataformat.adoc b/docs/components/modules/ROOT/pages/univocity-csv-dataformat.adoc
index c9911f8..651b44b 100644
--- a/docs/components/modules/ROOT/pages/univocity-csv-dataformat.adoc
+++ b/docs/components/modules/ROOT/pages/univocity-csv-dataformat.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.15*
 
-This xref:data-format.adoc[Data
+This xref:manual::data-format.adoc[Data
 Format] uses http://www.univocity.com/pages/about-parsers[uniVocity-parsers]
 for reading and writing 3 kinds of tabular data text files:
 
diff --git a/docs/components/modules/ROOT/pages/univocity-fixed-dataformat.adoc b/docs/components/modules/ROOT/pages/univocity-fixed-dataformat.adoc
index a54d9f4..c53c803 100644
--- a/docs/components/modules/ROOT/pages/univocity-fixed-dataformat.adoc
+++ b/docs/components/modules/ROOT/pages/univocity-fixed-dataformat.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.15*
 
-This xref:data-format.adoc[Data
+This xref:manual::data-format.adoc[Data
 Format] uses http://www.univocity.com/pages/about-parsers[uniVocity-parsers]
 for reading and writing 3 kinds of tabular data text files:
 
diff --git a/docs/components/modules/ROOT/pages/univocity-tsv-dataformat.adoc b/docs/components/modules/ROOT/pages/univocity-tsv-dataformat.adoc
index 8069fd1..ee5bc27 100644
--- a/docs/components/modules/ROOT/pages/univocity-tsv-dataformat.adoc
+++ b/docs/components/modules/ROOT/pages/univocity-tsv-dataformat.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.15*
 
-This xref:data-format.adoc[Data
+This xref:manual::data-format.adoc[Data
 Format] uses http://www.univocity.com/pages/about-parsers[uniVocity-parsers]
 for reading and writing 3 kinds of tabular data text files:
 
diff --git a/docs/components/modules/ROOT/pages/websocket-component.adoc b/docs/components/modules/ROOT/pages/websocket-component.adoc
index 16f3864..604cf17 100644
--- a/docs/components/modules/ROOT/pages/websocket-component.adoc
+++ b/docs/components/modules/ROOT/pages/websocket-component.adoc
@@ -206,7 +206,7 @@ from("activemq:topic:newsTopic")
 #### Using the JSSE Configuration Utility
 
 The WebSocket component supports SSL/TLS configuration
-through the xref:camel-configuration-utilities.adoc[Camel JSSE
+through the xref:manual::camel-configuration-utilities.adoc[Camel JSSE
 Configuration Utility].  This utility greatly decreases the amount of
 component specific code you need to write and is configurable at the
 endpoint and component levels.  The following examples demonstrate how
diff --git a/docs/components/modules/ROOT/pages/xmlsecurity-component.adoc b/docs/components/modules/ROOT/pages/xmlsecurity-component.adoc
index 0116b41..6bd9a79 100644
--- a/docs/components/modules/ROOT/pages/xmlsecurity-component.adoc
+++ b/docs/components/modules/ROOT/pages/xmlsecurity-component.adoc
@@ -8,7 +8,7 @@ signatures as described in the W3C standard
 http://www.w3.org/TR/xmldsig-core/[XML Signature Syntax and Processing]
 or as described in the successor
 http://www.w3.org/TR/xmldsig-core1/[version 1.1]. For XML Encryption
-support, please refer to the XML Security xref:data-format.adoc[Data
+support, please refer to the XML Security xref:manual::data-format.adoc[Data
 Format].
 
 You can find an introduction to XML signature
diff --git a/docs/components/modules/ROOT/pages/xpath-language.adoc b/docs/components/modules/ROOT/pages/xpath-language.adoc
index 5c673e3..68eee5a 100644
--- a/docs/components/modules/ROOT/pages/xpath-language.adoc
+++ b/docs/components/modules/ROOT/pages/xpath-language.adoc
@@ -5,7 +5,7 @@
 
 Camel supports http://www.w3.org/TR/xpath[XPath] to allow an
 Expression or Predicate to be
-used in the DSL or xref:xml-configuration.adoc[Xml
+used in the DSL or xref:manual::xml-configuration.adoc[Xml
 Configuration]. For example you could use XPath to create an
 Predicate in a xref:message-filter.adoc[Message
 Filter] or as an Expression for a
@@ -127,7 +127,7 @@ exchange:
 |function:properties |key for property |String |To lookup a property using the
 xref:properties-component.adoc[Properties] component (property placeholders).
 
-|function:simple |simple expression |Object |To evaluate a xref:simple-language.adoc[Simple] expression.
+|function:simple |simple expression |Object |To evaluate a xref:manual::simple-language.adoc[Simple] expression.
 |===
 
 CAUTION: `function:properties` and `function:simple` is not supported
diff --git a/docs/components/modules/ROOT/pages/xquery-component.adoc b/docs/components/modules/ROOT/pages/xquery-component.adoc
index 9a2e394..a55ec7c 100644
--- a/docs/components/modules/ROOT/pages/xquery-component.adoc
+++ b/docs/components/modules/ROOT/pages/xquery-component.adoc
@@ -5,7 +5,7 @@
 
 Camel supports http://www.w3.org/TR/xquery/[XQuery] to allow an
 Expression or Predicate to be
-used in the DSL or xref:xml-configuration.adoc[Xml
+used in the DSL or xref:manual::xml-configuration.adoc[Xml
 Configuration]. For example you could use XQuery to create an
 Predicate in a xref:message-filter.adoc[Message
 Filter] or as an Expression for a
diff --git a/docs/components/modules/ROOT/pages/xquery-language.adoc b/docs/components/modules/ROOT/pages/xquery-language.adoc
index 6b52fb5..bddfee1 100644
--- a/docs/components/modules/ROOT/pages/xquery-language.adoc
+++ b/docs/components/modules/ROOT/pages/xquery-language.adoc
@@ -5,7 +5,7 @@
 
 Camel supports http://www.w3.org/TR/xquery/[XQuery] to allow an
 Expression or Predicate to be
-used in the DSL or xref:xml-configuration.adoc[Xml
+used in the DSL or xref:manual::xml-configuration.adoc[Xml
 Configuration]. For example you could use XQuery to create an
 Predicate in a xref:message-filter.adoc[Message
 Filter] or as an Expression for a


[camel] 12/12: Revert "Regen"

Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 831e4666d926f675fb876e17fc2e7e1dc9a71766
Author: nayananga@acerubuntu18.04 <na...@gmail.com>
AuthorDate: Sun Jul 21 18:29:23 2019 +0530

    Revert "Regen"
    
    This reverts commit 276c6cc03870196c47c5aa6dcaf83cc33079d383.
---
 .../sql/stored/template/generated/SSPTParser.java  |  29 +-
 .../template/generated/SSPTParserConstants.java    |  16 +
 .../template/generated/SSPTParserTokenManager.java |  16 +
 components/readme.adoc                             | 416 +--------------------
 4 files changed, 57 insertions(+), 420 deletions(-)

diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParser.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParser.java
index 13c79f5..776e3a8 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParser.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParser.java
@@ -1,10 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /* Generated By:JavaCC: Do not edit this line. SSPTParser.java */
 package org.apache.camel.component.sql.stored.template.generated;
 
-import java.io.Reader;
-
+import org.apache.camel.component.sql.stored.template.ast.InOutParameter;
+import org.apache.camel.component.sql.stored.template.ast.InParameter;
+import org.apache.camel.component.sql.stored.template.ast.OutParameter;
+import org.apache.camel.component.sql.stored.template.ast.ParseHelper;
+import org.apache.camel.component.sql.stored.template.ast.Template;
 import org.apache.camel.spi.ClassResolver;
-import org.apache.camel.component.sql.stored.template.ast.*;
+
+import java.io.Reader;
 
 public class SSPTParser implements SSPTParserConstants {
    int parameterNameCounter = 0;
@@ -207,7 +227,6 @@ public class SSPTParser implements SSPTParserConstants {
 
   final public Token ParameterSqlType() throws ParseException {
     Token t;
-    Token scaleToken;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case NUMBER:
       t = jj_consume_token(NUMBER);
@@ -375,7 +394,7 @@ public class SSPTParser implements SSPTParserConstants {
       return (jj_ntk = jj_nt.kind);
   }
 
-  private java.util.List<int[]> jj_expentries = new java.util.ArrayList<int[]>();
+  private java.util.List<int[]> jj_expentries = new java.util.ArrayList<>();
   private int[] jj_expentry;
   private int jj_kind = -1;
 
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserConstants.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserConstants.java
index f48d31d..b035f00 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserConstants.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserConstants.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /* Generated By:JavaCC: Do not edit this line. SSPTParserConstants.java */
 package org.apache.camel.component.sql.stored.template.generated;
 
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java
index ba002be..670034b 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /* Generated By:JavaCC: Do not edit this line. SSPTParserTokenManager.java */
 package org.apache.camel.component.sql.stored.template.generated;
 import java.io.Reader;
diff --git a/components/readme.adoc b/components/readme.adoc
index 42be1f10..dd3d90b 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -1056,444 +1056,44 @@ Number of Languages: 17 in 11 JAR artifacts (0 deprecated)
 ==== Miscellaneous Components
 
 // others: START
-Number of Miscellaneous Components: 240 in 240 JAR artifacts (0 deprecated)
+Number of Miscellaneous Components: 33 in 33 JAR artifacts (0 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===
 | Component | Available From | Description
 
-| link:camel-activemq/src/main/docs/activemq.adoc[Activemq] (camel-activemq) |  | ActiveMQ component for Camel
-
-| link:camel-ahc/src/main/docs/ahc.adoc[Ahc] (camel-ahc) |  | Camel Async Http Client support
-
-| link:camel-ahc-ws/src/main/docs/ahc-ws.adoc[Ahc Ws] (camel-ahc-ws) |  | Camel Websocket Client support
-
-| link:camel-amqp/src/main/docs/amqp.adoc[Amqp] (camel-amqp) |  | Camel AMQP component which is based on the Apache Qpid project
-
-| link:camel-apns/src/main/docs/apns.adoc[Apns] (camel-apns) |  | A Camel Apple Push Notification Server Component
-
-| link:camel-asn1/src/main/docs/asn1.adoc[Asn1] (camel-asn1) |  | Camel ASN.1 support
-
-| link:camel-asterisk/src/main/docs/asterisk.adoc[Asterisk] (camel-asterisk) |  | Camel Asterisk to interact with an Asterisk PBX Server
-
-| link:camel-atmos/src/main/docs/atmos.adoc[Atmos] (camel-atmos) |  | Camel Atmos support
-
-| link:camel-atmosphere-websocket/src/main/docs/atmosphere-websocket.adoc[Atmosphere Websocket] (camel-atmosphere-websocket) |  | Camel Atmosphere WebSocket Servlet
-
-| link:camel-atom/src/main/docs/atom.adoc[Atom] (camel-atom) |  | Camel Atom support
-
-| link:camel-atomix/src/main/docs/atomix.adoc[Atomix] (camel-atomix) |  | Camel Atomix support
-
 | link:camel-attachments/src/main/docs/attachments.adoc[Attachments] (camel-attachments) | 3.0 | Java Attachments support for Camel Message
 
-| link:camel-avro/src/main/docs/avro.adoc[Avro] (camel-avro) |  | Camel Avro data format
-
-| link:camel-aws-cw/src/main/docs/aws-cw.adoc[Aws Cw] (camel-aws-cw) |  | A Camel Amazon CW Web Service Component
-
-| link:camel-aws-ddb/src/main/docs/aws-ddb.adoc[Aws Ddb] (camel-aws-ddb) |  | A Camel Amazon DynamoDB Web Service Component
-
-| link:camel-aws-ec2/src/main/docs/aws-ec2.adoc[Aws Ec2] (camel-aws-ec2) |  | A Camel Amazon EC2 Web Service Component
-
-| link:camel-aws-ecs/src/main/docs/aws-ecs.adoc[Aws Ecs] (camel-aws-ecs) |  | A Camel Amazon ECS Web Service Component
-
-| link:camel-aws-eks/src/main/docs/aws-eks.adoc[Aws Eks] (camel-aws-eks) |  | A Camel Amazon EKS Web Service Component
-
-| link:camel-aws-iam/src/main/docs/aws-iam.adoc[Aws Iam] (camel-aws-iam) |  | A Camel Amazon IAM Web Service Component
-
-| link:camel-aws-kinesis/src/main/docs/aws-kinesis.adoc[Aws Kinesis] (camel-aws-kinesis) |  | A Camel Amazon Kinesis Web Service Component
-
-| link:camel-aws-kms/src/main/docs/aws-kms.adoc[Aws Kms] (camel-aws-kms) |  | A Camel Amazon KMS Web Service Component
-
-| link:camel-aws-lambda/src/main/docs/aws-lambda.adoc[Aws Lambda] (camel-aws-lambda) |  | A Camel Amazon Lambda We Service Component
-
-| link:camel-aws-mq/src/main/docs/aws-mq.adoc[Aws Mq] (camel-aws-mq) |  | A Camel Amazon MQ Web Service Component
-
-| link:camel-aws-msk/src/main/docs/aws-msk.adoc[Aws Msk] (camel-aws-msk) |  | A Camel Amazon MSK Web Service Component
-
-| link:camel-aws-s3/src/main/docs/aws-s3.adoc[Aws S3] (camel-aws-s3) |  | A Camel Amazon S3 Web Service Component
-
-| link:camel-aws-sdb/src/main/docs/aws-sdb.adoc[Aws Sdb] (camel-aws-sdb) |  | A Camel Amazon SDB Web Service Component
-
-| link:camel-aws-ses/src/main/docs/aws-ses.adoc[Aws Ses] (camel-aws-ses) |  | A Camel Amazon SES Web Service Component
-
-| link:camel-aws-sns/src/main/docs/aws-sns.adoc[Aws Sns] (camel-aws-sns) |  | A Camel Amazon SNS Web Service Component
-
-| link:camel-aws-sqs/src/main/docs/aws-sqs.adoc[Aws Sqs] (camel-aws-sqs) |  | A Camel Amazon SQS Web Service Component
-
-| link:camel-aws-swf/src/main/docs/aws-swf.adoc[Aws Swf] (camel-aws-swf) |  | A Camel Amazon SWF Web Service Component
-
-| link:camel-azure/src/main/docs/azure.adoc[Azure] (camel-azure) |  | Camel Microsoft Azure Components
-
-| link:camel-barcode/src/main/docs/barcode.adoc[Barcode] (camel-barcode) |  | Camel Barcode (e.g. QRcode, PDF417, DataMatrix) support
-
-| link:camel-base64/src/main/docs/base64.adoc[Base64] (camel-base64) |  | Camel Base64 data format support
-
-| link:camel-bean/src/main/docs/bean.adoc[Bean] (camel-bean) |  | Camel Bean component
-
-| link:camel-bean-validator/src/main/docs/bean-validator.adoc[Bean Validator] (camel-bean-validator) |  | Camel bean validation support (JSR 303)
-
-| link:camel-beanio/src/main/docs/beanio.adoc[Beanio] (camel-beanio) |  | Camel BeanIO data format support
-
-| link:camel-beanstalk/src/main/docs/beanstalk.adoc[Beanstalk] (camel-beanstalk) |  | Camel Beanstalk component
-
-| link:camel-bindy/src/main/docs/bindy.adoc[Bindy] (camel-bindy) |  | Camel Bindy data format support
-
 | link:camel-blueprint/src/main/docs/blueprint.adoc[Blueprint] (camel-blueprint) | 2.4 | Using Camel with OSGi Blueprint
 
-| link:camel-bonita/src/main/docs/bonita.adoc[Bonita] (camel-bonita) |  | Camel Bonita support
-
-| link:camel-boon/src/main/docs/boon.adoc[Boon] (camel-boon) |  | Camel Boon support
-
-| link:camel-braintree/src/main/docs/braintree.adoc[Braintree] (camel-braintree) |  | Camel Braintree support
-
-| link:camel-browse/src/main/docs/browse.adoc[Browse] (camel-browse) |  | Camel Browse component
-
-| link:camel-caffeine/src/main/docs/caffeine.adoc[Caffeine] (camel-caffeine) |  | Camel Caffeine support
-
-| link:camel-cassandraql/src/main/docs/cassandraql.adoc[Cassandraql] (camel-cassandraql) |  | Cassandra CQL3 support
-
-| link:camel-cbor/src/main/docs/cbor.adoc[Cbor] (camel-cbor) |  | Camel Cbor Support
-
 | link:camel-cdi/src/main/docs/cdi.adoc[CDI] (camel-cdi) | 2.10 | Using Camel with CDI
 
-| link:camel-chatscript/src/main/docs/chatscript.adoc[Chatscript] (camel-chatscript) |  | Camel support for ChatScript
-
-| link:camel-chunk/src/main/docs/chunk.adoc[Chunk] (camel-chunk) |  | Camel Chunk support
-
-| link:camel-cm-sms/src/main/docs/cm-sms.adoc[Cm Sms] (camel-cm-sms) |  | Camel CM SMS Gateway Component
-
-| link:camel-cmis/src/main/docs/cmis.adoc[Cmis] (camel-cmis) |  | Camel CMIS which is based on Apache Chemistry support
-
-| link:camel-coap/src/main/docs/coap.adoc[Coap] (camel-coap) |  | Camel CoAP support
-
-| link:camel-cometd/src/main/docs/cometd.adoc[Cometd] (camel-cometd) |  | Camel Cometd support based on Jetty
-
-| link:camel-consul/src/main/docs/consul.adoc[Consul] (camel-consul) |  | Camel Consul support
-
-| link:camel-controlbus/src/main/docs/controlbus.adoc[Controlbus] (camel-controlbus) |  | Camel Controlbus component
-
-| link:camel-corda/src/main/docs/corda.adoc[Corda] (camel-corda) |  | Camel Corda which is based on corda-rpc support
-
-| link:camel-couchbase/src/main/docs/couchbase.adoc[Couchbase] (camel-couchbase) |  | Camel Couchbase component
-
-| link:camel-couchdb/src/main/docs/couchdb.adoc[Couchdb] (camel-couchdb) |  | Camel CouchDB component
-
-| link:camel-crypto/src/main/docs/crypto.adoc[Crypto] (camel-crypto) |  | Camel Cryptographic Support
-
-| link:camel-crypto-cms/src/main/docs/crypto-cms.adoc[Crypto Cms] (camel-crypto-cms) |  | Camel Cryptographic Message Syntax Support
-
-| link:camel-csv/src/main/docs/csv.adoc[Csv] (camel-csv) |  | Camel CSV data format support
-
-| link:camel-cxf/src/main/docs/cxf.adoc[Cxf] (camel-cxf) |  | Camel CXF support
-
 | link:camel-cxf-transport/src/main/docs/cxf-transport.adoc[CXF Transport] (camel-cxf-transport) | 2.8 | Camel Transport for Apache CXF
 
-| link:camel-dataformat/src/main/docs/dataformat.adoc[Dataformat] (camel-dataformat) |  | Camel DataFormat component
-
-| link:camel-dataset/src/main/docs/dataset.adoc[Dataset] (camel-dataset) |  | Camel DataSet component
-
-| link:camel-digitalocean/src/main/docs/digitalocean.adoc[Digitalocean] (camel-digitalocean) |  | Camel DigitalOcean support
-
-| link:camel-direct/src/main/docs/direct.adoc[Direct] (camel-direct) |  | Camel Direct component
-
-| link:camel-directvm/src/main/docs/directvm.adoc[Directvm] (camel-directvm) |  | Camel Direct VM component
-
-| link:camel-disruptor/src/main/docs/disruptor.adoc[Disruptor] (camel-disruptor) |  | Camel :: Disruptor component
-
-| link:camel-dns/src/main/docs/dns.adoc[Dns] (camel-dns) |  | Camel DNS support
-
-| link:camel-docker/src/main/docs/docker.adoc[Docker] (camel-docker) |  | Camel Docker Support
-
-| link:camel-dozer/src/main/docs/dozer.adoc[Dozer] (camel-dozer) |  | Camel Support for the Dozer type conversion framework
-
-| link:camel-drill/src/main/docs/drill.adoc[Drill] (camel-drill) |  | Camel Apache Drill support
-
-| link:camel-dropbox/src/main/docs/dropbox.adoc[Dropbox] (camel-dropbox) |  | Camel Dropbox support
-
-| link:camel-ehcache/src/main/docs/ehcache.adoc[Ehcache] (camel-ehcache) |  | Camel Ehcache support
-
-| link:camel-ejb/src/main/docs/ejb.adoc[Ejb] (camel-ejb) |  | Camel EJB support
-
-| link:camel-elasticsearch-rest/src/main/docs/elasticsearch-rest.adoc[Elasticsearch Rest] (camel-elasticsearch-rest) |  | Camel ElasticSearch REST support
-
-| link:camel-elsql/src/main/docs/elsql.adoc[Elsql] (camel-elsql) |  | Camel ElSql support
-
-| link:camel-etcd/src/main/docs/etcd.adoc[Etcd] (camel-etcd) |  | Camel Etcd support
-
-| link:camel-eventadmin/src/main/docs/eventadmin.adoc[Eventadmin] (camel-eventadmin) |  | Camel OSGi Event Admin support
-
-| link:camel-exec/src/main/docs/exec.adoc[Exec] (camel-exec) |  | Camel support for system command execution
-
-| link:camel-facebook/src/main/docs/facebook.adoc[Facebook] (camel-facebook) |  | Camel Facebook Support
-
-| link:camel-fastjson/src/main/docs/fastjson.adoc[Fastjson] (camel-fastjson) |  | Camel Fastjson support
-
-| link:camel-file/src/main/docs/file.adoc[File] (camel-file) |  | Camel File component
-
-| link:camel-file-watch/src/main/docs/file-watch.adoc[File Watch] (camel-file-watch) |  | Camel File Watch component
-
-| link:camel-flatpack/src/main/docs/flatpack.adoc[Flatpack] (camel-flatpack) |  | Camel FlatPack support
-
-| link:camel-flink/src/main/docs/flink.adoc[Flink] (camel-flink) |  | Camel Apache Flink support
-
-| link:camel-fop/src/main/docs/fop.adoc[Fop] (camel-fop) |  | Camel FOP support
-
-| link:camel-freemarker/src/main/docs/freemarker.adoc[Freemarker] (camel-freemarker) |  | Camel Freemarker support
-
-| link:camel-ftp/src/main/docs/ftp.adoc[Ftp] (camel-ftp) |  | Camel FTP support
-
-| link:camel-ganglia/src/main/docs/ganglia.adoc[Ganglia] (camel-ganglia) |  | Camel Ganglia support
-
-| link:camel-geocoder/src/main/docs/geocoder.adoc[Geocoder] (camel-geocoder) |  | Camel GeoCoder support
-
-| link:camel-git/src/main/docs/git.adoc[Git] (camel-git) |  | Camel Components
-
-| link:camel-github/src/main/docs/github.adoc[Github] (camel-github) |  | Camel Components
-
-| link:camel-google-bigquery/src/main/docs/google-bigquery.adoc[Google Bigquery] (camel-google-bigquery) |  | Camel Component for Google Cloud Platform BigQuery
-
-| link:camel-google-calendar/src/main/docs/google-calendar.adoc[Google Calendar] (camel-google-calendar) |  | Camel Component for GoogleCalendar
-
-| link:camel-google-drive/src/main/docs/google-drive.adoc[Google Drive] (camel-google-drive) |  | Camel Component for GoogleDrive
-
-| link:camel-google-mail/src/main/docs/google-mail.adoc[Google Mail] (camel-google-mail) |  | Camel Component for GoogleMail
-
-| link:camel-google-pubsub/src/main/docs/google-pubsub.adoc[Google Pubsub] (camel-google-pubsub) |  | Camel Component for Google Cloud Platform PubSub
-
-| link:camel-google-sheets/src/main/docs/google-sheets.adoc[Google Sheets] (camel-google-sheets) |  | Camel Component for Google Sheets
-
-| link:camel-gora/src/main/docs/gora.adoc[Gora] (camel-gora) |  | Gora Component for Apache Camel.
-
-| link:camel-grape/src/main/docs/grape.adoc[Grape] (camel-grape) |  | The grape component allows you to fetch, load and manage additional jars when CamelContext is running
-
-| link:camel-grok/src/main/docs/grok.adoc[Grok] (camel-grok) |  | Camel Grok support
-
-| link:camel-groovy/src/main/docs/groovy.adoc[Groovy] (camel-groovy) |  | Camel Groovy support
-
-| link:camel-grpc/src/main/docs/grpc.adoc[Grpc] (camel-grpc) |  | Camel component for gRPC (Remote Procedure Call) support
-
-| link:camel-gson/src/main/docs/gson.adoc[Gson] (camel-gson) |  | Camel Gson support
-
-| link:camel-guava-eventbus/src/main/docs/guava-eventbus.adoc[Guava Eventbus] (camel-guava-eventbus) |  | Camel Guava EventBus support
-
-| link:camel-hazelcast/src/main/docs/hazelcast.adoc[Hazelcast] (camel-hazelcast) |  | Camel HazelCast based work queue implementation
-
-| link:camel-hbase/src/main/docs/hbase.adoc[Hbase] (camel-hbase) |  | Camel HBase component
-
-| link:camel-hdfs2/src/main/docs/hdfs2.adoc[Hdfs2] (camel-hdfs2) |  | Camel HDFS support with Hadoop 2.x libraries
-
-| link:camel-hipchat/src/main/docs/hipchat.adoc[Hipchat] (camel-hipchat) |  | Camel Hipchat Component
-
-| link:camel-hl7/src/main/docs/hl7.adoc[Hl7] (camel-hl7) |  | Camel HL7 support
-
-| link:camel-http4/src/main/docs/http4.adoc[Http4] (camel-http4) |  | Camel HTTP (Apache HttpClient 4.x) support
-
 | link:camel-hystrix/src/main/docs/hystrix.adoc[Hystrix] (camel-hystrix) | 2.18 | Circuit Breaker EIP using Netflix Hystrix
 
-| link:camel-ical/src/main/docs/ical.adoc[Ical] (camel-ical) |  | Camel iCal component
-
-| link:camel-iec60870/src/main/docs/iec60870.adoc[Iec60870] (camel-iec60870) |  | Camel IEC 60870-5-104 support
-
-| link:camel-ignite/src/main/docs/ignite.adoc[Ignite] (camel-ignite) |  | Camel Ignite component
-
-| link:camel-infinispan/src/main/docs/infinispan.adoc[Infinispan] (camel-infinispan) |  | Camel Infinispan support
-
-| link:camel-influxdb/src/main/docs/influxdb.adoc[Influxdb] (camel-influxdb) |  | Camel InfluxDB component
-
-| link:camel-iota/src/main/docs/iota.adoc[Iota] (camel-iota) |  | Camel IOTA component
-
-| link:camel-ipfs/src/main/docs/ipfs.adoc[Ipfs] (camel-ipfs) |  | Camel IPFS support
-
-| link:camel-irc/src/main/docs/irc.adoc[Irc] (camel-irc) |  | Camel IRC support
-
-| link:camel-ironmq/src/main/docs/ironmq.adoc[Ironmq] (camel-ironmq) |  | Camel IronMQ component
-
-| link:camel-jackson/src/main/docs/jackson.adoc[Jackson] (camel-jackson) |  | Camel Jackson support
-
-| link:camel-jacksonxml/src/main/docs/jacksonxml.adoc[Jacksonxml] (camel-jacksonxml) |  | Camel Jackson XML support
-
 | link:camel-jasypt/src/main/docs/jasypt.adoc[Jasypt] (camel-jasypt) | 2.5 | Security using Jasypt
 
-| link:camel-jaxb/src/main/docs/jaxb.adoc[Jaxb] (camel-jaxb) |  | Camel JAXB support
-
-| link:camel-jbpm/src/main/docs/jbpm.adoc[Jbpm] (camel-jbpm) |  | Camel JBPM support
-
-| link:camel-jcache/src/main/docs/jcache.adoc[Jcache] (camel-jcache) |  | Camel JCache support
-
-| link:camel-jclouds/src/main/docs/jclouds.adoc[Jclouds] (camel-jclouds) |  | Camel JClouds support
-
-| link:camel-jcr/src/main/docs/jcr.adoc[Jcr] (camel-jcr) |  | Camel JCR support
-
-| link:camel-jdbc/src/main/docs/jdbc.adoc[Jdbc] (camel-jdbc) | 1.2 | Camel JDBC support
-
-| link:camel-jetty/src/main/docs/jetty.adoc[Jetty] (camel-jetty) |  | Camel Jetty support
-
-| link:camel-jgroups/src/main/docs/jgroups.adoc[Jgroups] (camel-jgroups) |  | Camel JGroups support
-
-| link:camel-jgroups-raft/src/main/docs/jgroups-raft.adoc[Jgroups Raft] (camel-jgroups-raft) |  | Camel jgroups-raft support
-
-| link:camel-jing/src/main/docs/jing.adoc[Jing] (camel-jing) |  | Camel Jing support
-
-| link:camel-jira/src/main/docs/jira.adoc[Jira] (camel-jira) |  | Camel Components
-
-| link:camel-jms/src/main/docs/jms.adoc[Jms] (camel-jms) |  | Camel JMS support
-
-| link:camel-jmx/src/main/docs/jmx.adoc[Jmx] (camel-jmx) |  | Camel JMX support
-
-| link:camel-johnzon/src/main/docs/johnzon.adoc[Johnzon] (camel-johnzon) |  | Camel Johnzon support
-
-| link:camel-jolt/src/main/docs/jolt.adoc[Jolt] (camel-jolt) |  | Camel Jolt Support
-
-| link:camel-jooq/src/main/docs/jooq.adoc[Jooq] (camel-jooq) |  | The jooq component enables you to store and retrieve entities from databases using JOOQ
-
-| link:camel-jpa/src/main/docs/jpa.adoc[Jpa] (camel-jpa) |  | Camel JPA support
-
-| link:camel-jsch/src/main/docs/jsch.adoc[Jsch] (camel-jsch) |  | Camel SCP Support
-
-| link:camel-json-validator/src/main/docs/json-validator.adoc[Json Validator] (camel-json-validator) |  | Camel JSON Schema validation based on NetworkNT SON-schema library
-
-| link:camel-jsonapi/src/main/docs/jsonapi.adoc[Jsonapi] (camel-jsonapi) |  | Camel JsonApi data format
-
-| link:camel-jsonpath/src/main/docs/jsonpath.adoc[Jsonpath] (camel-jsonpath) |  | Camel JSON Path Language
-
-| link:camel-jt400/src/main/docs/jt400.adoc[Jt400] (camel-jt400) |  | Camel AS/400 support
-
-| link:camel-kafka/src/main/docs/kafka.adoc[Kafka] (camel-kafka) |  | Camel Kafka support
-
-| link:camel-kubernetes/src/main/docs/kubernetes.adoc[Kubernetes] (camel-kubernetes) |  | Camel Components
-
 | link:camel-kura/src/main/docs/kura.adoc[Kura] (camel-kura) | 2.15 | Using Camel with Eclipse Kura (OSGi)
 
-| link:camel-language/src/main/docs/language.adoc[Language] (camel-language) |  | Camel Language component
-
-| link:camel-ldap/src/main/docs/ldap.adoc[Ldap] (camel-ldap) |  | Camel LDAP support
-
-| link:camel-ldif/src/main/docs/ldif.adoc[Ldif] (camel-ldif) |  | Camel LDIF support
-
 | link:camel-leveldb/src/main/docs/leveldb.adoc[LevelDB] (camel-leveldb) | 2.10 | Using LevelDB as persistent EIP store
 
-| link:camel-log/src/main/docs/log.adoc[Log] (camel-log) |  | Camel Log component
-
 | link:camel-lra/src/main/docs/lra.adoc[Lra] (camel-lra) | 2.21 | Camel saga binding for Long-Running-Action framework
 
-| link:camel-lucene/src/main/docs/lucene.adoc[Lucene] (camel-lucene) |  | Camel Lucene based search component
-
-| link:camel-lumberjack/src/main/docs/lumberjack.adoc[Lumberjack] (camel-lumberjack) |  | Camel Lumberjack log streaming component
-
-| link:camel-lzf/src/main/docs/lzf.adoc[Lzf] (camel-lzf) |  | Camel LZF support
-
-| link:camel-mail/src/main/docs/mail.adoc[Mail] (camel-mail) |  | Camel Mail support
-
-| link:camel-master/src/main/docs/master.adoc[Master] (camel-master) |  | Camel Master Support
-
-| link:camel-metrics/src/main/docs/metrics.adoc[Metrics] (camel-metrics) |  | Camel Metrics based monitoring component
-
-| link:camel-micrometer/src/main/docs/micrometer.adoc[Micrometer] (camel-micrometer) |  | Camel Micrometer based monitoring component
-
 | link:camel-microprofile-config/src/main/docs/microprofile-config.adoc[Microprofile Config] (camel-microprofile-config) | 3.0 | Bridging Eclipse MicroProfile Config with Camel properties
 
-| link:camel-milo/src/main/docs/milo.adoc[Milo] (camel-milo) |  | Camel OPC UA support
-
-| link:camel-mina2/src/main/docs/mina2.adoc[Mina2] (camel-mina2) |  | Camel MINA 2.x support
-
-| link:camel-mllp/src/main/docs/mllp.adoc[Mllp] (camel-mllp) |  | Camel MLLP Component
-
-| link:camel-mock/src/main/docs/mock.adoc[Mock] (camel-mock) |  | Camel Mock component
-
-| link:camel-mongodb-gridfs/src/main/docs/mongodb-gridfs.adoc[Mongodb Gridfs] (camel-mongodb-gridfs) |  | Camel MongoDB GridFS component
-
-| link:camel-mongodb3/src/main/docs/mongodb3.adoc[Mongodb3] (camel-mongodb3) |  | Camel MongoDB (Java Driver 3) component
-
-| link:camel-mqtt/src/main/docs/mqtt.adoc[Mqtt] (camel-mqtt) |  | Camel MQTT client
-
-| link:camel-msv/src/main/docs/msv.adoc[Msv] (camel-msv) |  | Camel MSV support
-
-| link:camel-mustache/src/main/docs/mustache.adoc[Mustache] (camel-mustache) |  | Camel Mustache support
-
-| link:camel-mvel/src/main/docs/mvel.adoc[Mvel] (camel-mvel) |  | Camel MVEL support
-
-| link:camel-mybatis/src/main/docs/mybatis.adoc[Mybatis] (camel-mybatis) |  | Camel MyBatis support
-
-| link:camel-nagios/src/main/docs/nagios.adoc[Nagios] (camel-nagios) |  | Camel Nagios support
-
-| link:camel-nats/src/main/docs/nats.adoc[Nats] (camel-nats) |  | Camel Components
-
-| link:camel-netty4/src/main/docs/netty4.adoc[Netty4] (camel-netty4) |  | Camel Netty NIO based socket communication component
-
-| link:camel-netty4-http/src/main/docs/netty4-http.adoc[Netty4 Http] (camel-netty4-http) |  | Camel Netty4 HTTP support
-
-| link:camel-nsq/src/main/docs/nsq.adoc[Nsq] (camel-nsq) |  | Camel Components
-
-| link:camel-ognl/src/main/docs/ognl.adoc[Ognl] (camel-ognl) |  | Camel OGNL support
-
-| link:camel-openstack/src/main/docs/openstack.adoc[Openstack] (camel-openstack) |  | Camel OpenStack support
-
 | link:camel-opentracing/src/main/docs/opentracing.adoc[OpenTracing] (camel-opentracing) | 2.19 | Distributed tracing using OpenTracing
 
-| link:camel-optaplanner/src/main/docs/optaplanner.adoc[Optaplanner] (camel-optaplanner) |  | Camel OptaPlanner support
-
-| link:camel-paho/src/main/docs/paho.adoc[Paho] (camel-paho) |  | Camel Eclipse Paho support
-
-| link:camel-paxlogging/src/main/docs/paxlogging.adoc[Paxlogging] (camel-paxlogging) |  | Camel OSGi PaxLogging support
-
-| link:camel-pdf/src/main/docs/pdf.adoc[Pdf] (camel-pdf) |  | Camel PDF support
-
-| link:camel-pg-replication-slot/src/main/docs/pg-replication-slot.adoc[Pg Replication Slot] (camel-pg-replication-slot) |  | Component for receiving from PostgreSQL Replication Slots
-
-| link:camel-pgevent/src/main/docs/pgevent.adoc[Pgevent] (camel-pgevent) |  | Component for sending/receiving notifications in PostgreSQL
-
-| link:camel-printer/src/main/docs/printer.adoc[Printer] (camel-printer) |  | Camel Printer support
-
-| link:camel-properties/src/main/docs/properties.adoc[Properties] (camel-properties) |  | Camel Properties component
-
-| link:camel-protobuf/src/main/docs/protobuf.adoc[Protobuf] (camel-protobuf) |  | Camel Google Protobuf data format support
-
-| link:camel-pubnub/src/main/docs/pubnub.adoc[Pubnub] (camel-pubnub) |  | Camel PubNub Support
-
-| link:camel-pulsar/src/main/docs/pulsar.adoc[Pulsar] (camel-pulsar) |  | Camel Apache Pulsar Component
-
-| link:camel-quartz2/src/main/docs/quartz2.adoc[Quartz2] (camel-quartz2) |  | Camel Quartz2 support
-
-| link:camel-quickfix/src/main/docs/quickfix.adoc[Quickfix] (camel-quickfix) |  | Camel QuickFIX/J support
-
-| link:camel-rabbitmq/src/main/docs/rabbitmq.adoc[Rabbitmq] (camel-rabbitmq) |  | Camel RabbitMQ Component
-
 | link:camel-reactive-executor-vertx/src/main/docs/reactive-executor-vertx.adoc[Reactive Executor Vertx] (camel-reactive-executor-vertx) | 3.0 | Reactive Executor for camel-core using Vert X
 
-| link:camel-reactive-streams/src/main/docs/reactive-streams.adoc[Reactive Streams] (camel-reactive-streams) |  | Camel Reactive Streams Component
-
 | link:camel-reactor/src/main/docs/reactor.adoc[Reactor] (camel-reactor) | 2.20 | Reactor based back-end for Camel's reactive streams component
 
-| link:camel-ref/src/main/docs/ref.adoc[Ref] (camel-ref) |  | Camel Ref component
-
-| link:camel-rest/src/main/docs/rest.adoc[Rest] (camel-rest) |  | Camel REST component
-
-| link:camel-rest-swagger/src/main/docs/rest-swagger.adoc[Rest Swagger] (camel-rest-swagger) | 2.19 | Camel REST support using Swagger
-
-| link:camel-restlet/src/main/docs/restlet.adoc[Restlet] (camel-restlet) |  | Camel REST (Restlet based) Component
-
 | link:camel-ribbon/src/main/docs/ribbon.adoc[Ribbon] (camel-ribbon) | 2.18 | Using Netflix Ribbon for client side load balancing
 
-| link:camel-rss/src/main/docs/rss.adoc[Rss] (camel-rss) |  | Camel RSS support
-
 | link:camel-rxjava2/src/main/docs/rxjava2.adoc[Rxjava2] (camel-rxjava2) | 2.22 | RxJava2 based back-end for Camel's reactive streams component
 
-| link:camel-sap-netweaver/src/main/docs/sap-netweaver.adoc[Sap Netweaver] (camel-sap-netweaver) |  | Camel SAP NetWeaver support
-
-| link:camel-saxon/src/main/docs/saxon.adoc[Saxon] (camel-saxon) |  | Camel Saxon (XQuery/XPath) support
-
-| link:camel-schematron/src/main/docs/schematron.adoc[Schematron] (camel-schematron) |  | Camel Schematron support
-
-| link:camel-seda/src/main/docs/seda.adoc[Seda] (camel-seda) |  | Camel Seda component
-
-| link:camel-service/src/main/docs/service.adoc[Service] (camel-service) |  | Camel service Support
-
-| link:camel-servlet/src/main/docs/servlet.adoc[Servlet] (camel-servlet) |  | Camel servlet transport support
-
 | link:camel-shiro/src/main/docs/shiro.adoc[Shiro] (camel-shiro) | 2.5 | Security using Shiro
 
-| link:camel-spring/src/main/docs/spring.adoc[Spring] (camel-spring) |  | Camel Spring with XML DSL
-
 | link:camel-spring-boot/src/main/docs/spring-boot.adoc[Spring Boot] (camel-spring-boot) | 2.15 | Using Camel with Spring Boot
 
 | link:camel-spring-cloud/src/main/docs/spring-cloud.adoc[Spring Cloud] (camel-spring-cloud) | 2.19 | Camel Cloud integration with Spring Cloud
@@ -1508,8 +1108,6 @@ Number of Miscellaneous Components: 240 in 240 JAR artifacts (0 deprecated)
 
 | link:camel-spring-security/src/main/docs/spring-security.adoc[Spring Security] (camel-spring-security) | 2.3 | Security using Spring Security
 
-| link:camel-stub/src/main/docs/stub.adoc[Stub] (camel-stub) |  | Camel Stub component
-
 | link:camel-swagger-java/src/main/docs/swagger-java.adoc[Swagger Java] (camel-swagger-java) | 2.16 | Rest-dsl support for using swagger api-doc
 
 | link:camel-test/src/main/docs/test.adoc[Test] (camel-test) | 2.9 | Camel unit testing
@@ -1526,20 +1124,8 @@ Number of Miscellaneous Components: 240 in 240 JAR artifacts (0 deprecated)
 
 | link:camel-testcontainers-spring/src/main/docs/testcontainers-spring.adoc[Testcontainers Spring] (camel-testcontainers-spring) | 2.22 | Camel unit testing with Spring and testcontainers
 
-| link:camel-timer/src/main/docs/timer.adoc[Timer] (camel-timer) |  | Camel Timer component
-
-| link:camel-undertow/src/main/docs/undertow.adoc[Undertow] (camel-undertow) |  | Camel Components
-
-| link:camel-validator/src/main/docs/validator.adoc[Validator] (camel-validator) |  | Camel Validator component
-
-| link:camel-vm/src/main/docs/vm.adoc[Vm] (camel-vm) |  | Camel VM component
-
-| link:camel-xpath/src/main/docs/xpath.adoc[Xpath] (camel-xpath) |  | Camel XPath language
-
 | link:camel-aws-xray/src/main/docs/aws-xray.adoc[XRay] (camel-aws-xray) | 2.21 | Distributed tracing using AWS XRay
 
-| link:camel-xslt/src/main/docs/xslt.adoc[Xslt] (camel-xslt) |  | Camel XSLT component
-
 | link:camel-zipkin/src/main/docs/zipkin.adoc[Zipkin] (camel-zipkin) | 2.18 | Distributed message tracing using Zipkin
 |===
 // others: END


[camel] 02/12: fixed incorrect cross references in core/camel-core

Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit da3b41ee7786a741882cda4d3cb3cb62ede0f8c6
Author: nayananga@acerubuntu18.04 <na...@gmail.com>
AuthorDate: Fri Jul 19 17:06:01 2019 +0530

    fixed incorrect cross references in core/camel-core
---
 core/camel-core/src/main/docs/eips/aggregate-eip.adoc      |  2 +-
 core/camel-core/src/main/docs/eips/bean-eip.adoc           |  6 +++---
 core/camel-core/src/main/docs/eips/content-filter-eip.adoc |  2 +-
 core/camel-core/src/main/docs/eips/dynamic-router.adoc     |  6 +++---
 .../src/main/docs/eips/eventDrivenConsumer-eip.adoc        |  2 +-
 .../src/main/docs/eips/idempotentConsumer-eip.adoc         | 14 +++++++-------
 core/camel-core/src/main/docs/eips/log-eip.adoc            |  4 ++--
 core/camel-core/src/main/docs/eips/requestReply-eip.adoc   |  4 ++--
 core/camel-core/src/main/docs/eips/toD-eip.adoc            |  4 ++--
 core/camel-core/src/main/docs/eips/unmarshal-eip.adoc      |  2 +-
 10 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/core/camel-core/src/main/docs/eips/aggregate-eip.adoc b/core/camel-core/src/main/docs/eips/aggregate-eip.adoc
index 9965366..e4e0d3c 100644
--- a/core/camel-core/src/main/docs/eips/aggregate-eip.adoc
+++ b/core/camel-core/src/main/docs/eips/aggregate-eip.adoc
@@ -187,7 +187,7 @@ consumer etc)
 The aggregator provides a pluggable repository which you can implement
 your own `org.apache.camel.spi.AggregationRepository`. +
  If you need persistent repository then you can use either Camel
-xref:leveldb.adoc[LevelDB], or xref:sql-component.adoc[SQL Component] components.
+xref:components::leveldb.adoc[LevelDB], or xref:components::sql-component.adoc[SQL Component] components.
 
 === Using TimeoutAwareAggregationStrategy
 
diff --git a/core/camel-core/src/main/docs/eips/bean-eip.adoc b/core/camel-core/src/main/docs/eips/bean-eip.adoc
index d0c9ccc..003c728 100644
--- a/core/camel-core/src/main/docs/eips/bean-eip.adoc
+++ b/core/camel-core/src/main/docs/eips/bean-eip.adoc
@@ -30,7 +30,7 @@ The Bean EIP supports 4 options which are listed below:
 
 === Bean as endpoint
 
-Camel also supports invoking xref:bean-component.adoc[Bean] as an Endpoint. In the
+Camel also supports invoking xref:components::bean-component.adoc[Bean] as an Endpoint. In the
 route below:
 
 What happens is that when the exchange is routed to the `myBean` Camel
@@ -43,7 +43,7 @@ type and storing the output of the method on the Exchange Out body.
 
 === Java DSL bean syntax
 
-Java DSL comes with syntactic sugar for the xref:bean-component.adoc[Bean]
+Java DSL comes with syntactic sugar for the xref:components::bean-component.adoc[Bean]
 component. Instead of specifying the bean explicitly as the endpoint
 (i.e. `to("bean:beanName")`) you can use the following syntax:
 
@@ -84,6 +84,6 @@ mechanisms in Camel.
 
 === See also
 
-* xref:class-component.adoc[Class] component
+* xref:components::class-component.adoc[Class] component
 * xref:bean-binding.adoc[Bean Binding]
 * xref:bean-integration.adoc[Bean Integration]
diff --git a/core/camel-core/src/main/docs/eips/content-filter-eip.adoc b/core/camel-core/src/main/docs/eips/content-filter-eip.adoc
index 7801314..08a9d98 100644
--- a/core/camel-core/src/main/docs/eips/content-filter-eip.adoc
+++ b/core/camel-core/src/main/docs/eips/content-filter-eip.adoc
@@ -16,7 +16,7 @@ image:http://www.enterpriseintegrationpatterns.com/img/ContentFilter.gif[image]
 
 A common way to filter messages is to use an
 xref:Expression-Expressions.adoc[Expression] in the xref:DSL-DSL.adoc[DSL] like
-xref:xquery-language.adoc[XQuery], xref:sql-language.adoc[SQL] or one of the supported
+xref:components::xquery-language.adoc[XQuery], xref:sql-language.adoc[SQL] or one of the supported
 xref:ScriptingLanguages-ScriptingLanguages.adoc[Scripting Languages].
 
 === Using the xref:FluentBuilders-FluentBuilders.adoc[Fluent Builders]
diff --git a/core/camel-core/src/main/docs/eips/dynamic-router.adoc b/core/camel-core/src/main/docs/eips/dynamic-router.adoc
index c4c592e..e6866fd 100644
--- a/core/camel-core/src/main/docs/eips/dynamic-router.adoc
+++ b/core/camel-core/src/main/docs/eips/dynamic-router.adoc
@@ -60,7 +60,7 @@ from("direct:start")
     .dynamicRouter(method(DynamicRouterTest.class, "slip"));
 ----
 
-Which will leverage a xref:bean-component.adoc[Bean] to compute the slip
+Which will leverage a xref:components::bean-component.adoc[Bean] to compute the slip
 _on-the-fly_, which could be implemented as follows:
 
 [source,java]
@@ -191,12 +191,12 @@ In the above we can use the
 Parameter Binding Annotations
 to bind different parts of the Message to method
 parameters or use an Expression such as using
-xref:xpath-language.adoc[XPath] or xref:xpath-language.adoc[XQuery].
+xref:components::xpath-language.adoc[XPath] or xref:components::xpath-language.adoc[XQuery].
 
 The method can be invoked in a number of ways as described in the
 Bean Integration such as
 
 * POJO Producing
 * Spring Remoting
-* xref:bean-component.adoc[Bean] component
+* xref:components::bean-component.adoc[Bean] component
 
diff --git a/core/camel-core/src/main/docs/eips/eventDrivenConsumer-eip.adoc b/core/camel-core/src/main/docs/eips/eventDrivenConsumer-eip.adoc
index 47a2d62..2fc4f98 100644
--- a/core/camel-core/src/main/docs/eips/eventDrivenConsumer-eip.adoc
+++ b/core/camel-core/src/main/docs/eips/eventDrivenConsumer-eip.adoc
@@ -22,7 +22,7 @@ when a xref:message-eip.adoc[Message] is available for processing.
 The following demonstrates a
 http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/Processor.html[Processor]
 defined in the Camel xref:Registry-Registry.adoc[Registry] which is
-invoked when an event occurs from a xref:jms-component.adoc[JMS] queue.
+invoked when an event occurs from a xref:components::jms-component.adoc[JMS] queue.
 
 *Using the xref:FluentBuilders-FluentBuilders.adoc[Fluent Builders]*
 
diff --git a/core/camel-core/src/main/docs/eips/idempotentConsumer-eip.adoc b/core/camel-core/src/main/docs/eips/idempotentConsumer-eip.adoc
index 2c61d34..da153e4 100644
--- a/core/camel-core/src/main/docs/eips/idempotentConsumer-eip.adoc
+++ b/core/camel-core/src/main/docs/eips/idempotentConsumer-eip.adoc
@@ -19,13 +19,13 @@ Camel provides the following Idempotent Consumer implementations:
 * MemoryIdempotentRepository
 * xref:file2.adoc[FileIdempotentRepository]
 * xref:hazelcast-component.adoc[HazelcastIdempotentRepository]
-* xref:sql-component.adoc[JdbcMessageIdRepository]
-* xref:jpa-component.adoc[JpaMessageIdRepository]
-* xref:infinispan-component.adoc[InfinispanIdempotentRepository]
-* xref:jcache-component.adoc[JCacheIdempotentRepository]
-* xref:spring.adoc[SpringCacheIdempotentRepository]
-* xref:ehcache-component.adoc[EhcacheIdempotentRepository]
-* xref:kafka-component.adoc[KafkaIdempotentRepository]
+* xref:components::sql-component.adoc[JdbcMessageIdRepository]
+* xref:components::jpa-component.adoc[JpaMessageIdRepository]
+* xref:components::infinispan-component.adoc[InfinispanIdempotentRepository]
+* xref:components::jcache-component.adoc[JCacheIdempotentRepository]
+* xref:components::spring.adoc[SpringCacheIdempotentRepository]
+* xref:components::ehcache-component.adoc[EhcacheIdempotentRepository]
+* xref:components::kafka-component.adoc[KafkaIdempotentRepository]
 
 === Options
 
diff --git a/core/camel-core/src/main/docs/eips/log-eip.adoc b/core/camel-core/src/main/docs/eips/log-eip.adoc
index d2f1420..86240ac 100644
--- a/core/camel-core/src/main/docs/eips/log-eip.adoc
+++ b/core/camel-core/src/main/docs/eips/log-eip.adoc
@@ -4,7 +4,7 @@
 How can I log the processing of a xref:message.adoc[Message]?
 
 Camel provides many ways to log the fact that you are processing a message. Here are just a few examples:
-* You can use the xref:log-component.adoc[Log] component which logs the Message content.
+* You can use the xref:components::log-component.adoc[Log] component which logs the Message content.
 * You can use the xref:tracer.adoc[Tracer] which trace logs message flow.
 * You can also use a xref:processor.adoc[Processor] or xref:bean.adoc[Bean] and log from Java code.
 * You can use the log DSL.
@@ -165,7 +165,7 @@ In some scenarios it is required that the bundle associated with logger should b
 *Available as of Camel 2.19*
 
 You can enable security masking for logging by setting `logMask` flag to `true`.
-Note that this option also affects xref:log-component.adoc[Log] component.
+Note that this option also affects xref:components::log-component.adoc[Log] component.
 
 To enable mask in Java DSL at CamelContext level:
 [source,java]
diff --git a/core/camel-core/src/main/docs/eips/requestReply-eip.adoc b/core/camel-core/src/main/docs/eips/requestReply-eip.adoc
index 68ac289..9c44cba 100644
--- a/core/camel-core/src/main/docs/eips/requestReply-eip.adoc
+++ b/core/camel-core/src/main/docs/eips/requestReply-eip.adoc
@@ -11,7 +11,7 @@ this pattern using the underlying transport or protocols.
 
 image:http://www.enterpriseintegrationpatterns.com/img/RequestReply.gif[image]
 
-For example when using xref:jms-component.adoc[JMS] with InOut the component will
+For example when using xref:components::jms-component.adoc[JMS] with InOut the component will
 by default perform these actions
 
 * create by default a temporary inbound queue
@@ -27,7 +27,7 @@ TIP: *Related* See the related Event Message message
 [[RequestReply-ExplicitlyspecifyingInOut]]
 === Explicitly specifying InOut
 
-When consuming messages from xref:jms-component.adoc[JMS] a Request-Reply is
+When consuming messages from xref:components::jms-component.adoc[JMS] a Request-Reply is
 indicated by the presence of the *JMSReplyTo* header.
 
 You can explicitly force an endpoint to be in Request Reply mode by
diff --git a/core/camel-core/src/main/docs/eips/toD-eip.adoc b/core/camel-core/src/main/docs/eips/toD-eip.adoc
index baf1b62..cbdb5f4 100644
--- a/core/camel-core/src/main/docs/eips/toD-eip.adoc
+++ b/core/camel-core/src/main/docs/eips/toD-eip.adoc
@@ -68,7 +68,7 @@ then the header foo is appended. So for example if the header foo has
 value order, then the endpoint is computed as "mock:order".
 
 You can also use other languages than xref:simple-language.adoc[Simple] such
-as xref:xpath-language.adoc[XPath] - this requires to prefix with language: as
+as xref:components::xpath-language.adoc[XPath] - this requires to prefix with language: as
 shown below (simple language is the default language). If you do not
 specify language: then the endpoint is a component name. And in some
 cases there is both a component and language with the same name such as
@@ -90,7 +90,7 @@ from("direct:start")
   .toD("language:xpath:/order/@uri");
 ----
 
-You can also concat multiple xref:language-component.adoc[Language](s) together
+You can also concat multiple xref:components::language-component.adoc[Language](s) together
 using the plus sign `+` such as shown below:
 
 [source,xml]
diff --git a/core/camel-core/src/main/docs/eips/unmarshal-eip.adoc b/core/camel-core/src/main/docs/eips/unmarshal-eip.adoc
index 2bb37a5..fe917a8 100644
--- a/core/camel-core/src/main/docs/eips/unmarshal-eip.adoc
+++ b/core/camel-core/src/main/docs/eips/unmarshal-eip.adoc
@@ -28,7 +28,7 @@ from("activemq:My.Queue").
   to("mqseries:Another.Queue");
 ----
 
-The above uses a named DataFormat of _jaxb_ which is configured with a number of Java package names. You can if you prefer use a named reference to a data format which can then be defined in your https://github.com/apache/camel/blob/master/docs/user-manual/en/registry.adoc[Registry] such as via your xref:spring.adoc[Spring] XML file.
+The above uses a named DataFormat of _jaxb_ which is configured with a number of Java package names. You can if you prefer use a named reference to a data format which can then be defined in your https://github.com/apache/camel/blob/master/docs/user-manual/en/registry.adoc[Registry] such as via your xref:components::spring.adoc[Spring] XML file.
 
 You can also use the DSL itself to define the data format as you use it.
 For example the following uses Java serialization to unmarshal a binary


[camel] 05/12: fixed incorrect cross references in docs/user-manual

Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 90f7fb865be54b37e51839ff9fa9e4bd26423d78
Author: nayananga@acerubuntu18.04 <na...@gmail.com>
AuthorDate: Fri Jul 19 17:55:45 2019 +0530

    fixed incorrect cross references in docs/user-manual
---
 .../modules/ROOT/pages/aggregate-eip.adoc          |  2 +-
 docs/user-manual/modules/ROOT/pages/async.adoc     |  4 +-
 .../ROOT/pages/asynchronous-routing-engine.adoc    | 38 +++++++--------
 .../modules/ROOT/pages/backlog-tracer.adoc         |  2 +-
 .../modules/ROOT/pages/backlogdebugger.adoc        |  2 +-
 .../modules/ROOT/pages/bam-example.adoc            |  8 ++--
 .../modules/ROOT/pages/batch-consumer.adoc         | 20 ++++----
 docs/user-manual/modules/ROOT/pages/bean-eip.adoc  |  6 +--
 .../modules/ROOT/pages/bean-integration.adoc       |  6 +--
 .../modules/ROOT/pages/browsable-endpoint.adoc     |  8 ++--
 .../ROOT/pages/camel-configuration-utilities.adoc  | 14 +++---
 .../modules/ROOT/pages/configuring-camel.adoc      |  2 +-
 ...ing-route-startup-ordering-and-autostartup.adoc |  2 +-
 .../modules/ROOT/pages/content-filter-eip.adoc     |  2 +-
 .../modules/ROOT/pages/correlation-identifier.adoc |  4 +-
 .../modules/ROOT/pages/data-format.adoc            | 56 +++++++++++-----------
 .../modules/ROOT/pages/dead-letter-channel.adoc    |  2 +-
 docs/user-manual/modules/ROOT/pages/dsl.adoc       |  2 +-
 .../modules/ROOT/pages/dynamic-router.adoc         |  6 +--
 .../pages/enterprise-integration-patterns.adoc     |  2 +-
 .../ROOT/pages/error-handling-in-camel.adoc        |  8 ++--
 .../modules/ROOT/pages/event-message.adoc          |  4 +-
 .../ROOT/pages/eventDrivenConsumer-eip.adoc        |  2 +-
 .../modules/ROOT/pages/exception-clause.adoc       |  2 +-
 .../modules/ROOT/pages/exchange-pattern.adoc       |  2 +-
 .../user-manual/modules/ROOT/pages/expression.adoc | 24 +++++-----
 docs/user-manual/modules/ROOT/pages/faq.adoc       |  4 +-
 ...ption-javaxnamingnoinitialcontextexception.adoc |  2 +-
 .../faq/how-can-i-stop-a-route-from-a-route.adoc   |  4 +-
 .../pages/faq/how-do-i-configure-endpoints.adoc    |  6 +--
 ...en-consuming-for-example-from-a-ftp-server.adoc |  4 +-
 .../faq/how-do-i-let-jetty-match-wildcards.adoc    |  4 +-
 ...ow-do-i-make-my-jms-endpoint-transactional.adoc |  4 +-
 ...om-a-certain-point-back-or-an-entire-route.adoc |  2 +-
 ...ify-time-period-in-a-human-friendly-syntax.adoc |  2 +-
 ...h-method-to-use-when-using-beans-in-routes.adoc |  2 +-
 ...spring-property-placeholder-with-camel-xml.adoc |  4 +-
 ...direct-event-seda-and-vm-endpoints-compare.adoc | 10 ++--
 ...-do-the-timer-and-quartz-endpoints-compare.adoc |  2 +-
 .../pages/faq/how-does-camel-compare-to-mule.adoc  |  4 +-
 .../how-does-camel-compare-to-servicemix-eip.adoc  |  4 +-
 .../faq/how-does-camel-compare-to-servicemix.adoc  |  4 +-
 .../faq/how-does-camel-compare-to-synapse.adoc     |  2 +-
 ...how-does-camel-look-up-beans-and-endpoints.adoc |  6 +--
 .../faq/how-does-camel-work-with-activemq.adoc     |  6 +--
 .../faq/how-does-camel-work-with-servicemix.adoc   |  2 +-
 .../faq/how-does-the-camel-api-compare-to.adoc     |  8 ++--
 ...-avoid-sending-some-or-all-message-headers.adoc |  2 +-
 .../ROOT/pages/faq/is-camel-ioc-friendly.adoc      |  4 +-
 .../modules/ROOT/pages/faq/is-there-an-ide.adoc    |  2 +-
 .../ROOT/pages/faq/running-camel-standalone.adoc   |  2 +-
 ...-activemq-broker-or-in-another-application.adoc |  2 +-
 .../modules/ROOT/pages/faq/what-is-camel.adoc      |  8 ++--
 ...se-when-or-otherwise-in-a-java-camel-route.adoc |  2 +-
 ...use-too-many-threads-with-producertemplate.adoc |  4 +-
 ...-does-ftp-component-not-download-any-files.adoc |  2 +-
 ...-file-consumer-use-the-camel-error-handler.adoc |  6 +--
 ...jms-route-only-consume-one-message-at-once.adoc |  4 +-
 .../pages/faq/why-use-multiple-camelcontext.adoc   |  4 +-
 .../modules/ROOT/pages/file-language.adoc          |  4 +-
 .../modules/ROOT/pages/graceful-shutdown.adoc      |  4 +-
 .../modules/ROOT/pages/guaranteed-delivery.adoc    | 12 ++---
 .../modules/ROOT/pages/idempotentConsumer-eip.adoc | 14 +++---
 docs/user-manual/modules/ROOT/pages/index.adoc     |  8 ++--
 docs/user-manual/modules/ROOT/pages/injector.adoc  |  2 +-
 docs/user-manual/modules/ROOT/pages/intercept.adoc |  2 +-
 docs/user-manual/modules/ROOT/pages/jndi.adoc      |  2 +-
 docs/user-manual/modules/ROOT/pages/languages.adoc | 14 +++---
 docs/user-manual/modules/ROOT/pages/log-eip.adoc   |  4 +-
 .../modules/ROOT/pages/message-bus.adoc            |  2 +-
 .../modules/ROOT/pages/message-channel.adoc        |  2 +-
 .../modules/ROOT/pages/message-translator.adoc     |  4 +-
 .../modules/ROOT/pages/point-to-point-channel.adoc | 10 ++--
 .../ROOT/pages/publish-subscribe-channel.adoc      |  8 ++--
 .../modules/ROOT/pages/requestReply-eip.adoc       |  4 +-
 docs/user-manual/modules/ROOT/pages/rest-dsl.adoc  | 20 ++++----
 .../modules/ROOT/pages/return-address.adoc         |  2 +-
 .../modules/ROOT/pages/route-policy.adoc           |  2 +-
 .../ROOT/pages/scala-dsl-supported-languages.adoc  |  2 +-
 .../modules/ROOT/pages/scripting-languages.adoc    |  4 +-
 .../modules/ROOT/pages/servlet-tomcat-example.adoc |  6 +--
 .../modules/ROOT/pages/simple-language.adoc        | 16 +++----
 .../modules/ROOT/pages/spring-testing.adoc         | 10 ++--
 docs/user-manual/modules/ROOT/pages/testing.adoc   | 14 +++---
 docs/user-manual/modules/ROOT/pages/toD-eip.adoc   |  4 +-
 .../modules/ROOT/pages/transactional-client.adoc   |  4 +-
 .../modules/ROOT/pages/try-catch-finally.adoc      |  4 +-
 .../modules/ROOT/pages/unmarshal-eip.adoc          |  2 +-
 .../ROOT/pages/using-propertyplaceholder.adoc      |  4 +-
 docs/user-manual/modules/ROOT/pages/validator.adoc |  2 +-
 .../modules/ROOT/pages/writing-components.adoc     |  2 +-
 .../modules/ROOT/pages/xml-configuration.adoc      |  6 +--
 .../modules/ROOT/pages/xml-reference.adoc          |  2 +-
 93 files changed, 280 insertions(+), 280 deletions(-)

diff --git a/docs/user-manual/modules/ROOT/pages/aggregate-eip.adoc b/docs/user-manual/modules/ROOT/pages/aggregate-eip.adoc
index 9965366..e4e0d3c 100644
--- a/docs/user-manual/modules/ROOT/pages/aggregate-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/aggregate-eip.adoc
@@ -187,7 +187,7 @@ consumer etc)
 The aggregator provides a pluggable repository which you can implement
 your own `org.apache.camel.spi.AggregationRepository`. +
  If you need persistent repository then you can use either Camel
-xref:leveldb.adoc[LevelDB], or xref:sql-component.adoc[SQL Component] components.
+xref:components::leveldb.adoc[LevelDB], or xref:components::sql-component.adoc[SQL Component] components.
 
 === Using TimeoutAwareAggregationStrategy
 
diff --git a/docs/user-manual/modules/ROOT/pages/async.adoc b/docs/user-manual/modules/ROOT/pages/async.adoc
index 4376adc..5da1683 100644
--- a/docs/user-manual/modules/ROOT/pages/async.adoc
+++ b/docs/user-manual/modules/ROOT/pages/async.adoc
@@ -628,8 +628,8 @@ transaction.
 * Request Only
 * http://davsclaus.blogspot.com/2009/05/on-road-to-camel-20-concurrency-with.html[Blog
 entry on using async for concurrent file processing]
-* xref:seda-component.adoc[SEDA]
-* xref:direct-component.adoc[Direct]
+* xref:components::seda-component.adoc[SEDA]
+* xref:components::direct-component.adoc[Direct]
 * To Async for non blocking
 Request Reply
 
diff --git a/docs/user-manual/modules/ROOT/pages/asynchronous-routing-engine.adoc b/docs/user-manual/modules/ROOT/pages/asynchronous-routing-engine.adoc
index f3daf84..c17e413 100644
--- a/docs/user-manual/modules/ROOT/pages/asynchronous-routing-engine.adoc
+++ b/docs/user-manual/modules/ROOT/pages/asynchronous-routing-engine.adoc
@@ -8,37 +8,37 @@ All the xref:enterprise-integration-patterns.adoc[Enterprise Integration Pattern
 are supported as well a selected number of
 Components:
 
-* xref:ahc-component.adoc[AHC] *Camel 2.8:* (only producer)
+* xref:components::ahc-component.adoc[AHC] *Camel 2.8:* (only producer)
 * AWS *Camel 2.11:* (only consumer) for S3 and SNS.
-* xref:avro-component.adoc[Avro] *Camel 2.10:* (only producer)
-* xref:cxf-component.adoc[CXF] *Camel 2.5:* (both consumer and producer)
-* xref:cxfrs-component.adoc[CXFRS] *Camel 2.5:* (only consumer)
-* xref:direct-vm-component.adoc[Direct-VM] *Camel 2.10.5/2.11.0:* (both consumer
+* xref:components::avro-component.adoc[Avro] *Camel 2.10:* (only producer)
+* xref:components::cxf-component.adoc[CXF] *Camel 2.5:* (both consumer and producer)
+* xref:components::cxfrs-component.adoc[CXFRS] *Camel 2.5:* (only consumer)
+* xref:components::direct-vm-component.adoc[Direct-VM] *Camel 2.10.5/2.11.0:* (both consumer
 and producer)
-* xref:file-component.adoc[File] - (only consumer)
-* xref:ftp-component.adoc[FTP] - (only consumer)
-* xref:guava-eventbus-component.adoc[Guava EventBus] *Camel 2.10:* (only consumer)
+* xref:components::file-component.adoc[File] - (only consumer)
+* xref:components::ftp-component.adoc[FTP] - (only consumer)
+* xref:components::guava-eventbus-component.adoc[Guava EventBus] *Camel 2.10:* (only consumer)
 * JBI (both consumer and producer)
-* xref:jetty-component.adoc[Jetty] (both consumer and producer)
-* xref:jgroups-component.adoc[JGroups] *Camel 2.10:* (only consumer)
-* xref:jms-component.adoc[JMS] *Camel 2.5:* (only producer for
+* xref:components::jetty-component.adoc[Jetty] (both consumer and producer)
+* xref:components::jgroups-component.adoc[JGroups] *Camel 2.10:* (only consumer)
+* xref:components::jms-component.adoc[JMS] *Camel 2.5:* (only producer for
 Request Reply messaging over JMS). *Camel 2.9:*
 (consumer, if option `asyncConsumer=true` is used).
-* xref:jms-component.adoc[JMS] *Camel 2.9:* (also consumer)
-* xref:mqtt-component.adoc[MQTT] *Camel 2.10.2:* (only producer)
+* xref:components::jms-component.adoc[JMS] *Camel 2.9:* (also consumer)
+* xref:components::mqtt-component.adoc[MQTT] *Camel 2.10.2:* (only producer)
 * NMR (both consumer and producer)
 * xref:netty-component.adoc[Netty] only producer (*Camel 2.10:* also consumer)
-* xref:restlet-component.adoc[Restlet] *Camel 2.8:* (only producer)
-* xref:seda-component.adoc[SEDA] (both consumer and producer) SEDA was mistakenly
+* xref:components::restlet-component.adoc[Restlet] *Camel 2.8:* (only producer)
+* xref:components::seda-component.adoc[SEDA] (both consumer and producer) SEDA was mistakenly
 in this list until November 3rd 2012. As of Camel 2.10.x, it still does
 not leverage the Async Routing Engine, but support is planned for
 http://camel.apache.org/camel-30-roadmap.html#Camel3.0-Roadmap-SEDA%2FVMcomponentstoleverageasyncroutingengine[Camel
 3.0].
 
-* xref:timer-component.adoc[Timer] *Camel 2.12:* (only consumer)
+* xref:components::timer-component.adoc[Timer] *Camel 2.12:* (only consumer)
 
 When we say a component is supported, that means, the component is
-leveraging the asynchronous model. For example xref:jetty-component.adoc[Jetty]
+leveraging the asynchronous model. For example xref:components::jetty-component.adoc[Jetty]
 uses continuations and the async http client to be fully asynchronous
 and non blocked. That means no threads will ever be blocked while
 waiting for a reply.
@@ -51,10 +51,10 @@ supported as well where it's applicable.
 
 You can configure the endpoints with the option `synchronous=true` to
 force using synchronous processing. For example when sending a web
-service request using xref:cxf-component.adoc[CXF], the caller will wait for the
+service request using xref:components::cxf-component.adoc[CXF], the caller will wait for the
 reply if `synchronous=true` was configured. Currently this option is
 supported by the all the producers. If you don't want to let the
-xref:cxf-component.adoc[CXF] consumer leverage the CXF continuation API to use the
+xref:components::cxf-component.adoc[CXF] consumer leverage the CXF continuation API to use the
 asynchronous processing, you can also use this option `synchronous=true`
 to disable it. The JBI and NMR component
 are always asynchronous and doesn't support this option.
diff --git a/docs/user-manual/modules/ROOT/pages/backlog-tracer.adoc b/docs/user-manual/modules/ROOT/pages/backlog-tracer.adoc
index 0081282..0b17c43 100644
--- a/docs/user-manual/modules/ROOT/pages/backlog-tracer.adoc
+++ b/docs/user-manual/modules/ROOT/pages/backlog-tracer.adoc
@@ -110,5 +110,5 @@ You would need to enable this using the JMX API.
 * xref:tracer-example.adoc[Tracer Example]
 * xref:debugger.adoc[Debugger]
 * xref:delay-interceptor.adoc[Delay Interceptor]
-* xref:log-component.adoc[Log]
+* xref:components::log-component.adoc[Log]
 
diff --git a/docs/user-manual/modules/ROOT/pages/backlogdebugger.adoc b/docs/user-manual/modules/ROOT/pages/backlogdebugger.adoc
index 4438f68..e1f01fa 100644
--- a/docs/user-manual/modules/ROOT/pages/backlogdebugger.adoc
+++ b/docs/user-manual/modules/ROOT/pages/backlogdebugger.adoc
@@ -98,5 +98,5 @@ You would need to enable this using the JMX API.
 
 * BacklogTracer
 * xref:debugger.adoc[Debugger]
-* xref:log-component.adoc[Log]
+* xref:components::log-component.adoc[Log]
 
diff --git a/docs/user-manual/modules/ROOT/pages/bam-example.adoc b/docs/user-manual/modules/ROOT/pages/bam-example.adoc
index 568b397..ca6462b 100644
--- a/docs/user-manual/modules/ROOT/pages/bam-example.adoc
+++ b/docs/user-manual/modules/ROOT/pages/bam-example.adoc
@@ -76,17 +76,17 @@ the Camel Components
 correlate together the purchase order and invoice messages which can be
 any Expression via any of the
 Languages Supported. In this case we are
-using xref:xpath-language.adoc[XPath].
+using xref:components::xpath-language.adoc[XPath].
 
 Then the final line of code defines the temporal rules to use; namely
 that it is considered to be an error if an invoice is not received
 within 2 seconds of a purchase order being received. When a failure
-occurs in this example we just send it to the xref:log-component.adoc[Log]
+occurs in this example we just send it to the xref:components::log-component.adoc[Log]
 component to log out an error level message to commons-logging / log4j.
 You could change this to use some of the other
 Components such as ActiveMQ,
-xref:jms-component.adoc[JMS], xref:jms-component.adoc[IRC], xref:jms-component.adoc[Mail],
-xref:xmpp-component.adoc[XMPP] etc.
+xref:components::jms-component.adoc[JMS], xref:components::jms-component.adoc[IRC], xref:components::jms-component.adoc[Mail],
+xref:components::xmpp-component.adoc[XMPP] etc.
 
 [[BAMExample-Runningtheexample]]
 ==== Running the example
diff --git a/docs/user-manual/modules/ROOT/pages/batch-consumer.adoc b/docs/user-manual/modules/ROOT/pages/batch-consumer.adoc
index 7115c47..3cab287 100644
--- a/docs/user-manual/modules/ROOT/pages/batch-consumer.adoc
+++ b/docs/user-manual/modules/ROOT/pages/batch-consumer.adoc
@@ -12,19 +12,19 @@ that a consumer can implement to indicate it support batching as well.
 The following components supports xref:batch-consumer.adoc[Batch
 Consumer] by its consumer:
 
-* xref:atom-component.adoc[Atom]
+* xref:components::atom-component.adoc[Atom]
 * File
 * FTP
-* xref:hbase-component.adoc[hbase]
+* xref:components::hbase-component.adoc[hbase]
 * xref:ibatis-component.adoc[iBatis]
-* xref:jpa-component.adoc[JPA]
-* xref:jclouds-component.adoc[JCLOUDS]
-* xref:mail-component.adoc[Mail]
-* xref:mybatis-component.adoc[MyBatis]
-* xref:snmp-component.adoc[SNMP]
-* xref:sql-component.adoc[SQL]
-* xref:aws-sqs-component.adoc[SQS]
-* xref:aws-s3-component.adoc[S3]
+* xref:components::jpa-component.adoc[JPA]
+* xref:components::jclouds-component.adoc[JCLOUDS]
+* xref:components::mail-component.adoc[Mail]
+* xref:components::mybatis-component.adoc[MyBatis]
+* xref:components::snmp-component.adoc[SNMP]
+* xref:components::sql-component.adoc[SQL]
+* xref:components::aws-sqs-component.adoc[SQS]
+* xref:components::aws-s3-component.adoc[S3]
 
 [[BatchConsumer-ConsumerOptions]]
 ==== Consumer Options
diff --git a/docs/user-manual/modules/ROOT/pages/bean-eip.adoc b/docs/user-manual/modules/ROOT/pages/bean-eip.adoc
index d0c9ccc..003c728 100644
--- a/docs/user-manual/modules/ROOT/pages/bean-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/bean-eip.adoc
@@ -30,7 +30,7 @@ The Bean EIP supports 4 options which are listed below:
 
 === Bean as endpoint
 
-Camel also supports invoking xref:bean-component.adoc[Bean] as an Endpoint. In the
+Camel also supports invoking xref:components::bean-component.adoc[Bean] as an Endpoint. In the
 route below:
 
 What happens is that when the exchange is routed to the `myBean` Camel
@@ -43,7 +43,7 @@ type and storing the output of the method on the Exchange Out body.
 
 === Java DSL bean syntax
 
-Java DSL comes with syntactic sugar for the xref:bean-component.adoc[Bean]
+Java DSL comes with syntactic sugar for the xref:components::bean-component.adoc[Bean]
 component. Instead of specifying the bean explicitly as the endpoint
 (i.e. `to("bean:beanName")`) you can use the following syntax:
 
@@ -84,6 +84,6 @@ mechanisms in Camel.
 
 === See also
 
-* xref:class-component.adoc[Class] component
+* xref:components::class-component.adoc[Class] component
 * xref:bean-binding.adoc[Bean Binding]
 * xref:bean-integration.adoc[Bean Integration]
diff --git a/docs/user-manual/modules/ROOT/pages/bean-integration.adoc b/docs/user-manual/modules/ROOT/pages/bean-integration.adoc
index 8f40c19..afd9b3d 100644
--- a/docs/user-manual/modules/ROOT/pages/bean-integration.adoc
+++ b/docs/user-manual/modules/ROOT/pages/bean-integration.adoc
@@ -64,8 +64,8 @@ to use the annotations for routing and messaging.
 [[BeanIntegration-BeanComponent]]
 ==== Bean Component
 
-The xref:bean-component.adoc[Bean] component allows one to invoke a particular
-method. Alternately the xref:bean-component.adoc[Bean] component supports the
+The xref:components::bean-component.adoc[Bean] component allows one to invoke a particular
+method. Alternately the xref:components::bean-component.adoc[Bean] component supports the
 creation of a proxy via
 http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/component/bean/ProxyHelper.html[ProxyHelper]
 to a Java interface; which the implementation just sends a message
@@ -90,7 +90,7 @@ headers and so forth.
 *Bean binding*
 
 Whenever Camel invokes a bean method via one of the above methods
-(xref:bean-component.adoc[Bean] component, xref:spring-remoting.adoc[Spring
+(xref:components::bean-component.adoc[Bean] component, xref:spring-remoting.adoc[Spring
 Remoting] or POJO Consuming) then the
 *Bean Binding* mechanism is used to figure out
 what method to use (if it is not explicit) and how to bind the
diff --git a/docs/user-manual/modules/ROOT/pages/browsable-endpoint.adoc b/docs/user-manual/modules/ROOT/pages/browsable-endpoint.adoc
index 01550b5..ba5e80d 100644
--- a/docs/user-manual/modules/ROOT/pages/browsable-endpoint.adoc
+++ b/docs/user-manual/modules/ROOT/pages/browsable-endpoint.adoc
@@ -8,9 +8,9 @@ which are pending or have been sent on it.
 
 Some example implementations include
 
-* xref:jms-component.adoc[JMS] for queues only (as of 1.3.0)
+* xref:components::jms-component.adoc[JMS] for queues only (as of 1.3.0)
 * List
-* xref:mock-component.adoc[Mock]
-* xref:seda-component.adoc[Seda]
-* xref:vm-component.adoc[VM]
+* xref:components::mock-component.adoc[Mock]
+* xref:components::seda-component.adoc[Seda]
+* xref:components::vm-component.adoc[VM]
 
diff --git a/docs/user-manual/modules/ROOT/pages/camel-configuration-utilities.adoc b/docs/user-manual/modules/ROOT/pages/camel-configuration-utilities.adoc
index 7e701e0..2a1f91f 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-configuration-utilities.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-configuration-utilities.adoc
@@ -13,20 +13,20 @@ of custom transport layer security (TLS) settings on Camel components.
 The following Camel components directly support the use of this
 configuration utility:
 
-* xref:http4-component.adoc[HTTP4]
-* xref:jetty-component.adoc[Jetty]
-* xref:ahc-component.adoc[AHC]
+* xref:components::http4-component.adoc[HTTP4]
+* xref:components::jetty-component.adoc[Jetty]
+* xref:components::ahc-component.adoc[AHC]
 * xref:netty-component.adoc[Netty]
-* xref:cometd-component.adoc[Cometd]
+* xref:components::cometd-component.adoc[Cometd]
 * FTP2
-* xref:irc-component.adoc[IRC]
-* xref:mail-component.adoc[Mail]
+* xref:components::irc-component.adoc[IRC]
+* xref:components::mail-component.adoc[Mail]
 * MINA 2
 
 The following Camel components indirectly support the use of this
 configuration utility:
 
-* xref:cxf-component.adoc[CXF]
+* xref:components::cxf-component.adoc[CXF]
 * xref:http-component.adoc[HTTP]
 
 [[CamelConfigurationUtilities-Configuration]]
diff --git a/docs/user-manual/modules/ROOT/pages/configuring-camel.adoc b/docs/user-manual/modules/ROOT/pages/configuring-camel.adoc
index 716f3e0..30d5a15 100644
--- a/docs/user-manual/modules/ROOT/pages/configuring-camel.adoc
+++ b/docs/user-manual/modules/ROOT/pages/configuring-camel.adoc
@@ -41,7 +41,7 @@ will auto-discover your component and register it.
 
 The `FooComponent` can then be auto-injected with resources using the
 http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/spi/Injector.html[Injector],
-such as to support xref:spring.adoc[Spring] based auto-wiring, or to
+such as to support xref:components::spring.adoc[Spring] based auto-wiring, or to
 support `@Resource` (EJB3 style) injection or Guice style `@Inject`
 injection.
 
diff --git a/docs/user-manual/modules/ROOT/pages/configuring-route-startup-ordering-and-autostartup.adoc b/docs/user-manual/modules/ROOT/pages/configuring-route-startup-ordering-and-autostartup.adoc
index c6202a5..6581e7b 100644
--- a/docs/user-manual/modules/ROOT/pages/configuring-route-startup-ordering-and-autostartup.adoc
+++ b/docs/user-manual/modules/ROOT/pages/configuring-route-startup-ordering-and-autostartup.adoc
@@ -90,7 +90,7 @@ from("activemq:queue:special").noAutoStartup().to("file://backup");
 *Available as of Camel 2.9*
 
 To startup based on a boolean, String or
-xref:properties-component.adoc[Property], do one of the following:
+xref:components::properties-component.adoc[Property], do one of the following:
 
 [source,java]
 ----
diff --git a/docs/user-manual/modules/ROOT/pages/content-filter-eip.adoc b/docs/user-manual/modules/ROOT/pages/content-filter-eip.adoc
index 7801314..08a9d98 100644
--- a/docs/user-manual/modules/ROOT/pages/content-filter-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/content-filter-eip.adoc
@@ -16,7 +16,7 @@ image:http://www.enterpriseintegrationpatterns.com/img/ContentFilter.gif[image]
 
 A common way to filter messages is to use an
 xref:Expression-Expressions.adoc[Expression] in the xref:DSL-DSL.adoc[DSL] like
-xref:xquery-language.adoc[XQuery], xref:sql-language.adoc[SQL] or one of the supported
+xref:components::xquery-language.adoc[XQuery], xref:sql-language.adoc[SQL] or one of the supported
 xref:ScriptingLanguages-ScriptingLanguages.adoc[Scripting Languages].
 
 === Using the xref:FluentBuilders-FluentBuilders.adoc[Fluent Builders]
diff --git a/docs/user-manual/modules/ROOT/pages/correlation-identifier.adoc b/docs/user-manual/modules/ROOT/pages/correlation-identifier.adoc
index 42662b3..38af51f 100644
--- a/docs/user-manual/modules/ROOT/pages/correlation-identifier.adoc
+++ b/docs/user-manual/modules/ROOT/pages/correlation-identifier.adoc
@@ -18,7 +18,7 @@ image:http://www.enterpriseintegrationpatterns.com/img/CorrelationIdentifierSolu
 The use of a Correlation Identifier is key to working with the
 xref:bam.adoc[Camel Business Activity Monitoring Framework] and can also
 be highly useful when testing with simulation or canned data such as
-with the xref:mock-component.adoc[Mock testing framework]
+with the xref:components::mock-component.adoc[Mock testing framework]
 
 Some xref:eip.adoc[EIP] patterns will spin off a sub message, and in
 those cases, Camel will add a correlation id on the
@@ -31,7 +31,7 @@ Tap] EIP does this.
 
 The following example demonstrates using the Camel JMSMessageID as the
 Correlation Identifier within a request/reply pattern in
-the xref:jms-component.adoc[JMS] component
+the xref:components::jms-component.adoc[JMS] component
 
 === Samples
 
diff --git a/docs/user-manual/modules/ROOT/pages/data-format.adoc b/docs/user-manual/modules/ROOT/pages/data-format.adoc
index 05ec6d7..0ccd9e2 100644
--- a/docs/user-manual/modules/ROOT/pages/data-format.adoc
+++ b/docs/user-manual/modules/ROOT/pages/data-format.adoc
@@ -12,20 +12,20 @@ The following data formats are currently supported:
 ** xref:string-dataformat.adoc[String]
 
 * Object marshalling
-** xref:avro-dataformat.adoc[Avro]
-** xref:boon-dataformat.adoc[Boon]
+** xref:components::avro-dataformat.adoc[Avro]
+** xref:components::boon-dataformat.adoc[Boon]
 ** xref:hessian-dataformat.adoc[Hessian]
 ** xref:json.adoc[JSON]
-** xref:protobuf-dataformat.adoc[Protobuf]
-** xref:yaml-snakeyaml-dataformat.adoc[YAML]
+** xref:components::protobuf-dataformat.adoc[Protobuf]
+** xref:components::yaml-snakeyaml-dataformat.adoc[YAML]
 
 * Object/XML marshalling
 ** xref:castor-dataformat.adoc[Castor]
-** xref:jaxb-dataformat.adoc[JAXB]
+** xref:components::jaxb-dataformat.adoc[JAXB]
 ** xref:xmlBeans-dataformat.adoc[XmlBeans]
-** xref:xstream-dataformat.adoc[XStream]
+** xref:components::xstream-dataformat.adoc[XStream]
 ** xref:jibx-dataformat.adoc[JiBX]
-** xref:jacksonxml-dataformat.adoc[Jackson XML]
+** xref:components::jacksonxml-dataformat.adoc[Jackson XML]
 
 * Object/XML/Webservice marshalling
 ** xref:soap-dataformat.adoc[SOAP]
@@ -34,43 +34,43 @@ The following data formats are currently supported:
 ** xref:xmljson-dataformat.adoc[XmlJson]
 
 * Flat data structure marshalling
-** xref:beanio-dataformat.adoc[BeanIO]
-** xref:bindy-dataformat.adoc[Bindy]
-** xref:csv-dataformat.adoc[CSV]
+** xref:components::beanio-dataformat.adoc[BeanIO]
+** xref:components::bindy-dataformat.adoc[Bindy]
+** xref:components::csv-dataformat.adoc[CSV]
 ** xref:edi-dataformat.adoc[EDI]
-** xref:flatpack-dataformat.adoc[Flatpack DataFormat]
-** uniVocity DataFormats xref:univocity-csv-dataformat.adoc[CSV] / xref:univocity-tsv-dataformat.adoc[TSV] / xref:univocity-fixed-dataformat.adoc[Fixed Length]
+** xref:components::flatpack-dataformat.adoc[Flatpack DataFormat]
+** uniVocity DataFormats xref:components::univocity-csv-dataformat.adoc[CSV] / xref:components::univocity-tsv-dataformat.adoc[TSV] / xref:components::univocity-fixed-dataformat.adoc[Fixed Length]
 
 * Domain specific marshalling
-** xref:hl7-dataformat.adoc[HL7 DataFormat]
+** xref:components::hl7-dataformat.adoc[HL7 DataFormat]
 
 * Compression
 ** xref:gzip-dataformat.adoc[GZip DataFormat]
 ** xref:zip-dataformat.adoc[Zip DataFormat]
-** xref:zipfile-dataformat.adoc[Zip File DataFormat]
-** xref:lzf-dataformat.adoc[LZF Data Format]
+** xref:components::zipfile-dataformat.adoc[Zip File DataFormat]
+** xref:components::lzf-dataformat.adoc[LZF Data Format]
 ** xref:tar-dataformat.adoc[Tar DataFormat]
 
 * Security
-** xref:crypto-component.adoc[Crypto]
-** xref:crypto-component.adoc[PGP]
-** xref:secureXML-dataformat.adoc[XMLSecurity DataFormat]
+** xref:components::crypto-component.adoc[Crypto]
+** xref:components::crypto-component.adoc[PGP]
+** xref:components::secureXML-dataformat.adoc[XMLSecurity DataFormat]
 
 * Misc.
-** xref:base64-dataformat.adoc[Base64]
+** xref:components::base64-dataformat.adoc[Base64]
 ** xref:custom-dataformat.adoc[Custom DataFormat] -- to use your own
 custom implementation
-** xref:mime-multipart-dataformat.adoc[MIME-Multipart]
-** xref:rss-dataformat.adoc[RSS]
+** xref:components::mime-multipart-dataformat.adoc[MIME-Multipart]
+** xref:components::rss-dataformat.adoc[RSS]
 ** xref:tidymarkup-dataformat.adoc[TidyMarkup]
-** xref:syslog-dataformat.adoc[Syslog]
-** xref:ical-dataformat.adoc[ICal]
-** xref:barcode-dataformat.adoc[Barcode] -- to read and generate barcodes
+** xref:components::syslog-dataformat.adoc[Syslog]
+** xref:components::ical-dataformat.adoc[ICal]
+** xref:components::barcode-dataformat.adoc[Barcode] -- to read and generate barcodes
 (QR-Code, PDF417, ...)
 
 And related is the following:
 
-* xref:dataformat-component.adoc[DataFormat Component] for working with
+* xref:components::dataformat-component.adoc[DataFormat Component] for working with
   Data Formats as if it was a regular xref:component.adoc[Component]
   supporting xref:endpoint.adoc[Endpoints] and xref:uris.adoc[URIs].
 * xref:dozer-type-conversion.adoc[Dozer Type Conversion] using Dozer for
@@ -80,8 +80,8 @@ And related is the following:
 ==== Unmarshalling
 
 If you receive a message from one of the Camel
-xref:component.adoc[Components] such as xref:file-component.adoc[File],
-xref:http-component.adoc[HTTP] or xref:jms-component.adoc[JMS] you often want to unmarshal
+xref:component.adoc[Components] such as xref:components::file-component.adoc[File],
+xref:http-component.adoc[HTTP] or xref:components::jms-component.adoc[JMS] you often want to unmarshal
 the payload into some bean so that you can process it using some
 xref:bean-integration.adoc[Bean Integration] or perform
 xref:predicate.adoc[Predicate] evaluation and so forth. To do this use
@@ -102,7 +102,7 @@ from("activemq:My.Queue").
 The above uses a named DataFormat of `jaxb` which is configured with a
 number of Java package names. You can if you prefer use a named
 reference to a data format which can then be defined in your
-xref:registry.adoc[Registry] such as via your xref:spring.adoc[Spring]
+xref:registry.adoc[Registry] such as via your xref:components::spring.adoc[Spring]
 XML file.
 
 You can also use the DSL itself to define the data format as you use it.
diff --git a/docs/user-manual/modules/ROOT/pages/dead-letter-channel.adoc b/docs/user-manual/modules/ROOT/pages/dead-letter-channel.adoc
index ed42735..01889dc 100644
--- a/docs/user-manual/modules/ROOT/pages/dead-letter-channel.adoc
+++ b/docs/user-manual/modules/ROOT/pages/dead-letter-channel.adoc
@@ -323,7 +323,7 @@ failed.
 
 These information is kept on the Exchange even if the message
 was successfully processed by a given endpoint, and then later fails for
-example in a local xref:bean-component.adoc[Bean] processing instead. So beware
+example in a local xref:components::bean-component.adoc[Bean] processing instead. So beware
 that this is a hint that helps pinpoint errors.
 
 [source,java]
diff --git a/docs/user-manual/modules/ROOT/pages/dsl.adoc b/docs/user-manual/modules/ROOT/pages/dsl.adoc
index 9c20375..0f53368 100644
--- a/docs/user-manual/modules/ROOT/pages/dsl.adoc
+++ b/docs/user-manual/modules/ROOT/pages/dsl.adoc
@@ -8,7 +8,7 @@ languages (DSL) as listed below.
 
 * xref:java-dsl.adoc[Java DSL] - A Java based DSL using the fluent
 builder style.
-* xref:spring.adoc[Spring XML] - A XML based DSL in Spring XML files
+* xref:components::spring.adoc[Spring XML] - A XML based DSL in Spring XML files
 * Blueprint XML - A XML based
 DSL in OSGi Blueprint XML files
 * Rest DSL - A DSL to define REST services using a
diff --git a/docs/user-manual/modules/ROOT/pages/dynamic-router.adoc b/docs/user-manual/modules/ROOT/pages/dynamic-router.adoc
index c4c592e..e6866fd 100644
--- a/docs/user-manual/modules/ROOT/pages/dynamic-router.adoc
+++ b/docs/user-manual/modules/ROOT/pages/dynamic-router.adoc
@@ -60,7 +60,7 @@ from("direct:start")
     .dynamicRouter(method(DynamicRouterTest.class, "slip"));
 ----
 
-Which will leverage a xref:bean-component.adoc[Bean] to compute the slip
+Which will leverage a xref:components::bean-component.adoc[Bean] to compute the slip
 _on-the-fly_, which could be implemented as follows:
 
 [source,java]
@@ -191,12 +191,12 @@ In the above we can use the
 Parameter Binding Annotations
 to bind different parts of the Message to method
 parameters or use an Expression such as using
-xref:xpath-language.adoc[XPath] or xref:xpath-language.adoc[XQuery].
+xref:components::xpath-language.adoc[XPath] or xref:components::xpath-language.adoc[XQuery].
 
 The method can be invoked in a number of ways as described in the
 Bean Integration such as
 
 * POJO Producing
 * Spring Remoting
-* xref:bean-component.adoc[Bean] component
+* xref:components::bean-component.adoc[Bean] component
 
diff --git a/docs/user-manual/modules/ROOT/pages/enterprise-integration-patterns.adoc b/docs/user-manual/modules/ROOT/pages/enterprise-integration-patterns.adoc
index 337c8db..439e7b3 100644
--- a/docs/user-manual/modules/ROOT/pages/enterprise-integration-patterns.adoc
+++ b/docs/user-manual/modules/ROOT/pages/enterprise-integration-patterns.adoc
@@ -288,7 +288,7 @@ and via non-messaging techniques?
 [width="100%",cols="10%,10%,80%",]
 |=======================================================================
 |image:http://www.eaipatterns.com/img/ControlBusIcon.gif[image]
-|xref:controlbus-component.adoc[ControlBus] |How can we effectively administer a
+|xref:components::controlbus-component.adoc[ControlBus] |How can we effectively administer a
 messaging system that is distributed across multiple platforms and a
 wide geographic area?
 
diff --git a/docs/user-manual/modules/ROOT/pages/error-handling-in-camel.adoc b/docs/user-manual/modules/ROOT/pages/error-handling-in-camel.adoc
index 6aff968..029a753 100644
--- a/docs/user-manual/modules/ROOT/pages/error-handling-in-camel.adoc
+++ b/docs/user-manual/modules/ROOT/pages/error-handling-in-camel.adoc
@@ -61,7 +61,7 @@ ERROR level :star:
 A dead letter queue is like a black hole, it will consume the
 xref:exchange.adoc[Exchange] and the xref:exchange.adoc[Exchange]
 routing is ended with no indication that it failed. +
-This works great in the xref:jms-component.adoc[JMS] Messaging world where we
+This works great in the xref:components::jms-component.adoc[JMS] Messaging world where we
 don't want a bad message to cause endless retries and causing the system
 to exhaust. The message is said to be poison and thus we want to move it
 to a dead letter queue so the system can continue to operate and work
@@ -175,9 +175,9 @@ just a ERROR logger.
 [NOTE]
 ====
 This applies to all kind of xref:component.adoc[Components] in Camel.
-The sample above only uses xref:bean-component.adoc[Bean] but it's the same for
-xref:file-component.adoc[File], xref:mail-component.adoc[Mail],
-xref:velocity-component.adoc[Velocity] or whatever component you use.
+The sample above only uses xref:components::bean-component.adoc[Bean] but it's the same for
+xref:components::file-component.adoc[File], xref:components::mail-component.adoc[Mail],
+xref:components::velocity-component.adoc[Velocity] or whatever component you use.
 ====
 
 [[ErrorhandlinginCamel-Transactional]]
diff --git a/docs/user-manual/modules/ROOT/pages/event-message.adoc b/docs/user-manual/modules/ROOT/pages/event-message.adoc
index 5fa45f0..48f2a15 100644
--- a/docs/user-manual/modules/ROOT/pages/event-message.adoc
+++ b/docs/user-manual/modules/ROOT/pages/event-message.adoc
@@ -12,8 +12,8 @@ implement this pattern using the underlying transport or protocols.
 image:http://www.enterpriseintegrationpatterns.com/img/EventMessageSolution.gif[image]
 
 The default behaviour of many xref:components.adoc[Components] is InOnly
-such as for xref:jms-component.adoc[JMS], xref:jms-component.adoc[File] or
-xref:seda-component.adoc[SEDA]
+such as for xref:components::jms-component.adoc[JMS], xref:components::jms-component.adoc[File] or
+xref:components::seda-component.adoc[SEDA]
 
 TIP: See the related xref:request-reply.adoc[Request Reply] message.
 
diff --git a/docs/user-manual/modules/ROOT/pages/eventDrivenConsumer-eip.adoc b/docs/user-manual/modules/ROOT/pages/eventDrivenConsumer-eip.adoc
index 47a2d62..2fc4f98 100644
--- a/docs/user-manual/modules/ROOT/pages/eventDrivenConsumer-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/eventDrivenConsumer-eip.adoc
@@ -22,7 +22,7 @@ when a xref:message-eip.adoc[Message] is available for processing.
 The following demonstrates a
 http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/Processor.html[Processor]
 defined in the Camel xref:Registry-Registry.adoc[Registry] which is
-invoked when an event occurs from a xref:jms-component.adoc[JMS] queue.
+invoked when an event occurs from a xref:components::jms-component.adoc[JMS] queue.
 
 *Using the xref:FluentBuilders-FluentBuilders.adoc[Fluent Builders]*
 
diff --git a/docs/user-manual/modules/ROOT/pages/exception-clause.adoc b/docs/user-manual/modules/ROOT/pages/exception-clause.adoc
index fca12a5..860b15a 100644
--- a/docs/user-manual/modules/ROOT/pages/exception-clause.adoc
+++ b/docs/user-manual/modules/ROOT/pages/exception-clause.adoc
@@ -25,7 +25,7 @@ from("seda:inputB")
 Here if the processing of *`seda:inputA`* or *`seda:inputB`* cause
 a *`ValidationException`* to be thrown (such as due to the XSD
 validation of the xref:validator-components.adoc[Validation] component or the
-Relax NG Compact syntax validation of the xref:jing-component.adoc[Jing]
+Relax NG Compact syntax validation of the xref:components::jing-component.adoc[Jing]
 component), then the message will be sent to the
 *`activemq:validationFailed`* queue.
 
diff --git a/docs/user-manual/modules/ROOT/pages/exchange-pattern.adoc b/docs/user-manual/modules/ROOT/pages/exchange-pattern.adoc
index ea782da..adbbea8 100644
--- a/docs/user-manual/modules/ROOT/pages/exchange-pattern.adoc
+++ b/docs/user-manual/modules/ROOT/pages/exchange-pattern.adoc
@@ -17,7 +17,7 @@ the Message Exchange indicating if a message
 exchange is a one way Event Message (InOnly) or
 a Request Reply message exchange (InOut).
 
-For example to override the default pattern on a xref:jms-component.adoc[JMS]
+For example to override the default pattern on a xref:components::jms-component.adoc[JMS]
 endpoint you could use this URI
 
 [source,java]
diff --git a/docs/user-manual/modules/ROOT/pages/expression.adoc b/docs/user-manual/modules/ROOT/pages/expression.adoc
index 82cbf26..ee241aa 100644
--- a/docs/user-manual/modules/ROOT/pages/expression.adoc
+++ b/docs/user-manual/modules/ROOT/pages/expression.adoc
@@ -72,27 +72,27 @@ The following languages are supported out of the box
 * xref:constant-language.adoc[Constant]
 * the unified xref:el-language.adoc[EL] from JSP and JSF
 * xref:header-language.adoc[Header]
-* xref:jsonpath-language.adoc[JSonPath]
+* xref:components::jsonpath-language.adoc[JSonPath]
 * xref:jxpath-language.adoc[JXPath]
-* xref:mvel-component.adoc[Mvel]
-* xref:ognl-language.adoc[OGNL]
+* xref:components::mvel-component.adoc[Mvel]
+* xref:components::ognl-language.adoc[OGNL]
 * xref:ref-language.adoc[Ref Language]
 * ExchangeProperty
 / Property
 * Scripting Languages such as
 ** BeanShell
 ** JavaScript
-** xref:groovy-language.adoc[Groovy]
+** xref:components::groovy-language.adoc[Groovy]
 ** xref:python-language.adoc[Python]
 ** xref:php-language.adoc[PHP]
 ** xref:ruby-language.adoc[Ruby]
 * xref:simple-language.adoc[Simple]
 ** xref:file-language.adoc[File Language]
-* xref:spel-language.adoc[Spring Expression Language]
-* xref:sql-component.adoc[SQL]
+* xref:components::spel-language.adoc[Spring Expression Language]
+* xref:components::sql-component.adoc[SQL]
 * Tokenizer
-* xref:xpath-language.adoc[XPath]
-* xref:xquery-component.adoc[XQuery]
+* xref:components::xpath-language.adoc[XPath]
+* xref:components::xquery-component.adoc[XQuery]
 * https://github.com/camel-extra/camel-extra/blob/master/components/camel-vtdxml/src/main/docs/vtdxml-component.adoc[VTD-XML]
 
 Most of these languages is also supported used as
@@ -112,14 +112,14 @@ wish to use.
 
 |Scripting Languages such as
 BeanShell, JavaScript,
-xref:groovy-language.adoc[Groovy], xref:groovy-language.adoc[PHP], xref:groovy-language.adoc[Python]
+xref:components::groovy-language.adoc[Groovy], xref:components::groovy-language.adoc[PHP], xref:components::groovy-language.adoc[Python]
 and xref:ruby-language.adoc[Ruby] |http://camel.apache.org/maven/current/camel-script/apidocs/org/apache/camel/builder/script/ScriptBuilder.html[org.apache.camel.builder.script.ScriptBuilder]
 
-|xref:sql-component.adoc[SQL] |http://camel.apache.org/maven/current/camel-josql/apidocs/org/apache/camel/builder/sql/SqlBuilder.html[org.apache.camel.builder.josql.SqlBuilder]
+|xref:components::sql-component.adoc[SQL] |http://camel.apache.org/maven/current/camel-josql/apidocs/org/apache/camel/builder/sql/SqlBuilder.html[org.apache.camel.builder.josql.SqlBuilder]
 
-|xref:xpath-language.adoc[XPath] |http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/builder/xml/XPathBuilder.html[org.apache.camel.builder.xml.XPathBuilder]
+|xref:components::xpath-language.adoc[XPath] |http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/builder/xml/XPathBuilder.html[org.apache.camel.builder.xml.XPathBuilder]
 
-|xref:xquery-component.adoc[XQuery] |http://camel.apache.org/maven/current/camel-saxon/apidocs/org/apache/camel/builder/saxon/XQueryBuilder.html[org.apache.camel.builder.saxon.XQueryBuilder]
+|xref:components::xquery-component.adoc[XQuery] |http://camel.apache.org/maven/current/camel-saxon/apidocs/org/apache/camel/builder/saxon/XQueryBuilder.html[org.apache.camel.builder.saxon.XQueryBuilder]
 |=======================================================================
 
 [[Expression-SeeAlso]]
diff --git a/docs/user-manual/modules/ROOT/pages/faq.adoc b/docs/user-manual/modules/ROOT/pages/faq.adoc
index 7d1b5ea..88df8cf 100644
--- a/docs/user-manual/modules/ROOT/pages/faq.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq.adoc
@@ -124,7 +124,7 @@ Questions on using Apache Camel
 ==== Logging Questions
 
 Questions on logging output from Camel to a console, using the
-xref:log-component.adoc[Log] endpoint or JDK 1.4 logging or Log4j etc
+xref:components::log-component.adoc[Log] endpoint or JDK 1.4 logging or Log4j etc
 
 * xref:faq/how-do-i-enable-debug-logging.adoc[How do I enable debug logging?]
 * xref:faq/how-do-i-use-java-14-logging.adoc[How do I use Java 1.4 logging?]
@@ -150,7 +150,7 @@ Questions on using specific components
 [[FAQ-JMSQuestions]]
 ===== JMS Questions
 
-Questions on using the xref:jms-component.adoc[JMS] endpoints in Camel
+Questions on using the xref:components::jms-component.adoc[JMS] endpoints in Camel
 
 * xref:faq/why-does-my-jms-route-only-consume-one-message-at-once.adoc[Why does my JMS route only consume one message at once?]
 
diff --git a/docs/user-manual/modules/ROOT/pages/faq/exception-javaxnamingnoinitialcontextexception.adoc b/docs/user-manual/modules/ROOT/pages/faq/exception-javaxnamingnoinitialcontextexception.adoc
index 2df3ca4..b706df7 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/exception-javaxnamingnoinitialcontextexception.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/exception-javaxnamingnoinitialcontextexception.adoc
@@ -1,7 +1,7 @@
 [[Exception-javax.naming.NoInitialContextException-Exceptionjavax.naming.NoInitialContextException]]
 === Exception: `javax.naming.NoInitialContextException`
 
-If you try to use Camel without xref:spring.adoc[Spring] using code
+If you try to use Camel without xref:components::spring.adoc[Spring] using code
 something like this:
 
 [source,java]
diff --git a/docs/user-manual/modules/ROOT/pages/faq/how-can-i-stop-a-route-from-a-route.adoc b/docs/user-manual/modules/ROOT/pages/faq/how-can-i-stop-a-route-from-a-route.adoc
index 96fd13b..05c67a8 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/how-can-i-stop-a-route-from-a-route.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/how-can-i-stop-a-route-from-a-route.adoc
@@ -58,7 +58,7 @@ A route must have been stopped prior to be shutdown.
 
 See more details about the xref:lifecycle.adoc[Lifecycle].
 
-NOTE: You can also use the xref:controlbus-component.adoc[ControlBus] component to let
+NOTE: You can also use the xref:components::controlbus-component.adoc[ControlBus] component to let
 it stop/start routes.
 
 [[HowcanIstoparoutefromaroute-SeeAlso]]
@@ -67,4 +67,4 @@ it stop/start routes.
 * xref:routepolicy.adoc[RoutePolicy]
 * xref:graceful-shutdown.adoc[Graceful Shutdown]
 * xref:lifecycle.adoc[Lifecycle]
-* xref:controlbus-component.adoc[ControlBus]
+* xref:components::controlbus-component.adoc[ControlBus]
diff --git a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-configure-endpoints.adoc b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-configure-endpoints.adoc
index 860325e..743d4fe 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-configure-endpoints.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-configure-endpoints.adoc
@@ -11,7 +11,7 @@ You can explicitly configure a Component using Java
 code as shown in this example
 
 Or you can explicitly get hold of an Endpoint and
-configure it using Java code as shown in the xref:mock-component.adoc[Mock endpoint examples].
+configure it using Java code as shown in the xref:components::mock-component.adoc[Mock endpoint examples].
 
 [source,java]
 ----
@@ -115,7 +115,7 @@ URIs
 ==== Using Endpoint URIs
 
 Another approach is to use the URI syntax. The URI syntax supports the
-query notation. So for example with the xref:mail-component.adoc[Mail] component
+query notation. So for example with the xref:components::mail-component.adoc[Mail] component
 you can configure the password property via the URI
 
 [source]
@@ -312,6 +312,6 @@ can have multiple options in one line, eg this is the same:
 
 * xref:configuring-camel.adoc[How do I add a component?]
 * xref:cdi-component.adoc[CDI]
-* xref:spring.adoc[Spring]
+* xref:components::spring.adoc[Spring]
 * xref:uris.adoc[URIs]
 * xref:using-propertyplaceholder.adoc[Using `PropertyPlaceholder`]
diff --git a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-handle-failures-when-consuming-for-example-from-a-ftp-server.adoc b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-handle-failures-when-consuming-for-example-from-a-ftp-server.adoc
index 7ca91f4..caf5b0b 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-handle-failures-when-consuming-for-example-from-a-ftp-server.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-handle-failures-when-consuming-for-example-from-a-ftp-server.adoc
@@ -14,7 +14,7 @@ based on when a message is *being* routed.
 In this case the error occurs *before* a message has been initiated and
 routed. So how can I control the error handling?
 
-The xref:ftp-component.adoc[FTP] component have a few options
+The xref:components::ftp-component.adoc[FTP] component have a few options
 (`maximumReconnectAttempts, reconnectDelay` to control number of retries
 and delay in between.
 
@@ -27,5 +27,5 @@ a `ScheduledPollConsumer` consumer. The page lists those.
 [[HowdoIhandlefailureswhenconsumingforexamplefromaFTPserver-Seealso]]
 ==== See also
 
-* xref:ftp-component.adoc[FTP]
+* xref:components::ftp-component.adoc[FTP]
 * xref:pollingConsumer-eip.adoc[Polling Consumer]
diff --git a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-let-jetty-match-wildcards.adoc b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-let-jetty-match-wildcards.adoc
index d65f2bf..7ef41c8 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-let-jetty-match-wildcards.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-let-jetty-match-wildcards.adoc
@@ -1,7 +1,7 @@
 [[HowdoIletJettymatchwildcards-HowdoIletJettymatchwildcards]]
 === How do I let Jetty match wildcards?
 
-By default xref:jetty-component.adoc[Jetty] will only match on exact uri's. But
+By default xref:components::jetty-component.adoc[Jetty] will only match on exact uri's. But
 you can instruct Jetty to match prefixes. For example:
 
 [source,java]
@@ -9,7 +9,7 @@ you can instruct Jetty to match prefixes. For example:
 from("jetty://0.0.0.0:8123/foo").to("mock:foo");
 ----
 
-In the route above xref:jetty-component.adoc[Jetty] will only match if the uri is
+In the route above xref:components::jetty-component.adoc[Jetty] will only match if the uri is
 an exact match, so it will match if you enter
 `\http://0.0.0.0:8123/foo` but not match if you do
 `\http://0.0.0.0:8123/foo/bar`.
diff --git a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-make-my-jms-endpoint-transactional.adoc b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-make-my-jms-endpoint-transactional.adoc
index 050be48..d933bd0 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-make-my-jms-endpoint-transactional.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-make-my-jms-endpoint-transactional.adoc
@@ -19,7 +19,7 @@ How Do I Make It Transactional?
 
 There are examples in the xref:transactionalClient-eip.adoc[Transactional Client]
 and it is described in the _Enabling Transacted Consumption_
-section of xref:jms-component.adoc[JMS]. To make a session transactional
+section of xref:components::jms-component.adoc[JMS]. To make a session transactional
 set `transacted=true` flag on the JMS endpoint and configure
 a `transactionManager` on the xref:component.adoc[Component] or
 xref:endpoint.adoc[Endpoint].
@@ -28,4 +28,4 @@ xref:endpoint.adoc[Endpoint].
 ==== See Also
 
 * xref:transactionalClient-eip.adoc[Transactional Client]
-* xref:jms-component.adoc[JMS]
+* xref:components::jms-component.adoc[JMS]
diff --git a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-retry-processing-a-message-from-a-certain-point-back-or-an-entire-route.adoc b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-retry-processing-a-message-from-a-certain-point-back-or-an-entire-route.adoc
index 3569d68..f695621 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-retry-processing-a-message-from-a-certain-point-back-or-an-entire-route.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-retry-processing-a-message-from-a-certain-point-back-or-an-entire-route.adoc
@@ -9,7 +9,7 @@ In the example above we have 2 routes (`direct:start`, `direct:sub`). In
 case of a failure anywhere in the `direct:sub` route, then the entire
 route is retried. This happens because we have instructed the `direct:sub`
 route to not use any error handler (eg the no error handler). Then we
-link the routes using the xref:direct-component.adoc[Direct] component by calling
+link the routes using the xref:components::direct-component.adoc[Direct] component by calling
 the sub route from the 1st route.
 
 [source,java]
diff --git a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-specify-time-period-in-a-human-friendly-syntax.adoc b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-specify-time-period-in-a-human-friendly-syntax.adoc
index ba3b709..9273613 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-specify-time-period-in-a-human-friendly-syntax.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-specify-time-period-in-a-human-friendly-syntax.adoc
@@ -22,7 +22,7 @@ You can use the following short syntax, which is most common to use:
 |s |second
 |============
 
-So for example the xref:timer-component.adoc[Timer] endpoint can be configured as
+So for example the xref:components::timer-component.adoc[Timer] endpoint can be configured as
 follows:
 
 [source,java]
diff --git a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-specify-which-method-to-use-when-using-beans-in-routes.adoc b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-specify-which-method-to-use-when-using-beans-in-routes.adoc
index 049d312..98186ae 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-specify-which-method-to-use-when-using-beans-in-routes.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-specify-which-method-to-use-when-using-beans-in-routes.adoc
@@ -1,7 +1,7 @@
 [[HodoIspecifywhichmethodtousewhenusingbeansinroutes-HodoIspecifywhichmethodtousewhenusingbeansinroutes]]
 === Ho do I specify which method to use when using beans in routes?
 
-See xref:bean-component.adoc[Bean], xref:bean-integration.adoc[Bean Integration]
+See xref:components::bean-component.adoc[Bean], xref:bean-integration.adoc[Bean Integration]
 and xref:bean-binding.adoc[Bean Binding]
 
 However if you have overloaded methods you need to specify which of
diff --git a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-use-spring-property-placeholder-with-camel-xml.adoc b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-use-spring-property-placeholder-with-camel-xml.adoc
index 0d5e6bf..69fc8a3 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-use-spring-property-placeholder-with-camel-xml.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-use-spring-property-placeholder-with-camel-xml.adoc
@@ -30,7 +30,7 @@ Camel XML. For example at the time of writing this is *NOT* supported
 
 However you can use the `<endpoint/>` element to define endpoints which
 does support the property resolving which you can then refer to by name,
-using the xref:ref-component.adoc[Ref] component as shown below (notice the `ref:`
+using the xref:components::ref-component.adoc[Ref] component as shown below (notice the `ref:`
 in the URI):
 
 *SUPPORTED*
@@ -72,6 +72,6 @@ Here is a trick that you can use to define the uri in a property file
 using Spring injection and Camel endpoint:
 http://cmoulliard.blogspot.com/2009/05/trick-to-pass-uri-declared-in-property.html.
 
-From Camel 2.3 onwards there is a xref:properties-component.adoc[Properties]
+From Camel 2.3 onwards there is a xref:components::properties-component.adoc[Properties]
 component build in Camel core which allows you to use properties in the
 same way as Spring property placeholders, and even more.
diff --git a/docs/user-manual/modules/ROOT/pages/faq/how-do-the-direct-event-seda-and-vm-endpoints-compare.adoc b/docs/user-manual/modules/ROOT/pages/faq/how-do-the-direct-event-seda-and-vm-endpoints-compare.adoc
index 6ba2814..a58b75f 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/how-do-the-direct-event-seda-and-vm-endpoints-compare.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/how-do-the-direct-event-seda-and-vm-endpoints-compare.adoc
@@ -1,14 +1,14 @@
 [[Howdothedirecteventsedaandvmendpointscompare-Howdothedirecteventsedaandvmendpointscompare]]
 === How do the `direct`, `event`, `seda`, and `vm` endpoints compare?
 
-* xref:vm-component.adoc[VM] and xref:seda-component.adoc[SEDA] endpoints are basically the
+* xref:components::vm-component.adoc[VM] and xref:components::seda-component.adoc[SEDA] endpoints are basically the
 same; they both offer asychronous in memory SEDA queues; they differ in
 visibility -- endpoints are visible inside the same JVM or within the same
 CamelContext respectively.
-* xref:direct-component.adoc[Direct] uses no threading; it directly invokes the
+* xref:components::direct-component.adoc[Direct] uses no threading; it directly invokes the
 consumer when sending.
-* xref:spring-event-component.adoc[Spring Event] adds a listener to Spring's
+* xref:components::spring-event-component.adoc[Spring Event] adds a listener to Spring's
 application events; so the consumer is invoked the same thread as Spring
 notifies events. Event differs in that the payload should be a Spring
-`ApplicationEvent` object whereas xref:direct-component.adoc[Direct],
-xref:seda-component.adoc[SEDA] and xref:vm-component.adoc[VM] can use any payload.
+`ApplicationEvent` object whereas xref:components::direct-component.adoc[Direct],
+xref:components::seda-component.adoc[SEDA] and xref:components::vm-component.adoc[VM] can use any payload.
diff --git a/docs/user-manual/modules/ROOT/pages/faq/how-do-the-timer-and-quartz-endpoints-compare.adoc b/docs/user-manual/modules/ROOT/pages/faq/how-do-the-timer-and-quartz-endpoints-compare.adoc
index f244cae..9fd6616 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/how-do-the-timer-and-quartz-endpoints-compare.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/how-do-the-timer-and-quartz-endpoints-compare.adoc
@@ -1,7 +1,7 @@
 [[HowdotheTimerandQuartzendpointscompare-HowdotheTimerandQuartzendpointscompare]]
 === How do the Timer and Quartz endpoints compare?
 
-xref:timer-component.adoc[Timer] is a simple, non persistence timer using the
+xref:components::timer-component.adoc[Timer] is a simple, non persistence timer using the
 JDK's in built timer mechanism.
 
 xref:quartz-component.adoc[Quartz] uses the Quartz library which uses a database
diff --git a/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-mule.adoc b/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-mule.adoc
index 5937cd3..0e38d6b 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-mule.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-mule.adoc
@@ -13,8 +13,8 @@ routing/mediation engines. The main differences are as follows:
   xref:enterprise-integration-patterns.adoc[Enterprise Integration
   Patterns]
 * Camel's API is smaller & cleaner (IMHO) and is closely aligned with
-  the APIs of JBI, xref:cxf-component.adoc[CXF] and
-  xref:jms-component.adoc[JMS]; based around message exchanges (with in and optional
+  the APIs of JBI, xref:components::cxf-component.adoc[CXF] and
+  xref:components::jms-component.adoc[JMS]; based around message exchanges (with in and optional
   out messages) which more closely maps to REST, WS, WSDL & JBI than the
   UMO model Mule is based on
 * Camel allows the underlying transport details to be easily exposed
diff --git a/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-servicemix-eip.adoc b/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-servicemix-eip.adoc
index 78a66e1..021bcaa 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-servicemix-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-servicemix-eip.adoc
@@ -8,8 +8,8 @@ The main difference with ServiceMix EIP is its integrated into the
 existing ServiceMix XBean XML configuration whereas Camel has more
 xref:enterprise-integration-patterns.adoc[Enterprise Integration
 Patterns] and can be used outside of JBI (e.g. just with pure
-xref:jms-component.adoc[JMS] or xref:mina-component.adoc[MINA]). Also Camel supports a
-xref:dsl.adoc[Java DSL] or xref:spring.adoc[XML configuration].
+xref:components::jms-component.adoc[JMS] or xref:mina-component.adoc[MINA]). Also Camel supports a
+xref:dsl.adoc[Java DSL] or xref:components::spring.adoc[XML configuration].
 
 [[HowdoesCamelcomparetoServiceMixEIP-ConvertingfromServiceMixEIPtoCamel]]
 ==== Converting from ServiceMix EIP to Camel
diff --git a/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-servicemix.adoc b/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-servicemix.adoc
index a0e8922..c1d095d 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-servicemix.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-servicemix.adoc
@@ -18,13 +18,13 @@ xref:how-does-camel-compare-to-servicemix-eip.adoc[ServiceMix EIP
 component].
 
 To work with Camel and ServiceMix you take your Camel
-xref:spring.adoc[Spring] configuration and turn it into a JBI Service
+xref:components::spring.adoc[Spring] configuration and turn it into a JBI Service
 Unit using the maven plugin or archetype. For more details see
 http://incubator.apache.org/servicemix/servicemix-camel.html[ServiceMix
 Camel plugin].
 
 So you could start out using Camel routing inside your application via
-xref:dsl.adoc[Java] or xref:spring.adoc[Spring]; then later on if you
+xref:dsl.adoc[Java] or xref:components::spring.adoc[Spring]; then later on if you
 choose to you could wrap up your routing and mediation rules as a JBI
 deployment unit and drop it into your ServiceMix ESB. This provides a
 nice agile approach to integration; start small & simple on an endpoint
diff --git a/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-synapse.adoc b/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-synapse.adoc
index b158f7e..baa337f 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-synapse.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-synapse.adoc
@@ -22,7 +22,7 @@ http://www.nabble.com/Apache-f90.html[very popular too].
 * Camel is designed from the ground up around
 xref:enterprise-integration-patterns.adoc[Enterprise Integration
 Patterns] -- having an EIP pattern language implemented in
-xref:dsl.adoc[Java], xref:spring.adoc[Spring XML],
+xref:dsl.adoc[Java], xref:components::spring.adoc[Spring XML],
 xref:scala-dsl.adoc[Scala] and xref:groovy-dsl.adoc[Groovy] as well as
 xref:visualisation.adoc[EIP Visualisations].
 * Camel is designed to work with pretty much all kinds of
diff --git a/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-look-up-beans-and-endpoints.adoc b/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-look-up-beans-and-endpoints.adoc
index 3fe8b93..f59af0c 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-look-up-beans-and-endpoints.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-look-up-beans-and-endpoints.adoc
@@ -2,7 +2,7 @@
 === How does Camel look up beans, components or endpoints?
 
 There are many times using Camel that a name is used for a bean such as
-using the xref:bean-component.adoc[Bean] endpoint or using the
+using the xref:components::bean-component.adoc[Bean] endpoint or using the
 xref:bean-language.adoc[Bean Language] to create a
 xref:expression.adoc[Expression] or xref:predicate.adoc[Predicate] or
 referring to any xref:component.adoc[Component] or
@@ -10,7 +10,7 @@ xref:endpoint.adoc[Endpoint].
 
 Camel uses the xref:registry.adoc[Registry] to resolve names when
 looking up beans or components or endpoints. Typically this will be
-xref:spring.adoc[Spring]; though you can use Camel without Spring in
+xref:components::spring.adoc[Spring]; though you can use Camel without Spring in
 which case it will use the xref:jndi.adoc[JNDI] registry implementation.
 
 Lots of test cases in the camel-core module don't use Spring (as
@@ -19,5 +19,5 @@ camel-spring do.
 
 So you can just define beans, components or endpoints in your
 xref:registry.adoc[Registry] implementation then you can refer to them
-by name in the xref:endpoint.adoc[Endpoint] URIs or xref:bean-component.adoc[Bean]
+by name in the xref:endpoint.adoc[Endpoint] URIs or xref:components::bean-component.adoc[Bean]
 endpoints or xref:bean-language.adoc[Bean Language] expressions.
diff --git a/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-work-with-activemq.adoc b/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-work-with-activemq.adoc
index 351e5ee..197085b 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-work-with-activemq.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-work-with-activemq.adoc
@@ -8,9 +8,9 @@ Patterns] inside:
 * the ActiveMQ message broker
 * the ActiveMQ JMS client
 
-So Camel can route messages to and from xref:mail-component.adoc[Mail],
-xref:file-component.adoc[File], xref:ftp-component.adoc[FTP], xref:jpa-component.adoc[JPA],
-xref:xmpp-component.adoc[XMPP] other xref:jms-component.adoc[JMS] providers and any of the
+So Camel can route messages to and from xref:components::mail-component.adoc[Mail],
+xref:components::file-component.adoc[File], xref:components::ftp-component.adoc[FTP], xref:components::jpa-component.adoc[JPA],
+xref:components::xmpp-component.adoc[XMPP] other xref:components::jms-component.adoc[JMS] providers and any of the
 other Camel xref:component.adoc[Components] as well as implementating
 all of the xref:enterprise-integration-patterns.adoc[Enterprise
 Integration Patterns] such as xref:content-based-router.adoc[Content
diff --git a/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-work-with-servicemix.adoc b/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-work-with-servicemix.adoc
index 02fc436..3a89fd8 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-work-with-servicemix.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-work-with-servicemix.adoc
@@ -7,7 +7,7 @@ Patterns] inside of the JBI container, routing between existing JBI
 components together with communicating with any of the other Camel
 xref:component.adoc[Components].
 
-To do this you take your Camel xref:spring.adoc[Spring] configuration
+To do this you take your Camel xref:components::spring.adoc[Spring] configuration
 and turn it into a JBI Service Unit using the maven plugin or archetype.
 
 For more details see
diff --git a/docs/user-manual/modules/ROOT/pages/faq/how-does-the-camel-api-compare-to.adoc b/docs/user-manual/modules/ROOT/pages/faq/how-does-the-camel-api-compare-to.adoc
index 33e63fa..dd17354 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/how-does-the-camel-api-compare-to.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/how-does-the-camel-api-compare-to.adoc
@@ -6,8 +6,8 @@ http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/Exchan
 and
 http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/Message.html[Message]
 map very closely to JBI in particular but also
-xref:cxf-component.adoc[CXF], xref:http-component.adoc[HTTP], xref:jms-component.adoc[JMS],
-xref:mail-component.adoc[Mail], xref:xmpp-component.adoc[XMPP] and most other integration
+xref:components::cxf-component.adoc[CXF], xref:http-component.adoc[HTTP], xref:components::jms-component.adoc[JMS],
+xref:components::mail-component.adoc[Mail], xref:components::xmpp-component.adoc[XMPP] and most other integration
 abstractions. We want to prevent leaky abstractions, so the Camel API
 exposes the underlying APIs so that a xref:processor.adoc[Processor] can
 make use of the underlying abstractions if they make sense.
@@ -17,7 +17,7 @@ For example:
 [width="100%",cols="50%,50%",options="header",]
 |=======================================================================
 |Component |Inbound exchange exposes
-|xref:cxf-component.adoc[CXF] |Each Inbound
+|xref:components::cxf-component.adoc[CXF] |Each Inbound
 http://camel.apache.org/maven/current/camel-cxf/apidocs/org/apache/camel/component/cxf/CxfExchange.html[CxfExchange]
 has access to the underlying Exchange and Message from CXF
 
@@ -30,7 +30,7 @@ http://camel.apache.org/maven/current/camel-jbi/apidocs/org/apache/camel/compone
 has access to the underlying JBI MessageExchange and NormalizedMessage
 objects
 
-|xref:jms-component.adoc[JMS] |Each inbound
+|xref:components::jms-component.adoc[JMS] |Each inbound
 http://camel.apache.org/maven/current/camel-jms/apidocs/org/apache/camel/component/jms/JmsExchange.html[JmsExchange]
 has access to the underlying JMS Message objects
 |=======================================================================
diff --git a/docs/user-manual/modules/ROOT/pages/faq/how-to-avoid-sending-some-or-all-message-headers.adoc b/docs/user-manual/modules/ROOT/pages/faq/how-to-avoid-sending-some-or-all-message-headers.adoc
index 4971c9d..e333df1 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/how-to-avoid-sending-some-or-all-message-headers.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/how-to-avoid-sending-some-or-all-message-headers.adoc
@@ -2,7 +2,7 @@
 === How to avoid sending some or all message headers?
 
 When I send a message to a Camel endpoint such as the
-xref:mail-component.adoc[Mail] component, then the mail include some message
+xref:components::mail-component.adoc[Mail] component, then the mail include some message
 headers I do not want. How can I avoid this?
 
 [[Howtoavoidsendingsomeorallmessageheaders-UseremoveHeadersintheroute]]
diff --git a/docs/user-manual/modules/ROOT/pages/faq/is-camel-ioc-friendly.adoc b/docs/user-manual/modules/ROOT/pages/faq/is-camel-ioc-friendly.adoc
index cabe72c..b735cb4 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/is-camel-ioc-friendly.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/is-camel-ioc-friendly.adoc
@@ -8,7 +8,7 @@ Now for the longer answer...
 ==== Spring
 
 In particular we've gone out of our way to make Camel work great with
-xref:spring.adoc[Spring] and to reuse all of Spring 2.x's power. For
+xref:components::spring.adoc[Spring] and to reuse all of Spring 2.x's power. For
 example:
 
 * the CamelContext, Components and Endpoints and their dependent beans
@@ -34,7 +34,7 @@ Spring is clearly the leading IoC container; though there are some
 others such as Guice, OSGi, Pico, HiveMind & Plexus so we have made the
 IoC pluggable in Camel.
 For example camel-core has no dependencies on anything other than
-commons-logging; camel-spring contains all the xref:spring.adoc[Spring]
+commons-logging; camel-spring contains all the xref:components::spring.adoc[Spring]
 integration, etc.
 
 We hope to have closer integration to other IoC containers, particularly
diff --git a/docs/user-manual/modules/ROOT/pages/faq/is-there-an-ide.adoc b/docs/user-manual/modules/ROOT/pages/faq/is-there-an-ide.adoc
index beadca3..e28ef8c 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/is-there-an-ide.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/is-there-an-ide.adoc
@@ -7,7 +7,7 @@ You could use your Java IDE for smart completion when creating
 xref:routes.adoc[Java routing rules] via the xref:dsl.adoc[DSL] which
 will give you smart completion in Java code.
 Or you can use your XML IDE (with XSD smart completion) to edit the
-xref:spring.adoc[routing rules in XML] using the
+xref:components::spring.adoc[routing rules in XML] using the
 xref:xml-configuration.adoc[XML Configuration]
 
 Some of the xref:commercial-camel-offerings.adoc[Commercial Companies]
diff --git a/docs/user-manual/modules/ROOT/pages/faq/running-camel-standalone.adoc b/docs/user-manual/modules/ROOT/pages/faq/running-camel-standalone.adoc
index 5bd507a..5b71ac1 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/running-camel-standalone.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/running-camel-standalone.adoc
@@ -4,7 +4,7 @@
 Yes, Camel can run standalone or in any container. Running Standalone is
 as simple just to create a xref:camelcontext.adoc[CamelContext], add
 routes and start it. If you don't want to write your own Java main, you
-could use the one from xref:spring.adoc[camel-spring]
+could use the one from xref:components::spring.adoc[camel-spring]
 (http://camel.apache.org/maven/current/camel-spring/apidocs/) also used
 by the xref:camel-maven-plugin.adoc[Camel Maven Plugin].
 
diff --git a/docs/user-manual/modules/ROOT/pages/faq/should-i-deploy-camel-inside-the-activemq-broker-or-in-another-application.adoc b/docs/user-manual/modules/ROOT/pages/faq/should-i-deploy-camel-inside-the-activemq-broker-or-in-another-application.adoc
index f4aac0c..7a7030f 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/should-i-deploy-camel-inside-the-activemq-broker-or-in-another-application.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/should-i-deploy-camel-inside-the-activemq-broker-or-in-another-application.adoc
@@ -15,7 +15,7 @@ to deploy something.
 databases and bridging them to queues or topics then its usually more
 efficient to host in the broker; as there's less contention and there's
 no network communication between the EIP rules and the message broker as
-its all in the same JVM (so you can use the xref:vm-component.adoc[VM Transport]
+its all in the same JVM (so you can use the xref:components::vm-component.adoc[VM Transport]
 to avoid network overhead.
 
 [[ShouldIdeployCamelinsidetheActiveMQbrokerorinanotherapplication-AdvantagesofdeployingEIPinsideaseparateapplication]]
diff --git a/docs/user-manual/modules/ROOT/pages/faq/what-is-camel.adoc b/docs/user-manual/modules/ROOT/pages/faq/what-is-camel.adoc
index 11f91bd..a9ee79e 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/what-is-camel.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/what-is-camel.adoc
@@ -6,7 +6,7 @@ Patterns].
 
 Camel empowers you to define routing and mediation rules in a variety of
 domain-specific languages, including a Java-based xref:dsl.adoc[Fluent
-API], xref:spring.adoc[Spring] or
+API], xref:components::spring.adoc[Spring] or
 xref:using-osgi-blueprint-with-camel.adoc[Blueprint]
 xref:xml-configuration.adoc[XML Configuration] files, and a
 xref:scala-dsl.adoc[Scala DSL]. This means you get smart completion of
@@ -14,8 +14,8 @@ routing rules in your IDE, whether in a Java, Scala or XML editor.
 
 Apache Camel uses xref:uris.adoc[URIs] to work directly with any kind of
 xref:transport.adoc[Transport] or messaging model such as
-xref:components::http4-component.adoc[HTTP], xref:activemq.adoc[ActiveMQ], xref:jms-component.adoc[JMS],
-JBI, SCA, xref:components::mina2-component.adoc[MINA] or xref:cxf-component.adoc[CXF], as
+xref:components::http4-component.adoc[HTTP], xref:activemq.adoc[ActiveMQ], xref:components::jms-component.adoc[JMS],
+JBI, SCA, xref:components::mina2-component.adoc[MINA] or xref:components::cxf-component.adoc[CXF], as
 well as pluggable xref:component.adoc[Components] and
 xref:data-format.adoc[Data Format] options. Apache Camel is a small
 library with minimal xref:what-are-the-dependencies.adoc[dependencies]
@@ -27,7 +27,7 @@ out-of-box.
 
 Apache Camel provides support for xref:bean-binding.adoc[Bean Binding]
 and seamless integration with popular frameworks such as
-xref:cdi-component.adoc[CDI], xref:spring.adoc[Spring],
+xref:cdi-component.adoc[CDI], xref:components::spring.adoc[Spring],
 xref:using-osgi-blueprint-with-camel.adoc[Blueprint] and
 xref:guice.adoc[Guice]. Camel also has extensive support for
 xref:testing.adoc[unit testing] your routes.
diff --git a/docs/user-manual/modules/ROOT/pages/faq/why-can-i-not-use-when-or-otherwise-in-a-java-camel-route.adoc b/docs/user-manual/modules/ROOT/pages/faq/why-can-i-not-use-when-or-otherwise-in-a-java-camel-route.adoc
index babd735..225bad2 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/why-can-i-not-use-when-or-otherwise-in-a-java-camel-route.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/why-can-i-not-use-when-or-otherwise-in-a-java-camel-route.adoc
@@ -91,7 +91,7 @@ to the xref:contentBasedRouter-eip.adoc[Content Based Router]. Note
 ==== Still problems
 
 If there are still problems, then you can split your route into multiple
-routes, and link them together using the xref:direct-component.adoc[Direct]
+routes, and link them together using the xref:components::direct-component.adoc[Direct]
 component.
 There can be some combinations of xref:enterprise-integration-patterns.adoc[EIP]s
 that can hit limits in how far we can take the fluent builder DSL with
diff --git a/docs/user-manual/modules/ROOT/pages/faq/why-does-camel-use-too-many-threads-with-producertemplate.adoc b/docs/user-manual/modules/ROOT/pages/faq/why-does-camel-use-too-many-threads-with-producertemplate.adoc
index f01d983..9b237b1 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/why-does-camel-use-too-many-threads-with-producertemplate.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/why-does-camel-use-too-many-threads-with-producertemplate.adoc
@@ -12,11 +12,11 @@ Also when you have finished using the `ProducerTemplate` you should call
 the `stop()` method to close down all the resources it has been using.
 
 It's better to either explicitly create one on startup or get your IoC
-container (xref:spring.adoc[Spring] or xref:guice.adoc[Guice]) to inject
+container (xref:components::spring.adoc[Spring] or xref:guice.adoc[Guice]) to inject
 it into your `Processor` or bean then it can take care of creating it and
 destroying all the resources when you have finished with it.
 
-For instance using xref:spring.adoc[Spring] you can define a template
+For instance using xref:components::spring.adoc[Spring] you can define a template
 and have Spring handle the lifecycle of it:
 
 [source,java]
diff --git a/docs/user-manual/modules/ROOT/pages/faq/why-does-ftp-component-not-download-any-files.adoc b/docs/user-manual/modules/ROOT/pages/faq/why-does-ftp-component-not-download-any-files.adoc
index 7687b62..b4a60df 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/why-does-ftp-component-not-download-any-files.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/why-does-ftp-component-not-download-any-files.adoc
@@ -1,7 +1,7 @@
 [[WhydoesFTPcomponentnotdownloadanyfiles-WhydoesFTPcomponentnotdownloadanyfiles]]
 === Why does FTP component not download any files?
 
-The xref:ftp-component.adoc[FTP] component has many options. So make sure you
+The xref:components::ftp-component.adoc[FTP] component has many options. So make sure you
 have configured it properly.
 Also a common issue is that you have to use either active or passive
 mode. So you may have to set `passiveMode=true` on the endpoint
diff --git a/docs/user-manual/modules/ROOT/pages/faq/why-does-my-file-consumer-not-pick-up-the-file-and-how-do-i-let-the-file-consumer-use-the-camel-error-handler.adoc b/docs/user-manual/modules/ROOT/pages/faq/why-does-my-file-consumer-not-pick-up-the-file-and-how-do-i-let-the-file-consumer-use-the-camel-error-handler.adoc
index fcb3b19..a5ba352 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/why-does-my-file-consumer-not-pick-up-the-file-and-how-do-i-let-the-file-consumer-use-the-camel-error-handler.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/why-does-my-file-consumer-not-pick-up-the-file-and-how-do-i-let-the-file-consumer-use-the-camel-error-handler.adoc
@@ -1,7 +1,7 @@
 [[WhydoesmyfileconsumernotpickupthefileandhowdoIletthefileconsumerusetheCamelerrorhandler-WhydoesmyfileconsumernotpickupthefileandhowdoIletthefileconsumerusetheCamelerrorhandler]]
 === Why does my file consumer not pick up the file, and how do I let the file consumer use the Camel error handler?
 
-There could be several reasons why the xref:file-component.adoc[File] consumer is
+There could be several reasons why the xref:components::file-component.adoc[File] consumer is
 not picking up files. For example it may not run at all, or it cannot
 acquire a read lock on the file.
 xref:faq.adoc#FAQ-LoggingQuestions[Check the logs] for any exceptions or other
@@ -31,7 +31,7 @@ xref:component.adoc[component]-specific.
 
 From Camel 2.10 onwards the file and ftp consumers can now bridge to the
 Camel routing engine's error handler. See more details at the
-`consumer.bridgeErrorHandler` option on the xref:file-component.adoc[File]
+`consumer.bridgeErrorHandler` option on the xref:components::file-component.adoc[File]
 documentation.
 ====
 
@@ -45,7 +45,7 @@ https://github.com/apache/camel/blob/master/camel-core/src/main/java/org/apache/
 that will log the exception at `ERROR`/`WARN` level, and then ignore the
 exception.
 
-See the xref:file-component.adoc[File] page in the bottom for an example how to
+See the xref:components::file-component.adoc[File] page in the bottom for an example how to
 use a custom `ExceptionHandler` that sends a new message to the Camel
 routing engine, which then allows the routing engine to trigger its own
 error handling to deal with the exception.
diff --git a/docs/user-manual/modules/ROOT/pages/faq/why-does-my-jms-route-only-consume-one-message-at-once.adoc b/docs/user-manual/modules/ROOT/pages/faq/why-does-my-jms-route-only-consume-one-message-at-once.adoc
index 3a232b5..c8d600f 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/why-does-my-jms-route-only-consume-one-message-at-once.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/why-does-my-jms-route-only-consume-one-message-at-once.adoc
@@ -1,7 +1,7 @@
 [[WhydoesmyJMSrouteonlyconsumeonemessageatonce-WhydoesmyJMSrouteonlyconsumeonemessageatonce]]
 === Why does my JMS route only consume one message at once?
 
-The default xref:jms-component.adoc[JMS] endpoint configuration defines
+The default xref:components::jms-component.adoc[JMS] endpoint configuration defines
 *concurrentConsumers* to be 1 so only 1 message is processed
 concurrently at any point in time. To change this to make things more
 concurrent, just configure this value; either at the JMS component level
@@ -18,4 +18,4 @@ from("activemq:SomeQueue?concurrentConsumers=25").
 [[WhydoesmyJMSrouteonlyconsumeonemessageatonce-SeeAlso]]
 ==== See Also
 
-* xref:jms-component.adoc[JMS] for more configuration details
+* xref:components::jms-component.adoc[JMS] for more configuration details
diff --git a/docs/user-manual/modules/ROOT/pages/faq/why-use-multiple-camelcontext.adoc b/docs/user-manual/modules/ROOT/pages/faq/why-use-multiple-camelcontext.adoc
index 9772bfa..86c9c4c 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/why-use-multiple-camelcontext.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/why-use-multiple-camelcontext.adoc
@@ -12,5 +12,5 @@ other Camel applications.
 
 If you want the endpoints or producers in different camel contexts to
 communicate with another, there are a number of solutions. You can use
-the ServiceMix NMR, or you can use xref:jms-component.adoc[JMS], or
-you can use Camel's xref:vm-component.adoc[VM] transport.
+the ServiceMix NMR, or you can use xref:components::jms-component.adoc[JMS], or
+you can use Camel's xref:components::vm-component.adoc[VM] transport.
diff --git a/docs/user-manual/modules/ROOT/pages/file-language.adoc b/docs/user-manual/modules/ROOT/pages/file-language.adoc
index aa2e77d..f241fc9 100644
--- a/docs/user-manual/modules/ROOT/pages/file-language.adoc
+++ b/docs/user-manual/modules/ROOT/pages/file-language.adoc
@@ -42,7 +42,7 @@ filename.
 All the file tokens use the same expression name as the method on the
 `java.io.File` object, for instance `file:absolute` refers to the
 `java.io.File.getAbsolute()` method. Notice that not all expressions are
-supported by the current Exchange. For instance the xref:ftp-component.adoc[FTP]
+supported by the current Exchange. For instance the xref:components::ftp-component.adoc[FTP]
 component supports some of the options, where as the
 File component supports all of them.
 
@@ -223,7 +223,7 @@ fileName="uniquefile-${bean:myguidgenerator.generateid}.txt"
 
 And of course all this can be combined in one expression where you can
 use the xref:file-language.adoc[File Language], xref:file-language.adoc[Simple]
-and the xref:bean-component.adoc[Bean] language in one combined expression. This
+and the xref:components::bean-component.adoc[Bean] language in one combined expression. This
 is pretty powerful for those common file path patterns.
 
 === Using Spring PropertyPlaceholderConfigurer together with the File component
diff --git a/docs/user-manual/modules/ROOT/pages/graceful-shutdown.adoc b/docs/user-manual/modules/ROOT/pages/graceful-shutdown.adoc
index 1501faa..6d498e7 100644
--- a/docs/user-manual/modules/ROOT/pages/graceful-shutdown.adoc
+++ b/docs/user-manual/modules/ROOT/pages/graceful-shutdown.adoc
@@ -159,7 +159,7 @@ For example in the route below we have two routes, where route 1 is
 dependent upon route 2. At shutdown we want route 1 to complete all its
 current messages and we also want the 2nd route to do this as well. So
 we can mark both routes to `Defer` but since route 1 is a
-xref:seda-component.adoc[SEDA] based route its `Defer` by default (it uses
+xref:components::seda-component.adoc[SEDA] based route its `Defer` by default (it uses
 `ShutdownAware`).
 
 A Java DSL based example to defer shutting down the 2nd
@@ -410,7 +410,7 @@ The interface `org.apache.camel.spi.ShutdownAware` is an optional
 interface consumers can implement to have fine grained control during
 shutdown. The `ShutdownStrategy` must be able to deal with consumers
 which implement this interface. This interface was introduced to cater
-for in memory consumers such as xref:seda-component.adoc[SEDA] which potentially
+for in memory consumers such as xref:components::seda-component.adoc[SEDA] which potentially
 have a number of pending messages on its internal in memory queues. What
 this allows is to let it control the shutdown process to let it complete
 its pending messages.
diff --git a/docs/user-manual/modules/ROOT/pages/guaranteed-delivery.adoc b/docs/user-manual/modules/ROOT/pages/guaranteed-delivery.adoc
index 9f36d79..502e0c6 100644
--- a/docs/user-manual/modules/ROOT/pages/guaranteed-delivery.adoc
+++ b/docs/user-manual/modules/ROOT/pages/guaranteed-delivery.adoc
@@ -8,13 +8,13 @@ patterns] using among others the following components:
 
 * xref:file2.adoc[File] for using file systems as a persistent store of
 messages
-* xref:jms-component.adoc[JMS] when using persistent delivery (the default) for
+* xref:components::jms-component.adoc[JMS] when using persistent delivery (the default) for
 working with JMS Queues and Topics for high performance, clustering and
 load balancing
-* xref:jpa-component.adoc[JPA] for using a database as a persistence layer, or use
-any of the many other database component such as xref:sql-component.adoc[SQL],
-xref:jdbc-component.adoc[JDBC],
-xref:mybatis-component.adoc[MyBatis],
+* xref:components::jpa-component.adoc[JPA] for using a database as a persistence layer, or use
+any of the many other database component such as xref:components::sql-component.adoc[SQL],
+xref:components::jdbc-component.adoc[JDBC],
+xref:components::mybatis-component.adoc[MyBatis],
 xref:hibernate.adoc[Hibernate]
 * xref:hawtdb.adoc[HawtDB] for a lightweight key-value persistent store
 
@@ -25,7 +25,7 @@ image:http://www.enterpriseintegrationpatterns.com/img/GuaranteedMessagingSoluti
 
 The following example demonstrates illustrates the use
 of http://www.enterpriseintegrationpatterns.com/GuaranteedMessaging.html[Guaranteed
-Delivery] within the xref:jms-component.adoc[JMS] component. By default, a message
+Delivery] within the xref:components::jms-component.adoc[JMS] component. By default, a message
 is not considered successfully delivered until the recipient has
 persisted the message locally guaranteeing its receipt in the event the
 destination becomes unavailable.
diff --git a/docs/user-manual/modules/ROOT/pages/idempotentConsumer-eip.adoc b/docs/user-manual/modules/ROOT/pages/idempotentConsumer-eip.adoc
index 2c61d34..da153e4 100644
--- a/docs/user-manual/modules/ROOT/pages/idempotentConsumer-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/idempotentConsumer-eip.adoc
@@ -19,13 +19,13 @@ Camel provides the following Idempotent Consumer implementations:
 * MemoryIdempotentRepository
 * xref:file2.adoc[FileIdempotentRepository]
 * xref:hazelcast-component.adoc[HazelcastIdempotentRepository]
-* xref:sql-component.adoc[JdbcMessageIdRepository]
-* xref:jpa-component.adoc[JpaMessageIdRepository]
-* xref:infinispan-component.adoc[InfinispanIdempotentRepository]
-* xref:jcache-component.adoc[JCacheIdempotentRepository]
-* xref:spring.adoc[SpringCacheIdempotentRepository]
-* xref:ehcache-component.adoc[EhcacheIdempotentRepository]
-* xref:kafka-component.adoc[KafkaIdempotentRepository]
+* xref:components::sql-component.adoc[JdbcMessageIdRepository]
+* xref:components::jpa-component.adoc[JpaMessageIdRepository]
+* xref:components::infinispan-component.adoc[InfinispanIdempotentRepository]
+* xref:components::jcache-component.adoc[JCacheIdempotentRepository]
+* xref:components::spring.adoc[SpringCacheIdempotentRepository]
+* xref:components::ehcache-component.adoc[EhcacheIdempotentRepository]
+* xref:components::kafka-component.adoc[KafkaIdempotentRepository]
 
 === Options
 
diff --git a/docs/user-manual/modules/ROOT/pages/index.adoc b/docs/user-manual/modules/ROOT/pages/index.adoc
index 10e2ef8..9957967 100644
--- a/docs/user-manual/modules/ROOT/pages/index.adoc
+++ b/docs/user-manual/modules/ROOT/pages/index.adoc
@@ -36,7 +36,7 @@
 * xref:camel-jar-dependencies.adoc[Camel JAR Dependencies]
 * xref:camel-boot.adoc[Camel Boot]
 * xref:components::cdi-component.adoc[Working with Camel and CDI]
-* xref:spring.adoc[Working with Camel and Spring]
+* xref:components::spring.adoc[Working with Camel and Spring]
 * xref:guice.adoc[Working with Camel and Guice]
 * xref:karaf.adoc[Working with Camel and Karaf]
 * xref:faq/how-do-i-configure-endpoints.adoc[How do I configure endpoints?]
@@ -127,7 +127,7 @@ camel routes without them knowing
 === xref:dsl.adoc[DSL]
 
 * xref:java-dsl.adoc[Java DSL]
-* xref:spring.adoc[Spring DSL]
+* xref:components::spring.adoc[Spring DSL]
 * xref:using-osgi-blueprint-with-camel.adoc[Blueprint DSL]
 * xref:rest-dsl.adoc[Rest DSL]
 * xref:groovy-dsl.adoc[Groovy DSL]
@@ -537,11 +537,11 @@ camel routes without them knowing
 ** xref:constant-language.adoc[Constant]
 ** xref:exchangeProperty-language.adoc[ExchangeProperty]
 ** xref:file-language.adoc[File]
-** xref:groovy-language.adoc[Groovy]
+** xref:components::groovy-language.adoc[Groovy]
 ** xref:header-language.adoc[Header]
 ** xref:terser-language.adoc[HL7 Terser]
 ** xref:javaScript-language.adoc[JavaScript]
-** xref:jsonpath-language.adoc[JsonPath]
+** xref:components::jsonpath-language.adoc[JsonPath]
 ** xref:components::mvel-language.adoc[MVEL]
 ** xref:components::ognl-language.adoc[OGNL]
 ** xref:ref-language.adoc[Ref]
diff --git a/docs/user-manual/modules/ROOT/pages/injector.adoc b/docs/user-manual/modules/ROOT/pages/injector.adoc
index d0d73b4..201f0a6 100644
--- a/docs/user-manual/modules/ROOT/pages/injector.adoc
+++ b/docs/user-manual/modules/ROOT/pages/injector.adoc
@@ -17,7 +17,7 @@ Endpoint in your Spring XML file; or let Camel find
 the defaults then use the Injector to create and inject any of its
 dependencies.
 
-As an example; consider the xref:jms-component.adoc[JMS] component. Rather than
+As an example; consider the xref:components::jms-component.adoc[JMS] component. Rather than
 explicitly configuring the JMS component in Spring XML you can just
 provide a ConnectionFactory in your Spring XML which the Injector will
 use to properly configure the JmsComponent when it is instantiated.
diff --git a/docs/user-manual/modules/ROOT/pages/intercept.adoc b/docs/user-manual/modules/ROOT/pages/intercept.adoc
index 0621688..059e541 100644
--- a/docs/user-manual/modules/ROOT/pages/intercept.adoc
+++ b/docs/user-manual/modules/ROOT/pages/intercept.adoc
@@ -113,7 +113,7 @@ particular route.
 
 So lets start with the logging example. We want to log all the
 *incoming* requests so we use `interceptFrom` to route to the
-xref:log-component.adoc[Log] component. As `proceed` is default then the
+xref:components::log-component.adoc[Log] component. As `proceed` is default then the
 Exchange will continue its route, and thus it will
 continue to `mock:first`.
 
diff --git a/docs/user-manual/modules/ROOT/pages/jndi.adoc b/docs/user-manual/modules/ROOT/pages/jndi.adoc
index e9c9203..5c8b906 100644
--- a/docs/user-manual/modules/ROOT/pages/jndi.adoc
+++ b/docs/user-manual/modules/ROOT/pages/jndi.adoc
@@ -2,7 +2,7 @@
 === JNDI
 
 Camel will use JNDI as the default xref:registry.adoc[Registry]
-implementation if you do not use xref:spring.adoc[Spring]. This means
+implementation if you do not use xref:components::spring.adoc[Spring]. This means
 that using a DefaultCamelContext will try and create a
 http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/impl/JndiRegistry.html[JndiRegistry]
 which uses the JNDI InitialContext as the registry.
diff --git a/docs/user-manual/modules/ROOT/pages/languages.adoc b/docs/user-manual/modules/ROOT/pages/languages.adoc
index e1bceeb..a668016 100644
--- a/docs/user-manual/modules/ROOT/pages/languages.adoc
+++ b/docs/user-manual/modules/ROOT/pages/languages.adoc
@@ -23,26 +23,26 @@ The following is the list of currently supported languages:
 * xref:constant-language.adoc[Constant]
 * the unified xref:el-language.adoc[EL] from JSP and JSF
 * xref:header-language.adoc[Header]
-* xref:jsonpath-language.adoc[JSonPath]
+* xref:components::jsonpath-language.adoc[JSonPath]
 * xref:jxpath-language.adoc[JXPath]
-* xref:mvel-language.adoc[Mvel]
-* xref:ognl-language.adoc[OGNL]
+* xref:components::mvel-language.adoc[Mvel]
+* xref:components::ognl-language.adoc[OGNL]
 * xref:ref-language.adoc[Ref Language]
 * xref:exchangeproperty-language.adoc[ExchangeProperty] / xref:property-language.adoc[Property]
 * xref:scripting-languages-language.adoc[Scripting Languages] such as:
 ** xref:beanshell-language.adoc[BeanShell]
 ** xref:javascript-language.adoc[JavaScript]
-** xref:groovy-language.adoc[Groovy]
+** xref:components::groovy-language.adoc[Groovy]
 ** xref:python-language.adoc[Python]
 ** xref:php-language.adoc[PHP]
 ** xref:ruby-language.adoc[Ruby]
 * xref:simple-language.adoc[Simple]
 ** xref:file-language.adoc[File Language]
-* xref:spel-language.adoc[Spring Expression Language]
+* xref:components::spel-language.adoc[Spring Expression Language]
 * xref:sql-language.adoc[SQL]
 * xref:tokenizer-language.adoc[Tokenizer]
-* xref:xpath-language.adoc[XPath]
-* xref:xquery-language.adoc[XQuery]
+* xref:components::xpath-language.adoc[XPath]
+* xref:components::xquery-language.adoc[XQuery]
 * https://github.com/camel-extra/camel-extra/blob/master/components/camel-vtdxml/src/main/docs/vtdxml-component.adoc[VTD-XML]
 
 Most of these languages are also supported used as
diff --git a/docs/user-manual/modules/ROOT/pages/log-eip.adoc b/docs/user-manual/modules/ROOT/pages/log-eip.adoc
index d2f1420..86240ac 100644
--- a/docs/user-manual/modules/ROOT/pages/log-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/log-eip.adoc
@@ -4,7 +4,7 @@
 How can I log the processing of a xref:message.adoc[Message]?
 
 Camel provides many ways to log the fact that you are processing a message. Here are just a few examples:
-* You can use the xref:log-component.adoc[Log] component which logs the Message content.
+* You can use the xref:components::log-component.adoc[Log] component which logs the Message content.
 * You can use the xref:tracer.adoc[Tracer] which trace logs message flow.
 * You can also use a xref:processor.adoc[Processor] or xref:bean.adoc[Bean] and log from Java code.
 * You can use the log DSL.
@@ -165,7 +165,7 @@ In some scenarios it is required that the bundle associated with logger should b
 *Available as of Camel 2.19*
 
 You can enable security masking for logging by setting `logMask` flag to `true`.
-Note that this option also affects xref:log-component.adoc[Log] component.
+Note that this option also affects xref:components::log-component.adoc[Log] component.
 
 To enable mask in Java DSL at CamelContext level:
 [source,java]
diff --git a/docs/user-manual/modules/ROOT/pages/message-bus.adoc b/docs/user-manual/modules/ROOT/pages/message-bus.adoc
index db5d3a9..674b5d6 100644
--- a/docs/user-manual/modules/ROOT/pages/message-bus.adoc
+++ b/docs/user-manual/modules/ROOT/pages/message-bus.adoc
@@ -10,7 +10,7 @@ consumers to be decoupled.
 image:http://www.enterpriseintegrationpatterns.com/img/MessageBusSolution.gif[image]
 
 Folks often assume that a Message Bus is a JMS though so you may wish to
-refer to the xref:jms-component.adoc[JMS] component for traditional MOM support. +
+refer to the xref:components::jms-component.adoc[JMS] component for traditional MOM support. +
 
 
 [[MessageBus-Example]]
diff --git a/docs/user-manual/modules/ROOT/pages/message-channel.adoc b/docs/user-manual/modules/ROOT/pages/message-channel.adoc
index 669b1f5..26b26cb 100644
--- a/docs/user-manual/modules/ROOT/pages/message-channel.adoc
+++ b/docs/user-manual/modules/ROOT/pages/message-channel.adoc
@@ -23,7 +23,7 @@ jms:queue:foo
 -------------
 
 This message channel can be then used within the
-xref:jms-component.adoc[JMS] component
+xref:components::jms-component.adoc[JMS] component
 
 And the following shows a little Java route snippet:
 
diff --git a/docs/user-manual/modules/ROOT/pages/message-translator.adoc b/docs/user-manual/modules/ROOT/pages/message-translator.adoc
index ce2c31f..05ee20c 100644
--- a/docs/user-manual/modules/ROOT/pages/message-translator.adoc
+++ b/docs/user-manual/modules/ROOT/pages/message-translator.adoc
@@ -17,7 +17,7 @@ image:http://www.enterpriseintegrationpatterns.com/img/MessageTranslator.gif[ima
 You can transform a message using Camel's
 xref:bean-integration.adoc[Bean Integration] to call any method on a
 bean in your xref:Registry-Registry.adoc[Registry] such as your
-xref:spring.adoc[Spring] XML configuration file as follows
+xref:components::spring.adoc[Spring] XML configuration file as follows
 
 [source,java]
 ----
@@ -54,7 +54,7 @@ invoke a bean
 
 You can also use xref:templating.adoc[Templating] to consume a message
 from one destination, transform it with something like
-xref:velocity-component.adoc[Velocity] or xref:velocity-component.adoc[XQuery] and then send
+xref:components::velocity-component.adoc[Velocity] or xref:components::velocity-component.adoc[XQuery] and then send
 it on to another destination. For example using InOnly (one way
 messaging)
 
diff --git a/docs/user-manual/modules/ROOT/pages/point-to-point-channel.adoc b/docs/user-manual/modules/ROOT/pages/point-to-point-channel.adoc
index 831fe7a..26d65d1 100644
--- a/docs/user-manual/modules/ROOT/pages/point-to-point-channel.adoc
+++ b/docs/user-manual/modules/ROOT/pages/point-to-point-channel.adoc
@@ -6,18 +6,18 @@ http://www.enterpriseintegrationpatterns.com/PointToPointChannel.html[Point
 to Point Channel] from the xref:enterprise-integration-patterns.adoc[EIP
 patterns] using the following components
 
-* xref:seda-component.adoc[SEDA] for in-VM seda based messaging
-* xref:jms-component.adoc[JMS] for working with JMS Queues for high performance,
+* xref:components::seda-component.adoc[SEDA] for in-VM seda based messaging
+* xref:components::jms-component.adoc[JMS] for working with JMS Queues for high performance,
 clustering and load balancing
-* xref:jpa-component.adoc[JPA] for using a database as a simple message queue
-* xref:xmpp-component.adoc[XMPP] for point-to-point communication over XMPP
+* xref:components::jpa-component.adoc[JPA] for using a database as a simple message queue
+* xref:components::xmpp-component.adoc[XMPP] for point-to-point communication over XMPP
 (Jabber)
 * and others
 
 image:http://www.enterpriseintegrationpatterns.com/img/PointToPointSolution.gif[image]
 
 The following example demonstrates point to point messaging using
-the xref:jms-component.adoc[JMS] component 
+the xref:components::jms-component.adoc[JMS] component 
 
 [[PointtoPointChannel-Samples]]
 === Samples
diff --git a/docs/user-manual/modules/ROOT/pages/publish-subscribe-channel.adoc b/docs/user-manual/modules/ROOT/pages/publish-subscribe-channel.adoc
index 4a106af..9b6f32a 100644
--- a/docs/user-manual/modules/ROOT/pages/publish-subscribe-channel.adoc
+++ b/docs/user-manual/modules/ROOT/pages/publish-subscribe-channel.adoc
@@ -7,13 +7,13 @@ Subscribe Channel] from the
 xref:enterprise-integration-patterns.adoc[EIP patterns] using for
 example the following components:
 
-* xref:jms-component.adoc[JMS] for working with JMS Topics for high performance,
+* xref:components::jms-component.adoc[JMS] for working with JMS Topics for high performance,
 clustering and load balancing
-* xref:xmpp-component.adoc[XMPP] when using rooms for group communication
-* xref:seda-component.adoc[SEDA] for working with SEDA in the same
+* xref:components::xmpp-component.adoc[XMPP] when using rooms for group communication
+* xref:components::seda-component.adoc[SEDA] for working with SEDA in the same
 xref:camelcontext.adoc[CamelContext] which can work in pub-sub, but
 allowing multiple consumers.
-* xref:vm-component.adoc[VM] as SEDA but for intra-JVM.
+* xref:components::vm-component.adoc[VM] as SEDA but for intra-JVM.
 
 image:http://www.enterpriseintegrationpatterns.com/img/PublishSubscribeSolution.gif[image]
 
diff --git a/docs/user-manual/modules/ROOT/pages/requestReply-eip.adoc b/docs/user-manual/modules/ROOT/pages/requestReply-eip.adoc
index 68ac289..9c44cba 100644
--- a/docs/user-manual/modules/ROOT/pages/requestReply-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/requestReply-eip.adoc
@@ -11,7 +11,7 @@ this pattern using the underlying transport or protocols.
 
 image:http://www.enterpriseintegrationpatterns.com/img/RequestReply.gif[image]
 
-For example when using xref:jms-component.adoc[JMS] with InOut the component will
+For example when using xref:components::jms-component.adoc[JMS] with InOut the component will
 by default perform these actions
 
 * create by default a temporary inbound queue
@@ -27,7 +27,7 @@ TIP: *Related* See the related Event Message message
 [[RequestReply-ExplicitlyspecifyingInOut]]
 === Explicitly specifying InOut
 
-When consuming messages from xref:jms-component.adoc[JMS] a Request-Reply is
+When consuming messages from xref:components::jms-component.adoc[JMS] a Request-Reply is
 indicated by the presence of the *JMSReplyTo* header.
 
 You can explicitly force an endpoint to be in Request Reply mode by
diff --git a/docs/user-manual/modules/ROOT/pages/rest-dsl.adoc b/docs/user-manual/modules/ROOT/pages/rest-dsl.adoc
index fd2e6b6..b8d0c1e 100644
--- a/docs/user-manual/modules/ROOT/pages/rest-dsl.adoc
+++ b/docs/user-manual/modules/ROOT/pages/rest-dsl.adoc
@@ -8,10 +8,10 @@ REST style with verbs such as get, post, delete etc.
 
 === How it works
 
-The Rest DSL is a facade that builds xref:rest-component.adoc[Rest] endpoints as
+The Rest DSL is a facade that builds xref:components::rest-component.adoc[Rest] endpoints as
 consumers for Camel routes. The actual REST transport is leveraged by
 using Camel REST components such
-as xref:restlet-component.adoc[Restlet], xref:restlet-component.adoc[Spark-rest], and
+as xref:components::restlet-component.adoc[Restlet], xref:components::restlet-component.adoc[Spark-rest], and
 others that has native REST integration.
 
 === Components supporting Rest DSL
@@ -19,20 +19,20 @@ others that has native REST integration.
 The following Camel components supports the Rest DSL. See the bottom of
 this page for how to integrate a component with the Rest DSL.
 
-* xref:rest-component.adoc[came-rest] *required* contains the base rest component needed by Rest DSL
+* xref:components::rest-component.adoc[came-rest] *required* contains the base rest component needed by Rest DSL
 * xref:netty-http-component.adoc[camel-netty-http] (also
 supports Swagger Java)
-* xref:netty4-http-component.adoc[camel-netty4-http] (also
+* xref:components::netty4-http-component.adoc[camel-netty4-http] (also
 supports Swagger Java)
-* xref:jetty-component.adoc[camel-jetty] (also
+* xref:components::jetty-component.adoc[camel-jetty] (also
 supports Swagger Java)
-* xref:restlet-component.adoc[camel-restlet] (also
+* xref:components::restlet-component.adoc[camel-restlet] (also
 supports Swagger Java)
-* xref:servlet-component.adoc[camel-servlet] (also
+* xref:components::servlet-component.adoc[camel-servlet] (also
 supports Swagger Java)
-* xref:spark-rest-component.adoc[camel-spark-rest] (also
+* xref:components::spark-rest-component.adoc[camel-spark-rest] (also
 supports Swagger Java from Camel 2.17 onwards)
-* xref:undertow-component.adoc[camel-undertow] (also
+* xref:components::undertow-component.adoc[camel-undertow] (also
 supports Swagger Java from Camel 2.17 onwards)
 
 === Rest DSL with Java
@@ -181,7 +181,7 @@ only. The example above can be defined as:
 
 The Rest DSL supports the new .toD <toD> as dynamic
 to in the rest-dsl. For example to do a request/reply
-over xref:jms-component.adoc[JMS] where the queue name is dynamic defined
+over xref:components::jms-component.adoc[JMS] where the queue name is dynamic defined
 
 [source,java]
 ----
diff --git a/docs/user-manual/modules/ROOT/pages/return-address.adoc b/docs/user-manual/modules/ROOT/pages/return-address.adoc
index f840f87..6f5b029 100644
--- a/docs/user-manual/modules/ROOT/pages/return-address.adoc
+++ b/docs/user-manual/modules/ROOT/pages/return-address.adoc
@@ -7,7 +7,7 @@ patterns] by using the `JMSReplyTo` header.
 
 image:http://www.enterpriseintegrationpatterns.com/img/ReturnAddressSolution.gif[image]
 
-For example when using xref:jms-component.adoc[JMS] with InOut the component will
+For example when using xref:components::jms-component.adoc[JMS] with InOut the component will
 by default return to the address given in `JMSReplyTo`.
 
 *Requestor Code*
diff --git a/docs/user-manual/modules/ROOT/pages/route-policy.adoc b/docs/user-manual/modules/ROOT/pages/route-policy.adoc
index e231b34..4253ce3 100644
--- a/docs/user-manual/modules/ROOT/pages/route-policy.adoc
+++ b/docs/user-manual/modules/ROOT/pages/route-policy.adoc
@@ -220,7 +220,7 @@ example using this in practice with
 the *`ThrottlingInflightRoutePolicy`*
 * xref:scheduledroutepolicy.adoc[ScheduledRoutePolicy] for information
 on policy based scheduling capability for camel routes
-* xref:metrics-component.adoc[MetricsRoutePolicyFactory] for information
+* xref:components::metrics-component.adoc[MetricsRoutePolicyFactory] for information
 on a policy using the metrics component to expose route statistics using
 the metrics library.
 * xref:architecture.adoc[Architecture]
diff --git a/docs/user-manual/modules/ROOT/pages/scala-dsl-supported-languages.adoc b/docs/user-manual/modules/ROOT/pages/scala-dsl-supported-languages.adoc
index 0fd1c7c..59fd24a 100644
--- a/docs/user-manual/modules/ROOT/pages/scala-dsl-supported-languages.adoc
+++ b/docs/user-manual/modules/ROOT/pages/scala-dsl-supported-languages.adoc
@@ -10,7 +10,7 @@ You can use any of the supported Camel Languages in
 the Scala DSL; see below for a couple of examples:
 
 [[ScalaDSL-Supportedlanguages-Using]]
-Using xref:xpath-language.adoc[XPath]
+Using xref:components::xpath-language.adoc[XPath]
 
 With the XPath trait, you have an additional method available on an
 `Exchange` to do XPath queries against the message. Just look at this
diff --git a/docs/user-manual/modules/ROOT/pages/scripting-languages.adoc b/docs/user-manual/modules/ROOT/pages/scripting-languages.adoc
index e0c8867..ea61cf9 100644
--- a/docs/user-manual/modules/ROOT/pages/scripting-languages.adoc
+++ b/docs/user-manual/modules/ROOT/pages/scripting-languages.adoc
@@ -63,7 +63,7 @@ following attributes all set at `ENGINE_SCOPE`:
 IN message instead.
 
 |properties |`org.apache.camel.builder.script.PropertiesFunction` |*Camel 2.9:* Function with a `resolve` method to make it easier to use
-Camels xref:properties-component.adoc[Properties] component from scripts. See
+Camels xref:components::properties-component.adoc[Properties] component from scripts. See
 further below for example.
 |=======================================================================
 
@@ -84,7 +84,7 @@ See this example:
 
 *Available as of Camel 2.9*
 
-If you need to use the xref:properties-component.adoc[Properties] component from a
+If you need to use the xref:components::properties-component.adoc[Properties] component from a
 script to lookup property placeholders, then its a bit cumbersome to do
 so. For example to set a header name myHeader with a value from a property
 placeholder, which key is provided in a header named "foo".
diff --git a/docs/user-manual/modules/ROOT/pages/servlet-tomcat-example.adoc b/docs/user-manual/modules/ROOT/pages/servlet-tomcat-example.adoc
index 3ecd34c..65aff29 100644
--- a/docs/user-manual/modules/ROOT/pages/servlet-tomcat-example.adoc
+++ b/docs/user-manual/modules/ROOT/pages/servlet-tomcat-example.adoc
@@ -17,14 +17,14 @@ mvn package
 [[ServletTomcatExample-About]]
 ==== About
 
-This example demonstrates how you can use xref:servlet-component.adoc[Servlet] to expose
+This example demonstrates how you can use xref:components::servlet-component.adoc[Servlet] to expose
 a http service in a Camel route.
 
 [[ServletTomcatExample-Implementation]]
 ==== Implementation
 
 In the `web.xml` file in the `src/main/webapp/WEB-INF` folder the `CamelServlet`
-is defined. This is mandatory to do when using the xref:servlet-component.adoc[Servlet]
+is defined. This is mandatory to do when using the xref:components::servlet-component.adoc[Servlet]
 component.
 
 [source,xml]
@@ -117,5 +117,5 @@ http://localhost:8080/camel-example-servlet-tomcat/camel/hello URL.
 ==== See Also
 
 * xref:examples.adoc[Examples]
-*  xref:servlet-component.adoc[Servlet]
+*  xref:components::servlet-component.adoc[Servlet]
 *  xref:http-component.adoc[HTTP]
diff --git a/docs/user-manual/modules/ROOT/pages/simple-language.adoc b/docs/user-manual/modules/ROOT/pages/simple-language.adoc
index cc08482..4366e30 100644
--- a/docs/user-manual/modules/ROOT/pages/simple-language.adoc
+++ b/docs/user-manual/modules/ROOT/pages/simple-language.adoc
@@ -8,17 +8,17 @@ created, but has since grown more powerful. It is primarily intended for
 being a really small and simple language for evaluating
 Expressions and Predicates
 without requiring any new dependencies or knowledge of
-xref:xpath-language.adoc[XPath]; so it is ideal for testing in camel-core. The
+xref:components::xpath-language.adoc[XPath]; so it is ideal for testing in camel-core. The
 idea was to cover 95% of the common use cases when you need a little bit
 of expression based script in your Camel routes.
 
 However for much more complex use cases you are generally recommended to
 choose a more expressive and powerful language such as:
 
-* xref:groovy-language.adoc[Groovy]
-* xref:spel-language.adoc[SpEL]
-* xref:mvel-component.adoc[MVEL]
-* xref:ognl-language.adoc[OGNL]
+* xref:components::groovy-language.adoc[Groovy]
+* xref:components::spel-language.adoc[SpEL]
+* xref:components::mvel-component.adoc[MVEL]
+* xref:components::ognl-language.adoc[OGNL]
 
 The simple language uses `${body`} placeholders for complex expressions
 where the expression contains constant literals. The $\{ } placeholders
@@ -188,9 +188,9 @@ Command accepts offsets such as: *now-24h* or *in.header.xxx+1h* or even *now+1h
 
 |date-with-timezone:_command:timezone:pattern_ |String |Date formatting using `java.text.SimpleDataFormat` timezones and patterns.
 
-|bean:_bean expression_ |Object |Invoking a bean expression using the xref:bean-component.adoc[Bean] language.
+|bean:_bean expression_ |Object |Invoking a bean expression using the xref:components::bean-component.adoc[Bean] language.
 Specifying a method name you must use dot as separator. We also support
-the ?method=methodname syntax that is used by the xref:bean-component.adoc[Bean]
+the ?method=methodname syntax that is used by the xref:components::bean-component.adoc[Bean]
 component.
 
 |`properties:key:default` |String |Lookup a property with the given key. If the key does
@@ -755,7 +755,7 @@ from("direct:order")
 ----
 
 We can use the `?method=methodname` option that we are familiar with the
-xref:bean-component.adoc[Bean] component itself:
+xref:components::bean-component.adoc[Bean] component itself:
 
 [source,java]
 ----
diff --git a/docs/user-manual/modules/ROOT/pages/spring-testing.adoc b/docs/user-manual/modules/ROOT/pages/spring-testing.adoc
index 4f013bf..1fbd2e0 100644
--- a/docs/user-manual/modules/ROOT/pages/spring-testing.adoc
+++ b/docs/user-manual/modules/ROOT/pages/spring-testing.adoc
@@ -6,7 +6,7 @@ integration work. The Spring Framework offers a number of features that
 makes it easy to test while using Spring for Inversion of Control which
 works with JUnit 3.x, JUnit 4.x, and http://testng.org[TestNG].
 
-We can use Spring for IoC and the Camel xref:mock-component.adoc[Mock] and
+We can use Spring for IoC and the Camel xref:components::mock-component.adoc[Mock] and
 xref:test-component.adoc[Test] endpoints to create sophisticated integration/unit
 tests that are easy to run and debug inside your IDE.  There are three
 supported approaches for testing with Spring in Camel.
@@ -323,7 +323,7 @@ public class CamelSpringJUnit4ClassRunnerPlainTest {
 
 If you wish to programmatically add any new assertions to your test you
 can easily do so with the following. Notice how we use @EndpointInject
-to inject a Camel endpoint into our code then the xref:mock-component.adoc[Mock]
+to inject a Camel endpoint into our code then the xref:components::mock-component.adoc[Mock]
 API to add an expectation on a specific message.
 
 [source,java]
@@ -349,7 +349,7 @@ public class MyCamelTest extends AbstractJUnit38SpringContextTests {
 [[SpringTesting-Furtherprocessingthereceivedmessages]]
 ==== Further processing the received messages
 
-Sometimes once a xref:mock-component.adoc[Mock] endpoint has received some
+Sometimes once a xref:components::mock-component.adoc[Mock] endpoint has received some
 messages you want to then process them further to add further assertions
 that your test case worked as you expect.
 
@@ -388,7 +388,7 @@ It might be that the
 xref:enterprise-integration-patterns.adoc[Enterprise Integration
 Patterns] you have defined in either Spring XML or
 using the Java DSL do all of the sending and receiving
-and you might just work with the xref:mock-component.adoc[Mock] endpoints as
+and you might just work with the xref:components::mock-component.adoc[Mock] endpoints as
 described above. However sometimes in a test case its useful to
 explicitly send or receive messages directly.
 
@@ -428,6 +428,6 @@ example test case using Mock and Spring] along with its
 https://svn.apache.org/repos/asf/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/mock/InterceptSendToMockEndpointStrategyTest.xml[Spring
 XML]
 * Bean Integration
-* xref:mock-component.adoc[Mock] endpoint
+* xref:components::mock-component.adoc[Mock] endpoint
 * xref:test-component.adoc[Test] endpoint
 
diff --git a/docs/user-manual/modules/ROOT/pages/testing.adoc b/docs/user-manual/modules/ROOT/pages/testing.adoc
index 552225d..289c241 100644
--- a/docs/user-manual/modules/ROOT/pages/testing.adoc
+++ b/docs/user-manual/modules/ROOT/pages/testing.adoc
@@ -229,12 +229,12 @@ Camel provides a number of endpoints which can make testing easier.
 [width="100%",cols="1,3",options="header",]
 |=======================================================================
 |Name |Description
-|xref:dataset-component.adoc[DataSet] |For load & soak testing this endpoint
+|xref:components::dataset-component.adoc[DataSet] |For load & soak testing this endpoint
 provides a way to create huge numbers of messages for sending to
 Components and asserting that they are consumed
 correctly
 
-|xref:mock-component.adoc[Mock] |For testing routes and mediation rules using
+|xref:components::mock-component.adoc[Mock] |For testing routes and mediation rules using
 mocks and allowing assertions to be added to an endpoint
 
 |xref:test-component.adoc[Test] |Creates a xref:test-component.adoc[Mock] endpoint which
@@ -242,7 +242,7 @@ expects to receive all the message bodies that could be polled from the
 given underlying endpoint
 |=======================================================================
 
-The main endpoint is the xref:mock-component.adoc[Mock] endpoint which allows
+The main endpoint is the xref:components::mock-component.adoc[Mock] endpoint which allows
 expectations to be added to different endpoints; you can then run your
 tests and assert that your expectations are met at the end.
 
@@ -257,16 +257,16 @@ endpoints can be useful:
 [width="100%",cols="1,3",options="header",]
 |=======================================================================
 |Name |Description
-|xref:direct-component.adoc[Direct] |Direct invocation of the consumer from the
+|xref:components::direct-component.adoc[Direct] |Direct invocation of the consumer from the
 producer so that single threaded (non-SEDA) in VM invocation is
 performed which can be useful to mock out physical transports
 
-|xref:seda-component.adoc[SEDA] |Delivers messages asynchronously to consumers via
+|xref:components::seda-component.adoc[SEDA] |Delivers messages asynchronously to consumers via
 a
 http://java.sun.com/j2se/1.5.0/docs/api/java/util/concurrent/BlockingQueue.html[`java.util.concurrent.BlockingQueue`]
 which is good for testing asynchronous transports
 
-|xref:stub-component.adoc[Stub] |Works like xref:stub-component.adoc[SEDA] but does not
+|xref:components::stub-component.adoc[Stub] |Works like xref:components::stub-component.adoc[SEDA] but does not
 validate the endpoint URI, which makes stubbing much easier.
 |=======================================================================
 
@@ -274,7 +274,7 @@ validate the endpoint URI, which makes stubbing much easier.
 ==== Testing existing routes
 
 Camel provides some features to aid during testing of existing routes
-where you cannot or will not use xref:mock-component.adoc[Mock] etc. For example
+where you cannot or will not use xref:components::mock-component.adoc[Mock] etc. For example
 you may have a production ready route which you want to test with some
 3rd party API which sends messages into this route.
 
diff --git a/docs/user-manual/modules/ROOT/pages/toD-eip.adoc b/docs/user-manual/modules/ROOT/pages/toD-eip.adoc
index baf1b62..cbdb5f4 100644
--- a/docs/user-manual/modules/ROOT/pages/toD-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/toD-eip.adoc
@@ -68,7 +68,7 @@ then the header foo is appended. So for example if the header foo has
 value order, then the endpoint is computed as "mock:order".
 
 You can also use other languages than xref:simple-language.adoc[Simple] such
-as xref:xpath-language.adoc[XPath] - this requires to prefix with language: as
+as xref:components::xpath-language.adoc[XPath] - this requires to prefix with language: as
 shown below (simple language is the default language). If you do not
 specify language: then the endpoint is a component name. And in some
 cases there is both a component and language with the same name such as
@@ -90,7 +90,7 @@ from("direct:start")
   .toD("language:xpath:/order/@uri");
 ----
 
-You can also concat multiple xref:language-component.adoc[Language](s) together
+You can also concat multiple xref:components::language-component.adoc[Language](s) together
 using the plus sign `+` such as shown below:
 
 [source,xml]
diff --git a/docs/user-manual/modules/ROOT/pages/transactional-client.adoc b/docs/user-manual/modules/ROOT/pages/transactional-client.adoc
index d88688e..4bed40f 100644
--- a/docs/user-manual/modules/ROOT/pages/transactional-client.adoc
+++ b/docs/user-manual/modules/ROOT/pages/transactional-client.adoc
@@ -8,7 +8,7 @@ using spring transactions.
 
 image:http://www.enterpriseintegrationpatterns.com/img/TransactionalClientSolution.gif[image]
 
-Transaction Oriented Endpoints like xref:jms-component.adoc[JMS] support using a
+Transaction Oriented Endpoints like xref:components::jms-component.adoc[JMS] support using a
 transaction for both inbound and outbound message exchanges. Endpoints
 that support transactions will participate in the current transaction
 context that they are called from.
@@ -389,5 +389,5 @@ Camel to only do it for the current transaction and not globally.
 * xref:ErrorhandlinginCamel-ErrorhandlinginCamel.adoc[Error handling in Camel]
 * xref:TransactionErrorHandler-TransactionErrorHandler.adoc[TransactionErrorHandler]
 * xref:ErrorHandler-ErrorHandler.adoc[Error Handler]
-* xref:jms-component.adoc[JMS]
+* xref:components::jms-component.adoc[JMS]
 * xref:using-this-pattern.adoc[Using This Pattern]
diff --git a/docs/user-manual/modules/ROOT/pages/try-catch-finally.adoc b/docs/user-manual/modules/ROOT/pages/try-catch-finally.adoc
index 02e787d..4dad4df 100644
--- a/docs/user-manual/modules/ROOT/pages/try-catch-finally.adoc
+++ b/docs/user-manual/modules/ROOT/pages/try-catch-finally.adoc
@@ -63,7 +63,7 @@ reattach the exception on the xref:exchange.adoc[Exchange].
 ==== Using try .. catch .. finally in Java DSL
 
 In the route below we have all keywords in action. As the code is based
-on a unit test we route using xref:mock-component.adoc[Mock].
+on a unit test we route using xref:components::mock-component.adoc[Mock].
 
 https://github.com/apache/camel/tree/master/camel-core/src/test/java/org/apache/camel/processor/TryProcessorMultipleExceptionTest.java[TryProcessorMultipleExceptionTest.java]
 
@@ -100,7 +100,7 @@ to indicate the end there.
 We show the three sample samples using Spring DSL instead.
 
 In the route below we have all keywords in action. As the code is based
-on a unit test we route using xref:mock-component.adoc[Mock].
+on a unit test we route using xref:components::mock-component.adoc[Mock].
 
 https://github.com/apache/camel/tree/master/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringTryProcessorMultipleExceptionTest.xml[SpringTryProcessorMultipleExceptionTest.xml]
 
diff --git a/docs/user-manual/modules/ROOT/pages/unmarshal-eip.adoc b/docs/user-manual/modules/ROOT/pages/unmarshal-eip.adoc
index 2bb37a5..fe917a8 100644
--- a/docs/user-manual/modules/ROOT/pages/unmarshal-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/unmarshal-eip.adoc
@@ -28,7 +28,7 @@ from("activemq:My.Queue").
   to("mqseries:Another.Queue");
 ----
 
-The above uses a named DataFormat of _jaxb_ which is configured with a number of Java package names. You can if you prefer use a named reference to a data format which can then be defined in your https://github.com/apache/camel/blob/master/docs/user-manual/en/registry.adoc[Registry] such as via your xref:spring.adoc[Spring] XML file.
+The above uses a named DataFormat of _jaxb_ which is configured with a number of Java package names. You can if you prefer use a named reference to a data format which can then be defined in your https://github.com/apache/camel/blob/master/docs/user-manual/en/registry.adoc[Registry] such as via your xref:components::spring.adoc[Spring] XML file.
 
 You can also use the DSL itself to define the data format as you use it.
 For example the following uses Java serialization to unmarshal a binary
diff --git a/docs/user-manual/modules/ROOT/pages/using-propertyplaceholder.adoc b/docs/user-manual/modules/ROOT/pages/using-propertyplaceholder.adoc
index 9bbf752..b97c58b 100644
--- a/docs/user-manual/modules/ROOT/pages/using-propertyplaceholder.adoc
+++ b/docs/user-manual/modules/ROOT/pages/using-propertyplaceholder.adoc
@@ -27,7 +27,7 @@ following:
 * Lookup of beans in the xref:registry.adoc[Registry]
 * Additional supported in Spring XML (see below in examples)
 * Using Blueprint `PropertyPlaceholder` with Camel
-xref:properties-component.adoc[Properties] component
+xref:components::properties-component.adoc[Properties] component
 * Using `@PropertyInject` to inject a property in a POJO
 * *Camel 2.14.1* Using default value if a property does not exists
 * *Camel 2.14.1* Include out of the box functions, to lookup property
@@ -1208,4 +1208,4 @@ pc.addFunction(new MyBeerFunction());
 [[UsingPropertyPlaceholder-SeeAlso]]
 ==== See Also
 
-* xref:properties-component.adoc[Properties] component
+* xref:components::properties-component.adoc[Properties] component
diff --git a/docs/user-manual/modules/ROOT/pages/validator.adoc b/docs/user-manual/modules/ROOT/pages/validator.adoc
index 4c75466..7f93728 100644
--- a/docs/user-manual/modules/ROOT/pages/validator.adoc
+++ b/docs/user-manual/modules/ROOT/pages/validator.adoc
@@ -105,7 +105,7 @@ And here is an example to specify endpoint ref in XML DSL:
 
 Note that the Endpoint Validator just forwards the message to the specified endpoint. In above example,
 camel forwards the message to the `validator:` endpoint, which actually is a
-xref:validator-component.adoc[Validation Component]. You can also use any other validation component like
+xref:components::validator-component.adoc[Validation Component]. You can also use any other validation component like
 Bean Validation Component.
 
 [[Validator-Custom]]
diff --git a/docs/user-manual/modules/ROOT/pages/writing-components.adoc b/docs/user-manual/modules/ROOT/pages/writing-components.adoc
index c684d3e..d70509d 100644
--- a/docs/user-manual/modules/ROOT/pages/writing-components.adoc
+++ b/docs/user-manual/modules/ROOT/pages/writing-components.adoc
@@ -130,7 +130,7 @@ DefaultComponent:
 protected abstract Endpoint<E> createEndpoint(String uri, String remaining, Map parameters)
 ----
 
-The code is an example from the xref:seda-component.adoc[SEDA] component that removes the size
+The code is an example from the xref:components::seda-component.adoc[SEDA] component that removes the size
 parameter:
 
 [source,java]
diff --git a/docs/user-manual/modules/ROOT/pages/xml-configuration.adoc b/docs/user-manual/modules/ROOT/pages/xml-configuration.adoc
index 3db1384..d631258 100644
--- a/docs/user-manual/modules/ROOT/pages/xml-configuration.adoc
+++ b/docs/user-manual/modules/ROOT/pages/xml-configuration.adoc
@@ -6,13 +6,13 @@ completion and functionality while being the most expressive. However if
 you wish to put your routing rules in XML you can via the Camel XML
 language.
 
-Camel XML uses xref:spring.adoc[Spring] 2 namespaces; so that you can
+Camel XML uses xref:components::spring.adoc[Spring] 2 namespaces; so that you can
 configure your routing rules within your 
-xref:spring.adoc[Spring XML configuration file]; you can also use
+xref:components::spring.adoc[Spring XML configuration file]; you can also use
 xref:faq/how-do-i-configure-endpoints.adoc[Java code to configure components and endpoints].
 
 For examples on how to use Camel XML, see the
-xref:enterprise-integration-patterns.adoc[Enterprise Integration Patterns] or refer to the xref:spring.adoc[Spring Support].
+xref:enterprise-integration-patterns.adoc[Enterprise Integration Patterns] or refer to the xref:components::spring.adoc[Spring Support].
 
 [[XMLConfiguration-SeeAlso]]
 === See Also
diff --git a/docs/user-manual/modules/ROOT/pages/xml-reference.adoc b/docs/user-manual/modules/ROOT/pages/xml-reference.adoc
index c776851..e9c544d 100644
--- a/docs/user-manual/modules/ROOT/pages/xml-reference.adoc
+++ b/docs/user-manual/modules/ROOT/pages/xml-reference.adoc
@@ -1402,7 +1402,7 @@ available.
 [[XMLReference-UsingtheXSDsinconfigurationfiles]]
 ==== Using the XSDs in configuration files
 
-When you are using xref:spring.adoc[Spring]'s 2.5 XML handling to parse
+When you are using xref:components::spring.adoc[Spring]'s 2.5 XML handling to parse
 the XML then you need to refer to the XSD locations in your XML
 document.
 


[camel] 04/12: Fixed cross references in camel/components

Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit f4624cb1be9e84625834e662d9542d631fa1ad19
Author: nayananga@acerubuntu18.04 <na...@gmail.com>
AuthorDate: Fri Jul 19 17:33:26 2019 +0530

    Fixed cross references in camel/components
---
 .../camel-ahc/src/main/docs/ahc-component.adoc     |  2 +-
 .../src/main/docs/cometd-component.adoc            |  2 +-
 .../src/main/docs/controlbus-component.adoc        |  4 ++--
 .../src/main/docs/crypto-component.adoc            |  2 +-
 .../src/main/docs/dataformat-component.adoc        |  6 ++---
 .../src/main/docs/dataset-component.adoc           |  2 +-
 .../src/main/docs/dataset-test-component.adoc      |  2 +-
 .../main/docs/elasticsearch-rest-component.adoc    |  2 +-
 .../camel-elsql/src/main/docs/elsql-component.adoc |  2 +-
 .../camel-file/src/main/docs/file-component.adoc   | 26 +++++++++++-----------
 .../camel-grape/src/main/docs/grape-component.adoc |  2 +-
 .../src/main/docs/groovy-language.adoc             |  2 +-
 .../camel-http4/src/main/docs/http4-component.adoc |  2 +-
 .../camel-irc/src/main/docs/irc-component.adoc     |  2 +-
 .../camel-jetty/src/main/docs/jetty-component.adoc |  4 ++--
 .../camel-jms/src/main/docs/jms-component.adoc     |  2 +-
 .../src/main/docs/language-component.adoc          |  4 ++--
 .../camel-mail/src/main/docs/mail-component.adoc   |  2 +-
 .../camel-mock/src/main/docs/mock-component.adoc   |  2 +-
 .../src/main/docs/netty4-component.adoc            |  2 +-
 .../camel-paho/src/main/docs/paho-component.adoc   |  2 +-
 .../src/main/docs/properties-component.adoc        |  8 +++----
 .../src/main/docs/xquery-component.adoc            |  2 +-
 .../camel-saxon/src/main/docs/xquery-language.adoc |  2 +-
 .../src/main/docs/spring-event-component.adoc      |  2 +-
 components/camel-spring/src/main/docs/spring.adoc  |  8 +++----
 .../src/main/docs/univocity-csv-dataformat.adoc    |  2 +-
 .../src/main/docs/univocity-fixed-dataformat.adoc  |  2 +-
 .../src/main/docs/univocity-tsv-dataformat.adoc    |  2 +-
 .../src/main/docs/websocket-component.adoc         |  2 +-
 .../src/main/docs/xmlsecurity-component.adoc       |  2 +-
 .../camel-xpath/src/main/docs/xpath-language.adoc  |  4 ++--
 32 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/components/camel-ahc/src/main/docs/ahc-component.adoc b/components/camel-ahc/src/main/docs/ahc-component.adoc
index 98a9606..5b9e91e 100644
--- a/components/camel-ahc/src/main/docs/ahc-component.adoc
+++ b/components/camel-ahc/src/main/docs/ahc-component.adoc
@@ -421,7 +421,7 @@ from("direct:start")
 Using the JSSE Configuration Utility
 
 The AHC component supports SSL/TLS configuration
-through the xref:camel-configuration-utilities.adoc[Camel JSSE
+through the xref:manual::camel-configuration-utilities.adoc[Camel JSSE
 Configuration Utility].  This utility greatly decreases the amount of
 component specific code you need to write and is configurable at the
 endpoint and component levels.  The following examples demonstrate how
diff --git a/components/camel-cometd/src/main/docs/cometd-component.adoc b/components/camel-cometd/src/main/docs/cometd-component.adoc
index 8130b70..2d05c59 100644
--- a/components/camel-cometd/src/main/docs/cometd-component.adoc
+++ b/components/camel-cometd/src/main/docs/cometd-component.adoc
@@ -183,7 +183,7 @@ http://cometd.org/documentation/howtos/authentication[documented here]
 #### Using the JSSE Configuration Utility
 
 The Cometd component supports SSL/TLS configuration
-through the xref:camel-configuration-utilities.adoc[Camel JSSE
+through the xref:manual::camel-configuration-utilities.adoc[Camel JSSE
 Configuration Utility].  This utility greatly decreases the amount of
 component specific code you need to write and is configurable at the
 endpoint and component levels.  The following examples demonstrate how
diff --git a/components/camel-controlbus/src/main/docs/controlbus-component.adoc b/components/camel-controlbus/src/main/docs/controlbus-component.adoc
index 0a605aa..cfd64bf 100644
--- a/components/camel-controlbus/src/main/docs/controlbus-component.adoc
+++ b/components/camel-controlbus/src/main/docs/controlbus-component.adoc
@@ -185,7 +185,7 @@ String xml = template.requestBody("controlbus:route?action=stats", null, String.
 
 === Using Simple language
 
-You can use the xref:simple-language.adoc[Simple] language with the control bus,
+You can use the xref:manual::simple-language.adoc[Simple] language with the control bus,
 for example to stop a specific route, you can send a message to the
 `"controlbus:language:simple"` endpoint containing the following
 message:
@@ -206,7 +206,7 @@ String status = template.requestBody("controlbus:language:simple", "${camelConte
 It's easier to use the `route` command to control lifecycle of
 routes. The `language` command allows you to execute a language script
 that has stronger powers such as xref:groovy-language.adoc[Groovy] or to some
-extend the xref:simple-language.adoc[Simple] language.
+extend the xref:manual::simple-language.adoc[Simple] language.
 
 For example to shutdown Camel itself you can do:
 
diff --git a/components/camel-crypto/src/main/docs/crypto-component.adoc b/components/camel-crypto/src/main/docs/crypto-component.adoc
index b2c76df..5734dbe 100644
--- a/components/camel-crypto/src/main/docs/crypto-component.adoc
+++ b/components/camel-crypto/src/main/docs/crypto-component.adoc
@@ -213,7 +213,7 @@ The component supports 34 options, which are listed below.
 The most basic way to way to sign and verify an exchange is with a
 KeyPair as follows.
 
-The same can be achieved with the xref:spring-xml-extensions.adoc[Spring
+The same can be achieved with the xref:manual::spring-xml-extensions.adoc[Spring
 XML Extensions] using references to keys
 
 #### KeyStores and Aliases.
diff --git a/components/camel-dataformat/src/main/docs/dataformat-component.adoc b/components/camel-dataformat/src/main/docs/dataformat-component.adoc
index d523fa6..09bce42 100644
--- a/components/camel-dataformat/src/main/docs/dataformat-component.adoc
+++ b/components/camel-dataformat/src/main/docs/dataformat-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.12*
 
-The Dataformat component allows to use xref:data-format.adoc[Data
+The Dataformat component allows to use xref:manual::data-format.adoc[Data
 Format] as a Camel Component.
 
 === URI format
@@ -15,7 +15,7 @@ dataformat:name:(marshal|unmarshal)[?options]
 
 Where *name* is the name of the Data Format. And
 then followed by the operation which must either be `marshal` or
-`unmarshal`. The options is used for configuring the xref:data-format.adoc[Data
+`unmarshal`. The options is used for configuring the xref:manual::data-format.adoc[Data
 Format] in use. See the Data Format documentation
 for which options it support.
 
@@ -100,7 +100,7 @@ The component supports 3 options, which are listed below.
 
 === Samples
 
-For example to use the xref:jaxb-dataformat.adoc[JAXB] xref:data-format.adoc[Data
+For example to use the xref:jaxb-dataformat.adoc[JAXB] xref:manual::data-format.adoc[Data
 Format] we can do as follows:
 
 [source,java]
diff --git a/components/camel-dataset/src/main/docs/dataset-component.adoc b/components/camel-dataset/src/main/docs/dataset-component.adoc
index 3469c30..290a296 100644
--- a/components/camel-dataset/src/main/docs/dataset-component.adoc
+++ b/components/camel-dataset/src/main/docs/dataset-component.adoc
@@ -8,7 +8,7 @@ notoriously difficult. The xref:mock-component.adoc[Mock], xref:mock-component.a
 and xref:dataset-component.adoc[DataSet] endpoints work great with the
 Camel Testing Framework to simplify your unit and
 integration testing using
-xref:enterprise-integration-patterns.adoc[Enterprise Integration
+xref:manual::enterprise-integration-patterns.adoc[Enterprise Integration
 Patterns] and Camel's large range of Components
 together with the powerful Bean Integration.
 
diff --git a/components/camel-dataset/src/main/docs/dataset-test-component.adoc b/components/camel-dataset/src/main/docs/dataset-test-component.adoc
index 1d88d7ca..da5eb9b 100644
--- a/components/camel-dataset/src/main/docs/dataset-test-component.adoc
+++ b/components/camel-dataset/src/main/docs/dataset-test-component.adoc
@@ -8,7 +8,7 @@ notoriously difficult. The xref:mock-component.adoc[Mock], xref:mock-component.a
 and xref:dataset-component.adoc[DataSet] endpoints work great with the
 Camel Testing Framework to simplify your unit and
 integration testing using
-xref:enterprise-integration-patterns.adoc[Enterprise Integration
+xref:manual::enterprise-integration-patterns.adoc[Enterprise Integration
 Patterns] and Camel's large range of Components
 together with the powerful Bean Integration.
 
diff --git a/components/camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc b/components/camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc
index 935c7e6..5b691ee 100644
--- a/components/camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc
+++ b/components/camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc
@@ -303,7 +303,7 @@ try (ElasticsearchScrollRequestIterator response = template.requestBody("direct:
 }
 ----
 
-xref:split-eip.adoc[Split EIP] can also be used.
+xref:manual::split-eip.adoc[Split EIP] can also be used.
 
 [source,java]
 ----
diff --git a/components/camel-elsql/src/main/docs/elsql-component.adoc b/components/camel-elsql/src/main/docs/elsql-component.adoc
index 61c253a..59dfc8c 100644
--- a/components/camel-elsql/src/main/docs/elsql-component.adoc
+++ b/components/camel-elsql/src/main/docs/elsql-component.adoc
@@ -40,7 +40,7 @@ The parameters to the SQL queries are named parameters in the elsql
 mapping files, and maps to corresponding keys from the Camel message, in
 the given precedence:
 
-1. from message body if xref:simple-language.adoc[Simple]
+1. from message body if xref:manual::simple-language.adoc[Simple]
 expression.
 
 2. from message body if its a `java.util.Map`
diff --git a/components/camel-file/src/main/docs/file-component.adoc b/components/camel-file/src/main/docs/file-component.adoc
index 0878732e..bbbe5a6 100644
--- a/components/camel-file/src/main/docs/file-component.adoc
+++ b/components/camel-file/src/main/docs/file-component.adoc
@@ -237,7 +237,7 @@ bean completes, and thus the route is completed, the file consumer will
 perform the move operation and move the file to the `.done` sub-folder.
 
 The *move* and the *preMove* options are considered as a directory name
-(though if you use an expression such as xref:file-language.adoc[File Language], or xref:simple-language.adoc[Simple] then the result of the expression
+(though if you use an expression such as xref:manual::file-language.adoc[File Language], or xref:manual::simple-language.adoc[Simple] then the result of the expression
 evaluation is the file name to be used - eg if you set
 
 [source]
@@ -245,7 +245,7 @@ evaluation is the file name to be used - eg if you set
 move=../backup/copy-of-${file:name}
 ----
 
-then that's using the xref:file-language.adoc[File Language] which we
+then that's using the xref:manual::file-language.adoc[File Language] which we
 use return the file name to be used), which can be either relative or
 absolute. If relative, the directory is created as a sub-folder from
 within the folder where the file was consumed.
@@ -283,10 +283,10 @@ processed and after it's processed, it's moved to the `.done` folder.
 
 The *move* and *preMove* options
 are Expression-based, so we have the full power of
-the xref:file-language.adoc[File Language] to do advanced configuration
+the xref:manual::file-language.adoc[File Language] to do advanced configuration
 of the directory and name pattern. +
  Camel will, in fact, internally convert the directory name you enter
-into a xref:file-language.adoc[File Language] expression. So when we
+into a xref:manual::file-language.adoc[File Language] expression. So when we
 enter `move=.done` Camel will convert this into:
 `\${file:parent}/.done/${file:onlyname}`. This is only done if
 Camel detects that you have not provided a $\{ } in the option value
@@ -309,7 +309,7 @@ choice. For example to move the files in an error folder with a
 timestamp you can use
 `moveFailed=/error/${``file:name.noext``}-${date:now:yyyyMMddHHmmssSSS}.${``file:ext`}.
 
-See more examples at xref:file-language.adoc[File Language]
+See more examples at xref:manual::file-language.adoc[File Language]
 
 === Message Headers
 
@@ -323,7 +323,7 @@ The following headers are supported by this component:
 
 |`CamelFileName` |Specifies the name of the file to write (relative to the endpoint
 directory). This name can be a `String`; a `String` with a
-xref:file-language.adoc[File Language] or xref:simple-language.adoc[Simple]
+xref:manual::file-language.adoc[File Language] or xref:manual::simple-language.adoc[Simple]
 expression; or an Expression object. If it's
 `null` then Camel will auto-generate a filename based on the message
 unique ID.
@@ -530,8 +530,8 @@ from("direct:report").to("file:target/reports/?fileName=report.txt");
 === Filename Expression
 
 Filename can be set either using the *expression* option or as a
-string-based xref:file-language.adoc[File Language] expression in the
-`CamelFileName` header. See the xref:file-language.adoc[File Language]
+string-based xref:manual::file-language.adoc[File Language] expression in the
+`CamelFileName` header. See the xref:manual::file-language.adoc[File Language]
 for syntax and samples.
 
 [[File2-Consumingfilesfromfolderswhereothersdropfilesdirectly]]
@@ -814,7 +814,7 @@ today's date as a sub-folder name:
 from("file://inbox?move=backup/${date:now:yyyyMMdd}/${file:name}").to("...");
 ----
 
-See xref:file-language.adoc[File Language] for more samples.
+See xref:manual::file-language.adoc[File Language] for more samples.
 
 === Avoiding reading the same file more than once (idempotent consumer)
 
@@ -1011,7 +1011,7 @@ Registry for a bean with the ID, `mySorter`.
 ==== Sorting using sortBy
 
 Camel supports pluggable sorting strategies. This strategy it to use the
-xref:file-language.adoc[File Language] to configure the sorting. The
+xref:manual::file-language.adoc[File Language] to configure the sorting. The
 `sortBy` option is configured as follows:
 
 [source]
@@ -1035,7 +1035,7 @@ This will sort by file name, you can reverse the order by prefixing
 sortBy=reverse:file:name
 ----
 
-As we have the full power of xref:file-language.adoc[File Language] we
+As we have the full power of xref:manual::file-language.adoc[File Language] we
 can use some of the other parameters, so if we want to sort by file size
 we do:
 
@@ -1079,7 +1079,7 @@ sortBy=file:modified;file:name
 Now there is an issue here, can you spot it? Well the modified timestamp
 of the file is too fine as it will be in milliseconds, but what if we
 want to sort by date only and then subgroup by name? +
- Well as we have the true power of xref:file-language.adoc[File Language] we can use its date command that supports patterns. So this
+ Well as we have the true power of xref:manual::file-language.adoc[File Language] we can use its date command that supports patterns. So this
 can be solved as:
 
 [source]
@@ -1170,6 +1170,6 @@ problems.
 
 === See Also
 
-* xref:file-language.adoc[File Language]
+* xref:manual::file-language.adoc[File Language]
 * FTP
 * Polling Consumer
diff --git a/components/camel-grape/src/main/docs/grape-component.adoc b/components/camel-grape/src/main/docs/grape-component.adoc
index 85a9708..5dbdaaa 100644
--- a/components/camel-grape/src/main/docs/grape-component.adoc
+++ b/components/camel-grape/src/main/docs/grape-component.adoc
@@ -132,7 +132,7 @@ By default Camel Grape component operates on the String payloads:
 producerTemplate.sendBody("grape:defaultMavenCoordinates", "org.apache.camel/camel-ftp/2.15.2");
 ------------------------------------------------------------------------------------------------
 
-But of course Camel build-in xref:type-converter.adoc[type conversion
+But of course Camel build-in xref:manual::type-converter.adoc[type conversion
 API] can perform the automatic data type transformations for you. In the
 example below Camel automatically converts binary payload into the
 String:
diff --git a/components/camel-groovy/src/main/docs/groovy-language.adoc b/components/camel-groovy/src/main/docs/groovy-language.adoc
index cc62bba..e2c8000 100644
--- a/components/camel-groovy/src/main/docs/groovy-language.adoc
+++ b/components/camel-groovy/src/main/docs/groovy-language.adoc
@@ -6,7 +6,7 @@
 Camel supports http://groovy.codehaus.org/[Groovy] among other
 Scripting Languages to allow an
 Expression or Predicate to be
-used in the DSL or xref:xml-configuration.adoc[Xml
+used in the DSL or xref:manual::xml-configuration.adoc[Xml
 Configuration].
 
 To use a Groovy expression use the following Java code
diff --git a/components/camel-http4/src/main/docs/http4-component.adoc b/components/camel-http4/src/main/docs/http4-component.adoc
index 616a67e..a7e188b 100644
--- a/components/camel-http4/src/main/docs/http4-component.adoc
+++ b/components/camel-http4/src/main/docs/http4-component.adoc
@@ -565,7 +565,7 @@ behavior.
 Using the JSSE Configuration Utility
 
 The HTTP4 component supports SSL/TLS configuration
-through the xref:camel-configuration-utilities.adoc[Camel JSSE
+through the xref:manual::camel-configuration-utilities.adoc[Camel JSSE
 Configuration Utility].  This utility greatly decreases the amount of
 component specific code you need to write and is configurable at the
 endpoint and component levels.  The following examples demonstrate how
diff --git a/components/camel-irc/src/main/docs/irc-component.adoc b/components/camel-irc/src/main/docs/irc-component.adoc
index 7fc0250..a07bfa7 100644
--- a/components/camel-irc/src/main/docs/irc-component.adoc
+++ b/components/camel-irc/src/main/docs/irc-component.adoc
@@ -150,7 +150,7 @@ The component supports 4 options, which are listed below.
 #### Using the JSSE Configuration Utility
 
 The IRC component supports SSL/TLS configuration
-through the xref:camel-configuration-utilities.adoc[Camel JSSE
+through the xref:manual::camel-configuration-utilities.adoc[Camel JSSE
 Configuration Utility].  This utility greatly decreases the amount of
 component specific code you need to write and is configurable at the
 endpoint and component levels.  The following examples demonstrate how
diff --git a/components/camel-jetty/src/main/docs/jetty-component.adoc b/components/camel-jetty/src/main/docs/jetty-component.adoc
index e9e7cc5..5476b13 100644
--- a/components/camel-jetty/src/main/docs/jetty-component.adoc
+++ b/components/camel-jetty/src/main/docs/jetty-component.adoc
@@ -283,7 +283,7 @@ Jetty component will copy the HTTP request parameter, `one` to the
 exchange's `in.header`. We can then use the `simple` language to route
 exchanges that contain this header to a specific endpoint and all others
 to another. If we used a language more powerful than
-xref:simple-language.adoc[Simple] (such as xref:el-language.adoc[EL] or
+xref:manual::simple-language.adoc[Simple] (such as xref:el-language.adoc[EL] or
 xref:ognl-language.adoc[OGNL]) we could also test for the parameter value and do
 routing based on the header value as well.
 
@@ -326,7 +326,7 @@ public void process(Exchange exchange) throws Exception {
 Using the JSSE Configuration Utility
 
 The Jetty component supports SSL/TLS configuration
-through the xref:camel-configuration-utilities.adoc[Camel JSSE
+through the xref:manual::camel-configuration-utilities.adoc[Camel JSSE
 Configuration Utility].  This utility greatly decreases the amount of
 component specific code you need to write and is configurable at the
 endpoint and component levels.  The following examples demonstrate how
diff --git a/components/camel-jms/src/main/docs/jms-component.adoc b/components/camel-jms/src/main/docs/jms-component.adoc
index aed022e..f8d08ec 100644
--- a/components/camel-jms/src/main/docs/jms-component.adoc
+++ b/components/camel-jms/src/main/docs/jms-component.adoc
@@ -692,7 +692,7 @@ the documentation.
 
 Normally, when using xref:jms-component.adoc[JMS] as the transport, it only
 transfers the body and headers as the payload. If you want to use
-xref:jms-component.adoc[JMS] with a xref:dead-letter-channel.adoc[Dead Letter
+xref:jms-component.adoc[JMS] with a xref:manual::dead-letter-channel.adoc[Dead Letter
 Channel], using a JMS queue as the Dead Letter Queue, then normally the
 caused Exception is not stored in the JMS message. You can, however, use
 the `transferExchange` option on the JMS dead letter queue to instruct
diff --git a/components/camel-language/src/main/docs/language-component.adoc b/components/camel-language/src/main/docs/language-component.adoc
index dc3b08b..a3f0a81 100644
--- a/components/camel-language/src/main/docs/language-component.adoc
+++ b/components/camel-language/src/main/docs/language-component.adoc
@@ -8,7 +8,7 @@ to an endpoint which executes a script by any of the supported
 Languages in Camel. +
  By having a component to execute language scripts, it allows more
 dynamic routing capabilities. For example by using the
-Routing Slip or xref:dynamic-router.adoc[Dynamic
+Routing Slip or xref:manual::dynamic-router.adoc[Dynamic
 Router] EIPs you can send messages to `language` endpoints where the
 script is dynamic defined as well.
 
@@ -132,7 +132,7 @@ script configured on the endpoint.
 
 === Examples
 
-For example you can use the xref:simple-language.adoc[Simple] language to
+For example you can use the xref:manual::simple-language.adoc[Simple] language to
 Message Translator a message:
 
 In case you want to convert the message body type you can do this as
diff --git a/components/camel-mail/src/main/docs/mail-component.adoc b/components/camel-mail/src/main/docs/mail-component.adoc
index 68dccfc..acb8b67 100644
--- a/components/camel-mail/src/main/docs/mail-component.adoc
+++ b/components/camel-mail/src/main/docs/mail-component.adoc
@@ -341,7 +341,7 @@ configuration.
 ==== Using the JSSE Configuration Utility
 
 The mail component supports SSL/TLS configuration
-through the xref:camel-configuration-utilities.adoc[Camel JSSE
+through the xref:manual::camel-configuration-utilities.adoc[Camel JSSE
 Configuration Utility].  This utility greatly decreases the amount of
 component specific code you need to write and is configurable at the
 endpoint and component levels.  The following examples demonstrate how
diff --git a/components/camel-mock/src/main/docs/mock-component.adoc b/components/camel-mock/src/main/docs/mock-component.adoc
index 5388d43..11c36a5 100644
--- a/components/camel-mock/src/main/docs/mock-component.adoc
+++ b/components/camel-mock/src/main/docs/mock-component.adoc
@@ -8,7 +8,7 @@ notoriously difficult. The xref:mock-component.adoc[Mock], xref:mock-component.a
 and xref:dataset-component.adoc[DataSet] endpoints work great with the
 Camel Testing Framework to simplify your unit and
 integration testing using
-xref:enterprise-integration-patterns.adoc[Enterprise Integration
+xref:manual::enterprise-integration-patterns.adoc[Enterprise Integration
 Patterns] and Camel's large range of Components
 together with the powerful Bean Integration.
 
diff --git a/components/camel-netty4/src/main/docs/netty4-component.adoc b/components/camel-netty4/src/main/docs/netty4-component.adoc
index 52d0ea9..40806ba 100644
--- a/components/camel-netty4/src/main/docs/netty4-component.adoc
+++ b/components/camel-netty4/src/main/docs/netty4-component.adoc
@@ -406,7 +406,7 @@ RouteBuilder builder = new RouteBuilder() {
 Using the JSSE Configuration Utility
 
 The Netty component supports SSL/TLS configuration
-through the xref:camel-configuration-utilities.adoc[Camel JSSE
+through the xref:manual::camel-configuration-utilities.adoc[Camel JSSE
 Configuration Utility].  This utility greatly decreases the amount of
 component specific code you need to write and is configurable at the
 endpoint and component levels.  The following examples demonstrate how
diff --git a/components/camel-paho/src/main/docs/paho-component.adoc b/components/camel-paho/src/main/docs/paho-component.adoc
index cae5aa4..08bb67a 100644
--- a/components/camel-paho/src/main/docs/paho-component.adoc
+++ b/components/camel-paho/src/main/docs/paho-component.adoc
@@ -173,7 +173,7 @@ byte[] payload = "message".getBytes();
 producerTemplate.sendBody("paho:topic", payload);
 ----
 
-But of course Camel build-in xref:type-converter.adoc[type conversion
+But of course Camel build-in xref:manual::type-converter.adoc[type conversion
 API] can perform the automatic data type transformations for you. In the
 example below Camel automatically converts binary payload into `String`
 (and conversely):
diff --git a/components/camel-properties/src/main/docs/properties-component.adoc b/components/camel-properties/src/main/docs/properties-component.adoc
index a47fb77..7982075 100644
--- a/components/camel-properties/src/main/docs/properties-component.adoc
+++ b/components/camel-properties/src/main/docs/properties-component.adoc
@@ -390,9 +390,9 @@ ProducerTemplate for example:
 template.sendBody("{{cool.start}}", "Hello World");
 ----
 
-=== Example with xref:simple-language.adoc[Simple] language
+=== Example with xref:manual::simple-language.adoc[Simple] language
 
-The xref:simple-language.adoc[Simple] language now also support using property
+The xref:manual::simple-language.adoc[Simple] language now also support using property
 placeholders, for example in the route below:
 
 [source,java]
@@ -655,7 +655,7 @@ placeholder notation with `{{` and `}}`.
 === Clashing Spring property placeholders with Camels Simple language
 
 Take notice when using Spring bridging placeholder then the spring `${ }`
-syntax clashes with the xref:simple-language.adoc[Simple] in Camel, and therefore
+syntax clashes with the xref:manual::simple-language.adoc[Simple] in Camel, and therefore
 take care. For example:
 
 [source,xml]
@@ -666,7 +666,7 @@ take care. For example:
 ----
 
 clashes with Spring property placeholders, and you should use `$simple{ }`
-to indicate using the xref:simple-language.adoc[Simple] language in Camel.
+to indicate using the xref:manual::simple-language.adoc[Simple] language in Camel.
 
 [source,xml]
 ----
diff --git a/components/camel-saxon/src/main/docs/xquery-component.adoc b/components/camel-saxon/src/main/docs/xquery-component.adoc
index 9a2e394..a55ec7c 100644
--- a/components/camel-saxon/src/main/docs/xquery-component.adoc
+++ b/components/camel-saxon/src/main/docs/xquery-component.adoc
@@ -5,7 +5,7 @@
 
 Camel supports http://www.w3.org/TR/xquery/[XQuery] to allow an
 Expression or Predicate to be
-used in the DSL or xref:xml-configuration.adoc[Xml
+used in the DSL or xref:manual::xml-configuration.adoc[Xml
 Configuration]. For example you could use XQuery to create an
 Predicate in a xref:message-filter.adoc[Message
 Filter] or as an Expression for a
diff --git a/components/camel-saxon/src/main/docs/xquery-language.adoc b/components/camel-saxon/src/main/docs/xquery-language.adoc
index 6b52fb5..bddfee1 100644
--- a/components/camel-saxon/src/main/docs/xquery-language.adoc
+++ b/components/camel-saxon/src/main/docs/xquery-language.adoc
@@ -5,7 +5,7 @@
 
 Camel supports http://www.w3.org/TR/xquery/[XQuery] to allow an
 Expression or Predicate to be
-used in the DSL or xref:xml-configuration.adoc[Xml
+used in the DSL or xref:manual::xml-configuration.adoc[Xml
 Configuration]. For example you could use XQuery to create an
 Predicate in a xref:message-filter.adoc[Message
 Filter] or as an Expression for a
diff --git a/components/camel-spring/src/main/docs/spring-event-component.adoc b/components/camel-spring/src/main/docs/spring-event-component.adoc
index a166da2..ed628b1 100644
--- a/components/camel-spring/src/main/docs/spring-event-component.adoc
+++ b/components/camel-spring/src/main/docs/spring-event-component.adoc
@@ -7,7 +7,7 @@ The Spring Event component provides access to the Spring
 `ApplicationEvent` objects. This allows you to publish
 `ApplicationEvent` objects to a Spring `ApplicationContext` or to
 consume them. You can then use
-xref:enterprise-integration-patterns.adoc[Enterprise Integration
+xref:manual::enterprise-integration-patterns.adoc[Enterprise Integration
 Patterns] to process them such as xref:message-filter.adoc[Message
 Filter].
 
diff --git a/components/camel-spring/src/main/docs/spring.adoc b/components/camel-spring/src/main/docs/spring.adoc
index f83baf7..6af9007 100644
--- a/components/camel-spring/src/main/docs/spring.adoc
+++ b/components/camel-spring/src/main/docs/spring.adoc
@@ -8,7 +8,7 @@ http://www.springframework.org/[Spring Framework] in a number of ways.
 components like xref:jms-component.adoc[JMS] and xref:jms-component.adoc[JPA]
 * Camel works with Spring 2 XML processing with the
 Xml Configuration
-* Camel Spring XML Schema's is defined at xref:xml-reference.adoc[Xml
+* Camel Spring XML Schema's is defined at xref:manual::xml-reference.adoc[Xml
 Reference]
 * Camel supports a powerful version of xref:spring-remoting.adoc[Spring
 Remoting] which can use powerful routing between the client and server
@@ -24,7 +24,7 @@ instances or the CamelContext instance itself
 and auto-expose Spring beans as components and endpoints.
 * Allows you to reuse the Spring Testing
 framework to simplify your unit and integration testing using
-xref:enterprise-integration-patterns.adoc[Enterprise Integration
+xref:manual::enterprise-integration-patterns.adoc[Enterprise Integration
 Patterns] and Camel's powerful xref:mock-component.adoc[Mock] and
 xref:test-component.adoc[Test] endpoints
 Camel supports Spring Boot using the `camel-spring-boot` component.
@@ -228,7 +228,7 @@ above in the `<packageScan>` documentation.
 
 *Available as of Camel 2.3*
 
-When defining routes in Camel using xref:xml-configuration.adoc[Xml
+When defining routes in Camel using xref:manual::xml-configuration.adoc[Xml
 Configuration] you may want to define some routes in other XML files.
 For example you may have many routes and it may help to maintain the
 application if some of the routes are in separate XML files. You may
@@ -349,7 +349,7 @@ If you want to be injected with the CamelContext
 in your POJO just implement the
 http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/CamelContextAware.html[CamelContextAware
 interface]; then when Spring creates your POJO the CamelContext will be
-injected into your POJO. Also see the xref:bean-integration.adoc[Bean
+injected into your POJO. Also see the xref:manual::bean-integration.adoc[Bean
 Integration] for further injections.
 
 === Integration Testing
diff --git a/components/camel-univocity-parsers/src/main/docs/univocity-csv-dataformat.adoc b/components/camel-univocity-parsers/src/main/docs/univocity-csv-dataformat.adoc
index c9911f8..651b44b 100644
--- a/components/camel-univocity-parsers/src/main/docs/univocity-csv-dataformat.adoc
+++ b/components/camel-univocity-parsers/src/main/docs/univocity-csv-dataformat.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.15*
 
-This xref:data-format.adoc[Data
+This xref:manual::data-format.adoc[Data
 Format] uses http://www.univocity.com/pages/about-parsers[uniVocity-parsers]
 for reading and writing 3 kinds of tabular data text files:
 
diff --git a/components/camel-univocity-parsers/src/main/docs/univocity-fixed-dataformat.adoc b/components/camel-univocity-parsers/src/main/docs/univocity-fixed-dataformat.adoc
index a54d9f4..c53c803 100644
--- a/components/camel-univocity-parsers/src/main/docs/univocity-fixed-dataformat.adoc
+++ b/components/camel-univocity-parsers/src/main/docs/univocity-fixed-dataformat.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.15*
 
-This xref:data-format.adoc[Data
+This xref:manual::data-format.adoc[Data
 Format] uses http://www.univocity.com/pages/about-parsers[uniVocity-parsers]
 for reading and writing 3 kinds of tabular data text files:
 
diff --git a/components/camel-univocity-parsers/src/main/docs/univocity-tsv-dataformat.adoc b/components/camel-univocity-parsers/src/main/docs/univocity-tsv-dataformat.adoc
index 8069fd1..ee5bc27 100644
--- a/components/camel-univocity-parsers/src/main/docs/univocity-tsv-dataformat.adoc
+++ b/components/camel-univocity-parsers/src/main/docs/univocity-tsv-dataformat.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.15*
 
-This xref:data-format.adoc[Data
+This xref:manual::data-format.adoc[Data
 Format] uses http://www.univocity.com/pages/about-parsers[uniVocity-parsers]
 for reading and writing 3 kinds of tabular data text files:
 
diff --git a/components/camel-websocket/src/main/docs/websocket-component.adoc b/components/camel-websocket/src/main/docs/websocket-component.adoc
index 16f3864..604cf17 100644
--- a/components/camel-websocket/src/main/docs/websocket-component.adoc
+++ b/components/camel-websocket/src/main/docs/websocket-component.adoc
@@ -206,7 +206,7 @@ from("activemq:topic:newsTopic")
 #### Using the JSSE Configuration Utility
 
 The WebSocket component supports SSL/TLS configuration
-through the xref:camel-configuration-utilities.adoc[Camel JSSE
+through the xref:manual::camel-configuration-utilities.adoc[Camel JSSE
 Configuration Utility].  This utility greatly decreases the amount of
 component specific code you need to write and is configurable at the
 endpoint and component levels.  The following examples demonstrate how
diff --git a/components/camel-xmlsecurity/src/main/docs/xmlsecurity-component.adoc b/components/camel-xmlsecurity/src/main/docs/xmlsecurity-component.adoc
index 0116b41..6bd9a79 100644
--- a/components/camel-xmlsecurity/src/main/docs/xmlsecurity-component.adoc
+++ b/components/camel-xmlsecurity/src/main/docs/xmlsecurity-component.adoc
@@ -8,7 +8,7 @@ signatures as described in the W3C standard
 http://www.w3.org/TR/xmldsig-core/[XML Signature Syntax and Processing]
 or as described in the successor
 http://www.w3.org/TR/xmldsig-core1/[version 1.1]. For XML Encryption
-support, please refer to the XML Security xref:data-format.adoc[Data
+support, please refer to the XML Security xref:manual::data-format.adoc[Data
 Format].
 
 You can find an introduction to XML signature
diff --git a/components/camel-xpath/src/main/docs/xpath-language.adoc b/components/camel-xpath/src/main/docs/xpath-language.adoc
index 5c673e3..68eee5a 100644
--- a/components/camel-xpath/src/main/docs/xpath-language.adoc
+++ b/components/camel-xpath/src/main/docs/xpath-language.adoc
@@ -5,7 +5,7 @@
 
 Camel supports http://www.w3.org/TR/xpath[XPath] to allow an
 Expression or Predicate to be
-used in the DSL or xref:xml-configuration.adoc[Xml
+used in the DSL or xref:manual::xml-configuration.adoc[Xml
 Configuration]. For example you could use XPath to create an
 Predicate in a xref:message-filter.adoc[Message
 Filter] or as an Expression for a
@@ -127,7 +127,7 @@ exchange:
 |function:properties |key for property |String |To lookup a property using the
 xref:properties-component.adoc[Properties] component (property placeholders).
 
-|function:simple |simple expression |Object |To evaluate a xref:simple-language.adoc[Simple] expression.
+|function:simple |simple expression |Object |To evaluate a xref:manual::simple-language.adoc[Simple] expression.
 |===
 
 CAUTION: `function:properties` and `function:simple` is not supported


[camel] 01/12: fixed incorrect cross references in core/camel-base

Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 085d28e85b472bfbc0db88c2a3a57ad82866555f
Author: nayananga@acerubuntu18.04 <na...@gmail.com>
AuthorDate: Fri Jul 19 16:57:09 2019 +0530

    fixed incorrect cross references in core/camel-base
---
 core/camel-base/src/main/docs/file-language.adoc   |  4 ++--
 core/camel-base/src/main/docs/simple-language.adoc | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/camel-base/src/main/docs/file-language.adoc b/core/camel-base/src/main/docs/file-language.adoc
index aa2e77d..f241fc9 100644
--- a/core/camel-base/src/main/docs/file-language.adoc
+++ b/core/camel-base/src/main/docs/file-language.adoc
@@ -42,7 +42,7 @@ filename.
 All the file tokens use the same expression name as the method on the
 `java.io.File` object, for instance `file:absolute` refers to the
 `java.io.File.getAbsolute()` method. Notice that not all expressions are
-supported by the current Exchange. For instance the xref:ftp-component.adoc[FTP]
+supported by the current Exchange. For instance the xref:components::ftp-component.adoc[FTP]
 component supports some of the options, where as the
 File component supports all of them.
 
@@ -223,7 +223,7 @@ fileName="uniquefile-${bean:myguidgenerator.generateid}.txt"
 
 And of course all this can be combined in one expression where you can
 use the xref:file-language.adoc[File Language], xref:file-language.adoc[Simple]
-and the xref:bean-component.adoc[Bean] language in one combined expression. This
+and the xref:components::bean-component.adoc[Bean] language in one combined expression. This
 is pretty powerful for those common file path patterns.
 
 === Using Spring PropertyPlaceholderConfigurer together with the File component
diff --git a/core/camel-base/src/main/docs/simple-language.adoc b/core/camel-base/src/main/docs/simple-language.adoc
index cc08482..4366e30 100644
--- a/core/camel-base/src/main/docs/simple-language.adoc
+++ b/core/camel-base/src/main/docs/simple-language.adoc
@@ -8,17 +8,17 @@ created, but has since grown more powerful. It is primarily intended for
 being a really small and simple language for evaluating
 Expressions and Predicates
 without requiring any new dependencies or knowledge of
-xref:xpath-language.adoc[XPath]; so it is ideal for testing in camel-core. The
+xref:components::xpath-language.adoc[XPath]; so it is ideal for testing in camel-core. The
 idea was to cover 95% of the common use cases when you need a little bit
 of expression based script in your Camel routes.
 
 However for much more complex use cases you are generally recommended to
 choose a more expressive and powerful language such as:
 
-* xref:groovy-language.adoc[Groovy]
-* xref:spel-language.adoc[SpEL]
-* xref:mvel-component.adoc[MVEL]
-* xref:ognl-language.adoc[OGNL]
+* xref:components::groovy-language.adoc[Groovy]
+* xref:components::spel-language.adoc[SpEL]
+* xref:components::mvel-component.adoc[MVEL]
+* xref:components::ognl-language.adoc[OGNL]
 
 The simple language uses `${body`} placeholders for complex expressions
 where the expression contains constant literals. The $\{ } placeholders
@@ -188,9 +188,9 @@ Command accepts offsets such as: *now-24h* or *in.header.xxx+1h* or even *now+1h
 
 |date-with-timezone:_command:timezone:pattern_ |String |Date formatting using `java.text.SimpleDataFormat` timezones and patterns.
 
-|bean:_bean expression_ |Object |Invoking a bean expression using the xref:bean-component.adoc[Bean] language.
+|bean:_bean expression_ |Object |Invoking a bean expression using the xref:components::bean-component.adoc[Bean] language.
 Specifying a method name you must use dot as separator. We also support
-the ?method=methodname syntax that is used by the xref:bean-component.adoc[Bean]
+the ?method=methodname syntax that is used by the xref:components::bean-component.adoc[Bean]
 component.
 
 |`properties:key:default` |String |Lookup a property with the given key. If the key does
@@ -755,7 +755,7 @@ from("direct:order")
 ----
 
 We can use the `?method=methodname` option that we are familiar with the
-xref:bean-component.adoc[Bean] component itself:
+xref:components::bean-component.adoc[Bean] component itself:
 
 [source,java]
 ----


[camel] 09/12: copied components from docs/components to camel/components

Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit c42d5c7f8ea3dc9fe443e7225a67b14c110efbb8
Author: nayananga@acerubuntu18.04 <na...@gmail.com>
AuthorDate: Sun Jul 21 02:23:39 2019 +0530

    copied components from docs/components to camel/components
---
 .../camel-asn1/src/main/docs/asn1-dataformat.adoc  |  2 +-
 .../src/main/docs/aws-ddb-component.adoc           |  6 +--
 .../src/main/docs/aws-ddbstream-component.adoc     |  2 +-
 .../src/main/docs/aws-ec2-component.adoc           |  2 +-
 .../src/main/docs/aws-ecs-component.adoc           |  2 +-
 .../src/main/docs/aws-eks-component.adoc           |  2 +-
 .../src/main/docs/aws-iam-component.adoc           |  2 +-
 .../src/main/docs/aws-kinesis-component.adoc       |  2 +-
 .../main/docs/aws-kinesis-firehose-component.adoc  |  2 +-
 .../src/main/docs/aws-kms-component.adoc           |  2 +-
 .../src/main/docs/aws-lambda-component.adoc        |  2 +-
 .../src/main/docs/aws-mq-component.adoc            |  2 +-
 .../src/main/docs/aws-msk-component.adoc           |  2 +-
 .../src/main/docs/aws-s3-component.adoc            |  2 +-
 .../src/main/docs/aws-sdb-component.adoc           |  2 +-
 .../src/main/docs/aws-ses-component.adoc           |  2 +-
 .../src/main/docs/aws-sns-component.adoc           |  2 +-
 .../src/main/docs/aws-sqs-component.adoc           |  2 +-
 .../src/main/docs/aws-swf-component.adoc           |  2 +-
 .../camel-cxf/src/main/docs/cxf-component.adoc     |  4 +-
 .../main/docs/google-bigquery-sql-component.adoc   |  2 +-
 .../camel-grok/src/main/docs/grok-dataformat.adoc  |  4 +-
 .../src/main/docs/hipchat-component.adoc           |  2 +-
 components/camel-jasypt/src/main/docs/jasypt.adoc  |  2 +-
 .../src/main/docs/jcache-component.adoc            |  2 +-
 .../src/main/docs/jsonpath-language.adoc           |  2 +-
 .../camel-kafka/src/main/docs/kafka-component.adoc |  4 +-
 .../src/main/docs/properties-component.adoc        |  2 +-
 .../src/main/docs/rest-swagger-component.adoc      |  2 +-
 .../camel-rest/src/main/docs/rest-component.adoc   |  4 +-
 .../src/main/docs/restlet-component.adoc           |  2 +-
 .../src/main/docs/servicenow-component.adoc        | 60 +++++++++++-----------
 .../src/main/docs/testcontainers.adoc              |  4 +-
 33 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/components/camel-asn1/src/main/docs/asn1-dataformat.adoc b/components/camel-asn1/src/main/docs/asn1-dataformat.adoc
index 6b2ac84..4e1065a 100644
--- a/components/camel-asn1/src/main/docs/asn1-dataformat.adoc
+++ b/components/camel-asn1/src/main/docs/asn1-dataformat.adoc
@@ -73,7 +73,7 @@ from("direct:unmarshal").unmarshal(asn1).split(body(Iterator.class)).streaming()
 
 In the last example we unmarshal BER file payload to plain old Java Objects using Split EIP. The reason for applying Split EIP is already mentioned in the previous example. Please note and keep in mind that reason. In such example we also need to set the fully qualified name of the class or <YourObject>.class reference through data format.
 The important thing to note here is that your object should have been generated by jasn1 compiler which is a nice tool to generate java object representations of your ASN.1 structure. For the reference usage of jasn1 compiler see [JASN.1 Project Page](https://www.beanit.com/asn1/) and please also see how the compiler is invoked with the help of maven's exec plugin.
-For example, in this data format's unit tests an example ASN.1 structure(TestSMSBerCdr.asn1) is added in `src/test/resources/asn1_structure`. jasn1 compiler is invoked and java object's representations are generated in `${basedir}/target/generated/src/test/java`
+For example, in this data format's unit tests an example ASN.1 structure(TestSMSBerCdr.asn1) is added in `src/test/resources/asn1_structure`. jasn1 compiler is invoked and java object's representations are generated in `$\{basedir\}/target/generated/src/test/java`
 The nice thing about this example, you will get POJO instance at the mock endpoint or at whatever your endpoint is.    
 
 [source,java]
diff --git a/components/camel-aws-ddb/src/main/docs/aws-ddb-component.adoc b/components/camel-aws-ddb/src/main/docs/aws-ddb-component.adoc
index 728a4e6..8c74729 100644
--- a/components/camel-aws-ddb/src/main/docs/aws-ddb-component.adoc
+++ b/components/camel-aws-ddb/src/main/docs/aws-ddb-component.adoc
@@ -247,13 +247,13 @@ processed with the current response.
 |=======================================================================
 |Header |Type |Description
 
-|`CamelAwsDdbProvisionedThroughput` |{{ProvisionedThroughputDescription}} |The value of the ProvisionedThroughput property for this table
+|`CamelAwsDdbProvisionedThroughput` |{\{ProvisionedThroughputDescription\}} |The value of the ProvisionedThroughput property for this table
 
 |`CamelAwsDdbCreationDate` |`Date` |Creation DateTime of this table.
 
 |`CamelAwsDdbTableItemCount` |`Long` |Item count for this table.
 
-|`CamelAwsDdbKeySchema` |{{KeySchema}} |The KeySchema that identifies the primary key for this table.
+|`CamelAwsDdbKeySchema` |{\{KeySchema\}} |The KeySchema that identifies the primary key for this table.
 
 
 |`CamelAwsDdbTableName` |`String` |The table name.
@@ -383,7 +383,7 @@ Maven users will need to add the following dependency to their pom.xml.
 </dependency>
 ---------------------------------------
 
-where `\${camel-version}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
 
 ### See Also
 
diff --git a/components/camel-aws-ddb/src/main/docs/aws-ddbstream-component.adoc b/components/camel-aws-ddb/src/main/docs/aws-ddbstream-component.adoc
index 6697a5d..c8d85f9 100644
--- a/components/camel-aws-ddb/src/main/docs/aws-ddbstream-component.adoc
+++ b/components/camel-aws-ddb/src/main/docs/aws-ddbstream-component.adoc
@@ -240,7 +240,7 @@ Maven users will need to add the following dependency to their pom.xml.
 </dependency>
 ---------------------------------------
 
-where `\${camel-version}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
 
 ### See Also
 
diff --git a/components/camel-aws-ec2/src/main/docs/aws-ec2-component.adoc b/components/camel-aws-ec2/src/main/docs/aws-ec2-component.adoc
index ffa6bf9..b1ab7c9 100644
--- a/components/camel-aws-ec2/src/main/docs/aws-ec2-component.adoc
+++ b/components/camel-aws-ec2/src/main/docs/aws-ec2-component.adoc
@@ -181,7 +181,7 @@ Maven users will need to add the following dependency to their pom.xml.
 </dependency>
 ---------------------------------------
 
-where `\${camel-version}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
 
 ### See Also
 
diff --git a/components/camel-aws-ecs/src/main/docs/aws-ecs-component.adoc b/components/camel-aws-ecs/src/main/docs/aws-ecs-component.adoc
index 9c3dbc7..928aa24 100644
--- a/components/camel-aws-ecs/src/main/docs/aws-ecs-component.adoc
+++ b/components/camel-aws-ecs/src/main/docs/aws-ecs-component.adoc
@@ -175,7 +175,7 @@ Maven users will need to add the following dependency to their pom.xml.
 </dependency>
 ---------------------------------------
 
-where `\${camel-version}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
 
 ### See Also
 
diff --git a/components/camel-aws-eks/src/main/docs/aws-eks-component.adoc b/components/camel-aws-eks/src/main/docs/aws-eks-component.adoc
index ab0fd55..a33a1ff 100644
--- a/components/camel-aws-eks/src/main/docs/aws-eks-component.adoc
+++ b/components/camel-aws-eks/src/main/docs/aws-eks-component.adoc
@@ -181,7 +181,7 @@ Maven users will need to add the following dependency to their pom.xml.
 </dependency>
 ---------------------------------------
 
-where `\${camel-version}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
 
 ### See Also
 
diff --git a/components/camel-aws-iam/src/main/docs/aws-iam-component.adoc b/components/camel-aws-iam/src/main/docs/aws-iam-component.adoc
index ed93c70..4489a77 100644
--- a/components/camel-aws-iam/src/main/docs/aws-iam-component.adoc
+++ b/components/camel-aws-iam/src/main/docs/aws-iam-component.adoc
@@ -190,7 +190,7 @@ Maven users will need to add the following dependency to their pom.xml.
 </dependency>
 ---------------------------------------
 
-where `\${camel-version}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
 
 ### See Also
 
diff --git a/components/camel-aws-kinesis/src/main/docs/aws-kinesis-component.adoc b/components/camel-aws-kinesis/src/main/docs/aws-kinesis-component.adoc
index 6db0f8c4..54daab3 100644
--- a/components/camel-aws-kinesis/src/main/docs/aws-kinesis-component.adoc
+++ b/components/camel-aws-kinesis/src/main/docs/aws-kinesis-component.adoc
@@ -270,7 +270,7 @@ Maven users will need to add the following dependency to their pom.xml.
 </dependency>
 ---------------------------------------
 
-where `\${camel-version}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
 
 ### See Also
 
diff --git a/components/camel-aws-kinesis/src/main/docs/aws-kinesis-firehose-component.adoc b/components/camel-aws-kinesis/src/main/docs/aws-kinesis-firehose-component.adoc
index cff249c..8423426 100644
--- a/components/camel-aws-kinesis/src/main/docs/aws-kinesis-firehose-component.adoc
+++ b/components/camel-aws-kinesis/src/main/docs/aws-kinesis-firehose-component.adoc
@@ -206,7 +206,7 @@ Maven users will need to add the following dependency to their pom.xml.
 </dependency>
 ---------------------------------------
 
-where `\${camel-version}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
 
 ### See Also
 
diff --git a/components/camel-aws-kms/src/main/docs/aws-kms-component.adoc b/components/camel-aws-kms/src/main/docs/aws-kms-component.adoc
index 8df26df..6ae5c2e 100644
--- a/components/camel-aws-kms/src/main/docs/aws-kms-component.adoc
+++ b/components/camel-aws-kms/src/main/docs/aws-kms-component.adoc
@@ -179,7 +179,7 @@ Maven users will need to add the following dependency to their pom.xml.
 </dependency>
 ---------------------------------------
 
-where `\${camel-version}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
 
 ### See Also
 
diff --git a/components/camel-aws-lambda/src/main/docs/aws-lambda-component.adoc b/components/camel-aws-lambda/src/main/docs/aws-lambda-component.adoc
index 38368b7..35ca291 100644
--- a/components/camel-aws-lambda/src/main/docs/aws-lambda-component.adoc
+++ b/components/camel-aws-lambda/src/main/docs/aws-lambda-component.adoc
@@ -241,7 +241,7 @@ Maven users will need to add the following dependency to their pom.xml.
 </dependency>
 ---------------------------------------
 
-where `\${camel-version}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
 
 ### See Also
 
diff --git a/components/camel-aws-mq/src/main/docs/aws-mq-component.adoc b/components/camel-aws-mq/src/main/docs/aws-mq-component.adoc
index bb21314..e58c310 100644
--- a/components/camel-aws-mq/src/main/docs/aws-mq-component.adoc
+++ b/components/camel-aws-mq/src/main/docs/aws-mq-component.adoc
@@ -180,7 +180,7 @@ Maven users will need to add the following dependency to their pom.xml.
 </dependency>
 ---------------------------------------
 
-where `\${camel-version}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
 
 ### See Also
 
diff --git a/components/camel-aws-msk/src/main/docs/aws-msk-component.adoc b/components/camel-aws-msk/src/main/docs/aws-msk-component.adoc
index 629ab34..4898489 100644
--- a/components/camel-aws-msk/src/main/docs/aws-msk-component.adoc
+++ b/components/camel-aws-msk/src/main/docs/aws-msk-component.adoc
@@ -183,7 +183,7 @@ Maven users will need to add the following dependency to their pom.xml.
 </dependency>
 ---------------------------------------
 
-where `\${camel-version}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
 
 ### See Also
 
diff --git a/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc b/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc
index 1e1bd99..6bdd541 100644
--- a/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc
+++ b/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc
@@ -536,7 +536,7 @@ Maven users will need to add the following dependency to their pom.xml.
 </dependency>
 ---------------------------------------
 
-where `\${camel-version}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
 
 ### See Also
 
diff --git a/components/camel-aws-sdb/src/main/docs/aws-sdb-component.adoc b/components/camel-aws-sdb/src/main/docs/aws-sdb-component.adoc
index 7a0c379..02ad976 100644
--- a/components/camel-aws-sdb/src/main/docs/aws-sdb-component.adoc
+++ b/components/camel-aws-sdb/src/main/docs/aws-sdb-component.adoc
@@ -255,7 +255,7 @@ Maven users will need to add the following dependency to their pom.xml.
 </dependency>
 ---------------------------------------
 
-where `\${camel-version}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
 
 ### See Also
 
diff --git a/components/camel-aws-ses/src/main/docs/aws-ses-component.adoc b/components/camel-aws-ses/src/main/docs/aws-ses-component.adoc
index be3e459..22ea4ad 100644
--- a/components/camel-aws-ses/src/main/docs/aws-ses-component.adoc
+++ b/components/camel-aws-ses/src/main/docs/aws-ses-component.adoc
@@ -216,7 +216,7 @@ This may be really useful for smarter configuration of the endpoint.
 </dependency>
 ---------------------------------------
 
-where `\${camel-version}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
 
 ### See Also
 
diff --git a/components/camel-aws-sns/src/main/docs/aws-sns-component.adoc b/components/camel-aws-sns/src/main/docs/aws-sns-component.adoc
index a66c8ab..3c544af 100644
--- a/components/camel-aws-sns/src/main/docs/aws-sns-component.adoc
+++ b/components/camel-aws-sns/src/main/docs/aws-sns-component.adoc
@@ -251,7 +251,7 @@ Maven users will need to add the following dependency to their pom.xml.
 </dependency>
 ---------------------------------------
 
-where `\${camel-version}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
 
 ### See Also
 
diff --git a/components/camel-aws-sqs/src/main/docs/aws-sqs-component.adoc b/components/camel-aws-sqs/src/main/docs/aws-sqs-component.adoc
index 97bc970..6033f29 100644
--- a/components/camel-aws-sqs/src/main/docs/aws-sqs-component.adoc
+++ b/components/camel-aws-sqs/src/main/docs/aws-sqs-component.adoc
@@ -323,7 +323,7 @@ Maven users will need to add the following dependency to their pom.xml.
 </dependency>
 ---------------------------------------
 
-where `\${camel-version}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
 
 ### JMS-style Selectors
 
diff --git a/components/camel-aws-swf/src/main/docs/aws-swf-component.adoc b/components/camel-aws-swf/src/main/docs/aws-swf-component.adoc
index 4f4e8e5..5386501 100644
--- a/components/camel-aws-swf/src/main/docs/aws-swf-component.adoc
+++ b/components/camel-aws-swf/src/main/docs/aws-swf-component.adoc
@@ -306,7 +306,7 @@ Maven users will need to add the following dependency to their pom.xml.
 </dependency>
 ---------------------------------------
 
-where `\${camel-version}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
 
 ### See Also
 
diff --git a/components/camel-cxf/src/main/docs/cxf-component.adoc b/components/camel-cxf/src/main/docs/cxf-component.adoc
index 38f3e9f..ac9e9d4 100644
--- a/components/camel-cxf/src/main/docs/cxf-component.adoc
+++ b/components/camel-cxf/src/main/docs/cxf-component.adoc
@@ -152,7 +152,7 @@ with the following path and query parameters:
 | *bus* (advanced) | To use a custom configured CXF Bus. |  | Bus
 | *continuationTimeout* (advanced) | This option is used to set the CXF continuation timeout which could be used in CxfConsumer by default when the CXF server is using Jetty or Servlet transport. | 30000 | long
 | *cxfBinding* (advanced) | To use a custom CxfBinding to control the binding between Camel Message and CXF Message. |  | CxfBinding
-| *cxfEndpointConfigurer* (advanced) | This option could apply the implementation of org.apache.camel.component.cxf.CxfEndpointConfigurer which supports to configure the CXF endpoint in programmatic way. User can configure the CXF server and client by implementing configure{ServerClient} method of CxfEndpointConfigurer. |  | CxfEndpointConfigurer
+| *cxfEndpointConfigurer* (advanced) | This option could apply the implementation of org.apache.camel.component.cxf.CxfEndpointConfigurer which supports to configure the CXF endpoint in programmatic way. User can configure the CXF server and client by implementing configure{\ServerClient\} method of CxfEndpointConfigurer. |  | CxfEndpointConfigurer
 | *defaultBus* (advanced) | Will set the default bus when CXF endpoint create a bus by itself | false | boolean
 | *headerFilterStrategy* (advanced) | To use a custom HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *mergeProtocolHeaders* (advanced) | Whether to merge protocol headers. If enabled then propagating headers between Camel and CXF becomes more consistent and similar. For more details see CAMEL-6393. | false | boolean
@@ -450,7 +450,7 @@ which operation you are calling.
 Be sure to include the JAX-WS `schemaLocation` attribute specified on
 the root beans element. This allows CXF to validate the file and is
 required. Also note the namespace declarations at the end of the
-`<cxf:cxfEndpoint/>` tag. These declarations are required because the combined `{namespace}localName` syntax is presently not supported for this tag's
+`<cxf:cxfEndpoint/>` tag. These declarations are required because the combined `\{namespace\}localName` syntax is presently not supported for this tag's
 attribute values.
 
 The `cxf:cxfEndpoint` element supports many additional attributes:
diff --git a/components/camel-google-bigquery/src/main/docs/google-bigquery-sql-component.adoc b/components/camel-google-bigquery/src/main/docs/google-bigquery-sql-component.adoc
index a8d4b0f..007c317 100644
--- a/components/camel-google-bigquery/src/main/docs/google-bigquery-sql-component.adoc
+++ b/components/camel-google-bigquery/src/main/docs/google-bigquery-sql-component.adoc
@@ -60,7 +60,7 @@ Examples:
 --------------------------------------------------------
 where
 
- * parameters in form \${name} are extracted from message headers and formed the translated query
+ * parameters in form $\{name\} are extracted from message headers and formed the translated query
  * parameters in form @name are extracted from body or message headers and sent to Google Bigquery
 
 You can externalize your SQL queries to files in the classpath or file system as shown:
diff --git a/components/camel-grok/src/main/docs/grok-dataformat.adoc b/components/camel-grok/src/main/docs/grok-dataformat.adoc
index b1413af..e864b08 100644
--- a/components/camel-grok/src/main/docs/grok-dataformat.adoc
+++ b/components/camel-grok/src/main/docs/grok-dataformat.adoc
@@ -100,7 +100,7 @@ The Grok dataformat supports 5 options, which are listed below.
 | pattern |  | String | The grok pattern to match lines of input
 | flattened | false | Boolean | Turns on flattened mode. In flattened mode the exception is thrown when there are multiple pattern matches with same key.
 | allowMultipleMatchesPerLine | true | Boolean | If false, every line of input is matched for pattern only once. Otherwise the line can be scanned multiple times when non-terminal pattern is used.
-| namedOnly | false | Boolean | Whether to capture named expressions only or not (i.e. %{IP:ip} but not \${IP})
+| namedOnly | false | Boolean | Whether to capture named expressions only or not (i.e. %{IP:ip} but not $\{IP\})
 | contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
@@ -131,7 +131,7 @@ The component supports 6 options, which are listed below.
 | *camel.dataformat.grok.content-type-header* | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc. | false | Boolean
 | *camel.dataformat.grok.enabled* | Whether to enable auto configuration of the grok data format. This is enabled by default. |  | Boolean
 | *camel.dataformat.grok.flattened* | Turns on flattened mode. In flattened mode the exception is thrown when there are multiple pattern matches with same key. | false | Boolean
-| *camel.dataformat.grok.named-only* | Whether to capture named expressions only or not (i.e. %{IP:ip} but not \${IP}) | false | Boolean
+| *camel.dataformat.grok.named-only* | Whether to capture named expressions only or not (i.e. %{IP:ip} but not $\{IP\}) | false | Boolean
 | *camel.dataformat.grok.pattern* | The grok pattern to match lines of input |  | String
 |===
 // spring-boot-auto-configure options: END
diff --git a/components/camel-hipchat/src/main/docs/hipchat-component.adoc b/components/camel-hipchat/src/main/docs/hipchat-component.adoc
index f1cdd59..7b2aca6 100644
--- a/components/camel-hipchat/src/main/docs/hipchat-component.adoc
+++ b/components/camel-hipchat/src/main/docs/hipchat-component.adoc
@@ -258,4 +258,4 @@ Maven users will need to add the following dependency to their pom.xml.
 </dependency>
 ------------------------------------------
 
-where `\${camel-version}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
diff --git a/components/camel-jasypt/src/main/docs/jasypt.adoc b/components/camel-jasypt/src/main/docs/jasypt.adoc
index aa4c43f..c8485ff 100644
--- a/components/camel-jasypt/src/main/docs/jasypt.adoc
+++ b/components/camel-jasypt/src/main/docs/jasypt.adoc
@@ -100,7 +100,7 @@ The idea is then to use those encrypted values in your
 xref:properties-component.adoc[Properties] files. Notice how the password value is
 encrypted and the value has the tokens surrounding `ENC(value here)`
 
-TIP: When running jasypt tooling, if you come across `java.lang.NoClassDefFoundError: org/jasypt/encryption/pbe/StandardPBEStringEncryptor` this means you have to include jasypt{version}.jar in your classpath. Example of adding jar to classpath may be copying jasypt{version}.jar to $JAVA_HOME\jre\lib\ext if you are going to run as `java -jar ...`. The latter may be adding jasypt{version}.jar to classpath using `-cp`, in that case you should provide main class to execute as eg: `java -cp  [...]
+TIP: When running jasypt tooling, if you come across `java.lang.NoClassDefFoundError: org/jasypt/encryption/pbe/StandardPBEStringEncryptor` this means you have to include jasypt\{version\}.jar in your classpath. Example of adding jar to classpath may be copying jasypt\{version\}.jar to $JAVA_HOME\jre\lib\ext if you are going to run as `java -jar ...`. The latter may be adding jasypt\{version\}.jar to classpath using `-cp`, in that case you should provide main class to execute as eg: `jav [...]
 
 
 ### URI Options
diff --git a/components/camel-jcache/src/main/docs/jcache-component.adoc b/components/camel-jcache/src/main/docs/jcache-component.adoc
index 70bdca8..bc1cc13 100644
--- a/components/camel-jcache/src/main/docs/jcache-component.adoc
+++ b/components/camel-jcache/src/main/docs/jcache-component.adoc
@@ -238,7 +238,7 @@ The _.log()_ at the beginning and at the end of the route is always called, but
 
 ## KeyExpression
 
-By default the policy uses the received Exchange body as _key_, so the default expression is like _simple("${body})_.
+By default the policy uses the received Exchange body as _key_, so the default expression is like _simple("$\{body\})_.
  We can set a different Camel Expression as _keyExpression_ which will be evaluated to determine the key.
  For example if we try to find an _order_ by an _orderId_ which is in the message headers,
  set _header("orderId")_ (or _simple("${header.orderId})_ as _keyExpression_.
diff --git a/components/camel-jsonpath/src/main/docs/jsonpath-language.adoc b/components/camel-jsonpath/src/main/docs/jsonpath-language.adoc
index e15dd12..72280c2 100644
--- a/components/camel-jsonpath/src/main/docs/jsonpath-language.adoc
+++ b/components/camel-jsonpath/src/main/docs/jsonpath-language.adoc
@@ -212,7 +212,7 @@ This option is also available on the `@JsonPath` annotation.
 
 *Available as of Camel 2.18*
 
-Its now possible to inlined Simple language expressions in the JSonPath expression using the simple syntax \${xxx}.
+Its now possible to inlined Simple language expressions in the JSonPath expression using the simple syntax $\{xxx\}.
 An example is shown below:
 
 [source,java]
diff --git a/components/camel-kafka/src/main/docs/kafka-component.adoc b/components/camel-kafka/src/main/docs/kafka-component.adoc
index b404964..35e2b6e 100644
--- a/components/camel-kafka/src/main/docs/kafka-component.adoc
+++ b/components/camel-kafka/src/main/docs/kafka-component.adoc
@@ -153,7 +153,7 @@ with the following path and query parameters:
 | *interceptorClasses* (monitoring) | Sets interceptors for producer or consumers. Producer interceptors have to be classes implementing org.apache.kafka.clients.producer.ProducerInterceptor Consumer interceptors have to be classes implementing org.apache.kafka.clients.consumer.ConsumerInterceptor Note that if you use Producer interceptor on a consumer it will throw a class cast exception in runtime |  | String
 | *kerberosBeforeReloginMin Time* (security) | Login thread sleep time between refresh attempts. | 60000 | Integer
 | *kerberosInitCmd* (security) | Kerberos kinit command path. Default is /usr/bin/kinit | /usr/bin/kinit | String
-| *kerberosPrincipalToLocal Rules* (security) | A list of rules for mapping from principal names to short names (typically operating system usernames). The rules are evaluated in order and the first rule that matches a principal name is used to map it to a short name. Any later rules in the list are ignored. By default, principal names of the form {username}/{hostname}{REALM} are mapped to {username}. For more details on the format please see the security authorization and acls documenta [...]
+| *kerberosPrincipalToLocal Rules* (security) | A list of rules for mapping from principal names to short names (typically operating system usernames). The rules are evaluated in order and the first rule that matches a principal name is used to map it to a short name. Any later rules in the list are ignored. By default, principal names of the form \{username\}/\{hostname\}\{REALM\} are mapped to \{username\}. For more details on the format please see the security authorization and acls d [...]
 | *kerberosRenewJitter* (security) | Percentage of random jitter added to the renewal time. | 0.05 | Double
 | *kerberosRenewWindowFactor* (security) | Login thread will sleep until the specified window factor of time from last refresh to ticket's expiry has been reached, at which time it will try to renew the ticket. | 0.8 | Double
 | *saslJaasConfig* (security) | Expose the kafka sasl.jaas.config parameter Example: org.apache.kafka.common.security.plain.PlainLoginModule required username=USERNAME password=PASSWORD; |  | String
@@ -234,7 +234,7 @@ The component supports 101 options, which are listed below.
 | *camel.component.kafka.configuration.kafka-header-serializer* | Sets custom KafkaHeaderDeserializer for serialization camel headers values to kafka headers values. |  | KafkaHeaderSerializer
 | *camel.component.kafka.configuration.kerberos-before-relogin-min-time* | Login thread sleep time between refresh attempts. | 60000 | Integer
 | *camel.component.kafka.configuration.kerberos-init-cmd* | Kerberos kinit command path. Default is /usr/bin/kinit | /usr/bin/kinit | String
-| *camel.component.kafka.configuration.kerberos-principal-to-local-rules* | A list of rules for mapping from principal names to short names (typically operating system usernames). The rules are evaluated in order and the first rule that matches a principal name is used to map it to a short name. Any later rules in the list are ignored. By default, principal names of the form {username}/{hostname}@{REALM} are mapped to {username}. For more details on the format please see the security aut [...]
+| *camel.component.kafka.configuration.kerberos-principal-to-local-rules* | A list of rules for mapping from principal names to short names (typically operating system usernames). The rules are evaluated in order and the first rule that matches a principal name is used to map it to a short name. Any later rules in the list are ignored. By default, principal names of the form \{username\}/\{hostname\}@\{REALM\} are mapped to \{username\}. For more details on the format please see the secu [...]
 | *camel.component.kafka.configuration.kerberos-renew-jitter* | Percentage of random jitter added to the renewal time. | 0.05 | Double
 | *camel.component.kafka.configuration.kerberos-renew-window-factor* | Login thread will sleep until the specified window factor of time from last refresh to ticket's expiry has been reached, at which time it will try to renew the ticket. | 0.8 | Double
 | *camel.component.kafka.configuration.key* | The record key (or null if no key is specified). If this option has been configured then it take precedence over header {@link KafkaConstants#KEY} |  | String
diff --git a/components/camel-properties/src/main/docs/properties-component.adoc b/components/camel-properties/src/main/docs/properties-component.adoc
index 7982075..0764037 100644
--- a/components/camel-properties/src/main/docs/properties-component.adoc
+++ b/components/camel-properties/src/main/docs/properties-component.adoc
@@ -157,7 +157,7 @@ property component.
 
 === Syntax
 
-The syntax to use Camel's property placeholder is to use `{{key}}` for
+The syntax to use Camel's property placeholder is to use `{\{key\}}` for
 example `{{file.uri}}` where `file.uri` is the property key.
 
 You can use property placeholders in parts of the endpoint URI's which
diff --git a/components/camel-rest-swagger/src/main/docs/rest-swagger-component.adoc b/components/camel-rest-swagger/src/main/docs/rest-swagger-component.adoc
index c23c5f2..ca243bf 100644
--- a/components/camel-rest-swagger/src/main/docs/rest-swagger-component.adoc
+++ b/components/camel-rest-swagger/src/main/docs/rest-swagger-component.adoc
@@ -79,7 +79,7 @@ to message headers you can specify REST operation's parameters as
 endpoint parameters, these will be constant for all subsequent
 invocations so it makes sense to use this feature only for parameters
 that are indeed constant for all invocations -- for example API version
-in path such as `/api/{version}/users/{id}`. 
+in path such as `/api/\{version\}/users/\{id\}`. 
 
 ### Options
 
diff --git a/components/camel-rest/src/main/docs/rest-component.adoc b/components/camel-rest/src/main/docs/rest-component.adoc
index 12e7a2b..9e1032b 100644
--- a/components/camel-rest/src/main/docs/rest-component.adoc
+++ b/components/camel-rest/src/main/docs/rest-component.adoc
@@ -183,7 +183,7 @@ from("rest:get:hello:/french/{me}")
 
 You can use the rest component to call REST services like any other Camel component.
 
-For example to call a REST service on using `hello/{me}` you can do
+For example to call a REST service on using `hello/\{me\}` you can do
 
 [source,java]
 ----
@@ -191,7 +191,7 @@ from("direct:start")
   .to("rest:get:hello/{me}");
 ----
 
-And then the dynamic value `{me}` is mapped to Camel message with the same name.
+And then the dynamic value `\{me\}` is mapped to Camel message with the same name.
 So to call this REST service you can send an empty message body and a header as shown:
 
 [source,java]
diff --git a/components/camel-restlet/src/main/docs/restlet-component.adoc b/components/camel-restlet/src/main/docs/restlet-component.adoc
index e24cb61..5a17743 100644
--- a/components/camel-restlet/src/main/docs/restlet-component.adoc
+++ b/components/camel-restlet/src/main/docs/restlet-component.adoc
@@ -113,7 +113,7 @@ with the following path and query parameters:
 | *protocol* | *Required* The protocol to use which is http or https |  | String
 | *host* | *Required* The hostname of the restlet service |  | String
 | *port* | *Required* The port number of the restlet service | 80 | int
-| *uriPattern* | The resource pattern such as /customer/{id} |  | String
+| *uriPattern* | The resource pattern such as /customer/\{id\} |  | String
 |===
 
 
diff --git a/components/camel-servicenow/camel-servicenow-component/src/main/docs/servicenow-component.adoc b/components/camel-servicenow/camel-servicenow-component/src/main/docs/servicenow-component.adoc
index 717598c..8c4f794 100644
--- a/components/camel-servicenow/camel-servicenow-component/src/main/docs/servicenow-component.adoc
+++ b/components/camel-servicenow/camel-servicenow-component/src/main/docs/servicenow-component.adoc
@@ -295,18 +295,18 @@ The component supports 58 options, which are listed below.
 |===
 | CamelServiceNowResource | CamelServiceNowAction | Method | API URI
 1.5+<.^|TABLE
-| RETRIEVE | GET | /api/now/v1/table/{table_name}/{sys_id}
-| CREATE | POST | /api/now/v1/table/{table_name}
-| MODIFY | PUT | /api/now/v1/table/{table_name}/{sys_id}
-| DELETE | DELETE | /api/now/v1/table/{table_name}/{sys_id}
-| UPDATE | PATCH | /api/now/v1/table/{table_name}/{sys_id}
+| RETRIEVE | GET | /api/now/v1/table/\{table_name\}/\{sys_id\}
+| CREATE | POST | /api/now/v1/table/\{table_name\}
+| MODIFY | PUT | /api/now/v1/table/\{table_name\}/\{sys_id\}
+| DELETE | DELETE | /api/now/v1/table/\{table_name\}/\{sys_id\}
+| UPDATE | PATCH | /api/now/v1/table/\{table_name\}/\{sys_id\}
 
 | AGGREGATE
-| RETRIEVE | GET | /api/now/v1/stats/{table_name}
+| RETRIEVE | GET | /api/now/v1/stats/\{table_name\}
 
 1.2+<.^|IMPORT
-| RETRIEVE | GET | /api/now/import/{table_name}/{sys_id}
-| CREATE | POST | /api/now/import/{table_name}
+| RETRIEVE | GET | /api/now/import/\{table_name\}/\{sys_id\}
+| CREATE | POST | /api/now/import/\{table_name\}
 |===
 
 NOTE: http://wiki.servicenow.com/index.php?title=REST_API#Available_APIs[Fuji REST API Documentation]
@@ -317,24 +317,24 @@ NOTE: http://wiki.servicenow.com/index.php?title=REST_API#Available_APIs[Fuji RE
 |===
 | CamelServiceNowResource | CamelServiceNowAction | CamelServiceNowActionSubject | Method | API URI
 1.5+<.^|TABLE
-| RETRIEVE | | GET | /api/now/v1/table/{table_name}/{sys_id}
-| CREATE | | POST | /api/now/v1/table/{table_name}
-| MODIFY | | PUT | /api/now/v1/table/{table_name}/{sys_id}
-| DELETE | | DELETE | /api/now/v1/table/{table_name}/{sys_id}
-| UPDATE | | PATCH | /api/now/v1/table/{table_name}/{sys_id}
+| RETRIEVE | | GET | /api/now/v1/table/\{table_name\}/\{sys_id\}
+| CREATE | | POST | /api/now/v1/table/\{table_name\}
+| MODIFY | | PUT | /api/now/v1/table/\{table_name\}/\{sys_id\}
+| DELETE | | DELETE | /api/now/v1/table/\{table_name\}/\{sys_id\}
+| UPDATE | | PATCH | /api/now/v1/table/\{table_name\}/\{sys_id\}
 
 | AGGREGATE
-| RETRIEVE | | GET | /api/now/v1/stats/{table_name}
+| RETRIEVE | | GET | /api/now/v1/stats/\{table_name\}
 
 1.2+<.^|IMPORT
-| RETRIEVE | | GET | /api/now/import/{table_name}/{sys_id}
-| CREATE | | POST | /api/now/import/{table_name}
+| RETRIEVE | | GET | /api/now/import/\{table_name\}/\{sys_id\}
+| CREATE | | POST | /api/now/import/\{table_name\}
 
 1.4+<.^|ATTACHMENT
-| RETRIEVE | | GET | /api/now/api/now/attachment/{sys_id}
-| CONTENT | | GET | /api/now/attachment/{sys_id}/file
+| RETRIEVE | | GET | /api/now/api/now/attachment/\{sys_id\}
+| CONTENT | | GET | /api/now/attachment/\{sys_id\}/file
 | UPLOAD | | POST | /api/now/api/now/attachment/file
-| DELETE | | DELETE | /api/now/attachment/{sys_id}
+| DELETE | | DELETE | /api/now/attachment/\{sys_id\}
 
 | SCORECARDS
 | RETRIEVE | PERFORMANCE_ANALYTICS | GET | /api/now/pa/scorecards
@@ -344,26 +344,26 @@ NOTE: http://wiki.servicenow.com/index.php?title=REST_API#Available_APIs[Fuji RE
 | CREATE | IDENTIFY_RECONCILE | POST | /api/now/identifyreconcile
 
 1.2+<.^|SERVICE_CATALOG
-| RETRIEVE | | GET | /sn_sc/servicecatalog/catalogs/{sys_id}
-| RETRIEVE | CATEGORIES |  GET | /sn_sc/servicecatalog/catalogs/{sys_id}/categories
+| RETRIEVE | | GET | /sn_sc/servicecatalog/catalogs/\{sys_id\}
+| RETRIEVE | CATEGORIES |  GET | /sn_sc/servicecatalog/catalogs/\{sys_id\}/categories
 
 1.5+<.^|SERVICE_CATALOG_ITEMS
-| RETRIEVE | | GET | /sn_sc/servicecatalog/items/{sys_id}
-| RETRIEVE | SUBMIT_GUIDE | POST | /sn_sc/servicecatalog/items/{sys_id}/submit_guide
-| RETRIEVE | CHECKOUT_GUIDE | POST | /sn_sc/servicecatalog/items/{sys_id}/checkout_guide
-| CREATE | SUBJECT_CART | POST | /sn_sc/servicecatalog/items/{sys_id}/add_to_cart
-| CREATE | SUBJECT_PRODUCER | POST | /sn_sc/servicecatalog/items/{sys_id}/submit_producer
+| RETRIEVE | | GET | /sn_sc/servicecatalog/items/\{sys_id\}
+| RETRIEVE | SUBMIT_GUIDE | POST | /sn_sc/servicecatalog/items/\{sys_id\}/submit_guide
+| RETRIEVE | CHECKOUT_GUIDE | POST | /sn_sc/servicecatalog/items/\{sys_id\}/checkout_guide
+| CREATE | SUBJECT_CART | POST | /sn_sc/servicecatalog/items/\{sys_id\}/add_to_cart
+| CREATE | SUBJECT_PRODUCER | POST | /sn_sc/servicecatalog/items/\{sys_id\}/submit_producer
 
 1.6+<.^|SERVICE_CATALOG_CARTS
 | RETRIEVE | | GET | /sn_sc/servicecatalog/cart
-| RETRIEVE | DELIVERY_ADDRESS | GET | /sn_sc/servicecatalog/cart/delivery_address/{user_id}
+| RETRIEVE | DELIVERY_ADDRESS | GET | /sn_sc/servicecatalog/cart/delivery_address/\{user_id\}
 | RETRIEVE | CHECKOUT | POST | /sn_sc/servicecatalog/cart/checkout
-| UPDATE | | POST | /sn_sc/servicecatalog/cart/{cart_item_id}
+| UPDATE | | POST | /sn_sc/servicecatalog/cart/\{cart_item_id\}
 | UPDATE | CHECKOUT | POST | /sn_sc/servicecatalog/cart/submit_order
-| DELETE | | DELETE | /sn_sc/servicecatalog/cart/{sys_id}/empty
+| DELETE | | DELETE | /sn_sc/servicecatalog/cart/\{sys_id\}/empty
 
 | SERVICE_CATALOG_CATEGORIES
-| RETRIEVE | | GET | /sn_sc/servicecatalog/categories/{sys_id}
+| RETRIEVE | | GET | /sn_sc/servicecatalog/categories/\{sys_id\}
 
 |===
 
diff --git a/components/camel-testcontainers/src/main/docs/testcontainers.adoc b/components/camel-testcontainers/src/main/docs/testcontainers.adoc
index 8cebf7c..73be426 100644
--- a/components/camel-testcontainers/src/main/docs/testcontainers.adoc
+++ b/components/camel-testcontainers/src/main/docs/testcontainers.adoc
@@ -77,8 +77,8 @@ You may need to wait for some condition to be satisfied before starting your tes
 
 Camel Testcontainer provides a PropertiesFunction implementation that can be used to:
 
-- retrieve the container host with the following syntax `container:host:${container-name}`
-- retrieve the port mapping with the following syntax `container:port:${exposed-port}@${container-name}`
+- retrieve the container host with the following syntax `container:host:$\{container-name\}`
+- retrieve the port mapping with the following syntax `container:port:$\{exposed-port\}@$\{container-name\}`
 
 [source,java]
 .Example


[camel] 06/12: Regen

Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 8e3139e2464509f1897f7e5293353144d50e6bdd
Author: nayananga@acerubuntu18.04 <na...@gmail.com>
AuthorDate: Sat Jul 20 07:48:24 2019 +0530

    Regen
---
 .../sql/stored/template/generated/SSPTParser.java  |  29 +-
 .../template/generated/SSPTParserConstants.java    |  16 -
 .../template/generated/SSPTParserTokenManager.java |  16 -
 components/readme.adoc                             | 416 ++++++++++++++++++++-
 4 files changed, 420 insertions(+), 57 deletions(-)

diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParser.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParser.java
index 776e3a8..13c79f5 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParser.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParser.java
@@ -1,31 +1,11 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 /* Generated By:JavaCC: Do not edit this line. SSPTParser.java */
 package org.apache.camel.component.sql.stored.template.generated;
 
-import org.apache.camel.component.sql.stored.template.ast.InOutParameter;
-import org.apache.camel.component.sql.stored.template.ast.InParameter;
-import org.apache.camel.component.sql.stored.template.ast.OutParameter;
-import org.apache.camel.component.sql.stored.template.ast.ParseHelper;
-import org.apache.camel.component.sql.stored.template.ast.Template;
-import org.apache.camel.spi.ClassResolver;
-
 import java.io.Reader;
 
+import org.apache.camel.spi.ClassResolver;
+import org.apache.camel.component.sql.stored.template.ast.*;
+
 public class SSPTParser implements SSPTParserConstants {
    int parameterNameCounter = 0;
 
@@ -227,6 +207,7 @@ public class SSPTParser implements SSPTParserConstants {
 
   final public Token ParameterSqlType() throws ParseException {
     Token t;
+    Token scaleToken;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case NUMBER:
       t = jj_consume_token(NUMBER);
@@ -394,7 +375,7 @@ public class SSPTParser implements SSPTParserConstants {
       return (jj_ntk = jj_nt.kind);
   }
 
-  private java.util.List<int[]> jj_expentries = new java.util.ArrayList<>();
+  private java.util.List<int[]> jj_expentries = new java.util.ArrayList<int[]>();
   private int[] jj_expentry;
   private int jj_kind = -1;
 
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserConstants.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserConstants.java
index b035f00..f48d31d 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserConstants.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserConstants.java
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 /* Generated By:JavaCC: Do not edit this line. SSPTParserConstants.java */
 package org.apache.camel.component.sql.stored.template.generated;
 
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java
index 670034b..ba002be 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 /* Generated By:JavaCC: Do not edit this line. SSPTParserTokenManager.java */
 package org.apache.camel.component.sql.stored.template.generated;
 import java.io.Reader;
diff --git a/components/readme.adoc b/components/readme.adoc
index dd3d90b..42be1f10 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -1056,44 +1056,444 @@ Number of Languages: 17 in 11 JAR artifacts (0 deprecated)
 ==== Miscellaneous Components
 
 // others: START
-Number of Miscellaneous Components: 33 in 33 JAR artifacts (0 deprecated)
+Number of Miscellaneous Components: 240 in 240 JAR artifacts (0 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===
 | Component | Available From | Description
 
+| link:camel-activemq/src/main/docs/activemq.adoc[Activemq] (camel-activemq) |  | ActiveMQ component for Camel
+
+| link:camel-ahc/src/main/docs/ahc.adoc[Ahc] (camel-ahc) |  | Camel Async Http Client support
+
+| link:camel-ahc-ws/src/main/docs/ahc-ws.adoc[Ahc Ws] (camel-ahc-ws) |  | Camel Websocket Client support
+
+| link:camel-amqp/src/main/docs/amqp.adoc[Amqp] (camel-amqp) |  | Camel AMQP component which is based on the Apache Qpid project
+
+| link:camel-apns/src/main/docs/apns.adoc[Apns] (camel-apns) |  | A Camel Apple Push Notification Server Component
+
+| link:camel-asn1/src/main/docs/asn1.adoc[Asn1] (camel-asn1) |  | Camel ASN.1 support
+
+| link:camel-asterisk/src/main/docs/asterisk.adoc[Asterisk] (camel-asterisk) |  | Camel Asterisk to interact with an Asterisk PBX Server
+
+| link:camel-atmos/src/main/docs/atmos.adoc[Atmos] (camel-atmos) |  | Camel Atmos support
+
+| link:camel-atmosphere-websocket/src/main/docs/atmosphere-websocket.adoc[Atmosphere Websocket] (camel-atmosphere-websocket) |  | Camel Atmosphere WebSocket Servlet
+
+| link:camel-atom/src/main/docs/atom.adoc[Atom] (camel-atom) |  | Camel Atom support
+
+| link:camel-atomix/src/main/docs/atomix.adoc[Atomix] (camel-atomix) |  | Camel Atomix support
+
 | link:camel-attachments/src/main/docs/attachments.adoc[Attachments] (camel-attachments) | 3.0 | Java Attachments support for Camel Message
 
+| link:camel-avro/src/main/docs/avro.adoc[Avro] (camel-avro) |  | Camel Avro data format
+
+| link:camel-aws-cw/src/main/docs/aws-cw.adoc[Aws Cw] (camel-aws-cw) |  | A Camel Amazon CW Web Service Component
+
+| link:camel-aws-ddb/src/main/docs/aws-ddb.adoc[Aws Ddb] (camel-aws-ddb) |  | A Camel Amazon DynamoDB Web Service Component
+
+| link:camel-aws-ec2/src/main/docs/aws-ec2.adoc[Aws Ec2] (camel-aws-ec2) |  | A Camel Amazon EC2 Web Service Component
+
+| link:camel-aws-ecs/src/main/docs/aws-ecs.adoc[Aws Ecs] (camel-aws-ecs) |  | A Camel Amazon ECS Web Service Component
+
+| link:camel-aws-eks/src/main/docs/aws-eks.adoc[Aws Eks] (camel-aws-eks) |  | A Camel Amazon EKS Web Service Component
+
+| link:camel-aws-iam/src/main/docs/aws-iam.adoc[Aws Iam] (camel-aws-iam) |  | A Camel Amazon IAM Web Service Component
+
+| link:camel-aws-kinesis/src/main/docs/aws-kinesis.adoc[Aws Kinesis] (camel-aws-kinesis) |  | A Camel Amazon Kinesis Web Service Component
+
+| link:camel-aws-kms/src/main/docs/aws-kms.adoc[Aws Kms] (camel-aws-kms) |  | A Camel Amazon KMS Web Service Component
+
+| link:camel-aws-lambda/src/main/docs/aws-lambda.adoc[Aws Lambda] (camel-aws-lambda) |  | A Camel Amazon Lambda We Service Component
+
+| link:camel-aws-mq/src/main/docs/aws-mq.adoc[Aws Mq] (camel-aws-mq) |  | A Camel Amazon MQ Web Service Component
+
+| link:camel-aws-msk/src/main/docs/aws-msk.adoc[Aws Msk] (camel-aws-msk) |  | A Camel Amazon MSK Web Service Component
+
+| link:camel-aws-s3/src/main/docs/aws-s3.adoc[Aws S3] (camel-aws-s3) |  | A Camel Amazon S3 Web Service Component
+
+| link:camel-aws-sdb/src/main/docs/aws-sdb.adoc[Aws Sdb] (camel-aws-sdb) |  | A Camel Amazon SDB Web Service Component
+
+| link:camel-aws-ses/src/main/docs/aws-ses.adoc[Aws Ses] (camel-aws-ses) |  | A Camel Amazon SES Web Service Component
+
+| link:camel-aws-sns/src/main/docs/aws-sns.adoc[Aws Sns] (camel-aws-sns) |  | A Camel Amazon SNS Web Service Component
+
+| link:camel-aws-sqs/src/main/docs/aws-sqs.adoc[Aws Sqs] (camel-aws-sqs) |  | A Camel Amazon SQS Web Service Component
+
+| link:camel-aws-swf/src/main/docs/aws-swf.adoc[Aws Swf] (camel-aws-swf) |  | A Camel Amazon SWF Web Service Component
+
+| link:camel-azure/src/main/docs/azure.adoc[Azure] (camel-azure) |  | Camel Microsoft Azure Components
+
+| link:camel-barcode/src/main/docs/barcode.adoc[Barcode] (camel-barcode) |  | Camel Barcode (e.g. QRcode, PDF417, DataMatrix) support
+
+| link:camel-base64/src/main/docs/base64.adoc[Base64] (camel-base64) |  | Camel Base64 data format support
+
+| link:camel-bean/src/main/docs/bean.adoc[Bean] (camel-bean) |  | Camel Bean component
+
+| link:camel-bean-validator/src/main/docs/bean-validator.adoc[Bean Validator] (camel-bean-validator) |  | Camel bean validation support (JSR 303)
+
+| link:camel-beanio/src/main/docs/beanio.adoc[Beanio] (camel-beanio) |  | Camel BeanIO data format support
+
+| link:camel-beanstalk/src/main/docs/beanstalk.adoc[Beanstalk] (camel-beanstalk) |  | Camel Beanstalk component
+
+| link:camel-bindy/src/main/docs/bindy.adoc[Bindy] (camel-bindy) |  | Camel Bindy data format support
+
 | link:camel-blueprint/src/main/docs/blueprint.adoc[Blueprint] (camel-blueprint) | 2.4 | Using Camel with OSGi Blueprint
 
+| link:camel-bonita/src/main/docs/bonita.adoc[Bonita] (camel-bonita) |  | Camel Bonita support
+
+| link:camel-boon/src/main/docs/boon.adoc[Boon] (camel-boon) |  | Camel Boon support
+
+| link:camel-braintree/src/main/docs/braintree.adoc[Braintree] (camel-braintree) |  | Camel Braintree support
+
+| link:camel-browse/src/main/docs/browse.adoc[Browse] (camel-browse) |  | Camel Browse component
+
+| link:camel-caffeine/src/main/docs/caffeine.adoc[Caffeine] (camel-caffeine) |  | Camel Caffeine support
+
+| link:camel-cassandraql/src/main/docs/cassandraql.adoc[Cassandraql] (camel-cassandraql) |  | Cassandra CQL3 support
+
+| link:camel-cbor/src/main/docs/cbor.adoc[Cbor] (camel-cbor) |  | Camel Cbor Support
+
 | link:camel-cdi/src/main/docs/cdi.adoc[CDI] (camel-cdi) | 2.10 | Using Camel with CDI
 
+| link:camel-chatscript/src/main/docs/chatscript.adoc[Chatscript] (camel-chatscript) |  | Camel support for ChatScript
+
+| link:camel-chunk/src/main/docs/chunk.adoc[Chunk] (camel-chunk) |  | Camel Chunk support
+
+| link:camel-cm-sms/src/main/docs/cm-sms.adoc[Cm Sms] (camel-cm-sms) |  | Camel CM SMS Gateway Component
+
+| link:camel-cmis/src/main/docs/cmis.adoc[Cmis] (camel-cmis) |  | Camel CMIS which is based on Apache Chemistry support
+
+| link:camel-coap/src/main/docs/coap.adoc[Coap] (camel-coap) |  | Camel CoAP support
+
+| link:camel-cometd/src/main/docs/cometd.adoc[Cometd] (camel-cometd) |  | Camel Cometd support based on Jetty
+
+| link:camel-consul/src/main/docs/consul.adoc[Consul] (camel-consul) |  | Camel Consul support
+
+| link:camel-controlbus/src/main/docs/controlbus.adoc[Controlbus] (camel-controlbus) |  | Camel Controlbus component
+
+| link:camel-corda/src/main/docs/corda.adoc[Corda] (camel-corda) |  | Camel Corda which is based on corda-rpc support
+
+| link:camel-couchbase/src/main/docs/couchbase.adoc[Couchbase] (camel-couchbase) |  | Camel Couchbase component
+
+| link:camel-couchdb/src/main/docs/couchdb.adoc[Couchdb] (camel-couchdb) |  | Camel CouchDB component
+
+| link:camel-crypto/src/main/docs/crypto.adoc[Crypto] (camel-crypto) |  | Camel Cryptographic Support
+
+| link:camel-crypto-cms/src/main/docs/crypto-cms.adoc[Crypto Cms] (camel-crypto-cms) |  | Camel Cryptographic Message Syntax Support
+
+| link:camel-csv/src/main/docs/csv.adoc[Csv] (camel-csv) |  | Camel CSV data format support
+
+| link:camel-cxf/src/main/docs/cxf.adoc[Cxf] (camel-cxf) |  | Camel CXF support
+
 | link:camel-cxf-transport/src/main/docs/cxf-transport.adoc[CXF Transport] (camel-cxf-transport) | 2.8 | Camel Transport for Apache CXF
 
+| link:camel-dataformat/src/main/docs/dataformat.adoc[Dataformat] (camel-dataformat) |  | Camel DataFormat component
+
+| link:camel-dataset/src/main/docs/dataset.adoc[Dataset] (camel-dataset) |  | Camel DataSet component
+
+| link:camel-digitalocean/src/main/docs/digitalocean.adoc[Digitalocean] (camel-digitalocean) |  | Camel DigitalOcean support
+
+| link:camel-direct/src/main/docs/direct.adoc[Direct] (camel-direct) |  | Camel Direct component
+
+| link:camel-directvm/src/main/docs/directvm.adoc[Directvm] (camel-directvm) |  | Camel Direct VM component
+
+| link:camel-disruptor/src/main/docs/disruptor.adoc[Disruptor] (camel-disruptor) |  | Camel :: Disruptor component
+
+| link:camel-dns/src/main/docs/dns.adoc[Dns] (camel-dns) |  | Camel DNS support
+
+| link:camel-docker/src/main/docs/docker.adoc[Docker] (camel-docker) |  | Camel Docker Support
+
+| link:camel-dozer/src/main/docs/dozer.adoc[Dozer] (camel-dozer) |  | Camel Support for the Dozer type conversion framework
+
+| link:camel-drill/src/main/docs/drill.adoc[Drill] (camel-drill) |  | Camel Apache Drill support
+
+| link:camel-dropbox/src/main/docs/dropbox.adoc[Dropbox] (camel-dropbox) |  | Camel Dropbox support
+
+| link:camel-ehcache/src/main/docs/ehcache.adoc[Ehcache] (camel-ehcache) |  | Camel Ehcache support
+
+| link:camel-ejb/src/main/docs/ejb.adoc[Ejb] (camel-ejb) |  | Camel EJB support
+
+| link:camel-elasticsearch-rest/src/main/docs/elasticsearch-rest.adoc[Elasticsearch Rest] (camel-elasticsearch-rest) |  | Camel ElasticSearch REST support
+
+| link:camel-elsql/src/main/docs/elsql.adoc[Elsql] (camel-elsql) |  | Camel ElSql support
+
+| link:camel-etcd/src/main/docs/etcd.adoc[Etcd] (camel-etcd) |  | Camel Etcd support
+
+| link:camel-eventadmin/src/main/docs/eventadmin.adoc[Eventadmin] (camel-eventadmin) |  | Camel OSGi Event Admin support
+
+| link:camel-exec/src/main/docs/exec.adoc[Exec] (camel-exec) |  | Camel support for system command execution
+
+| link:camel-facebook/src/main/docs/facebook.adoc[Facebook] (camel-facebook) |  | Camel Facebook Support
+
+| link:camel-fastjson/src/main/docs/fastjson.adoc[Fastjson] (camel-fastjson) |  | Camel Fastjson support
+
+| link:camel-file/src/main/docs/file.adoc[File] (camel-file) |  | Camel File component
+
+| link:camel-file-watch/src/main/docs/file-watch.adoc[File Watch] (camel-file-watch) |  | Camel File Watch component
+
+| link:camel-flatpack/src/main/docs/flatpack.adoc[Flatpack] (camel-flatpack) |  | Camel FlatPack support
+
+| link:camel-flink/src/main/docs/flink.adoc[Flink] (camel-flink) |  | Camel Apache Flink support
+
+| link:camel-fop/src/main/docs/fop.adoc[Fop] (camel-fop) |  | Camel FOP support
+
+| link:camel-freemarker/src/main/docs/freemarker.adoc[Freemarker] (camel-freemarker) |  | Camel Freemarker support
+
+| link:camel-ftp/src/main/docs/ftp.adoc[Ftp] (camel-ftp) |  | Camel FTP support
+
+| link:camel-ganglia/src/main/docs/ganglia.adoc[Ganglia] (camel-ganglia) |  | Camel Ganglia support
+
+| link:camel-geocoder/src/main/docs/geocoder.adoc[Geocoder] (camel-geocoder) |  | Camel GeoCoder support
+
+| link:camel-git/src/main/docs/git.adoc[Git] (camel-git) |  | Camel Components
+
+| link:camel-github/src/main/docs/github.adoc[Github] (camel-github) |  | Camel Components
+
+| link:camel-google-bigquery/src/main/docs/google-bigquery.adoc[Google Bigquery] (camel-google-bigquery) |  | Camel Component for Google Cloud Platform BigQuery
+
+| link:camel-google-calendar/src/main/docs/google-calendar.adoc[Google Calendar] (camel-google-calendar) |  | Camel Component for GoogleCalendar
+
+| link:camel-google-drive/src/main/docs/google-drive.adoc[Google Drive] (camel-google-drive) |  | Camel Component for GoogleDrive
+
+| link:camel-google-mail/src/main/docs/google-mail.adoc[Google Mail] (camel-google-mail) |  | Camel Component for GoogleMail
+
+| link:camel-google-pubsub/src/main/docs/google-pubsub.adoc[Google Pubsub] (camel-google-pubsub) |  | Camel Component for Google Cloud Platform PubSub
+
+| link:camel-google-sheets/src/main/docs/google-sheets.adoc[Google Sheets] (camel-google-sheets) |  | Camel Component for Google Sheets
+
+| link:camel-gora/src/main/docs/gora.adoc[Gora] (camel-gora) |  | Gora Component for Apache Camel.
+
+| link:camel-grape/src/main/docs/grape.adoc[Grape] (camel-grape) |  | The grape component allows you to fetch, load and manage additional jars when CamelContext is running
+
+| link:camel-grok/src/main/docs/grok.adoc[Grok] (camel-grok) |  | Camel Grok support
+
+| link:camel-groovy/src/main/docs/groovy.adoc[Groovy] (camel-groovy) |  | Camel Groovy support
+
+| link:camel-grpc/src/main/docs/grpc.adoc[Grpc] (camel-grpc) |  | Camel component for gRPC (Remote Procedure Call) support
+
+| link:camel-gson/src/main/docs/gson.adoc[Gson] (camel-gson) |  | Camel Gson support
+
+| link:camel-guava-eventbus/src/main/docs/guava-eventbus.adoc[Guava Eventbus] (camel-guava-eventbus) |  | Camel Guava EventBus support
+
+| link:camel-hazelcast/src/main/docs/hazelcast.adoc[Hazelcast] (camel-hazelcast) |  | Camel HazelCast based work queue implementation
+
+| link:camel-hbase/src/main/docs/hbase.adoc[Hbase] (camel-hbase) |  | Camel HBase component
+
+| link:camel-hdfs2/src/main/docs/hdfs2.adoc[Hdfs2] (camel-hdfs2) |  | Camel HDFS support with Hadoop 2.x libraries
+
+| link:camel-hipchat/src/main/docs/hipchat.adoc[Hipchat] (camel-hipchat) |  | Camel Hipchat Component
+
+| link:camel-hl7/src/main/docs/hl7.adoc[Hl7] (camel-hl7) |  | Camel HL7 support
+
+| link:camel-http4/src/main/docs/http4.adoc[Http4] (camel-http4) |  | Camel HTTP (Apache HttpClient 4.x) support
+
 | link:camel-hystrix/src/main/docs/hystrix.adoc[Hystrix] (camel-hystrix) | 2.18 | Circuit Breaker EIP using Netflix Hystrix
 
+| link:camel-ical/src/main/docs/ical.adoc[Ical] (camel-ical) |  | Camel iCal component
+
+| link:camel-iec60870/src/main/docs/iec60870.adoc[Iec60870] (camel-iec60870) |  | Camel IEC 60870-5-104 support
+
+| link:camel-ignite/src/main/docs/ignite.adoc[Ignite] (camel-ignite) |  | Camel Ignite component
+
+| link:camel-infinispan/src/main/docs/infinispan.adoc[Infinispan] (camel-infinispan) |  | Camel Infinispan support
+
+| link:camel-influxdb/src/main/docs/influxdb.adoc[Influxdb] (camel-influxdb) |  | Camel InfluxDB component
+
+| link:camel-iota/src/main/docs/iota.adoc[Iota] (camel-iota) |  | Camel IOTA component
+
+| link:camel-ipfs/src/main/docs/ipfs.adoc[Ipfs] (camel-ipfs) |  | Camel IPFS support
+
+| link:camel-irc/src/main/docs/irc.adoc[Irc] (camel-irc) |  | Camel IRC support
+
+| link:camel-ironmq/src/main/docs/ironmq.adoc[Ironmq] (camel-ironmq) |  | Camel IronMQ component
+
+| link:camel-jackson/src/main/docs/jackson.adoc[Jackson] (camel-jackson) |  | Camel Jackson support
+
+| link:camel-jacksonxml/src/main/docs/jacksonxml.adoc[Jacksonxml] (camel-jacksonxml) |  | Camel Jackson XML support
+
 | link:camel-jasypt/src/main/docs/jasypt.adoc[Jasypt] (camel-jasypt) | 2.5 | Security using Jasypt
 
+| link:camel-jaxb/src/main/docs/jaxb.adoc[Jaxb] (camel-jaxb) |  | Camel JAXB support
+
+| link:camel-jbpm/src/main/docs/jbpm.adoc[Jbpm] (camel-jbpm) |  | Camel JBPM support
+
+| link:camel-jcache/src/main/docs/jcache.adoc[Jcache] (camel-jcache) |  | Camel JCache support
+
+| link:camel-jclouds/src/main/docs/jclouds.adoc[Jclouds] (camel-jclouds) |  | Camel JClouds support
+
+| link:camel-jcr/src/main/docs/jcr.adoc[Jcr] (camel-jcr) |  | Camel JCR support
+
+| link:camel-jdbc/src/main/docs/jdbc.adoc[Jdbc] (camel-jdbc) | 1.2 | Camel JDBC support
+
+| link:camel-jetty/src/main/docs/jetty.adoc[Jetty] (camel-jetty) |  | Camel Jetty support
+
+| link:camel-jgroups/src/main/docs/jgroups.adoc[Jgroups] (camel-jgroups) |  | Camel JGroups support
+
+| link:camel-jgroups-raft/src/main/docs/jgroups-raft.adoc[Jgroups Raft] (camel-jgroups-raft) |  | Camel jgroups-raft support
+
+| link:camel-jing/src/main/docs/jing.adoc[Jing] (camel-jing) |  | Camel Jing support
+
+| link:camel-jira/src/main/docs/jira.adoc[Jira] (camel-jira) |  | Camel Components
+
+| link:camel-jms/src/main/docs/jms.adoc[Jms] (camel-jms) |  | Camel JMS support
+
+| link:camel-jmx/src/main/docs/jmx.adoc[Jmx] (camel-jmx) |  | Camel JMX support
+
+| link:camel-johnzon/src/main/docs/johnzon.adoc[Johnzon] (camel-johnzon) |  | Camel Johnzon support
+
+| link:camel-jolt/src/main/docs/jolt.adoc[Jolt] (camel-jolt) |  | Camel Jolt Support
+
+| link:camel-jooq/src/main/docs/jooq.adoc[Jooq] (camel-jooq) |  | The jooq component enables you to store and retrieve entities from databases using JOOQ
+
+| link:camel-jpa/src/main/docs/jpa.adoc[Jpa] (camel-jpa) |  | Camel JPA support
+
+| link:camel-jsch/src/main/docs/jsch.adoc[Jsch] (camel-jsch) |  | Camel SCP Support
+
+| link:camel-json-validator/src/main/docs/json-validator.adoc[Json Validator] (camel-json-validator) |  | Camel JSON Schema validation based on NetworkNT SON-schema library
+
+| link:camel-jsonapi/src/main/docs/jsonapi.adoc[Jsonapi] (camel-jsonapi) |  | Camel JsonApi data format
+
+| link:camel-jsonpath/src/main/docs/jsonpath.adoc[Jsonpath] (camel-jsonpath) |  | Camel JSON Path Language
+
+| link:camel-jt400/src/main/docs/jt400.adoc[Jt400] (camel-jt400) |  | Camel AS/400 support
+
+| link:camel-kafka/src/main/docs/kafka.adoc[Kafka] (camel-kafka) |  | Camel Kafka support
+
+| link:camel-kubernetes/src/main/docs/kubernetes.adoc[Kubernetes] (camel-kubernetes) |  | Camel Components
+
 | link:camel-kura/src/main/docs/kura.adoc[Kura] (camel-kura) | 2.15 | Using Camel with Eclipse Kura (OSGi)
 
+| link:camel-language/src/main/docs/language.adoc[Language] (camel-language) |  | Camel Language component
+
+| link:camel-ldap/src/main/docs/ldap.adoc[Ldap] (camel-ldap) |  | Camel LDAP support
+
+| link:camel-ldif/src/main/docs/ldif.adoc[Ldif] (camel-ldif) |  | Camel LDIF support
+
 | link:camel-leveldb/src/main/docs/leveldb.adoc[LevelDB] (camel-leveldb) | 2.10 | Using LevelDB as persistent EIP store
 
+| link:camel-log/src/main/docs/log.adoc[Log] (camel-log) |  | Camel Log component
+
 | link:camel-lra/src/main/docs/lra.adoc[Lra] (camel-lra) | 2.21 | Camel saga binding for Long-Running-Action framework
 
+| link:camel-lucene/src/main/docs/lucene.adoc[Lucene] (camel-lucene) |  | Camel Lucene based search component
+
+| link:camel-lumberjack/src/main/docs/lumberjack.adoc[Lumberjack] (camel-lumberjack) |  | Camel Lumberjack log streaming component
+
+| link:camel-lzf/src/main/docs/lzf.adoc[Lzf] (camel-lzf) |  | Camel LZF support
+
+| link:camel-mail/src/main/docs/mail.adoc[Mail] (camel-mail) |  | Camel Mail support
+
+| link:camel-master/src/main/docs/master.adoc[Master] (camel-master) |  | Camel Master Support
+
+| link:camel-metrics/src/main/docs/metrics.adoc[Metrics] (camel-metrics) |  | Camel Metrics based monitoring component
+
+| link:camel-micrometer/src/main/docs/micrometer.adoc[Micrometer] (camel-micrometer) |  | Camel Micrometer based monitoring component
+
 | link:camel-microprofile-config/src/main/docs/microprofile-config.adoc[Microprofile Config] (camel-microprofile-config) | 3.0 | Bridging Eclipse MicroProfile Config with Camel properties
 
+| link:camel-milo/src/main/docs/milo.adoc[Milo] (camel-milo) |  | Camel OPC UA support
+
+| link:camel-mina2/src/main/docs/mina2.adoc[Mina2] (camel-mina2) |  | Camel MINA 2.x support
+
+| link:camel-mllp/src/main/docs/mllp.adoc[Mllp] (camel-mllp) |  | Camel MLLP Component
+
+| link:camel-mock/src/main/docs/mock.adoc[Mock] (camel-mock) |  | Camel Mock component
+
+| link:camel-mongodb-gridfs/src/main/docs/mongodb-gridfs.adoc[Mongodb Gridfs] (camel-mongodb-gridfs) |  | Camel MongoDB GridFS component
+
+| link:camel-mongodb3/src/main/docs/mongodb3.adoc[Mongodb3] (camel-mongodb3) |  | Camel MongoDB (Java Driver 3) component
+
+| link:camel-mqtt/src/main/docs/mqtt.adoc[Mqtt] (camel-mqtt) |  | Camel MQTT client
+
+| link:camel-msv/src/main/docs/msv.adoc[Msv] (camel-msv) |  | Camel MSV support
+
+| link:camel-mustache/src/main/docs/mustache.adoc[Mustache] (camel-mustache) |  | Camel Mustache support
+
+| link:camel-mvel/src/main/docs/mvel.adoc[Mvel] (camel-mvel) |  | Camel MVEL support
+
+| link:camel-mybatis/src/main/docs/mybatis.adoc[Mybatis] (camel-mybatis) |  | Camel MyBatis support
+
+| link:camel-nagios/src/main/docs/nagios.adoc[Nagios] (camel-nagios) |  | Camel Nagios support
+
+| link:camel-nats/src/main/docs/nats.adoc[Nats] (camel-nats) |  | Camel Components
+
+| link:camel-netty4/src/main/docs/netty4.adoc[Netty4] (camel-netty4) |  | Camel Netty NIO based socket communication component
+
+| link:camel-netty4-http/src/main/docs/netty4-http.adoc[Netty4 Http] (camel-netty4-http) |  | Camel Netty4 HTTP support
+
+| link:camel-nsq/src/main/docs/nsq.adoc[Nsq] (camel-nsq) |  | Camel Components
+
+| link:camel-ognl/src/main/docs/ognl.adoc[Ognl] (camel-ognl) |  | Camel OGNL support
+
+| link:camel-openstack/src/main/docs/openstack.adoc[Openstack] (camel-openstack) |  | Camel OpenStack support
+
 | link:camel-opentracing/src/main/docs/opentracing.adoc[OpenTracing] (camel-opentracing) | 2.19 | Distributed tracing using OpenTracing
 
+| link:camel-optaplanner/src/main/docs/optaplanner.adoc[Optaplanner] (camel-optaplanner) |  | Camel OptaPlanner support
+
+| link:camel-paho/src/main/docs/paho.adoc[Paho] (camel-paho) |  | Camel Eclipse Paho support
+
+| link:camel-paxlogging/src/main/docs/paxlogging.adoc[Paxlogging] (camel-paxlogging) |  | Camel OSGi PaxLogging support
+
+| link:camel-pdf/src/main/docs/pdf.adoc[Pdf] (camel-pdf) |  | Camel PDF support
+
+| link:camel-pg-replication-slot/src/main/docs/pg-replication-slot.adoc[Pg Replication Slot] (camel-pg-replication-slot) |  | Component for receiving from PostgreSQL Replication Slots
+
+| link:camel-pgevent/src/main/docs/pgevent.adoc[Pgevent] (camel-pgevent) |  | Component for sending/receiving notifications in PostgreSQL
+
+| link:camel-printer/src/main/docs/printer.adoc[Printer] (camel-printer) |  | Camel Printer support
+
+| link:camel-properties/src/main/docs/properties.adoc[Properties] (camel-properties) |  | Camel Properties component
+
+| link:camel-protobuf/src/main/docs/protobuf.adoc[Protobuf] (camel-protobuf) |  | Camel Google Protobuf data format support
+
+| link:camel-pubnub/src/main/docs/pubnub.adoc[Pubnub] (camel-pubnub) |  | Camel PubNub Support
+
+| link:camel-pulsar/src/main/docs/pulsar.adoc[Pulsar] (camel-pulsar) |  | Camel Apache Pulsar Component
+
+| link:camel-quartz2/src/main/docs/quartz2.adoc[Quartz2] (camel-quartz2) |  | Camel Quartz2 support
+
+| link:camel-quickfix/src/main/docs/quickfix.adoc[Quickfix] (camel-quickfix) |  | Camel QuickFIX/J support
+
+| link:camel-rabbitmq/src/main/docs/rabbitmq.adoc[Rabbitmq] (camel-rabbitmq) |  | Camel RabbitMQ Component
+
 | link:camel-reactive-executor-vertx/src/main/docs/reactive-executor-vertx.adoc[Reactive Executor Vertx] (camel-reactive-executor-vertx) | 3.0 | Reactive Executor for camel-core using Vert X
 
+| link:camel-reactive-streams/src/main/docs/reactive-streams.adoc[Reactive Streams] (camel-reactive-streams) |  | Camel Reactive Streams Component
+
 | link:camel-reactor/src/main/docs/reactor.adoc[Reactor] (camel-reactor) | 2.20 | Reactor based back-end for Camel's reactive streams component
 
+| link:camel-ref/src/main/docs/ref.adoc[Ref] (camel-ref) |  | Camel Ref component
+
+| link:camel-rest/src/main/docs/rest.adoc[Rest] (camel-rest) |  | Camel REST component
+
+| link:camel-rest-swagger/src/main/docs/rest-swagger.adoc[Rest Swagger] (camel-rest-swagger) | 2.19 | Camel REST support using Swagger
+
+| link:camel-restlet/src/main/docs/restlet.adoc[Restlet] (camel-restlet) |  | Camel REST (Restlet based) Component
+
 | link:camel-ribbon/src/main/docs/ribbon.adoc[Ribbon] (camel-ribbon) | 2.18 | Using Netflix Ribbon for client side load balancing
 
+| link:camel-rss/src/main/docs/rss.adoc[Rss] (camel-rss) |  | Camel RSS support
+
 | link:camel-rxjava2/src/main/docs/rxjava2.adoc[Rxjava2] (camel-rxjava2) | 2.22 | RxJava2 based back-end for Camel's reactive streams component
 
+| link:camel-sap-netweaver/src/main/docs/sap-netweaver.adoc[Sap Netweaver] (camel-sap-netweaver) |  | Camel SAP NetWeaver support
+
+| link:camel-saxon/src/main/docs/saxon.adoc[Saxon] (camel-saxon) |  | Camel Saxon (XQuery/XPath) support
+
+| link:camel-schematron/src/main/docs/schematron.adoc[Schematron] (camel-schematron) |  | Camel Schematron support
+
+| link:camel-seda/src/main/docs/seda.adoc[Seda] (camel-seda) |  | Camel Seda component
+
+| link:camel-service/src/main/docs/service.adoc[Service] (camel-service) |  | Camel service Support
+
+| link:camel-servlet/src/main/docs/servlet.adoc[Servlet] (camel-servlet) |  | Camel servlet transport support
+
 | link:camel-shiro/src/main/docs/shiro.adoc[Shiro] (camel-shiro) | 2.5 | Security using Shiro
 
+| link:camel-spring/src/main/docs/spring.adoc[Spring] (camel-spring) |  | Camel Spring with XML DSL
+
 | link:camel-spring-boot/src/main/docs/spring-boot.adoc[Spring Boot] (camel-spring-boot) | 2.15 | Using Camel with Spring Boot
 
 | link:camel-spring-cloud/src/main/docs/spring-cloud.adoc[Spring Cloud] (camel-spring-cloud) | 2.19 | Camel Cloud integration with Spring Cloud
@@ -1108,6 +1508,8 @@ Number of Miscellaneous Components: 33 in 33 JAR artifacts (0 deprecated)
 
 | link:camel-spring-security/src/main/docs/spring-security.adoc[Spring Security] (camel-spring-security) | 2.3 | Security using Spring Security
 
+| link:camel-stub/src/main/docs/stub.adoc[Stub] (camel-stub) |  | Camel Stub component
+
 | link:camel-swagger-java/src/main/docs/swagger-java.adoc[Swagger Java] (camel-swagger-java) | 2.16 | Rest-dsl support for using swagger api-doc
 
 | link:camel-test/src/main/docs/test.adoc[Test] (camel-test) | 2.9 | Camel unit testing
@@ -1124,8 +1526,20 @@ Number of Miscellaneous Components: 33 in 33 JAR artifacts (0 deprecated)
 
 | link:camel-testcontainers-spring/src/main/docs/testcontainers-spring.adoc[Testcontainers Spring] (camel-testcontainers-spring) | 2.22 | Camel unit testing with Spring and testcontainers
 
+| link:camel-timer/src/main/docs/timer.adoc[Timer] (camel-timer) |  | Camel Timer component
+
+| link:camel-undertow/src/main/docs/undertow.adoc[Undertow] (camel-undertow) |  | Camel Components
+
+| link:camel-validator/src/main/docs/validator.adoc[Validator] (camel-validator) |  | Camel Validator component
+
+| link:camel-vm/src/main/docs/vm.adoc[Vm] (camel-vm) |  | Camel VM component
+
+| link:camel-xpath/src/main/docs/xpath.adoc[Xpath] (camel-xpath) |  | Camel XPath language
+
 | link:camel-aws-xray/src/main/docs/aws-xray.adoc[XRay] (camel-aws-xray) | 2.21 | Distributed tracing using AWS XRay
 
+| link:camel-xslt/src/main/docs/xslt.adoc[Xslt] (camel-xslt) |  | Camel XSLT component
+
 | link:camel-zipkin/src/main/docs/zipkin.adoc[Zipkin] (camel-zipkin) | 2.18 | Distributed message tracing using Zipkin
 |===
 // others: END