This is an automated email from the ASF dual-hosted git repository. djencks pushed a commit to branch issue-14698-rearrange-adocs in repository https://gitbox.apache.org/repos/asf/camel.git
commit 38244674f3fa0cbacc65d6cd9c83f497e1b919a3 Author: David Jencks <[email protected]> AuthorDate: Thu Mar 12 12:55:29 2020 -0700 fix user-manual languages xrefs --- core/camel-base/src/main/docs/properties-component.adoc | 12 ++++++------ .../modules/ROOT/pages/properties-component.adoc | 12 ++++++------ docs/user-manual/modules/ROOT/pages/backlog-tracer.adoc | 2 +- docs/user-manual/modules/ROOT/pages/bean-binding.adoc | 10 +++++----- .../user-manual/modules/ROOT/pages/content-enricher.adoc | 16 ++++++++-------- .../user-manual/modules/ROOT/pages/exception-clause.adoc | 2 +- docs/user-manual/modules/ROOT/pages/expression.adoc | 10 +++++----- docs/user-manual/modules/ROOT/pages/index.adoc | 14 +++++++------- docs/user-manual/modules/ROOT/pages/intercept.adoc | 2 +- docs/user-manual/modules/ROOT/pages/languages.adoc | 14 +++++++------- .../ROOT/pages/parameter-binding-annotations.adoc | 6 +++--- docs/user-manual/modules/ROOT/pages/predicate.adoc | 14 +++++++------- .../modules/ROOT/pages/properties-component.adoc | 8 ++++---- docs/user-manual/modules/ROOT/pages/rest-dsl.adoc | 2 +- docs/user-manual/modules/ROOT/pages/spring-remoting.adoc | 10 +++++----- .../modules/ROOT/pages/using-propertyplaceholder.adoc | 12 ++++++------ 16 files changed, 73 insertions(+), 73 deletions(-) diff --git a/core/camel-base/src/main/docs/properties-component.adoc b/core/camel-base/src/main/docs/properties-component.adoc index 47916c5..b708e32 100644 --- a/core/camel-base/src/main/docs/properties-component.adoc +++ b/core/camel-base/src/main/docs/properties-component.adoc @@ -287,9 +287,9 @@ ProducerTemplate for example: template.sendBody("{{cool.start}}", "Hello World"); ---- -== Example with xref:manual::simple-language.adoc[Simple] language +== Example with xref:manual:languages:simple-language.adoc[Simple] language -The xref:manual::simple-language.adoc[Simple] language now also support using property +The xref:manual:languages:simple-language.adoc[Simple] language now also support using property placeholders, for example in the route below: [source,java] @@ -546,7 +546,7 @@ placeholder notation with `{{` and `}}`. == Clashing Spring property placeholders with Camels Simple language Take notice when using Spring bridging placeholder then the spring `${ }` -syntax clashes with the xref:manual::simple-language.adoc[Simple] in Camel, and therefore +syntax clashes with the xref:manual:languages:simple-language.adoc[Simple] in Camel, and therefore take care. For example: [source,xml] @@ -557,7 +557,7 @@ take care. For example: ---- clashes with Spring property placeholders, and you should use `$simple{ }` -to indicate using the xref:manual::simple-language.adoc[Simple] language in Camel. +to indicate using the xref:manual:languages:simple-language.adoc[Simple] language in Camel. [source,xml] ---- @@ -693,7 +693,7 @@ is a `log:foo` and `log:bar` value. </camelContext> ---- - + The service function is for looking up a service which is defined using OS environment variables using the service naming idiom, to refer to a @@ -808,7 +808,7 @@ To register a custom function from Java code is as shown below: PropertiesComponent pc = (org.apache.camel.componennt.properties.PropertiesComponent) context.getPropertiesComponent(); pc.addFunction(new MyBeerFunction()); ---- - + == Using 3rd-party properties sources diff --git a/docs/components/modules/ROOT/pages/properties-component.adoc b/docs/components/modules/ROOT/pages/properties-component.adoc index 17c6486..6850208 100644 --- a/docs/components/modules/ROOT/pages/properties-component.adoc +++ b/docs/components/modules/ROOT/pages/properties-component.adoc @@ -288,9 +288,9 @@ ProducerTemplate for example: template.sendBody("{{cool.start}}", "Hello World"); ---- -== Example with xref:manual::simple-language.adoc[Simple] language +== Example with xref:manual:languages:simple-language.adoc[Simple] language -The xref:manual::simple-language.adoc[Simple] language now also support using property +The xref:manual:languages:simple-language.adoc[Simple] language now also support using property placeholders, for example in the route below: [source,java] @@ -547,7 +547,7 @@ placeholder notation with `{{` and `}}`. == Clashing Spring property placeholders with Camels Simple language Take notice when using Spring bridging placeholder then the spring `${ }` -syntax clashes with the xref:manual::simple-language.adoc[Simple] in Camel, and therefore +syntax clashes with the xref:manual:languages:simple-language.adoc[Simple] in Camel, and therefore take care. For example: [source,xml] @@ -558,7 +558,7 @@ take care. For example: ---- clashes with Spring property placeholders, and you should use `$simple{ }` -to indicate using the xref:manual::simple-language.adoc[Simple] language in Camel. +to indicate using the xref:manual:languages:simple-language.adoc[Simple] language in Camel. [source,xml] ---- @@ -694,7 +694,7 @@ is a `log:foo` and `log:bar` value. </camelContext> ---- - + The service function is for looking up a service which is defined using OS environment variables using the service naming idiom, to refer to a @@ -809,7 +809,7 @@ To register a custom function from Java code is as shown below: PropertiesComponent pc = (org.apache.camel.componennt.properties.PropertiesComponent) context.getPropertiesComponent(); pc.addFunction(new MyBeerFunction()); ---- - + == Using 3rd-party properties sources diff --git a/docs/user-manual/modules/ROOT/pages/backlog-tracer.adoc b/docs/user-manual/modules/ROOT/pages/backlog-tracer.adoc index c59b9ac..5ce541e 100644 --- a/docs/user-manual/modules/ROOT/pages/backlog-tracer.adoc +++ b/docs/user-manual/modules/ROOT/pages/backlog-tracer.adoc @@ -56,7 +56,7 @@ do "to*" to match any to. Or use "route-foo*" to match any foo routes. |traceFilter |`null` |Allow to configure a filter as a xref:predicate.adoc[Predicate] using any of the Camel xref:languages.adoc[languages]. But default the -xref:simple-language.adoc[Simple] language is used. For example to filter on +xref:languages:simple-language.adoc[Simple] language is used. For example to filter on messages with a given header, use `${header.foo} != null`. To use xref:components::groovy-language.adoc[Groovy] then prefix the value with "groovy:". And similar for the other languages. diff --git a/docs/user-manual/modules/ROOT/pages/bean-binding.adoc b/docs/user-manual/modules/ROOT/pages/bean-binding.adoc index 6fd955c..0932932 100644 --- a/docs/user-manual/modules/ROOT/pages/bean-binding.adoc +++ b/docs/user-manual/modules/ROOT/pages/bean-binding.adoc @@ -231,9 +231,9 @@ the method option * The value is a numeric value such as `123` or `7` * The value is a String enclosed with either single or double quotes * The value is null which denotes a `null` value -* It can be evaluated using the xref:simple-language.adoc[Simple] language, which +* It can be evaluated using the xref:languages:simple-language.adoc[Simple] language, which means you can use, e.g., body, header.foo and other -xref:simple-language.adoc[Simple] tokens. Notice the tokens must be enclosed with +xref:languages:simple-language.adoc[Simple] tokens. Notice the tokens must be enclosed with $\{ }. Any other value is consider to be a type declaration instead - see the @@ -276,7 +276,7 @@ body as shown: .bean(OrderService.class, "doSomething(${body}, true)") ---- -The syntax of the parameters is using the xref:simple-language.adoc[Simple] +The syntax of the parameters is using the xref:languages:simple-language.adoc[Simple] expression language so we have to use $\{ } placeholders in the body to refer to the message body. @@ -312,7 +312,7 @@ first has the content 'World' (without quotes), and the 2nd has the value of 5. Camel will automatically convert these values to the parameters' types. -Having the power of the xref:simple-language.adoc[Simple] language allows us to +Having the power of the xref:languages:simple-language.adoc[Simple] language allows us to bind to message headers and other values such as: [source,syntaxhighlighter-pre] @@ -320,7 +320,7 @@ bind to message headers and other values such as: .bean(OrderService.class, "doSomething(${body}, ${header.high})") ---- -You can also use the OGNL support of the xref:simple-language.adoc[Simple] +You can also use the OGNL support of the xref:languages:simple-language.adoc[Simple] expression language. Now suppose the message body is an object which has a method named `asXml`. To invoke the `asXml` method we can do as follows: diff --git a/docs/user-manual/modules/ROOT/pages/content-enricher.adoc b/docs/user-manual/modules/ROOT/pages/content-enricher.adoc index 2c7252d..77fd4d8 100644 --- a/docs/user-manual/modules/ROOT/pages/content-enricher.adoc +++ b/docs/user-manual/modules/ROOT/pages/content-enricher.adoc @@ -135,8 +135,8 @@ confluenceTableSmall |`uri` | |The endpoint uri for the external service to enrich from. You must use either `uri` or `ref`. *Important:* From Camel 2.16 onwards, this option is removed, and you use an xref:expression.adoc[Expression] -to configure the uri, such as xref:simple-language.adoc[Simple] or -xref:constant-language.adoc[Constant] or any other dynamic language that can +to configure the uri, such as xref:languages:simple-language.adoc[Simple] or +xref:languages:constant-language.adoc[Constant] or any other dynamic language that can compute the uri dynamically using values from the current xref:exchange.adoc[Exchange]. @@ -144,13 +144,13 @@ xref:exchange.adoc[Exchange]. from. You must use either `uri` or `ref`. **Important:** From Camel 2.16 onwards, this option is removed, and you use an xref:expression.adoc[Expression] to configure the uri, such as -xref:simple-language.adoc[Simple] or xref:constant-language.adoc[Constant] or any other +xref:languages:simple-language.adoc[Simple] or xref:languages:constant-language.adoc[Constant] or any other dynamic language that can compute the uri dynamically using values from the current xref:exchange.adoc[Exchange]. |expression | |*Camel 2.16:* Mandatory. The xref:expression.adoc[Expression] to configure the uri, such as -xref:simple-language.adoc[Simple] or xref:constant-language.adoc[Constant] or any other +xref:languages:simple-language.adoc[Simple] or xref:languages:constant-language.adoc[Constant] or any other dynamic language that can compute the uri dynamically using values from the current xref:exchange.adoc[Exchange]. @@ -348,8 +348,8 @@ polling |`uri` | |The endpoint uri for the external service to enrich from. You must use either `uri` or `ref`. **Important:** From Camel 2.16 onwards, this option is removed, and you use an xref:expression.adoc[Expression] -to configure the uri, such as xref:simple-language.adoc[Simple] or -xref:constant-language.adoc[Constant] or any other dynamic language that can +to configure the uri, such as xref:languages:simple-language.adoc[Simple] or +xref:languages:constant-language.adoc[Constant] or any other dynamic language that can compute the uri dynamically using values from the current xref:exchange.adoc[Exchange]. @@ -357,13 +357,13 @@ compute the uri dynamically using values from the current from. You must use either `uri` or `ref`. **Important:** From Camel 2.16 onwards, this option is removed, and you use an xref:expression.adoc[Expression] to configure the uri, such as -xref:simple-language.adoc[Simple] or xref:constant-language.adoc[Constant] or any other +xref:languages:simple-language.adoc[Simple] or xref:languages:constant-language.adoc[Constant] or any other dynamic language that can compute the uri dynamically using values from the current xref:exchange.adoc[Exchange]. |`expression` | |**Camel 2.16:** Mandatory. The xref:expression.adoc[Expression] to configure the uri, such as -xref:simple-language.adoc[Simple] or xref:constant-language.adoc[Constant] or any other +xref:languages:simple-language.adoc[Simple] or xref:languages:constant-language.adoc[Constant] or any other dynamic language that can compute the uri dynamically using values from the current xref:exchange.adoc[Exchange]. diff --git a/docs/user-manual/modules/ROOT/pages/exception-clause.adoc b/docs/user-manual/modules/ROOT/pages/exception-clause.adoc index 3c23373..3526fed 100644 --- a/docs/user-manual/modules/ROOT/pages/exception-clause.adoc +++ b/docs/user-manual/modules/ROOT/pages/exception-clause.adoc @@ -417,7 +417,7 @@ message instead of the fixed text `Sorry`: /camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionHandleAndTransformTest.java -And we can use the xref:simple-language.adoc[Simple] language to set a readable error +And we can use the xref:languages:simple-language.adoc[Simple] language to set a readable error message with the caused exception message: /camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionHandleAndTransformTest.java diff --git a/docs/user-manual/modules/ROOT/pages/expression.adoc b/docs/user-manual/modules/ROOT/pages/expression.adoc index 61a9cacc7..b0bfc3f 100644 --- a/docs/user-manual/modules/ROOT/pages/expression.adoc +++ b/docs/user-manual/modules/ROOT/pages/expression.adoc @@ -69,19 +69,19 @@ public interface Predicate { The following languages are supported out of the box * xref:components::bean-language.adoc[Bean Language] for using Java for expressions -* xref:constant-language.adoc[Constant] -* xref:header-language.adoc[Header] +* xref:languages:constant-language.adoc[Constant] +* xref:languages:header-language.adoc[Header] * xref:components::jsonpath-language.adoc[JSonPath] * xref:components::mvel-component.adoc[Mvel] * xref:components::ognl-language.adoc[OGNL] -* xref:ref-language.adoc[Ref Language] +* xref:languages:ref-language.adoc[Ref Language] * ExchangeProperty / Property * Scripting Languages such as ** BeanShell ** JavaScript ** xref:components::groovy-language.adoc[Groovy] -* xref:simple-language.adoc[Simple] -** xref:file-language.adoc[File Language] +* xref:languages:simple-language.adoc[Simple] +** xref:languages:file-language.adoc[File Language] * xref:components::spel-language.adoc[Spring Expression Language] * xref:components::sql-component.adoc[SQL] * Tokenizer diff --git a/docs/user-manual/modules/ROOT/pages/index.adoc b/docs/user-manual/modules/ROOT/pages/index.adoc index 7e1ff8d..0859151 100644 --- a/docs/user-manual/modules/ROOT/pages/index.adoc +++ b/docs/user-manual/modules/ROOT/pages/index.adoc @@ -506,18 +506,18 @@ camel routes without them knowing * Expression Languages ** xref:components::bean-language.adoc[Bean method] -** xref:constant-language.adoc[Constant] -** xref:exchangeProperty-language.adoc[ExchangeProperty] -** xref:file-language.adoc[File] +** xref:languages:constant-language.adoc[Constant] +** xref:languages:exchangeProperty-language.adoc[ExchangeProperty] +** xref:languages:file-language.adoc[File] ** xref:components::groovy-language.adoc[Groovy] -** xref:header-language.adoc[Header] +** xref:languages:header-language.adoc[Header] ** xref:components::hl7terser-language.adoc[HL7 Terser] ** xref:components::mvel-language.adoc[MVEL] ** xref:components::ognl-language.adoc[OGNL] -** xref:ref-language.adoc[Ref] -** xref:simple-language.adoc[Simple] +** xref:languages:ref-language.adoc[Ref] +** xref:languages:simple-language.adoc[Simple] ** xref:components::spel-language.adoc[SpEL] -** xref:tokenize-language.adoc[Tokenize] +** xref:languages:tokenize-language.adoc[Tokenize] ** xref:components::xpath-language.adoc[XPath] ** xref:components::xquery-language.adoc[XQuery] diff --git a/docs/user-manual/modules/ROOT/pages/intercept.adoc b/docs/user-manual/modules/ROOT/pages/intercept.adoc index e13fb91..af1926e 100644 --- a/docs/user-manual/modules/ROOT/pages/intercept.adoc +++ b/docs/user-manual/modules/ROOT/pages/intercept.adoc @@ -184,7 +184,7 @@ Intercept endpoint is of course also available using Spring DSL. We start with the first example from above in Spring DSL: -And the 2nd. Notice how we can leverage the xref:simple-language.adoc[Simple] +And the 2nd. Notice how we can leverage the xref:languages:simple-language.adoc[Simple] language for the Predicate: And the 3rd with the `skip`, notice skip is set with the diff --git a/docs/user-manual/modules/ROOT/pages/languages.adoc b/docs/user-manual/modules/ROOT/pages/languages.adoc index 675b26a..fe0466a 100644 --- a/docs/user-manual/modules/ROOT/pages/languages.adoc +++ b/docs/user-manual/modules/ROOT/pages/languages.adoc @@ -20,19 +20,19 @@ For more information, see xref:predicate.adoc[Compound Predicates]. == The following is the list of currently supported languages: * xref:components::bean-language.adoc[Bean Language] for using Java for expressions -* xref:constant-language.adoc[Constant] -* xref:header-language.adoc[Header] +* xref:languages:constant-language.adoc[Constant] +* xref:languages:header-language.adoc[Header] * xref:components::jsonpath-language.adoc[JSonPath] * xref:components::mvel-language.adoc[Mvel] * xref:components::ognl-language.adoc[OGNL] -* xref:ref-language.adoc[Ref Language] -* xref:exchangeProperty-language.adoc[ExchangeProperty] +* xref:languages:ref-language.adoc[Ref Language] +* xref:languages:exchangeProperty-language.adoc[ExchangeProperty] * xref:scripting-languages.adoc[Scripting Languages] such as: ** xref:components::groovy-language.adoc[Groovy] -* xref:simple-language.adoc[Simple] -** xref:file-language.adoc[File Language] +* xref:languages:simple-language.adoc[Simple] +** xref:languages:file-language.adoc[File Language] * xref:components::spel-language.adoc[Spring Expression Language] -* xref:tokenize-language.adoc[Tokenizer] +* xref:languages:tokenize-language.adoc[Tokenizer] * xref:components::xpath-language.adoc[XPath] * xref:components::xquery-language.adoc[XQuery] * https://github.com/camel-extra/camel-extra/blob/master/components/camel-vtdxml/src/main/docs/vtdxml-component.adoc[VTD-XML] diff --git a/docs/user-manual/modules/ROOT/pages/parameter-binding-annotations.adoc b/docs/user-manual/modules/ROOT/pages/parameter-binding-annotations.adoc index ef958ed..c1f9fd0 100644 --- a/docs/user-manual/modules/ROOT/pages/parameter-binding-annotations.adoc +++ b/docs/user-manual/modules/ROOT/pages/parameter-binding-annotations.adoc @@ -154,13 +154,13 @@ any of these annotations: |Inject a xref:components::bean-language.adoc[Bean] expression |`org.apache.camel.language.Constant` -|Inject a xref:constant-language.adoc[Constant] expression +|Inject a xref:languages:constant-language.adoc[Constant] expression |`org.apache.camel.builder.script.Groovy` |Inject a xref:components::groovy-language.adoc[Groovy] expression |`org.apache.camel.Header` -|Inject a xref:header-language.adoc[Header] expression +|Inject a xref:languages:header-language.adoc[Header] expression |`org.apache.camel.language.mvel.MVEL` |Inject a xref:components::mvel-language.adoc[MVEL] expression @@ -169,7 +169,7 @@ any of these annotations: |Inject an xref:components::ognl-language.adoc[OGNL] expression |`org.apache.camel.language.Simple` -|Inject an xref:simple-language.adoc[Simple] expression +|Inject an xref:languages:simple-language.adoc[Simple] expression |`org.apache.camel.language.XPath` |Inject an xref:components::xpath-language.adoc[XPath] expression diff --git a/docs/user-manual/modules/ROOT/pages/predicate.adoc b/docs/user-manual/modules/ROOT/pages/predicate.adoc index c9ba4cc..50dc481 100644 --- a/docs/user-manual/modules/ROOT/pages/predicate.adoc +++ b/docs/user-manual/modules/ROOT/pages/predicate.adoc @@ -153,19 +153,19 @@ xref:languages.adoc[Languages]; the following languages are supported out of the box * xref:components::bean-language.adoc[Bean Language] for using Java for expressions -* xref:constant-language.adoc[Constant] -* xref:header-language.adoc[Header] +* xref:languages:constant-language.adoc[Constant] +* xref:languages:header-language.adoc[Header] * xref:components::jsonpath-language.adoc[JSonPath] * xref:components::mvel-language.adoc[Mvel] * xref:components::ognl-language.adoc[OGNL] -* xref:ref-language.adoc[Ref Language] -* xref:exchangeProperty-language.adoc[ExchangeProperty] +* xref:languages:ref-language.adoc[Ref Language] +* xref:languages:exchangeProperty-language.adoc[ExchangeProperty] * xref:scripting-languages.adoc[Scripting Languages] such as ** xref:components::groovy-language.adoc[Groovy] -* xref:simple-language.adoc[Simple] -** xref:file-language.adoc[File Language] +* xref:languages:simple-language.adoc[Simple] +** xref:languages:file-language.adoc[File Language] * xref:components::spel-language.adoc[Spring Expression Language] -* xref:tokenize-language.adoc[Tokenizer] +* xref:languages:tokenize-language.adoc[Tokenizer] * xref:components::xpath-language.adoc[XPath] * xref:components::xquery-language.adoc[XQuery] * https://github.com/camel-extra/camel-extra/blob/master/components/camel-vtdxml/src/main/docs/vtdxml-component.adoc[VTD-XML] diff --git a/docs/user-manual/modules/ROOT/pages/properties-component.adoc b/docs/user-manual/modules/ROOT/pages/properties-component.adoc index 17c6486..9e1a50f 100644 --- a/docs/user-manual/modules/ROOT/pages/properties-component.adoc +++ b/docs/user-manual/modules/ROOT/pages/properties-component.adoc @@ -288,9 +288,9 @@ ProducerTemplate for example: template.sendBody("{{cool.start}}", "Hello World"); ---- -== Example with xref:manual::simple-language.adoc[Simple] language +== Example with xref:manual:languages:simple-language.adoc[Simple] language -The xref:manual::simple-language.adoc[Simple] language now also support using property +The xref:manual:languages:simple-language.adoc[Simple] language now also support using property placeholders, for example in the route below: [source,java] @@ -547,7 +547,7 @@ placeholder notation with `{{` and `}}`. == Clashing Spring property placeholders with Camels Simple language Take notice when using Spring bridging placeholder then the spring `${ }` -syntax clashes with the xref:manual::simple-language.adoc[Simple] in Camel, and therefore +syntax clashes with the xref:manual:languages:simple-language.adoc[Simple] in Camel, and therefore take care. For example: [source,xml] @@ -558,7 +558,7 @@ take care. For example: ---- clashes with Spring property placeholders, and you should use `$simple{ }` -to indicate using the xref:manual::simple-language.adoc[Simple] language in Camel. +to indicate using the xref:manual:languages:simple-language.adoc[Simple] language in Camel. [source,xml] ---- diff --git a/docs/user-manual/modules/ROOT/pages/rest-dsl.adoc b/docs/user-manual/modules/ROOT/pages/rest-dsl.adoc index e3117b4..74d5c9f 100644 --- a/docs/user-manual/modules/ROOT/pages/rest-dsl.adoc +++ b/docs/user-manual/modules/ROOT/pages/rest-dsl.adoc @@ -209,7 +209,7 @@ over xref:components::jms-component.adoc[JMS] where the queue name is dynamic de See more details at Message Endpoint about the dynamic to, and what syntax it supports. By default it uses -the xref:simple-language.adoc[Simple] language, but it has more power than so. +the xref:languages:simple-language.adoc[Simple] language, but it has more power than so. == Embedding Camel routes diff --git a/docs/user-manual/modules/ROOT/pages/spring-remoting.adoc b/docs/user-manual/modules/ROOT/pages/spring-remoting.adoc index bbb330f..36fe857 100644 --- a/docs/user-manual/modules/ROOT/pages/spring-remoting.adoc +++ b/docs/user-manual/modules/ROOT/pages/spring-remoting.adoc @@ -351,9 +351,9 @@ the method option * The value is a numeric value such as `123` or `7` * The value is a String enclosed with either single or double quotes * The value is null which denotes a `null` value -* It can be evaluated using the xref:simple-language.adoc[Simple] language, which +* It can be evaluated using the xref:languages:simple-language.adoc[Simple] language, which means you can use, e.g., body, header.foo and other -xref:simple-language.adoc[Simple] tokens. Notice the tokens must be enclosed with +xref:languages:simple-language.adoc[Simple] tokens. Notice the tokens must be enclosed with $\{ }. Any other value is consider to be a type declaration instead - see the @@ -398,7 +398,7 @@ body as shown: .bean(OrderService.class, "doSomething(${body}, true)") ---- -The syntax of the parameters is using the xref:simple-language.adoc[Simple] +The syntax of the parameters is using the xref:languages:simple-language.adoc[Simple] expression language so we have to use $\{ } placeholders in the body to refer to the message body. @@ -434,7 +434,7 @@ first has the content 'World' (without quotes), and the 2nd has the value of 5. + Camel will automatically convert these values to the parameters' types. -Having the power of the xref:simple-language.adoc[Simple] language allows us to +Having the power of the xref:languages:simple-language.adoc[Simple] language allows us to bind to message headers and other values such as: [source,syntaxhighlighter-pre] @@ -442,7 +442,7 @@ bind to message headers and other values such as: .bean(OrderService.class, "doSomething(${body}, ${header.high})") ---- -You can also use the OGNL support of the xref:simple-language.adoc[Simple] +You can also use the OGNL support of the xref:languages:simple-language.adoc[Simple] expression language. Now suppose the message body is an object which has a method named `asXml`. To invoke the `asXml` method we can do as follows: diff --git a/docs/user-manual/modules/ROOT/pages/using-propertyplaceholder.adoc b/docs/user-manual/modules/ROOT/pages/using-propertyplaceholder.adoc index 54cbe8d..98823a8 100644 --- a/docs/user-manual/modules/ROOT/pages/using-propertyplaceholder.adoc +++ b/docs/user-manual/modules/ROOT/pages/using-propertyplaceholder.adoc @@ -293,9 +293,9 @@ template.sendBody("{{cool.start}}", "Hello World"); [[UsingPropertyPlaceholder-Examplewithlanguage]] -== Example with xref:simple-language.adoc[Simple] language +== Example with xref:languages:simple-language.adoc[Simple] language -The xref:simple-language.adoc[Simple] language now also support using property +The xref:languages:simple-language.adoc[Simple] language now also support using property placeholders, for example in the route below: @@ -308,7 +308,7 @@ cheese.quote=Camel rocks .transform().simple("Hi ${body} do you think ${properties:cheese.quote}?"); ---- -You can also specify the location in the xref:simple-language.adoc[Simple] +You can also specify the location in the xref:languages:simple-language.adoc[Simple] language for example: @@ -822,10 +822,10 @@ the `${}` notation. And in the Camel routes we use the Camel placeholder notation with `{{ }}`. [[UsingPropertyPlaceholder-ClashingSpringPropertyPlaceholderswithCamelsLanguage]] -== Clashing Spring Property Placeholders with Camels xref:simple-language.adoc[Simple] Language +== Clashing Spring Property Placeholders with Camels xref:languages:simple-language.adoc[Simple] Language Take notice when using Spring bridging placeholder then the -spring `${}` syntax clashes with the xref:simple-language.adoc[Simple] in +spring `${}` syntax clashes with the xref:languages:simple-language.adoc[Simple] in Camel, and therefore take care. Example: @@ -838,7 +838,7 @@ Example: ---- clashes with Spring property placeholders, and you should -use `$simple{}` to indicate using the xref:simple-language.adoc[Simple] +use `$simple{}` to indicate using the xref:languages:simple-language.adoc[Simple] language in Camel.
