This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.7.x by this push:
new f63622c Regen
f63622c is described below
commit f63622c8f3aed62b368d4f7c0297e13e4bb4b6ae
Author: Claus Ibsen <[email protected]>
AuthorDate: Tue Aug 17 12:13:10 2021 +0200
Regen
---
.../camel/catalog/docs/content-enricher.adoc | 2 +-
.../camel/catalog/docs/datasonnet-language.adoc | 13 +++++++---
.../apache/camel/catalog/docs/groovy-language.adoc | 15 ++++++-----
.../camel/catalog/docs/message-translator.adoc | 2 +-
.../camel/catalog/docs/polling-consumer.adoc | 2 --
.../catalog/docs/publish-subscribe-channel.adoc | 2 +-
.../apache/camel/catalog/docs/rollback-eip.adoc | 10 --------
.../apache/camel/catalog/docs/spring-summary.adoc | 3 +--
.../apache/camel/catalog/docs/sql-component.adoc | 4 +--
.../camel/catalog/docs/transactional-client.adoc | 11 +++-----
.../apache/camel/catalog/docs/unmarshal-eip.adoc | 3 ++-
.../org/apache/camel/catalog/docs/wireTap-eip.adoc | 2 --
.../apache/camel/catalog/docs/xpath-language.adoc | 29 ++++++++++++++++------
.../camel/catalog/docs/xquery-component.adoc | 7 +-----
.../apache/camel/catalog/docs/xquery-language.adoc | 13 +++++-----
.../modules/ROOT/pages/spring-summary.adoc | 3 +--
.../modules/ROOT/pages/sql-component.adoc | 4 +--
.../modules/ROOT/pages/xquery-component.adoc | 7 +-----
.../languages/pages/datasonnet-language.adoc | 13 +++++++---
.../modules/languages/pages/groovy-language.adoc | 15 ++++++-----
.../modules/languages/pages/xpath-language.adoc | 29 ++++++++++++++++------
.../modules/languages/pages/xquery-language.adoc | 13 +++++-----
22 files changed, 113 insertions(+), 89 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/content-enricher.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/content-enricher.adoc
index 1a93ce1..1742d8f 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/content-enricher.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/content-enricher.adoc
@@ -14,7 +14,7 @@ image::eip/DataEnricher.gif[image]
[[ContentEnricher-ContentenrichmentusingaMessageTranslatororaProcessor]]
== Content enrichment using a Message Translator or a Processor
-You can use xref:latest@manual:ROOT:templating.adoc[Templating] to consume a
message from
+You can consume a message from
one destination, transform it with something like
xref:components::velocity-component.adoc[Velocity] or
xref:components::xquery-component.adoc[XQuery], and then send
it on to another destination. For example using InOnly (one way
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/datasonnet-language.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/datasonnet-language.adoc
index 85da719..47ec789 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/datasonnet-language.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/datasonnet-language.adoc
@@ -9,13 +9,20 @@
include::{cq-version}@camel-quarkus:ROOT:partial$reference/languages/datasonnet.
*Since Camel {since}*
-Camel supports https://datasonnet.com/[DataSonnet] transformations to allow an
Expression or Predicate to be used in the Java DSL or
xref:manual::xml-configuration.adoc[XML
-Configuration].
+Camel supports https://datasonnet.com/[DataSonnet] transformations to allow an
+xref:manual::expression.adoc[Expression] or
xref:manual::predicate.adoc[Predicate] to be
+used in the xref:manual::dsl.adoc[DSL].
+
+For example you could use DataSonnet to create an
+Predicate in a xref:{eip-vc}:eips:filter-eip.adoc[Message
+Filter] or as an Expression for a
+xref:{eip-vc}:eips:recipientList-eip.adoc[Recipient List].
To use a DataSonnet expression use the following Java code:
+
[source,java]
---------------------------------------
-... datasonnet("someDSExpression") ...
+datasonnet("someDSExpression")
---------------------------------------
== DataSonnet Options
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/groovy-language.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/groovy-language.adoc
index 40ba5fa..5f489f2 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/groovy-language.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/groovy-language.adoc
@@ -9,17 +9,20 @@
include::{cq-version}@camel-quarkus:ROOT:partial$reference/languages/groovy.adoc
*Since Camel {since}*
-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:manual::xml-configuration.adoc[Xml
-Configuration].
+Camel supports http://www.groovy-lang.org/[Groovy] to allow an
+xref:manual::expression.adoc[Expression] or
xref:manual::predicate.adoc[Predicate] to be
+used in the xref:manual::dsl.adoc[DSL].
+
+For example you could use Groovy to create an
+Predicate in a xref:{eip-vc}:eips:filter-eip.adoc[Message
+Filter] or as an Expression for a
+xref:{eip-vc}:eips:recipientList-eip.adoc[Recipient List].
To use a Groovy expression use the following Java code
[source,java]
---------------------------------------
-... groovy("someGroovyExpression") ...
+groovy("someGroovyExpression")
---------------------------------------
For example you could use the *groovy* function to create an
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/message-translator.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/message-translator.adoc
index 4974569..aef4c99 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/message-translator.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/message-translator.adoc
@@ -52,7 +52,7 @@ invoke a bean
</route>
----
-You can also use xref:latest@manual:ROOT:templating.adoc[Templating] to
consume a message
+You can consume a message
from one destination, transform it with something like
xref:components::velocity-component.adoc[Velocity] or
xref:components::xquery-component.adoc[XQuery] and then send
it on to another destination. For example using InOnly (one way
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/polling-consumer.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/polling-consumer.adoc
index 628bd34..7763604 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/polling-consumer.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/polling-consumer.adoc
@@ -421,5 +421,3 @@ defined in the
xref:latest@manual:ROOT:registry.adoc[Registry] with the bean id
from("file://inbox/?pollStrategy=#myPoll").to("activemq:queue:inbox")
----
-xref:latest@manual:ROOT:using-this-pattern.adoc[Using This Pattern]
-
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/publish-subscribe-channel.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/publish-subscribe-channel.adoc
index c9b7c5e..55f2fe4 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/publish-subscribe-channel.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/publish-subscribe-channel.adoc
@@ -23,7 +23,7 @@ image::eip/PublishSubscribeSolution.gif[image]
Another option is to explicitly list the publish-subscribe relationship
in your routing logic; this keeps the producer and consumer decoupled
but lets you control the fine grained routing configuration using the
-xref:latest@manual:ROOT:dsl.adoc[DSL] or
xref:latest@manual:ROOT:xml-configuration.adoc[Xml Configuration].
+xref:latest@manual:ROOT:dsl.adoc[DSL].
In Java code:
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/rollback-eip.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/rollback-eip.adoc
index 28fa95d..3bfff96 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/rollback-eip.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/rollback-eip.adoc
@@ -186,16 +186,6 @@ then we configure our routes. Notice that all we have to
do is mark the
route as transacted using the *transacted*
tag.https://github.com/apache/camel/blob/master/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionMinimalConfigurationTest.xml[TransactionMinimalConfigurationTest.xml]
-Transaction error handler
-
-When a route is marked as transacted using *transacted* Camel will
-automatic use the
-xref:latest@manual:ROOT:transactionerrorhandler.adoc[TransactionErrorHandler]
as
-xref:latest@manual:ROOT:error-handler.adoc[Error Handler]. It supports
basically the same
-feature set as the
xref:latest@manual:ROOT:defaulterrorhandler.adoc[DefaultErrorHandler],
-so you can for instance use
xref:latest@manual:ROOT:exception-clause.adoc[Exception Clause]
-as well.
-
== Integration Testing with Spring
An Integration Test here means a test runner class annotated
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/spring-summary.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/spring-summary.adoc
index 64bef77..f96ed0e 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/spring-summary.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/spring-summary.adoc
@@ -215,8 +215,7 @@ above in the `<packageScan>` documentation.
== How do I import routes from other XML files
-When defining routes in Camel using xref:manual::xml-configuration.adoc[Xml
-Configuration] you may want to define some routes in other XML files.
+When defining routes in Camel using Spring XML 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
also want to store common and reusable routes in other XML files, which
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sql-component.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sql-component.adoc
index 4f36406..4de6cd1 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sql-component.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sql-component.adoc
@@ -235,8 +235,8 @@ You can use the option `useMessageBodyForSql` that
allows to use the message body as the SQL statement, and then the SQL
parameters must be provided in a header with the
key `SqlConstants.SQL_PARAMETERS`. This allows the SQL component to work
-more dynamically as the SQL query is from the message body. Use
-xref:manual::templating.adoc[Camel templating]
+more dynamically as the SQL query is from the message body. Use templating
+(such as xref:components::velocity-component.adoc[Velocity],
xref:components::freemarker-component.adoc[Freemarker])
for conditional processing, e.g. to include or exclude `where` clauses
depending on the presence of query parameters.
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/transactional-client.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/transactional-client.adoc
index 4da29f4..65c6a9c 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/transactional-client.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/transactional-client.adoc
@@ -288,13 +288,10 @@ route as transacted using the *transacted* tag.
=== Transaction error handler
When a route is marked as transacted using *transacted* Camel will
-automatic use the
-xref:latest@manual:ROOT:transactionerrorhandler.adoc[TransactionErrorHandler]
-as xref:latest@manual:ROOT:error-handler.adoc[Error Handler].
-It supports basically the same feature set as the
-xref:latest@manual:ROOT:defaulterrorhandler.adoc[DefaultErrorHandler],
-so you can for instance use
-xref:latest@manual:ROOT:exception-clause.adoc[Exception Clause]
+automatic use `TransactionErrorHandler` as the
+xref:latest@manual:ROOT:error-handler.adoc[Error Handler]. This error handler
supports basically the same
+feature set as the
xref:latest@manual:ROOT:defaulterrorhandler.adoc[DefaultErrorHandler],
+so you can for instance use
xref:latest@manual:ROOT:exception-clause.adoc[Exception Clause]
as well.
[[TransactionalClient-IntegrationTestingwithSpring]]
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/unmarshal-eip.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/unmarshal-eip.adoc
index c9f15be..d998681 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/unmarshal-eip.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/unmarshal-eip.adoc
@@ -1,7 +1,8 @@
[[unmarshal-eip]]
= Unmarshal EIP
-If you receive a message from one of the Camel
xref:components::index.adoc[Components] such as
xref:components::file-component.adoc[File],
xref:components::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:latest@manual:ROOT:bean-integration.adoc[Bean Integration] or perform
xref:latest@manual:ROOT:predicate.adoc[Predicate] evaluation and so forth. To
do this use the *unm [...]
+If you receive a message from one of the Camel
xref:components::index.adoc[Components] such as
xref:components::file-component.adoc[File],
xref:components::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:latest@manual:ROOT:bean-integration.adoc[Bean Integration] or perform
xref:latest@manual:ROOT:predicate.adoc[Predicate] evaluation and so forth.
+
== Options
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/wireTap-eip.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/wireTap-eip.adoc
index 2ffc610..7316edf 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/wireTap-eip.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/wireTap-eip.adoc
@@ -204,5 +204,3 @@ The following example sends a new message which has
== Using `onPrepare` to Execute Custom Logic when Preparing Messages
See details at xref:multicast-eip.adoc[Multicast]
-
-xref:latest@manual:ROOT:using-this-pattern.adoc[Using This Pattern]
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xpath-language.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xpath-language.adoc
index 5e7d3c5..b1a9768 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xpath-language.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xpath-language.adoc
@@ -10,12 +10,13 @@
include::{cq-version}@camel-quarkus:ROOT:partial$reference/languages/xpath.adoc[
*Since Camel {since}*
Camel supports http://www.w3.org/TR/xpath[XPath] to allow an
-Expression or Predicate to be
-used in the DSL or xref:manual::xml-configuration.adoc[Xml
-Configuration]. For example you could use XPath to create an
+xref:manual::expression.adoc[Expression] or
xref:manual::predicate.adoc[Predicate] to be
+used in the xref:manual::dsl.adoc[DSL].
+
+For example you could use XPath to create an
Predicate in a xref:{eip-vc}:eips:filter-eip.adoc[Message
Filter] or as an Expression for a
-Recipient List.
+xref:{eip-vc}:eips:recipientList-eip.adoc[Recipient List].
*Streams*
@@ -228,14 +229,14 @@ shown:
== Examples
Here is a simple
-https://github.com/apache/camel/blob/master/camel-core/src/test/java/org/apache/camel/processor/XPathFilterTest.java[example]
+https://github.com/apache/camel/blob/main/core/camel-core/src/test/java/org/apache/camel/processor/XPathFilterTest.java[example]
using an XPath expression as a predicate in a
Message Filter
If you have a standard set of namespaces you wish to work with and wish
to share them across many different XPath expressions you can use the
NamespaceBuilder as shown
-https://github.com/apache/camel/blob/master/camel-core/src/test/java/org/apache/camel/processor/XPathWithNamespaceBuilderFilterTest.java[in
+https://github.com/apache/camel/blob/main/core/camel-core/src/test/java/org/apache/camel/processor/XPathWithNamespaceBuilderFilterTest.java[in
this example]
In this sample we have a choice construct. The first choice evaulates if
@@ -497,6 +498,20 @@ eg to refer to a file on the classpath you can do:
== Dependencies
-The XPath language is part of camel-core.
+To use XPath in your camel routes you need to add the a dependency on
+*camel-xpath* which implements the XPath language.
+
+If you use maven you could just add the following to your pom.xml,
+substituting the version number for the latest & greatest release (see
+the download page for the latest versions).
+
+[source,xml]
+--------------------------------------
+<dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-xpath</artifactId>
+ <version>x.x.x</version>
+</dependency>
+--------------------------------------
include::{page-component-version}@camel-spring-boot::page$xpath-starter.adoc[]
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xquery-component.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xquery-component.adoc
index 83c49cf..222f26a 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xquery-component.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xquery-component.adoc
@@ -12,12 +12,7 @@
include::{cq-version}@camel-quarkus:ROOT:partial$reference/components/xquery.ado
*{component-header}*
-Camel supports http://www.w3.org/TR/xquery/[XQuery] to allow an
-Expression or Predicate to be
-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:{eip-vc}:eips:filter-eip.adoc[Message
-Filter] or as an Expression for a Recipient List.
+Camel supports http://www.w3.org/TR/xquery/[XQuery] component for message
transformation
== Options
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xquery-language.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xquery-language.adoc
index 44a5668..76ccd4c 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xquery-language.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xquery-language.adoc
@@ -10,12 +10,13 @@
include::{cq-version}@camel-quarkus:ROOT:partial$reference/languages/xquery.adoc
*Since Camel {since}*
Camel supports http://www.w3.org/TR/xquery/[XQuery] to allow an
-Expression or Predicate to be
-used in the DSL or xref:manual::xml-configuration.adoc[Xml
-Configuration]. For example you could use XQuery to create an
+xref:manual::expression.adoc[Expression] or
xref:manual::predicate.adoc[Predicate] to be
+used in the xref:manual::dsl.adoc[DSL].
+
+For example you could use XQuery to create an
Predicate in a xref:{eip-vc}:eips:filter-eip.adoc[Message
Filter] or as an Expression for a
-Recipient List.
+xref:{eip-vc}:eips:recipientList-eip.adoc[Recipient List].
== XQuery Language options
@@ -116,7 +117,7 @@ attribute:
[source,xml]
-------------------------------------------------------------------------------
- <xquery type="java.lang.String">concat('mock:foo.', /person/@city)</xquery>
+<xquery type="java.lang.String">concat('mock:foo.', /person/@city)</xquery>
-------------------------------------------------------------------------------
== Learning XQuery
@@ -153,7 +154,7 @@ If you use maven you could just add the following to your
pom.xml,
substituting the version number for the latest & greatest release (see
the download page for the latest versions).
-[source,java]
+[source,xml]
--------------------------------------
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/docs/components/modules/ROOT/pages/spring-summary.adoc
b/docs/components/modules/ROOT/pages/spring-summary.adoc
index 972ddc8..127611a 100644
--- a/docs/components/modules/ROOT/pages/spring-summary.adoc
+++ b/docs/components/modules/ROOT/pages/spring-summary.adoc
@@ -217,8 +217,7 @@ above in the `<packageScan>` documentation.
== How do I import routes from other XML files
-When defining routes in Camel using xref:manual::xml-configuration.adoc[Xml
-Configuration] you may want to define some routes in other XML files.
+When defining routes in Camel using Spring XML 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
also want to store common and reusable routes in other XML files, which
diff --git a/docs/components/modules/ROOT/pages/sql-component.adoc
b/docs/components/modules/ROOT/pages/sql-component.adoc
index 73de3ae..f211ff9 100644
--- a/docs/components/modules/ROOT/pages/sql-component.adoc
+++ b/docs/components/modules/ROOT/pages/sql-component.adoc
@@ -237,8 +237,8 @@ You can use the option `useMessageBodyForSql` that
allows to use the message body as the SQL statement, and then the SQL
parameters must be provided in a header with the
key `SqlConstants.SQL_PARAMETERS`. This allows the SQL component to work
-more dynamically as the SQL query is from the message body. Use
-xref:manual::templating.adoc[Camel templating]
+more dynamically as the SQL query is from the message body. Use templating
+(such as xref:components::velocity-component.adoc[Velocity],
xref:components::freemarker-component.adoc[Freemarker])
for conditional processing, e.g. to include or exclude `where` clauses
depending on the presence of query parameters.
diff --git a/docs/components/modules/ROOT/pages/xquery-component.adoc
b/docs/components/modules/ROOT/pages/xquery-component.adoc
index c9d2b31..28ff90b 100644
--- a/docs/components/modules/ROOT/pages/xquery-component.adoc
+++ b/docs/components/modules/ROOT/pages/xquery-component.adoc
@@ -14,12 +14,7 @@
include::{cq-version}@camel-quarkus:ROOT:partial$reference/components/xquery.ado
*{component-header}*
-Camel supports http://www.w3.org/TR/xquery/[XQuery] to allow an
-Expression or Predicate to be
-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:{eip-vc}:eips:filter-eip.adoc[Message
-Filter] or as an Expression for a Recipient List.
+Camel supports http://www.w3.org/TR/xquery/[XQuery] component for message
transformation
== Options
diff --git a/docs/components/modules/languages/pages/datasonnet-language.adoc
b/docs/components/modules/languages/pages/datasonnet-language.adoc
index c985bd2..3ac73da 100644
--- a/docs/components/modules/languages/pages/datasonnet-language.adoc
+++ b/docs/components/modules/languages/pages/datasonnet-language.adoc
@@ -11,13 +11,20 @@
include::{cq-version}@camel-quarkus:ROOT:partial$reference/languages/datasonnet.
*Since Camel {since}*
-Camel supports https://datasonnet.com/[DataSonnet] transformations to allow an
Expression or Predicate to be used in the Java DSL or
xref:manual::xml-configuration.adoc[XML
-Configuration].
+Camel supports https://datasonnet.com/[DataSonnet] transformations to allow an
+xref:manual::expression.adoc[Expression] or
xref:manual::predicate.adoc[Predicate] to be
+used in the xref:manual::dsl.adoc[DSL].
+
+For example you could use DataSonnet to create an
+Predicate in a xref:{eip-vc}:eips:filter-eip.adoc[Message
+Filter] or as an Expression for a
+xref:{eip-vc}:eips:recipientList-eip.adoc[Recipient List].
To use a DataSonnet expression use the following Java code:
+
[source,java]
---------------------------------------
-... datasonnet("someDSExpression") ...
+datasonnet("someDSExpression")
---------------------------------------
== DataSonnet Options
diff --git a/docs/components/modules/languages/pages/groovy-language.adoc
b/docs/components/modules/languages/pages/groovy-language.adoc
index fcc0d57..1e6abfa 100644
--- a/docs/components/modules/languages/pages/groovy-language.adoc
+++ b/docs/components/modules/languages/pages/groovy-language.adoc
@@ -11,17 +11,20 @@
include::{cq-version}@camel-quarkus:ROOT:partial$reference/languages/groovy.adoc
*Since Camel {since}*
-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:manual::xml-configuration.adoc[Xml
-Configuration].
+Camel supports http://www.groovy-lang.org/[Groovy] to allow an
+xref:manual::expression.adoc[Expression] or
xref:manual::predicate.adoc[Predicate] to be
+used in the xref:manual::dsl.adoc[DSL].
+
+For example you could use Groovy to create an
+Predicate in a xref:{eip-vc}:eips:filter-eip.adoc[Message
+Filter] or as an Expression for a
+xref:{eip-vc}:eips:recipientList-eip.adoc[Recipient List].
To use a Groovy expression use the following Java code
[source,java]
---------------------------------------
-... groovy("someGroovyExpression") ...
+groovy("someGroovyExpression")
---------------------------------------
For example you could use the *groovy* function to create an
diff --git a/docs/components/modules/languages/pages/xpath-language.adoc
b/docs/components/modules/languages/pages/xpath-language.adoc
index 799d06c..705905e 100644
--- a/docs/components/modules/languages/pages/xpath-language.adoc
+++ b/docs/components/modules/languages/pages/xpath-language.adoc
@@ -12,12 +12,13 @@
include::{cq-version}@camel-quarkus:ROOT:partial$reference/languages/xpath.adoc[
*Since Camel {since}*
Camel supports http://www.w3.org/TR/xpath[XPath] to allow an
-Expression or Predicate to be
-used in the DSL or xref:manual::xml-configuration.adoc[Xml
-Configuration]. For example you could use XPath to create an
+xref:manual::expression.adoc[Expression] or
xref:manual::predicate.adoc[Predicate] to be
+used in the xref:manual::dsl.adoc[DSL].
+
+For example you could use XPath to create an
Predicate in a xref:{eip-vc}:eips:filter-eip.adoc[Message
Filter] or as an Expression for a
-Recipient List.
+xref:{eip-vc}:eips:recipientList-eip.adoc[Recipient List].
*Streams*
@@ -230,14 +231,14 @@ shown:
== Examples
Here is a simple
-https://github.com/apache/camel/blob/master/camel-core/src/test/java/org/apache/camel/processor/XPathFilterTest.java[example]
+https://github.com/apache/camel/blob/main/core/camel-core/src/test/java/org/apache/camel/processor/XPathFilterTest.java[example]
using an XPath expression as a predicate in a
Message Filter
If you have a standard set of namespaces you wish to work with and wish
to share them across many different XPath expressions you can use the
NamespaceBuilder as shown
-https://github.com/apache/camel/blob/master/camel-core/src/test/java/org/apache/camel/processor/XPathWithNamespaceBuilderFilterTest.java[in
+https://github.com/apache/camel/blob/main/core/camel-core/src/test/java/org/apache/camel/processor/XPathWithNamespaceBuilderFilterTest.java[in
this example]
In this sample we have a choice construct. The first choice evaulates if
@@ -499,6 +500,20 @@ eg to refer to a file on the classpath you can do:
== Dependencies
-The XPath language is part of camel-core.
+To use XPath in your camel routes you need to add the a dependency on
+*camel-xpath* which implements the XPath language.
+
+If you use maven you could just add the following to your pom.xml,
+substituting the version number for the latest & greatest release (see
+the download page for the latest versions).
+
+[source,xml]
+--------------------------------------
+<dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-xpath</artifactId>
+ <version>x.x.x</version>
+</dependency>
+--------------------------------------
include::{page-component-version}@camel-spring-boot::page$xpath-starter.adoc[]
diff --git a/docs/components/modules/languages/pages/xquery-language.adoc
b/docs/components/modules/languages/pages/xquery-language.adoc
index 7bb71b0..0a82120 100644
--- a/docs/components/modules/languages/pages/xquery-language.adoc
+++ b/docs/components/modules/languages/pages/xquery-language.adoc
@@ -12,12 +12,13 @@
include::{cq-version}@camel-quarkus:ROOT:partial$reference/languages/xquery.adoc
*Since Camel {since}*
Camel supports http://www.w3.org/TR/xquery/[XQuery] to allow an
-Expression or Predicate to be
-used in the DSL or xref:manual::xml-configuration.adoc[Xml
-Configuration]. For example you could use XQuery to create an
+xref:manual::expression.adoc[Expression] or
xref:manual::predicate.adoc[Predicate] to be
+used in the xref:manual::dsl.adoc[DSL].
+
+For example you could use XQuery to create an
Predicate in a xref:{eip-vc}:eips:filter-eip.adoc[Message
Filter] or as an Expression for a
-Recipient List.
+xref:{eip-vc}:eips:recipientList-eip.adoc[Recipient List].
== XQuery Language options
@@ -118,7 +119,7 @@ attribute:
[source,xml]
-------------------------------------------------------------------------------
- <xquery type="java.lang.String">concat('mock:foo.', /person/@city)</xquery>
+<xquery type="java.lang.String">concat('mock:foo.', /person/@city)</xquery>
-------------------------------------------------------------------------------
== Learning XQuery
@@ -155,7 +156,7 @@ If you use maven you could just add the following to your
pom.xml,
substituting the version number for the latest & greatest release (see
the download page for the latest versions).
-[source,java]
+[source,xml]
--------------------------------------
<dependency>
<groupId>org.apache.camel</groupId>
