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 2020/11/04 18:52:39 UTC
[camel] branch camel-3.4.x updated: fix: convert absolute links to
relative
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch camel-3.4.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.4.x by this push:
new 9235ebb fix: convert absolute links to relative
9235ebb is described below
commit 9235ebb337ebc75bfdfdfdc92cefb6a07d00f519
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Wed Nov 4 00:30:17 2020 +0100
fix: convert absolute links to relative
(cherry picked from commit 5c2b1bd9c1ca62c92eeddab48800f2bdf79e7329)
# Conflicts:
# catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/log-eip.adoc
# catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/resequence-eip.adoc
# catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sql-component.adoc
# core/camel-core-engine/src/main/docs/modules/eips/pages/log-eip.adoc
---
components/camel-sql/src/main/docs/sql-component.adoc | 2 +-
.../camel-core-engine/src/main/docs/modules/eips/pages/log-eip.adoc | 6 +++---
.../src/main/docs/modules/eips/pages/resequence-eip.adoc | 4 ++--
docs/components/modules/ROOT/pages/sql-component.adoc | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/components/camel-sql/src/main/docs/sql-component.adoc b/components/camel-sql/src/main/docs/sql-component.adoc
index 8ed1b7a..d10dfd4 100644
--- a/components/camel-sql/src/main/docs/sql-component.adoc
+++ b/components/camel-sql/src/main/docs/sql-component.adoc
@@ -45,7 +45,7 @@ pattern. See further below.
[TIP]
====
This component can be used as a
-http://camel.apache.org/transactional-client.html[Transactional Client].
+xref:eips:transactional-client.adoc[Transactional Client].
====
The SQL component uses the following endpoint URI notation:
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/log-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/log-eip.adoc
index 26c2817f..b426191 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/log-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/log-eip.adoc
@@ -2,7 +2,7 @@
= Log EIP
:docTitle: Log
:description: Logs the defined message to the logger
-:since:
+:since:
:supportLevel: Stable
How can I log the processing of a xref:message.adoc[Message]?
@@ -52,7 +52,7 @@ Which will construct a String message at runtime using the Simple language. The
====
*Logging message body with streamed messages:*
-If the message body is stream based, then logging the message body, may cause the message body to be empty afterwards. See this FAQ. For streamed messages you can use Stream caching to allow logging the message body and be able to read the message body afterwards again.
+If the message body is stream based, then logging the message body, may cause the message body to be empty afterwards. See this xref:latest@manual:faq:why-is-my-message-body-empty.adoc[FAQ]. For streamed messages you can use Stream caching to allow logging the message body and be able to read the message body afterwards again.
====
The log DSL have overloaded methods to set the logging level and/or name as well.
@@ -113,7 +113,7 @@ Since Camel *2.12.4/2.13.1* it is possible to reference logger instance. For exa
<bean id="myLogger" class="org.slf4j.LoggerFactory" factory-method="getLogger" xmlns="http://www.springframework.org/schema/beans">
<constructor-arg value="com.mycompany.mylogger" />
</bean>
-
+
<route id="moo" xmlns="http://camel.apache.org/schema/spring">
<from uri="direct:moo"/>
<log message="Me Got ${body}" loggingLevel="INFO" loggerRef="myLogger"/>
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/resequence-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/resequence-eip.adoc
index c511c38..aeaa90b 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/resequence-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/resequence-eip.adoc
@@ -2,10 +2,10 @@
= Resequence EIP
:docTitle: Resequence
:description: Resequences (re-order) messages based on an expression
-:since:
+:since:
:supportLevel: Stable
-The http://www.enterpriseintegrationpatterns.com/Resequencer.html[Resequencer] from the https://camel.apache.org/enterprise-integration-patterns.html[EIP patterns] allows you to reorganise messages based on some comparator. +
+The http://www.enterpriseintegrationpatterns.com/Resequencer.html[Resequencer] from the xref:components:eips:enterprise-integration-patterns.adoc[EIP patterns] allows you to reorganise messages based on some comparator. +
By default in Camel we use an Expression to create the comparator; so that you can compare by a message header or the body or a piece of a message etc.
image::eip/Resequencer.gif[image]
diff --git a/docs/components/modules/ROOT/pages/sql-component.adoc b/docs/components/modules/ROOT/pages/sql-component.adoc
index e47f9b7..939bfb9 100644
--- a/docs/components/modules/ROOT/pages/sql-component.adoc
+++ b/docs/components/modules/ROOT/pages/sql-component.adoc
@@ -47,7 +47,7 @@ pattern. See further below.
[TIP]
====
This component can be used as a
-http://camel.apache.org/transactional-client.html[Transactional Client].
+xref:eips:transactional-client.adoc[Transactional Client].
====
The SQL component uses the following endpoint URI notation: