This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.4.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8760a3550630f1fbb12a379e431844956c4a4721
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue Aug 17 10:44:45 2021 +0200
Polish and cleanup documentation
---
.../src/main/docs/modules/eips/pages/content-enricher.adoc | 2 +-
.../src/main/docs/modules/eips/pages/message-translator.adoc | 2 +-
.../src/main/docs/modules/eips/pages/polling-consumer.adoc | 2 --
.../docs/modules/eips/pages/publish-subscribe-channel.adoc | 2 +-
.../src/main/docs/modules/eips/pages/rollback-eip.adoc | 10 ----------
.../main/docs/modules/eips/pages/transactional-client.adoc | 11 ++++-------
.../src/main/docs/modules/eips/pages/unmarshal-eip.adoc | 3 ++-
.../src/main/docs/modules/eips/pages/wireTap-eip.adoc | 2 --
8 files changed, 9 insertions(+), 25 deletions(-)
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/content-enricher.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/content-enricher.adoc
index 5a32621..a3ce956 100644
---
a/core/camel-core-engine/src/main/docs/modules/eips/pages/content-enricher.adoc
+++
b/core/camel-core-engine/src/main/docs/modules/eips/pages/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/core/camel-core-engine/src/main/docs/modules/eips/pages/message-translator.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/message-translator.adoc
index 4974569..aef4c99 100644
---
a/core/camel-core-engine/src/main/docs/modules/eips/pages/message-translator.adoc
+++
b/core/camel-core-engine/src/main/docs/modules/eips/pages/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/core/camel-core-engine/src/main/docs/modules/eips/pages/polling-consumer.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/polling-consumer.adoc
index 628bd34..7763604 100644
---
a/core/camel-core-engine/src/main/docs/modules/eips/pages/polling-consumer.adoc
+++
b/core/camel-core-engine/src/main/docs/modules/eips/pages/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/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/rollback-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/rollback-eip.adoc
index 28fa95d..3bfff96 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/rollback-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/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/core/camel-core-engine/src/main/docs/modules/eips/pages/transactional-client.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/transactional-client.adoc
index 4da29f4..65c6a9c 100644
---
a/core/camel-core-engine/src/main/docs/modules/eips/pages/transactional-client.adoc
+++
b/core/camel-core-engine/src/main/docs/modules/eips/pages/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/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/core/camel-core-engine/src/main/docs/modules/eips/pages/wireTap-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/wireTap-eip.adoc
index 2ffc610..7316edf 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/wireTap-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/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]
