This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 870c35648dae15ff9cbbe33fc54ef8878dc0c5bf Author: nayananga@acerubuntu18.04 <nayanangamuhandi...@gmail.com> AuthorDate: Sun Jul 21 01:52:57 2019 +0530 first set of "asciidoctor: WARNING: skipping reference to missing attribute:" fixed --- .../modules/ROOT/pages/asn1-dataformat.adoc | 2 +- .../modules/ROOT/pages/aws-ddb-component.adoc | 6 +-- .../ROOT/pages/aws-ddbstream-component.adoc | 2 +- .../modules/ROOT/pages/aws-ec2-component.adoc | 2 +- .../modules/ROOT/pages/aws-ecs-component.adoc | 2 +- .../modules/ROOT/pages/aws-eks-component.adoc | 2 +- .../modules/ROOT/pages/aws-iam-component.adoc | 2 +- .../modules/ROOT/pages/aws-kinesis-component.adoc | 2 +- .../ROOT/pages/aws-kinesis-firehose-component.adoc | 2 +- .../modules/ROOT/pages/aws-kms-component.adoc | 2 +- .../modules/ROOT/pages/aws-lambda-component.adoc | 2 +- .../modules/ROOT/pages/aws-mq-component.adoc | 2 +- .../modules/ROOT/pages/aws-msk-component.adoc | 2 +- .../modules/ROOT/pages/aws-s3-component.adoc | 2 +- .../modules/ROOT/pages/aws-sdb-component.adoc | 2 +- .../modules/ROOT/pages/aws-ses-component.adoc | 2 +- .../modules/ROOT/pages/aws-sns-component.adoc | 2 +- .../modules/ROOT/pages/aws-sqs-component.adoc | 2 +- .../modules/ROOT/pages/aws-swf-component.adoc | 2 +- .../modules/ROOT/pages/cxf-component.adoc | 4 +- .../ROOT/pages/google-bigquery-sql-component.adoc | 2 +- .../modules/ROOT/pages/grok-dataformat.adoc | 4 +- .../modules/ROOT/pages/hipchat-component.adoc | 2 +- docs/components/modules/ROOT/pages/jasypt.adoc | 2 +- .../modules/ROOT/pages/jcache-component.adoc | 2 +- .../modules/ROOT/pages/jsonpath-language.adoc | 2 +- .../modules/ROOT/pages/kafka-component.adoc | 4 +- .../modules/ROOT/pages/properties-component.adoc | 2 +- .../modules/ROOT/pages/rest-component.adoc | 4 +- .../modules/ROOT/pages/rest-swagger-component.adoc | 2 +- .../modules/ROOT/pages/restlet-component.adoc | 2 +- .../modules/ROOT/pages/servicenow-component.adoc | 60 +++++++++++----------- .../modules/ROOT/pages/testcontainers.adoc | 4 +- .../modules/ROOT/pages/stream-caching.adoc | 2 +- .../modules/ROOT/pages/threading-model.adoc | 2 +- 35 files changed, 71 insertions(+), 71 deletions(-) diff --git a/docs/components/modules/ROOT/pages/asn1-dataformat.adoc b/docs/components/modules/ROOT/pages/asn1-dataformat.adoc index 6b2ac84..4e1065a 100644 --- a/docs/components/modules/ROOT/pages/asn1-dataformat.adoc +++ b/docs/components/modules/ROOT/pages/asn1-dataformat.adoc @@ -73,7 +73,7 @@ from("direct:unmarshal").unmarshal(asn1).split(body(Iterator.class)).streaming() In the last example we unmarshal BER file payload to plain old Java Objects using Split EIP. The reason for applying Split EIP is already mentioned in the previous example. Please note and keep in mind that reason. In such example we also need to set the fully qualified name of the class or <YourObject>.class reference through data format. The important thing to note here is that your object should have been generated by jasn1 compiler which is a nice tool to generate java object representations of your ASN.1 structure. For the reference usage of jasn1 compiler see [JASN.1 Project Page](https://www.beanit.com/asn1/) and please also see how the compiler is invoked with the help of maven's exec plugin. -For example, in this data format's unit tests an example ASN.1 structure(TestSMSBerCdr.asn1) is added in `src/test/resources/asn1_structure`. jasn1 compiler is invoked and java object's representations are generated in `${basedir}/target/generated/src/test/java` +For example, in this data format's unit tests an example ASN.1 structure(TestSMSBerCdr.asn1) is added in `src/test/resources/asn1_structure`. jasn1 compiler is invoked and java object's representations are generated in `$\{basedir\}/target/generated/src/test/java` The nice thing about this example, you will get POJO instance at the mock endpoint or at whatever your endpoint is. [source,java] diff --git a/docs/components/modules/ROOT/pages/aws-ddb-component.adoc b/docs/components/modules/ROOT/pages/aws-ddb-component.adoc index 728a4e6..8c74729 100644 --- a/docs/components/modules/ROOT/pages/aws-ddb-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-ddb-component.adoc @@ -247,13 +247,13 @@ processed with the current response. |======================================================================= |Header |Type |Description -|`CamelAwsDdbProvisionedThroughput` |{{ProvisionedThroughputDescription}} |The value of the ProvisionedThroughput property for this table +|`CamelAwsDdbProvisionedThroughput` |{\{ProvisionedThroughputDescription\}} |The value of the ProvisionedThroughput property for this table |`CamelAwsDdbCreationDate` |`Date` |Creation DateTime of this table. |`CamelAwsDdbTableItemCount` |`Long` |Item count for this table. -|`CamelAwsDdbKeySchema` |{{KeySchema}} |The KeySchema that identifies the primary key for this table. +|`CamelAwsDdbKeySchema` |{\{KeySchema\}} |The KeySchema that identifies the primary key for this table. |`CamelAwsDdbTableName` |`String` |The table name. @@ -383,7 +383,7 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> --------------------------------------- -where `\${camel-version}` must be replaced by the actual version of Camel. +where `$\{camel-version\}` must be replaced by the actual version of Camel. ### See Also diff --git a/docs/components/modules/ROOT/pages/aws-ddbstream-component.adoc b/docs/components/modules/ROOT/pages/aws-ddbstream-component.adoc index 6697a5d..c8d85f9 100644 --- a/docs/components/modules/ROOT/pages/aws-ddbstream-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-ddbstream-component.adoc @@ -240,7 +240,7 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> --------------------------------------- -where `\${camel-version}` must be replaced by the actual version of Camel. +where `$\{camel-version\}` must be replaced by the actual version of Camel. ### See Also diff --git a/docs/components/modules/ROOT/pages/aws-ec2-component.adoc b/docs/components/modules/ROOT/pages/aws-ec2-component.adoc index ffa6bf9..b1ab7c9 100644 --- a/docs/components/modules/ROOT/pages/aws-ec2-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-ec2-component.adoc @@ -181,7 +181,7 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> --------------------------------------- -where `\${camel-version}` must be replaced by the actual version of Camel. +where `$\{camel-version\}` must be replaced by the actual version of Camel. ### See Also diff --git a/docs/components/modules/ROOT/pages/aws-ecs-component.adoc b/docs/components/modules/ROOT/pages/aws-ecs-component.adoc index 9c3dbc7..928aa24 100644 --- a/docs/components/modules/ROOT/pages/aws-ecs-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-ecs-component.adoc @@ -175,7 +175,7 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> --------------------------------------- -where `\${camel-version}` must be replaced by the actual version of Camel. +where `$\{camel-version\}` must be replaced by the actual version of Camel. ### See Also diff --git a/docs/components/modules/ROOT/pages/aws-eks-component.adoc b/docs/components/modules/ROOT/pages/aws-eks-component.adoc index ab0fd55..a33a1ff 100644 --- a/docs/components/modules/ROOT/pages/aws-eks-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-eks-component.adoc @@ -181,7 +181,7 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> --------------------------------------- -where `\${camel-version}` must be replaced by the actual version of Camel. +where `$\{camel-version\}` must be replaced by the actual version of Camel. ### See Also diff --git a/docs/components/modules/ROOT/pages/aws-iam-component.adoc b/docs/components/modules/ROOT/pages/aws-iam-component.adoc index ed93c70..4489a77 100644 --- a/docs/components/modules/ROOT/pages/aws-iam-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-iam-component.adoc @@ -190,7 +190,7 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> --------------------------------------- -where `\${camel-version}` must be replaced by the actual version of Camel. +where `$\{camel-version\}` must be replaced by the actual version of Camel. ### See Also diff --git a/docs/components/modules/ROOT/pages/aws-kinesis-component.adoc b/docs/components/modules/ROOT/pages/aws-kinesis-component.adoc index 6db0f8c4..54daab3 100644 --- a/docs/components/modules/ROOT/pages/aws-kinesis-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-kinesis-component.adoc @@ -270,7 +270,7 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> --------------------------------------- -where `\${camel-version}` must be replaced by the actual version of Camel. +where `$\{camel-version\}` must be replaced by the actual version of Camel. ### See Also diff --git a/docs/components/modules/ROOT/pages/aws-kinesis-firehose-component.adoc b/docs/components/modules/ROOT/pages/aws-kinesis-firehose-component.adoc index cff249c..8423426 100644 --- a/docs/components/modules/ROOT/pages/aws-kinesis-firehose-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-kinesis-firehose-component.adoc @@ -206,7 +206,7 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> --------------------------------------- -where `\${camel-version}` must be replaced by the actual version of Camel. +where `$\{camel-version\}` must be replaced by the actual version of Camel. ### See Also diff --git a/docs/components/modules/ROOT/pages/aws-kms-component.adoc b/docs/components/modules/ROOT/pages/aws-kms-component.adoc index 8df26df..6ae5c2e 100644 --- a/docs/components/modules/ROOT/pages/aws-kms-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-kms-component.adoc @@ -179,7 +179,7 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> --------------------------------------- -where `\${camel-version}` must be replaced by the actual version of Camel. +where `$\{camel-version\}` must be replaced by the actual version of Camel. ### See Also diff --git a/docs/components/modules/ROOT/pages/aws-lambda-component.adoc b/docs/components/modules/ROOT/pages/aws-lambda-component.adoc index 38368b7..35ca291 100644 --- a/docs/components/modules/ROOT/pages/aws-lambda-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-lambda-component.adoc @@ -241,7 +241,7 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> --------------------------------------- -where `\${camel-version}` must be replaced by the actual version of Camel. +where `$\{camel-version\}` must be replaced by the actual version of Camel. ### See Also diff --git a/docs/components/modules/ROOT/pages/aws-mq-component.adoc b/docs/components/modules/ROOT/pages/aws-mq-component.adoc index bb21314..e58c310 100644 --- a/docs/components/modules/ROOT/pages/aws-mq-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-mq-component.adoc @@ -180,7 +180,7 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> --------------------------------------- -where `\${camel-version}` must be replaced by the actual version of Camel. +where `$\{camel-version\}` must be replaced by the actual version of Camel. ### See Also diff --git a/docs/components/modules/ROOT/pages/aws-msk-component.adoc b/docs/components/modules/ROOT/pages/aws-msk-component.adoc index 629ab34..4898489 100644 --- a/docs/components/modules/ROOT/pages/aws-msk-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-msk-component.adoc @@ -183,7 +183,7 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> --------------------------------------- -where `\${camel-version}` must be replaced by the actual version of Camel. +where `$\{camel-version\}` must be replaced by the actual version of Camel. ### See Also diff --git a/docs/components/modules/ROOT/pages/aws-s3-component.adoc b/docs/components/modules/ROOT/pages/aws-s3-component.adoc index 1e1bd99..6bdd541 100644 --- a/docs/components/modules/ROOT/pages/aws-s3-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-s3-component.adoc @@ -536,7 +536,7 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> --------------------------------------- -where `\${camel-version}` must be replaced by the actual version of Camel. +where `$\{camel-version\}` must be replaced by the actual version of Camel. ### See Also diff --git a/docs/components/modules/ROOT/pages/aws-sdb-component.adoc b/docs/components/modules/ROOT/pages/aws-sdb-component.adoc index 7a0c379..02ad976 100644 --- a/docs/components/modules/ROOT/pages/aws-sdb-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-sdb-component.adoc @@ -255,7 +255,7 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> --------------------------------------- -where `\${camel-version}` must be replaced by the actual version of Camel. +where `$\{camel-version\}` must be replaced by the actual version of Camel. ### See Also diff --git a/docs/components/modules/ROOT/pages/aws-ses-component.adoc b/docs/components/modules/ROOT/pages/aws-ses-component.adoc index be3e459..22ea4ad 100644 --- a/docs/components/modules/ROOT/pages/aws-ses-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-ses-component.adoc @@ -216,7 +216,7 @@ This may be really useful for smarter configuration of the endpoint. </dependency> --------------------------------------- -where `\${camel-version}` must be replaced by the actual version of Camel. +where `$\{camel-version\}` must be replaced by the actual version of Camel. ### See Also diff --git a/docs/components/modules/ROOT/pages/aws-sns-component.adoc b/docs/components/modules/ROOT/pages/aws-sns-component.adoc index a66c8ab..3c544af 100644 --- a/docs/components/modules/ROOT/pages/aws-sns-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-sns-component.adoc @@ -251,7 +251,7 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> --------------------------------------- -where `\${camel-version}` must be replaced by the actual version of Camel. +where `$\{camel-version\}` must be replaced by the actual version of Camel. ### See Also diff --git a/docs/components/modules/ROOT/pages/aws-sqs-component.adoc b/docs/components/modules/ROOT/pages/aws-sqs-component.adoc index 97bc970..6033f29 100644 --- a/docs/components/modules/ROOT/pages/aws-sqs-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-sqs-component.adoc @@ -323,7 +323,7 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> --------------------------------------- -where `\${camel-version}` must be replaced by the actual version of Camel. +where `$\{camel-version\}` must be replaced by the actual version of Camel. ### JMS-style Selectors diff --git a/docs/components/modules/ROOT/pages/aws-swf-component.adoc b/docs/components/modules/ROOT/pages/aws-swf-component.adoc index 4f4e8e5..5386501 100644 --- a/docs/components/modules/ROOT/pages/aws-swf-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-swf-component.adoc @@ -306,7 +306,7 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> --------------------------------------- -where `\${camel-version}` must be replaced by the actual version of Camel. +where `$\{camel-version\}` must be replaced by the actual version of Camel. ### See Also diff --git a/docs/components/modules/ROOT/pages/cxf-component.adoc b/docs/components/modules/ROOT/pages/cxf-component.adoc index 38f3e9f..ac9e9d4 100644 --- a/docs/components/modules/ROOT/pages/cxf-component.adoc +++ b/docs/components/modules/ROOT/pages/cxf-component.adoc @@ -152,7 +152,7 @@ with the following path and query parameters: | *bus* (advanced) | To use a custom configured CXF Bus. | | Bus | *continuationTimeout* (advanced) | This option is used to set the CXF continuation timeout which could be used in CxfConsumer by default when the CXF server is using Jetty or Servlet transport. | 30000 | long | *cxfBinding* (advanced) | To use a custom CxfBinding to control the binding between Camel Message and CXF Message. | | CxfBinding -| *cxfEndpointConfigurer* (advanced) | This option could apply the implementation of org.apache.camel.component.cxf.CxfEndpointConfigurer which supports to configure the CXF endpoint in programmatic way. User can configure the CXF server and client by implementing configure{ServerClient} method of CxfEndpointConfigurer. | | CxfEndpointConfigurer +| *cxfEndpointConfigurer* (advanced) | This option could apply the implementation of org.apache.camel.component.cxf.CxfEndpointConfigurer which supports to configure the CXF endpoint in programmatic way. User can configure the CXF server and client by implementing configure{\ServerClient\} method of CxfEndpointConfigurer. | | CxfEndpointConfigurer | *defaultBus* (advanced) | Will set the default bus when CXF endpoint create a bus by itself | false | boolean | *headerFilterStrategy* (advanced) | To use a custom HeaderFilterStrategy to filter header to and from Camel message. | | HeaderFilterStrategy | *mergeProtocolHeaders* (advanced) | Whether to merge protocol headers. If enabled then propagating headers between Camel and CXF becomes more consistent and similar. For more details see CAMEL-6393. | false | boolean @@ -450,7 +450,7 @@ which operation you are calling. Be sure to include the JAX-WS `schemaLocation` attribute specified on the root beans element. This allows CXF to validate the file and is required. Also note the namespace declarations at the end of the -`<cxf:cxfEndpoint/>` tag. These declarations are required because the combined `{namespace}localName` syntax is presently not supported for this tag's +`<cxf:cxfEndpoint/>` tag. These declarations are required because the combined `\{namespace\}localName` syntax is presently not supported for this tag's attribute values. The `cxf:cxfEndpoint` element supports many additional attributes: diff --git a/docs/components/modules/ROOT/pages/google-bigquery-sql-component.adoc b/docs/components/modules/ROOT/pages/google-bigquery-sql-component.adoc index a8d4b0f..007c317 100644 --- a/docs/components/modules/ROOT/pages/google-bigquery-sql-component.adoc +++ b/docs/components/modules/ROOT/pages/google-bigquery-sql-component.adoc @@ -60,7 +60,7 @@ Examples: -------------------------------------------------------- where - * parameters in form \${name} are extracted from message headers and formed the translated query + * parameters in form $\{name\} are extracted from message headers and formed the translated query * parameters in form @name are extracted from body or message headers and sent to Google Bigquery You can externalize your SQL queries to files in the classpath or file system as shown: diff --git a/docs/components/modules/ROOT/pages/grok-dataformat.adoc b/docs/components/modules/ROOT/pages/grok-dataformat.adoc index b1413af..e864b08 100644 --- a/docs/components/modules/ROOT/pages/grok-dataformat.adoc +++ b/docs/components/modules/ROOT/pages/grok-dataformat.adoc @@ -100,7 +100,7 @@ The Grok dataformat supports 5 options, which are listed below. | pattern | | String | The grok pattern to match lines of input | flattened | false | Boolean | Turns on flattened mode. In flattened mode the exception is thrown when there are multiple pattern matches with same key. | allowMultipleMatchesPerLine | true | Boolean | If false, every line of input is matched for pattern only once. Otherwise the line can be scanned multiple times when non-terminal pattern is used. -| namedOnly | false | Boolean | Whether to capture named expressions only or not (i.e. %{IP:ip} but not \${IP}) +| namedOnly | false | Boolean | Whether to capture named expressions only or not (i.e. %{IP:ip} but not $\{IP\}) | contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc. |=== // dataformat options: END @@ -131,7 +131,7 @@ The component supports 6 options, which are listed below. | *camel.dataformat.grok.content-type-header* | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc. | false | Boolean | *camel.dataformat.grok.enabled* | Whether to enable auto configuration of the grok data format. This is enabled by default. | | Boolean | *camel.dataformat.grok.flattened* | Turns on flattened mode. In flattened mode the exception is thrown when there are multiple pattern matches with same key. | false | Boolean -| *camel.dataformat.grok.named-only* | Whether to capture named expressions only or not (i.e. %{IP:ip} but not \${IP}) | false | Boolean +| *camel.dataformat.grok.named-only* | Whether to capture named expressions only or not (i.e. %{IP:ip} but not $\{IP\}) | false | Boolean | *camel.dataformat.grok.pattern* | The grok pattern to match lines of input | | String |=== // spring-boot-auto-configure options: END diff --git a/docs/components/modules/ROOT/pages/hipchat-component.adoc b/docs/components/modules/ROOT/pages/hipchat-component.adoc index f1cdd59..7b2aca6 100644 --- a/docs/components/modules/ROOT/pages/hipchat-component.adoc +++ b/docs/components/modules/ROOT/pages/hipchat-component.adoc @@ -258,4 +258,4 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> ------------------------------------------ -where `\${camel-version}` must be replaced by the actual version of Camel. +where `$\{camel-version\}` must be replaced by the actual version of Camel. diff --git a/docs/components/modules/ROOT/pages/jasypt.adoc b/docs/components/modules/ROOT/pages/jasypt.adoc index aa4c43f..c8485ff 100644 --- a/docs/components/modules/ROOT/pages/jasypt.adoc +++ b/docs/components/modules/ROOT/pages/jasypt.adoc @@ -100,7 +100,7 @@ The idea is then to use those encrypted values in your xref:properties-component.adoc[Properties] files. Notice how the password value is encrypted and the value has the tokens surrounding `ENC(value here)` -TIP: When running jasypt tooling, if you come across `java.lang.NoClassDefFoundError: org/jasypt/encryption/pbe/StandardPBEStringEncryptor` this means you have to include jasypt{version}.jar in your classpath. Example of adding jar to classpath may be copying jasypt{version}.jar to $JAVA_HOME\jre\lib\ext if you are going to run as `java -jar ...`. The latter may be adding jasypt{version}.jar to classpath using `-cp`, in that case you should provide main class to execute as eg: `java -cp [...] +TIP: When running jasypt tooling, if you come across `java.lang.NoClassDefFoundError: org/jasypt/encryption/pbe/StandardPBEStringEncryptor` this means you have to include jasypt\{version\}.jar in your classpath. Example of adding jar to classpath may be copying jasypt\{version\}.jar to $JAVA_HOME\jre\lib\ext if you are going to run as `java -jar ...`. The latter may be adding jasypt\{version\}.jar to classpath using `-cp`, in that case you should provide main class to execute as eg: `jav [...] ### URI Options diff --git a/docs/components/modules/ROOT/pages/jcache-component.adoc b/docs/components/modules/ROOT/pages/jcache-component.adoc index 70bdca8..bc1cc13 100644 --- a/docs/components/modules/ROOT/pages/jcache-component.adoc +++ b/docs/components/modules/ROOT/pages/jcache-component.adoc @@ -238,7 +238,7 @@ The _.log()_ at the beginning and at the end of the route is always called, but ## KeyExpression -By default the policy uses the received Exchange body as _key_, so the default expression is like _simple("${body})_. +By default the policy uses the received Exchange body as _key_, so the default expression is like _simple("$\{body\})_. We can set a different Camel Expression as _keyExpression_ which will be evaluated to determine the key. For example if we try to find an _order_ by an _orderId_ which is in the message headers, set _header("orderId")_ (or _simple("${header.orderId})_ as _keyExpression_. diff --git a/docs/components/modules/ROOT/pages/jsonpath-language.adoc b/docs/components/modules/ROOT/pages/jsonpath-language.adoc index e15dd12..72280c2 100644 --- a/docs/components/modules/ROOT/pages/jsonpath-language.adoc +++ b/docs/components/modules/ROOT/pages/jsonpath-language.adoc @@ -212,7 +212,7 @@ This option is also available on the `@JsonPath` annotation. *Available as of Camel 2.18* -Its now possible to inlined Simple language expressions in the JSonPath expression using the simple syntax \${xxx}. +Its now possible to inlined Simple language expressions in the JSonPath expression using the simple syntax $\{xxx\}. An example is shown below: [source,java] diff --git a/docs/components/modules/ROOT/pages/kafka-component.adoc b/docs/components/modules/ROOT/pages/kafka-component.adoc index b404964..35e2b6e 100644 --- a/docs/components/modules/ROOT/pages/kafka-component.adoc +++ b/docs/components/modules/ROOT/pages/kafka-component.adoc @@ -153,7 +153,7 @@ with the following path and query parameters: | *interceptorClasses* (monitoring) | Sets interceptors for producer or consumers. Producer interceptors have to be classes implementing org.apache.kafka.clients.producer.ProducerInterceptor Consumer interceptors have to be classes implementing org.apache.kafka.clients.consumer.ConsumerInterceptor Note that if you use Producer interceptor on a consumer it will throw a class cast exception in runtime | | String | *kerberosBeforeReloginMin Time* (security) | Login thread sleep time between refresh attempts. | 60000 | Integer | *kerberosInitCmd* (security) | Kerberos kinit command path. Default is /usr/bin/kinit | /usr/bin/kinit | String -| *kerberosPrincipalToLocal Rules* (security) | A list of rules for mapping from principal names to short names (typically operating system usernames). The rules are evaluated in order and the first rule that matches a principal name is used to map it to a short name. Any later rules in the list are ignored. By default, principal names of the form {username}/{hostname}{REALM} are mapped to {username}. For more details on the format please see the security authorization and acls documenta [...] +| *kerberosPrincipalToLocal Rules* (security) | A list of rules for mapping from principal names to short names (typically operating system usernames). The rules are evaluated in order and the first rule that matches a principal name is used to map it to a short name. Any later rules in the list are ignored. By default, principal names of the form \{username\}/\{hostname\}\{REALM\} are mapped to \{username\}. For more details on the format please see the security authorization and acls d [...] | *kerberosRenewJitter* (security) | Percentage of random jitter added to the renewal time. | 0.05 | Double | *kerberosRenewWindowFactor* (security) | Login thread will sleep until the specified window factor of time from last refresh to ticket's expiry has been reached, at which time it will try to renew the ticket. | 0.8 | Double | *saslJaasConfig* (security) | Expose the kafka sasl.jaas.config parameter Example: org.apache.kafka.common.security.plain.PlainLoginModule required username=USERNAME password=PASSWORD; | | String @@ -234,7 +234,7 @@ The component supports 101 options, which are listed below. | *camel.component.kafka.configuration.kafka-header-serializer* | Sets custom KafkaHeaderDeserializer for serialization camel headers values to kafka headers values. | | KafkaHeaderSerializer | *camel.component.kafka.configuration.kerberos-before-relogin-min-time* | Login thread sleep time between refresh attempts. | 60000 | Integer | *camel.component.kafka.configuration.kerberos-init-cmd* | Kerberos kinit command path. Default is /usr/bin/kinit | /usr/bin/kinit | String -| *camel.component.kafka.configuration.kerberos-principal-to-local-rules* | A list of rules for mapping from principal names to short names (typically operating system usernames). The rules are evaluated in order and the first rule that matches a principal name is used to map it to a short name. Any later rules in the list are ignored. By default, principal names of the form {username}/{hostname}@{REALM} are mapped to {username}. For more details on the format please see the security aut [...] +| *camel.component.kafka.configuration.kerberos-principal-to-local-rules* | A list of rules for mapping from principal names to short names (typically operating system usernames). The rules are evaluated in order and the first rule that matches a principal name is used to map it to a short name. Any later rules in the list are ignored. By default, principal names of the form \{username\}/\{hostname\}@\{REALM\} are mapped to \{username\}. For more details on the format please see the secu [...] | *camel.component.kafka.configuration.kerberos-renew-jitter* | Percentage of random jitter added to the renewal time. | 0.05 | Double | *camel.component.kafka.configuration.kerberos-renew-window-factor* | Login thread will sleep until the specified window factor of time from last refresh to ticket's expiry has been reached, at which time it will try to renew the ticket. | 0.8 | Double | *camel.component.kafka.configuration.key* | The record key (or null if no key is specified). If this option has been configured then it take precedence over header {@link KafkaConstants#KEY} | | String diff --git a/docs/components/modules/ROOT/pages/properties-component.adoc b/docs/components/modules/ROOT/pages/properties-component.adoc index 7982075..0764037 100644 --- a/docs/components/modules/ROOT/pages/properties-component.adoc +++ b/docs/components/modules/ROOT/pages/properties-component.adoc @@ -157,7 +157,7 @@ property component. === Syntax -The syntax to use Camel's property placeholder is to use `{{key}}` for +The syntax to use Camel's property placeholder is to use `{\{key\}}` for example `{{file.uri}}` where `file.uri` is the property key. You can use property placeholders in parts of the endpoint URI's which diff --git a/docs/components/modules/ROOT/pages/rest-component.adoc b/docs/components/modules/ROOT/pages/rest-component.adoc index 12e7a2b..9e1032b 100644 --- a/docs/components/modules/ROOT/pages/rest-component.adoc +++ b/docs/components/modules/ROOT/pages/rest-component.adoc @@ -183,7 +183,7 @@ from("rest:get:hello:/french/{me}") You can use the rest component to call REST services like any other Camel component. -For example to call a REST service on using `hello/{me}` you can do +For example to call a REST service on using `hello/\{me\}` you can do [source,java] ---- @@ -191,7 +191,7 @@ from("direct:start") .to("rest:get:hello/{me}"); ---- -And then the dynamic value `{me}` is mapped to Camel message with the same name. +And then the dynamic value `\{me\}` is mapped to Camel message with the same name. So to call this REST service you can send an empty message body and a header as shown: [source,java] diff --git a/docs/components/modules/ROOT/pages/rest-swagger-component.adoc b/docs/components/modules/ROOT/pages/rest-swagger-component.adoc index c23c5f2..ca243bf 100644 --- a/docs/components/modules/ROOT/pages/rest-swagger-component.adoc +++ b/docs/components/modules/ROOT/pages/rest-swagger-component.adoc @@ -79,7 +79,7 @@ to message headers you can specify REST operation's parameters as endpoint parameters, these will be constant for all subsequent invocations so it makes sense to use this feature only for parameters that are indeed constant for all invocations -- for example API version -in path such as `/api/{version}/users/{id}`. +in path such as `/api/\{version\}/users/\{id\}`. ### Options diff --git a/docs/components/modules/ROOT/pages/restlet-component.adoc b/docs/components/modules/ROOT/pages/restlet-component.adoc index e24cb61..5a17743 100644 --- a/docs/components/modules/ROOT/pages/restlet-component.adoc +++ b/docs/components/modules/ROOT/pages/restlet-component.adoc @@ -113,7 +113,7 @@ with the following path and query parameters: | *protocol* | *Required* The protocol to use which is http or https | | String | *host* | *Required* The hostname of the restlet service | | String | *port* | *Required* The port number of the restlet service | 80 | int -| *uriPattern* | The resource pattern such as /customer/{id} | | String +| *uriPattern* | The resource pattern such as /customer/\{id\} | | String |=== diff --git a/docs/components/modules/ROOT/pages/servicenow-component.adoc b/docs/components/modules/ROOT/pages/servicenow-component.adoc index 717598c..8c4f794 100644 --- a/docs/components/modules/ROOT/pages/servicenow-component.adoc +++ b/docs/components/modules/ROOT/pages/servicenow-component.adoc @@ -295,18 +295,18 @@ The component supports 58 options, which are listed below. |=== | CamelServiceNowResource | CamelServiceNowAction | Method | API URI 1.5+<.^|TABLE -| RETRIEVE | GET | /api/now/v1/table/{table_name}/{sys_id} -| CREATE | POST | /api/now/v1/table/{table_name} -| MODIFY | PUT | /api/now/v1/table/{table_name}/{sys_id} -| DELETE | DELETE | /api/now/v1/table/{table_name}/{sys_id} -| UPDATE | PATCH | /api/now/v1/table/{table_name}/{sys_id} +| RETRIEVE | GET | /api/now/v1/table/\{table_name\}/\{sys_id\} +| CREATE | POST | /api/now/v1/table/\{table_name\} +| MODIFY | PUT | /api/now/v1/table/\{table_name\}/\{sys_id\} +| DELETE | DELETE | /api/now/v1/table/\{table_name\}/\{sys_id\} +| UPDATE | PATCH | /api/now/v1/table/\{table_name\}/\{sys_id\} | AGGREGATE -| RETRIEVE | GET | /api/now/v1/stats/{table_name} +| RETRIEVE | GET | /api/now/v1/stats/\{table_name\} 1.2+<.^|IMPORT -| RETRIEVE | GET | /api/now/import/{table_name}/{sys_id} -| CREATE | POST | /api/now/import/{table_name} +| RETRIEVE | GET | /api/now/import/\{table_name\}/\{sys_id\} +| CREATE | POST | /api/now/import/\{table_name\} |=== NOTE: http://wiki.servicenow.com/index.php?title=REST_API#Available_APIs[Fuji REST API Documentation] @@ -317,24 +317,24 @@ NOTE: http://wiki.servicenow.com/index.php?title=REST_API#Available_APIs[Fuji RE |=== | CamelServiceNowResource | CamelServiceNowAction | CamelServiceNowActionSubject | Method | API URI 1.5+<.^|TABLE -| RETRIEVE | | GET | /api/now/v1/table/{table_name}/{sys_id} -| CREATE | | POST | /api/now/v1/table/{table_name} -| MODIFY | | PUT | /api/now/v1/table/{table_name}/{sys_id} -| DELETE | | DELETE | /api/now/v1/table/{table_name}/{sys_id} -| UPDATE | | PATCH | /api/now/v1/table/{table_name}/{sys_id} +| RETRIEVE | | GET | /api/now/v1/table/\{table_name\}/\{sys_id\} +| CREATE | | POST | /api/now/v1/table/\{table_name\} +| MODIFY | | PUT | /api/now/v1/table/\{table_name\}/\{sys_id\} +| DELETE | | DELETE | /api/now/v1/table/\{table_name\}/\{sys_id\} +| UPDATE | | PATCH | /api/now/v1/table/\{table_name\}/\{sys_id\} | AGGREGATE -| RETRIEVE | | GET | /api/now/v1/stats/{table_name} +| RETRIEVE | | GET | /api/now/v1/stats/\{table_name\} 1.2+<.^|IMPORT -| RETRIEVE | | GET | /api/now/import/{table_name}/{sys_id} -| CREATE | | POST | /api/now/import/{table_name} +| RETRIEVE | | GET | /api/now/import/\{table_name\}/\{sys_id\} +| CREATE | | POST | /api/now/import/\{table_name\} 1.4+<.^|ATTACHMENT -| RETRIEVE | | GET | /api/now/api/now/attachment/{sys_id} -| CONTENT | | GET | /api/now/attachment/{sys_id}/file +| RETRIEVE | | GET | /api/now/api/now/attachment/\{sys_id\} +| CONTENT | | GET | /api/now/attachment/\{sys_id\}/file | UPLOAD | | POST | /api/now/api/now/attachment/file -| DELETE | | DELETE | /api/now/attachment/{sys_id} +| DELETE | | DELETE | /api/now/attachment/\{sys_id\} | SCORECARDS | RETRIEVE | PERFORMANCE_ANALYTICS | GET | /api/now/pa/scorecards @@ -344,26 +344,26 @@ NOTE: http://wiki.servicenow.com/index.php?title=REST_API#Available_APIs[Fuji RE | CREATE | IDENTIFY_RECONCILE | POST | /api/now/identifyreconcile 1.2+<.^|SERVICE_CATALOG -| RETRIEVE | | GET | /sn_sc/servicecatalog/catalogs/{sys_id} -| RETRIEVE | CATEGORIES | GET | /sn_sc/servicecatalog/catalogs/{sys_id}/categories +| RETRIEVE | | GET | /sn_sc/servicecatalog/catalogs/\{sys_id\} +| RETRIEVE | CATEGORIES | GET | /sn_sc/servicecatalog/catalogs/\{sys_id\}/categories 1.5+<.^|SERVICE_CATALOG_ITEMS -| RETRIEVE | | GET | /sn_sc/servicecatalog/items/{sys_id} -| RETRIEVE | SUBMIT_GUIDE | POST | /sn_sc/servicecatalog/items/{sys_id}/submit_guide -| RETRIEVE | CHECKOUT_GUIDE | POST | /sn_sc/servicecatalog/items/{sys_id}/checkout_guide -| CREATE | SUBJECT_CART | POST | /sn_sc/servicecatalog/items/{sys_id}/add_to_cart -| CREATE | SUBJECT_PRODUCER | POST | /sn_sc/servicecatalog/items/{sys_id}/submit_producer +| RETRIEVE | | GET | /sn_sc/servicecatalog/items/\{sys_id\} +| RETRIEVE | SUBMIT_GUIDE | POST | /sn_sc/servicecatalog/items/\{sys_id\}/submit_guide +| RETRIEVE | CHECKOUT_GUIDE | POST | /sn_sc/servicecatalog/items/\{sys_id\}/checkout_guide +| CREATE | SUBJECT_CART | POST | /sn_sc/servicecatalog/items/\{sys_id\}/add_to_cart +| CREATE | SUBJECT_PRODUCER | POST | /sn_sc/servicecatalog/items/\{sys_id\}/submit_producer 1.6+<.^|SERVICE_CATALOG_CARTS | RETRIEVE | | GET | /sn_sc/servicecatalog/cart -| RETRIEVE | DELIVERY_ADDRESS | GET | /sn_sc/servicecatalog/cart/delivery_address/{user_id} +| RETRIEVE | DELIVERY_ADDRESS | GET | /sn_sc/servicecatalog/cart/delivery_address/\{user_id\} | RETRIEVE | CHECKOUT | POST | /sn_sc/servicecatalog/cart/checkout -| UPDATE | | POST | /sn_sc/servicecatalog/cart/{cart_item_id} +| UPDATE | | POST | /sn_sc/servicecatalog/cart/\{cart_item_id\} | UPDATE | CHECKOUT | POST | /sn_sc/servicecatalog/cart/submit_order -| DELETE | | DELETE | /sn_sc/servicecatalog/cart/{sys_id}/empty +| DELETE | | DELETE | /sn_sc/servicecatalog/cart/\{sys_id\}/empty | SERVICE_CATALOG_CATEGORIES -| RETRIEVE | | GET | /sn_sc/servicecatalog/categories/{sys_id} +| RETRIEVE | | GET | /sn_sc/servicecatalog/categories/\{sys_id\} |=== diff --git a/docs/components/modules/ROOT/pages/testcontainers.adoc b/docs/components/modules/ROOT/pages/testcontainers.adoc index 8cebf7c..73be426 100644 --- a/docs/components/modules/ROOT/pages/testcontainers.adoc +++ b/docs/components/modules/ROOT/pages/testcontainers.adoc @@ -77,8 +77,8 @@ You may need to wait for some condition to be satisfied before starting your tes Camel Testcontainer provides a PropertiesFunction implementation that can be used to: -- retrieve the container host with the following syntax `container:host:${container-name}` -- retrieve the port mapping with the following syntax `container:port:${exposed-port}@${container-name}` +- retrieve the container host with the following syntax `container:host:$\{container-name\}` +- retrieve the port mapping with the following syntax `container:port:$\{exposed-port\}@$\{container-name\}` [source,java] .Example diff --git a/docs/user-manual/modules/ROOT/pages/stream-caching.adoc b/docs/user-manual/modules/ROOT/pages/stream-caching.adoc index 0f2387f..fef5ca3 100644 --- a/docs/user-manual/modules/ROOT/pages/stream-caching.adoc +++ b/docs/user-manual/modules/ROOT/pages/stream-caching.adoc @@ -246,7 +246,7 @@ The following patterns is supported: * `\#symbolicName#` = the OSGi symbolic name (only for OSGi environments) * `\#version#` = the OSGi bundle version (only for OSGi environments) * `${env:key}` = the environment variable with the key -* `${key}` = the JVM system property with the key +* `$\{key\}` = the JVM system property with the key A couple of examples: diff --git a/docs/user-manual/modules/ROOT/pages/threading-model.adoc b/docs/user-manual/modules/ROOT/pages/threading-model.adoc index e15c8bc..32c994a 100644 --- a/docs/user-manual/modules/ROOT/pages/threading-model.adoc +++ b/docs/user-manual/modules/ROOT/pages/threading-model.adoc @@ -146,7 +146,7 @@ thread. The default pattern is for: * *Camel 2.9.x or older:* -`Camel (${camelId}) thread #${counter} - ${name`} +`Camel (${camelId}) thread #${counter} - ${name}` * *Camel 2.10 onwards:* `Camel (#camelId#) thread ##counter# - #name#` Notice we renamed the tokens from Camel 2.10 onwards to not clash with