This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit d83e0a26ea8a50b67408a861195b078d55043a41 Author: Alexandros Koufoudakis <akoufouda...@gmail.com> AuthorDate: Fri Jun 14 18:32:15 2019 +0200 Components "g... - i...". https://issues.apache.org/jira/browse/CAMEL-13480 --- .../src/main/docs/geocoder-component.adoc | 2 +- .../camel-git/src/main/docs/git-component.adoc | 2 +- .../camel-github/src/main/docs/github-component.adoc | 2 +- .../src/main/docs/google-bigquery-component.adoc | 4 ++-- .../src/main/docs/google-bigquery-sql-component.adoc | 8 +++----- .../src/main/docs/google-calendar-component.adoc | 3 ++- .../main/docs/google-calendar-stream-component.adoc | 3 ++- .../src/main/docs/google-drive-component.adoc | 3 ++- .../src/main/docs/google-pubsub-component.adoc | 2 +- .../src/main/docs/google-sheets-component.adoc | 3 ++- .../main/docs/google-sheets-stream-component.adoc | 3 ++- .../camel-gora/src/main/docs/gora-component.adoc | 2 +- .../camel-groovy/src/main/docs/groovy-language.adoc | 5 ++--- .../camel-grpc/src/main/docs/grpc-component.adoc | 4 ++-- .../main/docs/hazelcast-atomicvalue-component.adoc | 5 ----- .../src/main/docs/hazelcast-map-component.adoc | 6 ------ .../src/main/docs/hazelcast-multimap-component.adoc | 6 +----- .../main/docs/hazelcast-replicatedmap-component.adoc | 3 --- .../main/docs/hazelcast-ringbuffer-component.adoc | 3 --- .../camel-hdfs2/src/main/docs/hdfs2-component.adoc | 4 ++-- .../src/main/docs/hipchat-component.adoc | 3 +-- .../camel-hl7/src/main/docs/hl7-dataformat.adoc | 20 ++++++++++---------- .../camel-hl7/src/main/docs/hl7terser-language.adoc | 6 ++---- .../camel-http4/src/main/docs/http4-component.adoc | 16 ++++------------ components/camel-hystrix/src/main/docs/hystrix.adoc | 2 +- .../camel-ical/src/main/docs/ical-dataformat.adoc | 2 +- .../src/main/docs/iec60870-client-component.adoc | 2 +- .../src/main/docs/infinispan-component.adoc | 8 ++++---- .../src/main/docs/influxdb-component.adoc | 2 +- .../camel-ipfs/src/main/docs/ipfs-component.adoc | 2 +- .../camel-irc/src/main/docs/irc-component.adoc | 6 +++--- 31 files changed, 56 insertions(+), 86 deletions(-) diff --git a/components/camel-geocoder/src/main/docs/geocoder-component.adoc b/components/camel-geocoder/src/main/docs/geocoder-component.adoc index e2b59f1..410ac80 100644 --- a/components/camel-geocoder/src/main/docs/geocoder-component.adoc +++ b/components/camel-geocoder/src/main/docs/geocoder-component.adoc @@ -3,7 +3,7 @@ *Available as of Camel version 2.12* -The *geocoder:* component is used for looking up geocodes (latitude and +The Geocoder component is used for looking up geocodes (latitude and longitude) for a given address, or reverse lookup. The component uses the https://code.google.com/p/geocoder-java/[Java API for Google Geocoder] library. diff --git a/components/camel-git/src/main/docs/git-component.adoc b/components/camel-git/src/main/docs/git-component.adoc index 2933863..d76d1b0 100644 --- a/components/camel-git/src/main/docs/git-component.adoc +++ b/components/camel-git/src/main/docs/git-component.adoc @@ -3,7 +3,7 @@ *Available as of Camel version 2.16* -The *git:* component allows you to work with a generic Git repository. +The Git component allows you to work with a generic Git repository. [source,xml] ------------------------------------------------------------ diff --git a/components/camel-github/src/main/docs/github-component.adoc b/components/camel-github/src/main/docs/github-component.adoc index 4c84d14..dd326ac 100644 --- a/components/camel-github/src/main/docs/github-component.adoc +++ b/components/camel-github/src/main/docs/github-component.adoc @@ -165,5 +165,5 @@ pull request discussion is assumed. |closePullRequest |none | - GitHubPullRequest (integer) (REQUIRED): Pull request number. -|createIssue (From Camel 2.18) |String (issue body text) | - GitHubIssueTitle (String) (REQUIRED): Issue Title. +|createIssue |String (issue body text) | - GitHubIssueTitle (String) (REQUIRED): Issue Title. |======================================================================= diff --git a/components/camel-google-bigquery/src/main/docs/google-bigquery-component.adoc b/components/camel-google-bigquery/src/main/docs/google-bigquery-component.adoc index 0050200..a84a5aa 100644 --- a/components/camel-google-bigquery/src/main/docs/google-bigquery-component.adoc +++ b/components/camel-google-bigquery/src/main/docs/google-bigquery-component.adoc @@ -19,8 +19,8 @@ for this component: <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-google-bigquery</artifactId> - <version>x.x.x</version> <!-- use the same version as your Camel core version --> + <version>x.x.x</version> </dependency> ------------------------------------------------------ @@ -159,7 +159,7 @@ The component supports 9 options, which are listed below. Producer endpoints can accept and deliver to BigQuery individual and grouped exchanges alike. Grouped exchanges have `Exchange.GROUPED_EXCHANGE` property set. -Goole BigQuery producer will send a grouped exchange in a single api call unless different table suffix or +Google BigQuery producer will send a grouped exchange in a single api call unless different table suffix or partition decorators are specified in which case it will break it down to ensure data is written with the correct suffix or partition decorator. diff --git a/components/camel-google-bigquery/src/main/docs/google-bigquery-sql-component.adoc b/components/camel-google-bigquery/src/main/docs/google-bigquery-sql-component.adoc index d6153f4..5673e1d 100644 --- a/components/camel-google-bigquery/src/main/docs/google-bigquery-sql-component.adoc +++ b/components/camel-google-bigquery/src/main/docs/google-bigquery-sql-component.adoc @@ -1,11 +1,9 @@ [[google-bigquery-sql-component]] == Google BigQuery Standard SQL Component -*Available as of Camel version 2.23* -*Available as of Camel version 2.23* - +*Available as of Camel version 2.23* -The Google Bigquery SQL component provides access +The Google BigQuery SQL component provides access to https://cloud.google.com/bigquery/[Cloud BigQuery Infrastructure] via the https://developers.google.com/apis-explorer/#p/bigquery/v2/bigquery.jobs.query[Google Client Services API]. @@ -20,8 +18,8 @@ for this component: <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-google-bigquery</artifactId> - <version>x.x.x</version> <!-- use the same version as your Camel core version --> + <version>x.x.x</version> </dependency> ------------------------------------------------------ diff --git a/components/camel-google-calendar/src/main/docs/google-calendar-component.adoc b/components/camel-google-calendar/src/main/docs/google-calendar-component.adoc index 8ec9d9f..d37c6a6 100644 --- a/components/camel-google-calendar/src/main/docs/google-calendar-component.adoc +++ b/components/camel-google-calendar/src/main/docs/google-calendar-component.adoc @@ -25,7 +25,8 @@ for this component: <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-google-calendar</artifactId> - <version>2.15.0</version> + <!-- use the same version as your Camel core version --> + <version>x.x.x</version> </dependency> ---------------------------------------------------------- diff --git a/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc b/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc index 5be2183..fbe1c0f 100644 --- a/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc +++ b/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc @@ -25,7 +25,8 @@ for this component: <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-google-calendar</artifactId> - <version>2.23.0</version> + <!-- use the same version as your Camel core version --> + <version>x.x.x</version> </dependency> ------------------------------------------------------ diff --git a/components/camel-google-drive/src/main/docs/google-drive-component.adoc b/components/camel-google-drive/src/main/docs/google-drive-component.adoc index ea4e723..9a513ce 100644 --- a/components/camel-google-drive/src/main/docs/google-drive-component.adoc +++ b/components/camel-google-drive/src/main/docs/google-drive-component.adoc @@ -24,7 +24,8 @@ for this component: <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-google-drive</artifactId> - <version>2.14-SNAPSHOT</version> + <!-- use the same version as your Camel core version --> + <version>x.x.x</version> </dependency> ------------------------------------------------------- diff --git a/components/camel-google-pubsub/src/main/docs/google-pubsub-component.adoc b/components/camel-google-pubsub/src/main/docs/google-pubsub-component.adoc index 4472134..dd094d5 100644 --- a/components/camel-google-pubsub/src/main/docs/google-pubsub-component.adoc +++ b/components/camel-google-pubsub/src/main/docs/google-pubsub-component.adoc @@ -16,8 +16,8 @@ for this component: <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-google-pubsub</artifactId> - <version>x.x.x</version> <!-- use the same version as your Camel core version --> + <version>x.x.x</version> </dependency> ------------------------------------------------------ diff --git a/components/camel-google-sheets/src/main/docs/google-sheets-component.adoc b/components/camel-google-sheets/src/main/docs/google-sheets-component.adoc index 4d616ea..944ce5c 100644 --- a/components/camel-google-sheets/src/main/docs/google-sheets-component.adoc +++ b/components/camel-google-sheets/src/main/docs/google-sheets-component.adoc @@ -25,7 +25,8 @@ for this component: <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-google-sheets</artifactId> - <version>2.23.0</version> + <!-- use the same version as your Camel core version --> + <version>x.x.x</version> </dependency> ---------------------------------------------------------- diff --git a/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc b/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc index 32390bb..87ca39a 100644 --- a/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc +++ b/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc @@ -25,7 +25,8 @@ for this component: <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-google-sheets</artifactId> - <version>2.23.0</version> + <!-- use the same version as your Camel core version --> + <version>x.x.x</version> </dependency> ------------------------------------------------------ diff --git a/components/camel-gora/src/main/docs/gora-component.adoc b/components/camel-gora/src/main/docs/gora-component.adoc index 7305a75..3e65b81 100644 --- a/components/camel-gora/src/main/docs/gora-component.adoc +++ b/components/camel-gora/src/main/docs/gora-component.adoc @@ -15,8 +15,8 @@ for this component: <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-gora</artifactId> + <!-- use the same version as your Camel core version --> <version>x.x.x</version> - <!-- use the same version as your Camel core version --> </dependency> --------------------------------------------------------- diff --git a/components/camel-groovy/src/main/docs/groovy-language.adoc b/components/camel-groovy/src/main/docs/groovy-language.adoc index 91e3bb3..0181cde 100644 --- a/components/camel-groovy/src/main/docs/groovy-language.adoc +++ b/components/camel-groovy/src/main/docs/groovy-language.adoc @@ -134,7 +134,7 @@ following attributes all set at `ENGINE_SCOPE`: |response |`org.apache.camel.Message` |*Deprecated*: The OUT message. The OUT message if null by default. Use IN message instead. -|properties |`org.apache.camel.builder.script.PropertiesFunction` |*Camel 2.9:* Function with a `resolve` method to make it easier to use +|properties |`org.apache.camel.builder.script.PropertiesFunction` |Function with a `resolve` method to make it easier to use Camels <<properties-component,Properties>> component from scripts. See further below for example. |======================================================================= @@ -165,8 +165,7 @@ placeholder, which key is provided in a header named "foo". .setHeader("myHeader").groovy(""context.resolvePropertyPlaceholders( + '{{' + request.headers.get('foo') + '}}' + ")") ------------------------------------------------------------------------------------------------------------------------------ -From Camel 2.9 onwards you can now use the properties function and the -same example is simpler: +You can use the properties function and the same example is simpler: [source,java] --------------------------------------------------------------------------------------- diff --git a/components/camel-grpc/src/main/docs/grpc-component.adoc b/components/camel-grpc/src/main/docs/grpc-component.adoc index ec21f4f..08f106d 100644 --- a/components/camel-grpc/src/main/docs/grpc-component.adoc +++ b/components/camel-grpc/src/main/docs/grpc-component.adoc @@ -20,7 +20,7 @@ for this component: </dependency> ------------------------------------------------------------ -Starting with Camel *2.22* gRCP requires strong own of the Google Guava version. It's necessary to +gRCP requires strong own of the Google Guava version. It's necessary to add following configuration property to the maven file [source,xml] @@ -138,7 +138,7 @@ The component supports 3 options, which are listed below. // spring-boot-auto-configure options: END -### Transport security and authentication support (available from *Camel 2.20*) +### Transport security and authentication support The following https://grpc.io/docs/guides/auth.html[authentication] mechanisms are built-in to gRPC and available in this component: diff --git a/components/camel-hazelcast/src/main/docs/hazelcast-atomicvalue-component.adoc b/components/camel-hazelcast/src/main/docs/hazelcast-atomicvalue-component.adoc index 6c11978..f167648 100644 --- a/components/camel-hazelcast/src/main/docs/hazelcast-atomicvalue-component.adoc +++ b/components/camel-hazelcast/src/main/docs/hazelcast-atomicvalue-component.adoc @@ -135,7 +135,6 @@ Spring DSL: ----------------------------------------------------------------------------------------------- <route> <from uri="direct:set" /> - <!-- If using version 2.8 and above set headerName to "CamelHazelcastOperationType" --> <setHeader headerName="hazelcast.operation.type"> <constant>setvalue</constant> </setHeader> @@ -163,7 +162,6 @@ Spring DSL: ----------------------------------------------------------------------------------------------- <route> <from uri="direct:get" /> - <!-- If using version 2.8 and above set headerName to "CamelHazelcastOperationType" --> <setHeader headerName="hazelcast.operation.type"> <constant>get</constant> </setHeader> @@ -191,7 +189,6 @@ Spring DSL: ----------------------------------------------------------------------------------------------- <route> <from uri="direct:increment" /> - <!-- If using version 2.8 and above set headerName to "CamelHazelcastOperationType" --> <setHeader headerName="hazelcast.operation.type"> <constant>increment</constant> </setHeader> @@ -219,7 +216,6 @@ Spring DSL: ----------------------------------------------------------------------------------------------- <route> <from uri="direct:decrement" /> - <!-- If using version 2.8 and above set headerName to "CamelHazelcastOperationType" --> <setHeader headerName="hazelcast.operation.type"> <constant>decrement</constant> </setHeader> @@ -247,7 +243,6 @@ Spring DSL: ----------------------------------------------------------------------------------------------- <route> <from uri="direct:destroy" /> - <!-- If using version 2.8 and above set headerName to "CamelHazelcastOperationType" --> <setHeader headerName="hazelcast.operation.type"> <constant>destroy</constant> </setHeader> diff --git a/components/camel-hazelcast/src/main/docs/hazelcast-map-component.adoc b/components/camel-hazelcast/src/main/docs/hazelcast-map-component.adoc index 7d48ea1..18a4825 100644 --- a/components/camel-hazelcast/src/main/docs/hazelcast-map-component.adoc +++ b/components/camel-hazelcast/src/main/docs/hazelcast-map-component.adoc @@ -171,7 +171,6 @@ Spring DSL: ----------------------------------------------------------------------------------------------- <route> <from uri="direct:put" /> - <!-- If using version 2.8 and above set headerName to "CamelHazelcastOperationType" --> <setHeader headerName="hazelcast.operation.type"> <constant>put</constant> </setHeader> @@ -198,7 +197,6 @@ Spring DSL: ----------------------------------------------------------------------------------------------- <route> <from uri="direct:put" /> - <!-- If using version 2.8 and above set headerName to "CamelHazelcastOperationType" --> <setHeader headerName="hazelcast.operation.type"> <constant>put</constant> </setHeader> @@ -231,7 +229,6 @@ Spring DSL: ----------------------------------------------------------------------------------------------- <route> <from uri="direct:get" /> - <!-- If using version 2.8 and above set headerName to "CamelHazelcastOperationType" --> <setHeader headerName="hazelcast.operation.type"> <constant>get</constant> </setHeader> @@ -257,7 +254,6 @@ Spring DSL: ----------------------------------------------------------------------------------------------- <route> <from uri="direct:update" /> - <!-- If using version 2.8 and above set headerName to "CamelHazelcastOperationType" --> <setHeader headerName="hazelcast.operation.type"> <constant>update</constant> </setHeader> @@ -282,7 +278,6 @@ Spring DSL: ----------------------------------------------------------------------------------------------- <route> <from uri="direct:delete" /> - <!-- If using version 2.8 and above set headerName to "CamelHazelcastOperationType" --> <setHeader headerName="hazelcast.operation.type"> <constant>delete</constant> </setHeader> @@ -308,7 +303,6 @@ Spring DSL: ----------------------------------------------------------------------------------------------- <route> <from uri="direct:query" /> - <!-- If using version 2.8 and above set headerName to "CamelHazelcastOperationType" --> <setHeader headerName="hazelcast.operation.type"> <constant>query</constant> </setHeader> diff --git a/components/camel-hazelcast/src/main/docs/hazelcast-multimap-component.adoc b/components/camel-hazelcast/src/main/docs/hazelcast-multimap-component.adoc index a069094..ff15f8e 100644 --- a/components/camel-hazelcast/src/main/docs/hazelcast-multimap-component.adoc +++ b/components/camel-hazelcast/src/main/docs/hazelcast-multimap-component.adoc @@ -115,7 +115,7 @@ Header Variables for the request message: |======================================================================= |Name |Type |Description -|`CamelHazelcastOperationType` |`String` |valid values are: put, get, removevalue, delete *From Camel 2.16:* clear. +|`CamelHazelcastOperationType` |`String` |valid values are: put, get, removevalue, delete, clear. |`CamelHazelcastObjectId` |`String` |the object id to store / find your object inside the cache |======================================================================= @@ -138,7 +138,6 @@ Spring DSL: <route> <from uri="direct:put" /> <log message="put.."/> - <!-- If using version 2.8 and above set headerName to "CamelHazelcastOperationType" --> <setHeader headerName="hazelcast.operation.type"> <constant>put</constant> </setHeader> @@ -164,7 +163,6 @@ Spring DSL: <route> <from uri="direct:removevalue" /> <log message="removevalue..."/> - <!-- If using version 2.8 and above set headerName to "CamelHazelcastOperationType" --> <setHeader headerName="hazelcast.operation.type"> <constant>removevalue</constant> </setHeader> @@ -196,7 +194,6 @@ Spring DSL: <route> <from uri="direct:get" /> <log message="get.."/> - <!-- If using version 2.8 and above set headerName to "CamelHazelcastOperationType" --> <setHeader headerName="hazelcast.operation.type"> <constant>get</constant> </setHeader> @@ -223,7 +220,6 @@ Spring DSL: <route> <from uri="direct:delete" /> <log message="delete.."/> - <!-- If using version 2.8 and above set headerName to "CamelHazelcastOperationType" --> <setHeader headerName="hazelcast.operation.type"> <constant>delete</constant> </setHeader> diff --git a/components/camel-hazelcast/src/main/docs/hazelcast-replicatedmap-component.adoc b/components/camel-hazelcast/src/main/docs/hazelcast-replicatedmap-component.adoc index d33e795..96e63b4 100644 --- a/components/camel-hazelcast/src/main/docs/hazelcast-replicatedmap-component.adoc +++ b/components/camel-hazelcast/src/main/docs/hazelcast-replicatedmap-component.adoc @@ -141,7 +141,6 @@ Spring DSL: <route> <from uri="direct:put" /> <log message="put.."/> - <!-- If using version 2.8 and above set headerName to "CamelHazelcastOperationType" --> <setHeader headerName="hazelcast.operation.type"> <constant>put</constant> </setHeader> @@ -168,7 +167,6 @@ Spring DSL: <route> <from uri="direct:get" /> <log message="get.."/> - <!-- If using version 2.8 and above set headerName to "CamelHazelcastOperationType" --> <setHeader headerName="hazelcast.operation.type"> <constant>get</constant> </setHeader> @@ -195,7 +193,6 @@ Spring DSL: <route> <from uri="direct:delete" /> <log message="delete.."/> - <!-- If using version 2.8 and above set headerName to "CamelHazelcastOperationType" --> <setHeader headerName="hazelcast.operation.type"> <constant>delete</constant> </setHeader> diff --git a/components/camel-hazelcast/src/main/docs/hazelcast-ringbuffer-component.adoc b/components/camel-hazelcast/src/main/docs/hazelcast-ringbuffer-component.adoc index d2fab2c..412dcf5 100644 --- a/components/camel-hazelcast/src/main/docs/hazelcast-ringbuffer-component.adoc +++ b/components/camel-hazelcast/src/main/docs/hazelcast-ringbuffer-component.adoc @@ -3,8 +3,6 @@ *Available as of Camel version 2.16* -*Avalaible from Camel 2.16* - The http://www.hazelcast.com/[Hazelcast] ringbuffer component is one of Camel Hazelcast Components which allows you to access Hazelcast ringbuffer. Ringbuffer is a distributed data structure where the data is stored in a ring-like structure. You can think of it as a circular array with a certain capacity. @@ -138,7 +136,6 @@ Spring DSL: <route> <from uri="direct:put" /> <log message="put.."/> - <!-- If using version 2.8 and above set headerName to "CamelHazelcastOperationType" --> <setHeader headerName="hazelcast.operation.type"> <constant>add</constant> </setHeader> diff --git a/components/camel-hdfs2/src/main/docs/hdfs2-component.adoc b/components/camel-hdfs2/src/main/docs/hdfs2-component.adoc index be8b8a2..81d117e 100644 --- a/components/camel-hdfs2/src/main/docs/hdfs2-component.adoc +++ b/components/camel-hdfs2/src/main/docs/hdfs2-component.adoc @@ -3,7 +3,7 @@ *Available as of Camel version 2.14* -The *hdfs2* component enables you to read and write messages from/to an +The HDFS2 component enables you to read and write messages from/to an HDFS file system using Hadoop 2.x. HDFS is the distributed file system at the heart of http://hadoop.apache.org[Hadoop]. @@ -241,7 +241,7 @@ The following headers are supported by this component: |======================================================================= |Header |Description -|`CamelFileName` |*Camel 2.13:* Specifies the name of the file to write (relative to the +|`CamelFileName` |Specifies the name of the file to write (relative to the endpoint path). The name can be a `String` or an Expression object. Only relevant when not using a split strategy. diff --git a/components/camel-hipchat/src/main/docs/hipchat-component.adoc b/components/camel-hipchat/src/main/docs/hipchat-component.adoc index 7b83b9a..2c42b54 100644 --- a/components/camel-hipchat/src/main/docs/hipchat-component.adoc +++ b/components/camel-hipchat/src/main/docs/hipchat-component.adoc @@ -258,5 +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 -(2.15.0 or higher) +where `${camel-version}` must be replaced by the actual version of Camel. diff --git a/components/camel-hl7/src/main/docs/hl7-dataformat.adoc b/components/camel-hl7/src/main/docs/hl7-dataformat.adoc index e6c1702..e13dac1 100644 --- a/components/camel-hl7/src/main/docs/hl7-dataformat.adoc +++ b/components/camel-hl7/src/main/docs/hl7-dataformat.adoc @@ -3,14 +3,14 @@ *Available as of Camel version 2.0* -The *HL7* component is used for working with the HL7 MLLP protocol and +The HL7 component is used for working with the HL7 MLLP protocol and http://www.hl7.org/implement/standards/product_brief.cfm?product_id=185[HL7 v2 messages] using the http://hl7api.sourceforge.net[HAPI library]. This component supports the following: * HL7 MLLP codec for <<mina2-component,Mina>> -* HL7 MLLP codec for <<netty4-component,Netty4>> from *Camel 2.15* onwards +* HL7 MLLP codec for <<netty4-component,Netty4>> * Type Converter from/to HAPI and String * HL7 DataFormat using the HAPI library * Even more ease-of-use as it's integrated well with the @@ -58,7 +58,7 @@ name]) to use for the codec. If not provided, Camel will use the http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html#defaultCharset()[JVM default Charset]. -|`produceString` |`true` |*(as of Camel 2.14.1)* If true, the codec creates a string using the +|`produceString` |`true` |If true, the codec creates a string using the defined charset. If false, the codec sends a plain byte array into the route, so that the HL7 Data Format can determine the actual charset from the HL7 message content. @@ -166,7 +166,7 @@ Type Converter to convert to/from strings to the HAPI HL7 model objects, but you can use the plain String objects if you prefer, for instance if you wish to parse the data yourself. -As of Camel 2.14.1 you can also let both the Mina and Netty codecs use a +You can also let both the Mina and Netty codecs use a plain `byte[]` as its data format by setting the `produceString` property to false. The Type Converter is also capable of converting the `byte[]` to/from HAPI HL7 model objects. @@ -289,14 +289,14 @@ passed to our patient lookup service. ==== Serializable messages -As of HAPI 2.0 (used by *Camel 2.11*), the HL7v2 model classes are fully +As of HAPI 2.0, the HL7v2 model classes are fully serializable. So you can put HL7v2 messages directly into a JMS queue (i.e. without calling `marshal()` and read them again directly from the queue (i.e. without calling `unmarshal()`. ==== Segment separators -As of *Camel 2.11*, `unmarshal` does not automatically fix segment +Unmarshalling does not automatically fix segment separators anymore by converting `\n` to `\r`. If you + need this conversion, `org.apache.camel.component.hl7.HL7#convertLFToCR` provides a handy @@ -305,7 +305,7 @@ separators anymore by converting `\n` to `\r`. If you + ==== Charset -As of *Camel 2.14.1*, both `marshal and unmarshal` evaluate the charset +Both `marshal and unmarshal` evaluate the charset provided in the field `MSH-18`. If this field is empty, by default the charset contained in the corresponding Camel charset property/header is assumed. You can even change this default behavior by overriding the @@ -360,11 +360,11 @@ headers on the Camel message: |`CamelHL7VersionId` |`MSH-12` |`2.4` -|`CamelHL7Context |`` |` *(Camel 2.14)* contains the +|`CamelHL7Context |`` |`contains the http://hl7api.sourceforge.net/base/apidocs/ca/uhn/hl7v2/HapiContext.html[HapiContext] -that was used to parse the message +that was used to parse the message` -|`CamelHL7Charset` |`MSH-18` |*(Camel 2.14.1)* `UNICODE UTF-8` +|`CamelHL7Charset` |`MSH-18` |`UNICODE UTF-8` |=== All headers except `CamelHL7Context `are `String` types. If a header diff --git a/components/camel-hl7/src/main/docs/hl7terser-language.adoc b/components/camel-hl7/src/main/docs/hl7terser-language.adoc index 69a237c..88c4385 100644 --- a/components/camel-hl7/src/main/docs/hl7terser-language.adoc +++ b/components/camel-hl7/src/main/docs/hl7terser-language.adoc @@ -1,9 +1,7 @@ [[hl7terser-language]] == HL7 Terser Language -*Available as of Camel version 2.11* -*Available as of Camel version 2.11* - +*Available as of Camel version 2.11* http://hl7api.sourceforge.net[HAPI] provides a http://hl7api.sourceforge.net/base/apidocs/ca/uhn/hl7v2/util/Terser.html[Terser] @@ -66,7 +64,7 @@ import ca.uhn.hl7v2.validation.impl.DefaultValidation; .to("mock:test1"); ---- -=== HL7 Validation predicate using the HapiContext (Camel 2.14) +=== HL7 Validation predicate using the HapiContext The HAPI Context is always configured with a http://hl7api.sourceforge.net/base/apidocs/ca/uhn/hl7v2/validation/ValidationContext.html[ValidationContext] diff --git a/components/camel-http4/src/main/docs/http4-component.adoc b/components/camel-http4/src/main/docs/http4-component.adoc index bbc300f..7bd59c2 100644 --- a/components/camel-http4/src/main/docs/http4-component.adoc +++ b/components/camel-http4/src/main/docs/http4-component.adoc @@ -3,7 +3,7 @@ *Available as of Camel version 2.3* -The *http4:* component provides HTTP based endpoints +The HTTP4 component provides HTTP based endpoints for calling external HTTP resources (as a client to call external servers using HTTP). @@ -397,10 +397,6 @@ from("direct:start") ### How to set the http method (GET/PATCH/POST/PUT/DELETE/HEAD/OPTIONS/TRACE) to the HTTP producer -*Using the http PATCH method* - -The http PATCH method is supported starting with Camel 2.11.3 / 2.12.1. - The HTTP4 component provides a way to set the HTTP request method by setting the message header. Here is an example: @@ -438,10 +434,6 @@ And the equivalent Spring sample: ### Using client timeout - SO_TIMEOUT See the -https://svn.apache.org/repos/asf/camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpSOTimeoutTest.java[HttpSOTimeoutTest] -unit test. - -*Since Camel 2.13.0*: See the updated https://github.com/apache/camel/blob/master/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpSOTimeoutTest.java[HttpSOTimeoutTest] unit test. @@ -486,7 +478,7 @@ Camel will first set the settings from Java System or CamelContext Properties and then the endpoint proxy options if provided. + So you can override the system properties with the endpoint options. -Notice in *Camel 2.8* there is also a `http.proxyScheme` property you +There is also a `http.proxyScheme` property you can set to explicit configure the scheme to use. ### Configuring charset @@ -572,8 +564,8 @@ behavior. [[HTTP4-UsingtheJSSEConfigurationUtility]] Using the JSSE Configuration Utility -As of Camel 2.8, the HTTP4 component supports SSL/TLS configuration -through the xref:camel-configuration-utilities.adoc[Camel JSSE +The HTTP4 component supports SSL/TLS configuration +through the link:camel-configuration-utilities.html[Camel JSSE Configuration Utility]. This utility greatly decreases the amount of component specific code you need to write and is configurable at the endpoint and component levels. The following examples demonstrate how diff --git a/components/camel-hystrix/src/main/docs/hystrix.adoc b/components/camel-hystrix/src/main/docs/hystrix.adoc index 8c48353..48dfab1 100644 --- a/components/camel-hystrix/src/main/docs/hystrix.adoc +++ b/components/camel-hystrix/src/main/docs/hystrix.adoc @@ -2,7 +2,7 @@ *Available as of Camel version 2.18* -The hystrix component integrates Netflix Hystrix circuit breaker in Camel routes. +The Hystrix component integrates Netflix Hystrix circuit breaker in Camel routes. For more details see the Hystrix EIP documentation. diff --git a/components/camel-ical/src/main/docs/ical-dataformat.adoc b/components/camel-ical/src/main/docs/ical-dataformat.adoc index ca7f855..6db63db 100644 --- a/components/camel-ical/src/main/docs/ical-dataformat.adoc +++ b/components/camel-ical/src/main/docs/ical-dataformat.adoc @@ -3,7 +3,7 @@ *Available as of Camel version 2.12* -The *ICal* dataformat is used for working with +The ICal dataformat is used for working with http://en.wikipedia.org/wiki/ICalendar[iCalendar] messages. A typical iCalendar message looks like: diff --git a/components/camel-iec60870/src/main/docs/iec60870-client-component.adoc b/components/camel-iec60870/src/main/docs/iec60870-client-component.adoc index 5a8a5cb..56f009b 100644 --- a/components/camel-iec60870/src/main/docs/iec60870-client-component.adoc +++ b/components/camel-iec60870/src/main/docs/iec60870-client-component.adoc @@ -3,7 +3,7 @@ *Available as of Camel version 2.20* -The *IEC 60870-5-104 Client* component provides access to IEC 60870 servers using the +The IEC 60870-5-104 Client component provides access to IEC 60870 servers using the http://eclipse.org/eclipsescada[Eclipse NeoSCADA™] implementation. Maven users will need to add the following dependency to their `pom.xml` diff --git a/components/camel-infinispan/src/main/docs/infinispan-component.adoc b/components/camel-infinispan/src/main/docs/infinispan-component.adoc index 972498e..80110db 100644 --- a/components/camel-infinispan/src/main/docs/infinispan-component.adoc +++ b/components/camel-infinispan/src/main/docs/infinispan-component.adoc @@ -8,7 +8,7 @@ http://infinispan.org/[Infinispan] distributed data grid / cache. Infinispan is an extremely scalable, highly available key/value data store and data grid platform written in Java. -From *Camel 2.17* onwards Infinispan requires Java 8. +Infinispan requires at least Java 8. Maven users will need to add the following dependency to their `pom.xml` for this component: @@ -172,9 +172,9 @@ The component supports 23 options, which are listed below. |CamelInfinispanTimeUnit |`null` |String |Producer |The Time Unit of an entry Lifespan Time. |CamelInfinispanMaxIdleTime |`null` |long |Producer |The maximum amount of time an entry is allowed to be idle for before it is considered as expired. |CamelInfinispanMaxIdleTimeUnit |`null` |String |Producer |The Time Unit of an entry Max Idle Time. -|CamelInfinispanQueryBuilder |null |InfinispanQueryBuilder |Producer | *From Camel 2.17:* The QueryBuilde to use for QUERY command, if not present the command defaults to InifinispanConfiguration's one -|CamelInfinispanIgnoreReturnValues |null |Boolean |Producer |*From Camel 2.17:* If this header is set, the return value for cache operation returning something is ignored by the client application -|CamelInfinispanOperationResultHeader |null |String |Producer|*From Camel 2.20:* Store the operation result in a header instead of the message body +|CamelInfinispanQueryBuilder |null |InfinispanQueryBuilder |Producer |The QueryBuilde to use for QUERY command, if not present the command defaults to InifinispanConfiguration's one +|CamelInfinispanIgnoreReturnValues |null |Boolean |Producer |If this header is set, the return value for cache operation returning something is ignored by the client application +|CamelInfinispanOperationResultHeader |null |String |Producer |Store the operation result in a header instead of the message body |======================================================================= ### Examples diff --git a/components/camel-influxdb/src/main/docs/influxdb-component.adoc b/components/camel-influxdb/src/main/docs/influxdb-component.adoc index 5500db4..c57f6d3 100644 --- a/components/camel-influxdb/src/main/docs/influxdb-component.adoc +++ b/components/camel-influxdb/src/main/docs/influxdb-component.adoc @@ -12,7 +12,7 @@ Aditionally of course you may register your own Converters to your data type to (un)marshalling tools provided by camel. -From *Camel 2.18* onwards Influxdb requires Java 8. +Influxdb component requires at least Java 8. Maven users will need to add the following dependency to their `pom.xml` for this component: diff --git a/components/camel-ipfs/src/main/docs/ipfs-component.adoc b/components/camel-ipfs/src/main/docs/ipfs-component.adoc index 030ce48..7c429a8 100644 --- a/components/camel-ipfs/src/main/docs/ipfs-component.adoc +++ b/components/camel-ipfs/src/main/docs/ipfs-component.adoc @@ -3,7 +3,7 @@ *Available as of Camel version 2.23* -The *ipfs:* component provides access to the Interplanetary File System https://ipfs.io/[(IPFS)]. +The IPFS component provides access to the Interplanetary File System https://ipfs.io/[(IPFS)]. Maven users will need to add the following dependency to their `pom.xml` for this component: diff --git a/components/camel-irc/src/main/docs/irc-component.adoc b/components/camel-irc/src/main/docs/irc-component.adoc index 88a7ef3..0e8eefe 100644 --- a/components/camel-irc/src/main/docs/irc-component.adoc +++ b/components/camel-irc/src/main/docs/irc-component.adoc @@ -3,7 +3,7 @@ *Available as of Camel version 1.1* -The *irc* component implements an +The IRC component implements an http://en.wikipedia.org/wiki/Internet_Relay_Chat[IRC] (Internet Relay Chat) transport. @@ -149,8 +149,8 @@ The component supports 4 options, which are listed below. #### Using the JSSE Configuration Utility -As of Camel 2.9, the IRC component supports SSL/TLS configuration -through the xref:camel-configuration-utilities.adoc[Camel JSSE +The IRC component supports SSL/TLS configuration +through the link:camel-configuration-utilities.html[Camel JSSE Configuration Utility]. This utility greatly decreases the amount of component specific code you need to write and is configurable at the endpoint and component levels. The following examples demonstrate how