You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2021/08/17 07:30:08 UTC
[camel] 01/15: Polish and cleanup documentation
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0a254ccd9428995d66f39d5e530644e97b2757b0
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Aug 16 12:50:04 2021 +0200
Polish and cleanup documentation
---
.../camel/catalog/docs/datasonnet-language.adoc | 13 ++++++--
.../apache/camel/catalog/docs/groovy-language.adoc | 21 +++++-------
.../catalog/docs/publish-subscribe-channel.adoc | 2 +-
.../apache/camel/catalog/docs/spring-summary.adoc | 3 +-
.../apache/camel/catalog/docs/unmarshal-eip.adoc | 3 +-
.../apache/camel/catalog/docs/xpath-language.adoc | 39 +++++++++++-----------
.../camel/catalog/docs/xquery-component.adoc | 9 ++---
.../apache/camel/catalog/docs/xquery-language.adoc | 13 ++++----
.../src/main/docs/datasonnet-language.adoc | 13 ++++++--
.../src/main/docs/groovy-language.adoc | 21 +++++-------
.../src/main/docs/xquery-component.adoc | 9 ++---
.../camel-saxon/src/main/docs/xquery-language.adoc | 13 ++++----
.../camel-spring/src/main/docs/spring-summary.adoc | 3 +-
.../camel-xpath/src/main/docs/xpath-language.adoc | 39 +++++++++++-----------
.../eips/pages/publish-subscribe-channel.adoc | 2 +-
.../docs/modules/eips/pages/unmarshal-eip.adoc | 3 +-
.../modules/ROOT/pages/spring-summary.adoc | 3 +-
.../modules/ROOT/pages/xquery-component.adoc | 9 ++---
.../languages/pages/datasonnet-language.adoc | 13 ++++++--
.../modules/languages/pages/groovy-language.adoc | 21 +++++-------
.../modules/languages/pages/xpath-language.adoc | 39 +++++++++++-----------
.../modules/languages/pages/xquery-language.adoc | 13 ++++----
docs/user-manual/modules/ROOT/nav.adoc | 1 -
.../modules/ROOT/pages/data-format.adoc | 3 +-
.../modules/ROOT/pages/getting-started.adoc | 3 +-
docs/user-manual/modules/ROOT/pages/index.adoc | 9 +----
docs/user-manual/modules/ROOT/pages/spring.adoc | 8 ++---
.../modules/ROOT/pages/xml-configuration.adoc | 16 ---------
...how-do-i-import-rests-from-other-xml-files.adoc | 3 +-
...ow-do-i-import-routes-from-other-xml-files.adoc | 2 +-
.../how-do-i-use-uris-with-parameters-in-xml.adoc | 3 +-
.../modules/faq/pages/is-there-an-ide.adoc | 3 +-
.../modules/faq/pages/what-is-camel.adoc | 5 +--
33 files changed, 165 insertions(+), 195 deletions(-)
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 39eece1..03e8085 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..a767a59 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
@@ -114,16 +117,12 @@ And the Spring DSL:
== Additional arguments to ScriptingEngine
-*Since Camel 2.8*
-
You can provide additional arguments to the `ScriptingEngine` using a
header on the Camel message with the key `CamelScriptArguments`. +
See this example:
== Loading script from external resource
-*Since Camel 2.11*
-
You can externalize the script and have Camel load it from a resource
such as `"classpath:"`, `"file:"`, or `"http:"`. +
This is done using the following syntax: `"resource:scheme:location"`,
@@ -136,8 +135,6 @@ eg to refer to a file on the classpath you can do:
== How to get the result from multiple statements script
-*Since Camel 2.14*
-
As the scripteengine evaluate method just return a Null if it runs a
multiple statements script. Camel now look up the value of script result
by using the key of "result" from the value set. If you have multiple
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/spring-summary.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/spring-summary.adoc
index fa93d8e..f56472d 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/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/xpath-language.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xpath-language.adoc
index fe007d12..bc4f79d 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*
@@ -212,8 +213,6 @@ type so the concat function works.
== Using XPath on Headers
-*Since Camel 2.11*
-
Some users may have XML stored in a header. To apply an XPath to a
header's value you can do this by defining the 'headerName' attribute.
@@ -279,8 +278,6 @@ public class Foo {
== Using XPathBuilder without an Exchange
-*Since Camel 2.3*
-
You can now use the `org.apache.camel.builder.XPathBuilder` without the
need for an Exchange. This comes handy if you want
to use it as a helper to do custom xpath evaluations.
@@ -319,8 +316,6 @@ String name = XPathBuilder.xpath("foo/bar").evaluate(context, "<foo><bar>cheese<
== Using Saxon with XPathBuilder
-*Since Camel 2.3*
-
You need to add *camel-saxon* as dependency to your project.
Its now easier to use http://saxon.sourceforge.net/[Saxon] with the
@@ -334,8 +329,6 @@ The easy one
== Setting a custom XPathFactory using System Property
-*Since Camel 2.3*
-
Camel now supports reading the
http://java.sun.com/j2se/1.5.0/docs/api/javax/xml/xpath/XPathFactory.html#newInstance(java.lang.String)[JVM
system property `javax.xml.xpath.XPathFactory`] that can be used to set
@@ -361,8 +354,6 @@ To use Apache Xerces you can configure the system property
== Enabling Saxon from Spring DSL
-*Since Camel 2.10*
-
Similarly to Java DSL, to enable Saxon from Spring DSL you have three
options:
@@ -389,8 +380,6 @@ Shortcut
== Namespace auditing to aid debugging
-*Since Camel 2.10*
-
A large number of XPath-related issues that users frequently face are
linked to the usage of namespaces. You may have some misalignment
between the namespaces present in your message and those that your XPath
@@ -483,8 +472,6 @@ xmlns:b=[http://apache.org/camelA, http://apache.org/camelB]}
== Loading script from external resource
-*Since Camel 2.11*
-
You can externalize the script and have Camel load it from a resource
such as `"classpath:"`, `"file:"`, or `"http:"`. +
This is done using the following syntax: `"resource:scheme:location"`,
@@ -497,6 +484,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 a359565..e602b19 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
// component-configure options: START
== Configuring Options
@@ -219,7 +214,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>
-------------------------------------------------------------------------------
== Using XQuery as transformation
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/components/camel-datasonnet/src/main/docs/datasonnet-language.adoc b/components/camel-datasonnet/src/main/docs/datasonnet-language.adoc
index 39eece1..03e8085 100644
--- a/components/camel-datasonnet/src/main/docs/datasonnet-language.adoc
+++ b/components/camel-datasonnet/src/main/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/components/camel-groovy/src/main/docs/groovy-language.adoc b/components/camel-groovy/src/main/docs/groovy-language.adoc
index 40ba5fa..a767a59 100644
--- a/components/camel-groovy/src/main/docs/groovy-language.adoc
+++ b/components/camel-groovy/src/main/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
@@ -114,16 +117,12 @@ And the Spring DSL:
== Additional arguments to ScriptingEngine
-*Since Camel 2.8*
-
You can provide additional arguments to the `ScriptingEngine` using a
header on the Camel message with the key `CamelScriptArguments`. +
See this example:
== Loading script from external resource
-*Since Camel 2.11*
-
You can externalize the script and have Camel load it from a resource
such as `"classpath:"`, `"file:"`, or `"http:"`. +
This is done using the following syntax: `"resource:scheme:location"`,
@@ -136,8 +135,6 @@ eg to refer to a file on the classpath you can do:
== How to get the result from multiple statements script
-*Since Camel 2.14*
-
As the scripteengine evaluate method just return a Null if it runs a
multiple statements script. Camel now look up the value of script result
by using the key of "result" from the value set. If you have multiple
diff --git a/components/camel-saxon/src/main/docs/xquery-component.adoc b/components/camel-saxon/src/main/docs/xquery-component.adoc
index a359565..e602b19 100644
--- a/components/camel-saxon/src/main/docs/xquery-component.adoc
+++ b/components/camel-saxon/src/main/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
// component-configure options: START
== Configuring Options
@@ -219,7 +214,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>
-------------------------------------------------------------------------------
== Using XQuery as transformation
diff --git a/components/camel-saxon/src/main/docs/xquery-language.adoc b/components/camel-saxon/src/main/docs/xquery-language.adoc
index 44a5668..76ccd4c 100644
--- a/components/camel-saxon/src/main/docs/xquery-language.adoc
+++ b/components/camel-saxon/src/main/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/components/camel-spring/src/main/docs/spring-summary.adoc b/components/camel-spring/src/main/docs/spring-summary.adoc
index fa93d8e..f56472d 100644
--- a/components/camel-spring/src/main/docs/spring-summary.adoc
+++ b/components/camel-spring/src/main/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/components/camel-xpath/src/main/docs/xpath-language.adoc b/components/camel-xpath/src/main/docs/xpath-language.adoc
index fe007d12..bc4f79d 100644
--- a/components/camel-xpath/src/main/docs/xpath-language.adoc
+++ b/components/camel-xpath/src/main/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*
@@ -212,8 +213,6 @@ type so the concat function works.
== Using XPath on Headers
-*Since Camel 2.11*
-
Some users may have XML stored in a header. To apply an XPath to a
header's value you can do this by defining the 'headerName' attribute.
@@ -279,8 +278,6 @@ public class Foo {
== Using XPathBuilder without an Exchange
-*Since Camel 2.3*
-
You can now use the `org.apache.camel.builder.XPathBuilder` without the
need for an Exchange. This comes handy if you want
to use it as a helper to do custom xpath evaluations.
@@ -319,8 +316,6 @@ String name = XPathBuilder.xpath("foo/bar").evaluate(context, "<foo><bar>cheese<
== Using Saxon with XPathBuilder
-*Since Camel 2.3*
-
You need to add *camel-saxon* as dependency to your project.
Its now easier to use http://saxon.sourceforge.net/[Saxon] with the
@@ -334,8 +329,6 @@ The easy one
== Setting a custom XPathFactory using System Property
-*Since Camel 2.3*
-
Camel now supports reading the
http://java.sun.com/j2se/1.5.0/docs/api/javax/xml/xpath/XPathFactory.html#newInstance(java.lang.String)[JVM
system property `javax.xml.xpath.XPathFactory`] that can be used to set
@@ -361,8 +354,6 @@ To use Apache Xerces you can configure the system property
== Enabling Saxon from Spring DSL
-*Since Camel 2.10*
-
Similarly to Java DSL, to enable Saxon from Spring DSL you have three
options:
@@ -389,8 +380,6 @@ Shortcut
== Namespace auditing to aid debugging
-*Since Camel 2.10*
-
A large number of XPath-related issues that users frequently face are
linked to the usage of namespaces. You may have some misalignment
between the namespaces present in your message and those that your XPath
@@ -483,8 +472,6 @@ xmlns:b=[http://apache.org/camelA, http://apache.org/camelB]}
== Loading script from external resource
-*Since Camel 2.11*
-
You can externalize the script and have Camel load it from a resource
such as `"classpath:"`, `"file:"`, or `"http:"`. +
This is done using the following syntax: `"resource:scheme:location"`,
@@ -497,6 +484,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/core/camel-core-engine/src/main/docs/modules/eips/pages/publish-subscribe-channel.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/publish-subscribe-channel.adoc
index c9b7c5e..55f2fe4 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/publish-subscribe-channel.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/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/core/camel-core-engine/src/main/docs/modules/eips/pages/unmarshal-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/unmarshal-eip.adoc
index c9f15be..d998681 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/unmarshal-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/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/docs/components/modules/ROOT/pages/spring-summary.adoc b/docs/components/modules/ROOT/pages/spring-summary.adoc
index 31e91d2..91c157e 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/xquery-component.adoc b/docs/components/modules/ROOT/pages/xquery-component.adoc
index 6bb12d0..7da682a 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
// component-configure options: START
== Configuring Options
@@ -221,7 +216,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>
-------------------------------------------------------------------------------
== Using XQuery as transformation
diff --git a/docs/components/modules/languages/pages/datasonnet-language.adoc b/docs/components/modules/languages/pages/datasonnet-language.adoc
index 0cc6dd6..fb832d1 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..e4cf0a0 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
@@ -116,16 +119,12 @@ And the Spring DSL:
== Additional arguments to ScriptingEngine
-*Since Camel 2.8*
-
You can provide additional arguments to the `ScriptingEngine` using a
header on the Camel message with the key `CamelScriptArguments`. +
See this example:
== Loading script from external resource
-*Since Camel 2.11*
-
You can externalize the script and have Camel load it from a resource
such as `"classpath:"`, `"file:"`, or `"http:"`. +
This is done using the following syntax: `"resource:scheme:location"`,
@@ -138,8 +137,6 @@ eg to refer to a file on the classpath you can do:
== How to get the result from multiple statements script
-*Since Camel 2.14*
-
As the scripteengine evaluate method just return a Null if it runs a
multiple statements script. Camel now look up the value of script result
by using the key of "result" from the value set. If you have multiple
diff --git a/docs/components/modules/languages/pages/xpath-language.adoc b/docs/components/modules/languages/pages/xpath-language.adoc
index 00b1647..616b0e4 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*
@@ -214,8 +215,6 @@ type so the concat function works.
== Using XPath on Headers
-*Since Camel 2.11*
-
Some users may have XML stored in a header. To apply an XPath to a
header's value you can do this by defining the 'headerName' attribute.
@@ -281,8 +280,6 @@ public class Foo {
== Using XPathBuilder without an Exchange
-*Since Camel 2.3*
-
You can now use the `org.apache.camel.builder.XPathBuilder` without the
need for an Exchange. This comes handy if you want
to use it as a helper to do custom xpath evaluations.
@@ -321,8 +318,6 @@ String name = XPathBuilder.xpath("foo/bar").evaluate(context, "<foo><bar>cheese<
== Using Saxon with XPathBuilder
-*Since Camel 2.3*
-
You need to add *camel-saxon* as dependency to your project.
Its now easier to use http://saxon.sourceforge.net/[Saxon] with the
@@ -336,8 +331,6 @@ The easy one
== Setting a custom XPathFactory using System Property
-*Since Camel 2.3*
-
Camel now supports reading the
http://java.sun.com/j2se/1.5.0/docs/api/javax/xml/xpath/XPathFactory.html#newInstance(java.lang.String)[JVM
system property `javax.xml.xpath.XPathFactory`] that can be used to set
@@ -363,8 +356,6 @@ To use Apache Xerces you can configure the system property
== Enabling Saxon from Spring DSL
-*Since Camel 2.10*
-
Similarly to Java DSL, to enable Saxon from Spring DSL you have three
options:
@@ -391,8 +382,6 @@ Shortcut
== Namespace auditing to aid debugging
-*Since Camel 2.10*
-
A large number of XPath-related issues that users frequently face are
linked to the usage of namespaces. You may have some misalignment
between the namespaces present in your message and those that your XPath
@@ -485,8 +474,6 @@ xmlns:b=[http://apache.org/camelA, http://apache.org/camelB]}
== Loading script from external resource
-*Since Camel 2.11*
-
You can externalize the script and have Camel load it from a resource
such as `"classpath:"`, `"file:"`, or `"http:"`. +
This is done using the following syntax: `"resource:scheme:location"`,
@@ -499,6 +486,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>
diff --git a/docs/user-manual/modules/ROOT/nav.adoc b/docs/user-manual/modules/ROOT/nav.adoc
index d65554c..af14584 100644
--- a/docs/user-manual/modules/ROOT/nav.adoc
+++ b/docs/user-manual/modules/ROOT/nav.adoc
@@ -22,7 +22,6 @@
** xref:testing.adoc[Testing]
** xref:rest-dsl.adoc[Working with REST and Rest DSL]
** xref:writing-components.adoc[Writing Components]
-** xref:xml-configuration.adoc[XML Configuration]
** xref:release-guide.adoc[Release guide]
** xref:improving-the-documentation.adoc[Improving the Documentation]
* xref:migration-and-upgrade.adoc[Migration and Upgrade]
diff --git a/docs/user-manual/modules/ROOT/pages/data-format.adoc b/docs/user-manual/modules/ROOT/pages/data-format.adoc
index bd74d8a..c05f6bc 100644
--- a/docs/user-manual/modules/ROOT/pages/data-format.adoc
+++ b/docs/user-manual/modules/ROOT/pages/data-format.adoc
@@ -18,8 +18,7 @@ xref:components::http-component.adoc[HTTP] or xref:components::jms-component.ado
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
-the `unmarshal` word in the xref:dsl.adoc[DSL] in Java or the
-xref:xml-configuration.adoc[XML DSL].
+the `unmarshal` word in the xref:dsl.adoc[DSL].
For example:
diff --git a/docs/user-manual/modules/ROOT/pages/getting-started.adoc b/docs/user-manual/modules/ROOT/pages/getting-started.adoc
index 42c3d6c..da8ee05 100644
--- a/docs/user-manual/modules/ROOT/pages/getting-started.adoc
+++ b/docs/user-manual/modules/ROOT/pages/getting-started.adoc
@@ -11,8 +11,7 @@ documentation before continuing:
* Longer xref:book-getting-started.adoc[Getting Started Guide]
* Find out about xref:{eip-vc}:eips:enterprise-integration-patterns.adoc[Enterprise Integration Patterns]
and how to implement them with Camel
-* Review the xref:architecture.adoc[Architecture guide] to see how to build Routes using the xref:java-dsl.adoc[Java DSL]
- or xref:xml-configuration.adoc[XML DSL]
+* Review the xref:architecture.adoc[Architecture guide] to see how to build Routes using the xref:dsl.adoc[DSL].
== Working with CamelContexts and RouteBuilders
diff --git a/docs/user-manual/modules/ROOT/pages/index.adoc b/docs/user-manual/modules/ROOT/pages/index.adoc
index cb1353f..44bc857 100644
--- a/docs/user-manual/modules/ROOT/pages/index.adoc
+++ b/docs/user-manual/modules/ROOT/pages/index.adoc
@@ -5,10 +5,7 @@ known xref:{eip-vc}:eips:enterprise-integration-patterns.adoc[Enterprise Integra
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
-xref:using-osgi-blueprint-with-camel.adoc[Blueprint]
-xref:xml-configuration.adoc[XML Configuration] files.
+domain-specific languages (xref:manual::dsl.adoc[DSL], such as Java, XML, Groovy, Kotlin, and YAML).
This means you get smart completion of
routing rules in your IDE, whether in a Java or XML editor.
@@ -57,9 +54,6 @@ For a deeper and better understanding of Apache Camel, an xref:faq:what-is-camel
* xref:using-propertyplaceholder.adoc[How to use Camel property placeholders]
* xref:examples.adoc[Examples]
* xref:testing.adoc[Testing]
-* xref:xml-configuration.adoc[XML Configuration]
-* [Using CamelProxy] for how to use proxies for clients to easily invoke
-camel routes without them knowing
* xref:camel-maven-plugin.adoc[Camel Maven Plugin] for running Camel from a Maven goal
* xref:camel-component-maven-plugin.adoc[Camel Component Maven Plugin] to generate all the necessary metadata and Java file for your custom component.
* xref:camel-report-maven-plugin.adoc[Camel Maven Report Plugin] to validate your source code and report the code coverage of your camel routes
@@ -116,7 +110,6 @@ camel routes without them knowing
* xref:type-converter.adoc[Type Converter]
* xref:uris.adoc[URIs]
* xref:uuidgenerator.adoc[UuidGenerator]
-* xref:xml-configuration.adoc[XML Configuration]
=== xref:dsl.adoc[DSL]
diff --git a/docs/user-manual/modules/ROOT/pages/spring.adoc b/docs/user-manual/modules/ROOT/pages/spring.adoc
index 00850a8..a474d2b 100644
--- a/docs/user-manual/modules/ROOT/pages/spring.adoc
+++ b/docs/user-manual/modules/ROOT/pages/spring.adoc
@@ -1,14 +1,14 @@
[[Spring-Spring]]
= Spring
-Apache Camel is designed to work nicely with the Spring Framework in a number of ways.
+Apache Camel is designed to work first class with Spring in a number of ways, such as:
* Camel runs on Spring Boot with the Camel Spring Boot project
* Camel works with Spring XML configuration files (classic Spring XML)
* Camel works with Spring dependency injection
-* Camel works with configuration and property placeholders
-* Camel works with Spring Transaction
-* Camel works with Spring Testing making it easy to write unit and integration tests with Camel and Spring
+* Camel works with Spring configuration and property placeholders
+* Camel works with Spring transactions
+* Camel works with Spring testing
== Using Spring to configure the CamelContext
diff --git a/docs/user-manual/modules/ROOT/pages/xml-configuration.adoc b/docs/user-manual/modules/ROOT/pages/xml-configuration.adoc
deleted file mode 100644
index 972cc4d..0000000
--- a/docs/user-manual/modules/ROOT/pages/xml-configuration.adoc
+++ /dev/null
@@ -1,16 +0,0 @@
-[[XMLConfiguration-XMLConfiguration]]
-= XML Configuration
-
-We recommend developers use the Java xref:dsl.adoc[Domain Specific Language] when writing routing rules as this provides maximum IDE
-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:components::spring-summary.adoc[Spring] 2 namespaces; so that you can
-configure your routing rules within your
-xref:components::spring-summary.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:{eip-vc}:eips:enterprise-integration-patterns.adoc[Enterprise Integration Patterns] or refer to the xref:components::spring-summary.adoc[Spring Support].
-
diff --git a/docs/user-manual/modules/faq/pages/how-do-i-import-rests-from-other-xml-files.adoc b/docs/user-manual/modules/faq/pages/how-do-i-import-rests-from-other-xml-files.adoc
index aa20088..bb6e894 100644
--- a/docs/user-manual/modules/faq/pages/how-do-i-import-rests-from-other-xml-files.adoc
+++ b/docs/user-manual/modules/faq/pages/how-do-i-import-rests-from-other-xml-files.adoc
@@ -3,8 +3,7 @@
*Since Camel 2.14*
-When defining rests in Camel using xref:ROOT:xml-configuration.adoc[Xml
-Configuration] you may want to define some rests in other XML files. For
+When defining rests in Camel using Spring XML you may want to define some rests in other XML files. For
example you may have many rest services and it may help to maintain the
application if some of the rests are in separate XML files. You may also
want to store common and reusable rests in other XML files, which you
diff --git a/docs/user-manual/modules/faq/pages/how-do-i-import-routes-from-other-xml-files.adoc b/docs/user-manual/modules/faq/pages/how-do-i-import-routes-from-other-xml-files.adoc
index a96e27c..f8b39e1 100644
--- a/docs/user-manual/modules/faq/pages/how-do-i-import-routes-from-other-xml-files.adoc
+++ b/docs/user-manual/modules/faq/pages/how-do-i-import-routes-from-other-xml-files.adoc
@@ -3,7 +3,7 @@
*Since Camel 2.3*
-When defining routes in Camel using xref:ROOT:xml-configuration.adoc[XML Configuration]
+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
diff --git a/docs/user-manual/modules/faq/pages/how-do-i-use-uris-with-parameters-in-xml.adoc b/docs/user-manual/modules/faq/pages/how-do-i-use-uris-with-parameters-in-xml.adoc
index 14c1839..b7a13ce 100644
--- a/docs/user-manual/modules/faq/pages/how-do-i-use-uris-with-parameters-in-xml.adoc
+++ b/docs/user-manual/modules/faq/pages/how-do-i-use-uris-with-parameters-in-xml.adoc
@@ -2,8 +2,7 @@
= How do I use URIs with parameters in XML?
If you try and use one of the Camel xref:ROOT:uris.adoc[URIs] in an
-xref:ROOT:xml-configuration.adoc[XML Configuration] using the URI query
-parameter notation, such as:
+XML DSL using the URI query parameter notation, such as:
[source,xml]
----
diff --git a/docs/user-manual/modules/faq/pages/is-there-an-ide.adoc b/docs/user-manual/modules/faq/pages/is-there-an-ide.adoc
index 13ea101..0ed573b 100644
--- a/docs/user-manual/modules/faq/pages/is-there-an-ide.adoc
+++ b/docs/user-manual/modules/faq/pages/is-there-an-ide.adoc
@@ -7,8 +7,7 @@ You could use your Java IDE for smart completion when creating
xref:ROOT:routes.adoc[Java routing rules] via the xref:ROOT: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:ROOT:spring.adoc[routing rules in XML] using the
-xref:ROOT:xml-configuration.adoc[XML Configuration]
+xref:ROOT:spring.adoc[routing rules in XML] using Spring XML files.
Some of the xref:ROOT:commercial-camel-offerings.adoc[Commercial Companies]
offers IDE's and other tooling for Camel.
diff --git a/docs/user-manual/modules/faq/pages/what-is-camel.adoc b/docs/user-manual/modules/faq/pages/what-is-camel.adoc
index 02356b2..aed1f87 100644
--- a/docs/user-manual/modules/faq/pages/what-is-camel.adoc
+++ b/docs/user-manual/modules/faq/pages/what-is-camel.adoc
@@ -6,10 +6,7 @@ known xref:{eip-vc}:eips:enterprise-integration-patterns.adoc[Enterprise Integra
Patterns].
Camel empowers you to define routing and mediation rules in a variety of
-domain-specific languages, including a Java-based xref:ROOT:dsl.adoc[Fluent
-API], xref:ROOT:spring.adoc[Spring] or
-xref:ROOT:using-osgi-blueprint-with-camel.adoc[Blueprint]
-xref:ROOT:xml-configuration.adoc[XML Configuration] files.
+domain-specific languages (xref:manual::dsl.adoc[DSL], such as Java, XML, Groovy, Kotlin, and YAML).
This means you get smart completion of
routing rules in your IDE, whether in a Java or XML editor.