This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.x by this push:
new d5efb9a [CAMEL-16992] Link to latest released EIP. Fix one
in-component link. Fix some AsciiDoc syntax.
d5efb9a is described below
commit d5efb9a047f9edceec78ae6eaba45f6a21157b6d
Author: David Jencks <[email protected]>
AuthorDate: Wed Sep 22 14:32:38 2021 -0700
[CAMEL-16992] Link to latest released EIP. Fix one in-component link. Fix
some AsciiDoc syntax.
---
.../docs/modules/languages/pages/simple-language.adoc | 18 +++++++++---------
.../camel-elsql/src/main/docs/elsql-component.adoc | 2 +-
docs/components/antora.yml | 2 +-
.../components/modules/ROOT/pages/elsql-component.adoc | 2 +-
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/camel-core/src/main/docs/modules/languages/pages/simple-language.adoc
b/camel-core/src/main/docs/modules/languages/pages/simple-language.adoc
index 8af4fcf..56382f0 100644
--- a/camel-core/src/main/docs/modules/languages/pages/simple-language.adoc
+++ b/camel-core/src/main/docs/modules/languages/pages/simple-language.adoc
@@ -25,8 +25,8 @@ choose a more expressive and powerful language such as:
* xref:ognl-language.adoc[OGNL]
* xref:el-language.adoc[EL]
-The simple language uses `${body`} placeholders for complex expressions
-where the expression contains constant literals. The $\{ } placeholders
+The simple language uses `${body}` placeholders for complex expressions
+where the expression contains constant literals. The ${ } placeholders
can be omitted if the expression is only the token itself.
TIP: *Alternative syntax* From Camel 2.5 onwards you can also use the
alternative syntax which
@@ -48,20 +48,20 @@ language as a Predicate then the literal text
`"$\{body} == 'Camel'"`. Notice how we have single quotes around the
literal. The old style of using `"body"` and `"header.foo"` to refer to
the message body and header is @deprecated, and it is encouraged to
-always use $\{ } tokens for the built-in functions.
+always use ${ } tokens for the built-in functions.
The range operator now requires the range to be in single quote as well
as shown: `"${header.zip} between '30000..39999'"`.
To get the body of the in message: `"body"`, or `"in.body"` or
`"$\{body}"`.
-A complex expression must use $\{ } placeholders, such as:
+A complex expression must use ${ } placeholders, such as:
`"Hello ${in.header.name} how are you?"`.
You can have multiple functions in the same expression:
`"Hello ${in.header.name} this is ${in.header.me} speaking"`. +
However you can *not* nest functions in Camel 2.8.x or older (i.e.
-having another $\{ } placeholder in an existing, is not allowed). +
+having another ${ } placeholder in an existing, is not allowed). +
From *Camel 2.9* onwards you can nest functions.
== Simple Language options
@@ -411,7 +411,7 @@ simple("${body.address.zip} > 1000")
The parser is limited to only support a single operator.
-To enable it the left value must be enclosed in $\{ }. The syntax is:
+To enable it the left value must be enclosed in ${ }. The syntax is:
[source]
--------------------------
@@ -419,7 +419,7 @@ ${leftValue} OP rightValue
--------------------------
Where the `rightValue` can be a String literal enclosed in `' '`,
-`null`, a constant value or another expression enclosed in $\{ }.
+`null`, a constant value or another expression enclosed in ${ }.
IMPORTANT: There *must* be spaces around the operator.
@@ -765,7 +765,7 @@ from("direct:hello")
.to("mock:reply");
----
-Notice that we must use $\{ } placeholders in the expression now to
+Notice that we must use ${ } placeholders in the expression now to
allow Camel to parse it correctly.
And this sample uses the date command to output current date.
@@ -921,7 +921,7 @@ And in XML DSL
*Since Camel 2.9.1*
-You can configure the function start and end tokens - $\{ } using the
+You can configure the function start and end tokens - ${ } using the
setters `changeFunctionStartToken` and `changeFunctionEndToken` on
`SimpleLanguage`, using Java code. From Spring XML you can define a
<bean> tag with the new changed tokens in the properties as shown below:
diff --git a/components/camel-elsql/src/main/docs/elsql-component.adoc
b/components/camel-elsql/src/main/docs/elsql-component.adoc
index 033f0c3..28ec586 100644
--- a/components/camel-elsql/src/main/docs/elsql-component.adoc
+++ b/components/camel-elsql/src/main/docs/elsql-component.adoc
@@ -46,7 +46,7 @@ The parameters to the SQL queries are named parameters in the
elsql
mapping files, and maps to corresponding keys from the Camel message, in
the given precedence:
-1. from message body if
xref:latest@components:languages:simple-language.adoc[Simple]
+1. from message body if xref:languages:simple-language.adoc[Simple]
expression.
2. from message body if its a `java.util.Map`
diff --git a/docs/components/antora.yml b/docs/components/antora.yml
index 6a7b940..916fc08 100644
--- a/docs/components/antora.yml
+++ b/docs/components/antora.yml
@@ -27,4 +27,4 @@ asciidoc:
attributes:
index-table-format: width="100%",cols="4,3,3,3,6",options="header"
# | Data Format | Artifact | Support Level | Since | Description
- eip-vc: latest@components
+ eip-vc: components
diff --git a/docs/components/modules/ROOT/pages/elsql-component.adoc
b/docs/components/modules/ROOT/pages/elsql-component.adoc
index c7c03c7..be1df8b 100644
--- a/docs/components/modules/ROOT/pages/elsql-component.adoc
+++ b/docs/components/modules/ROOT/pages/elsql-component.adoc
@@ -48,7 +48,7 @@ The parameters to the SQL queries are named parameters in the
elsql
mapping files, and maps to corresponding keys from the Camel message, in
the given precedence:
-1. from message body if
xref:latest@components:languages:simple-language.adoc[Simple]
+1. from message body if xref:languages:simple-language.adoc[Simple]
expression.
2. from message body if its a `java.util.Map`
