This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1a95fcac6985b92f9e031e92b1d8c0488a76532b
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Tue Jul 2 16:53:11 2019 +0200
Regen
---
.../camel-corda/src/main/docs/corda-component.adoc | 2 +-
.../camel-ftp/src/main/docs/ftp-component.adoc | 2 +-
.../camel-ftp/src/main/docs/ftps-component.adoc | 2 +-
.../camel-ftp/src/main/docs/sftp-component.adoc | 2 +-
.../src/main/docs/websocket-jsr356-component.adoc | 2 +-
components/readme.adoc | 39 +++-------------------
.../endpoint/dsl/FtpEndpointBuilderFactory.java | 12 +++----
.../endpoint/dsl/FtpsEndpointBuilderFactory.java | 12 +++----
.../endpoint/dsl/SftpEndpointBuilderFactory.java | 12 +++----
.../modules/ROOT/pages/corda-component.adoc | 2 +-
.../modules/ROOT/pages/file-component.adoc | 2 +-
.../modules/ROOT/pages/ftp-component.adoc | 2 +-
.../modules/ROOT/pages/ftps-component.adoc | 2 +-
.../modules/ROOT/pages/mail-component.adoc | 3 +-
.../modules/ROOT/pages/sftp-component.adoc | 2 +-
.../ROOT/pages/websocket-jsr356-component.adoc | 2 +-
16 files changed, 34 insertions(+), 66 deletions(-)
diff --git a/components/camel-corda/src/main/docs/corda-component.adoc
b/components/camel-corda/src/main/docs/corda-component.adoc
index 3d23f20..526797e 100644
--- a/components/camel-corda/src/main/docs/corda-component.adoc
+++ b/components/camel-corda/src/main/docs/corda-component.adoc
@@ -48,7 +48,7 @@ The corda component supports 3 options, which are listed
below.
The corda endpoint is configured using URI syntax:
----
-corda:url
+corda:configuration
----
with the following path and query parameters:
diff --git a/components/camel-ftp/src/main/docs/ftp-component.adoc
b/components/camel-ftp/src/main/docs/ftp-component.adoc
index ccc1aff..efb87c9 100644
--- a/components/camel-ftp/src/main/docs/ftp-component.adoc
+++ b/components/camel-ftp/src/main/docs/ftp-component.adoc
@@ -189,7 +189,7 @@ with the following path and query parameters:
| *minDepth* (filter) | The minimum depth to start processing when recursively
processing a directory. Using minDepth=1 means the base directory. Using
minDepth=2 means the first sub directory. | | int
| *move* (filter) | Expression (such as Simple Language) used to dynamically
set the filename when moving it after processing. To move files into a .done
subdirectory just enter .done. | | String
| *exclusiveReadLockStrategy* (lock) | Pluggable read-lock as a
org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy
implementation. | | GenericFileExclusive ReadLockStrategy
-| *readLock* (lock) | Used by consumer, to only poll the files if it has
exclusive read-lock on the file (i.e. the file is not in-progress or being
written). Camel will wait until the file lock is granted. This option provides
the build in strategies: none - No read lock is in use markerFile - Camel
creates a marker file (fileName.camelLock) and then holds a lock on it. This
option is not available for the FTP component changed - Changed is using file
length/modification timestamp to det [...]
+| *readLock* (lock) | Used by consumer, to only poll the files if it has
exclusive read-lock on the file (i.e. the file is not in-progress or being
written). Camel will wait until the file lock is granted. This option provides
the build in strategies: none - No read lock is in use markerFile - Camel
creates a marker file (fileName.camelLock) and then holds a lock on it. This
option is not available for the FTP component changed - Changed is using file
length/modification timestamp to det [...]
| *readLockCheckInterval* (lock) | Interval in millis for the read-lock, if
supported by the read lock. This interval is used for sleeping between attempts
to acquire the read lock. For example when using the changed read lock, you can
set a higher interval period to cater for slow writes. The default of 1 sec.
may be too fast if the producer is very slow writing the file. Notice: For FTP
the default readLockCheckInterval is 5000. The readLockTimeout value must be
higher than readLockChe [...]
| *readLockDeleteOrphanLock Files* (lock) | Whether or not read lock with
marker files should upon startup delete any orphan read lock files, which may
have been left on the file system, if Camel was not properly shutdown (such as
a JVM crash). If turning this option to false then any orphaned lock file will
cause Camel to not attempt to pickup that file, this could also be due another
node is concurrently reading files from the same shared directory. | true |
boolean
| *readLockLoggingLevel* (lock) | Logging level used when a read lock could
not be acquired. By default a DEBUG is logged. You can change this level, for
example to OFF to not have any logging. This option is only applicable for
readLock of types: changed, fileLock, idempotent, idempotent-changed,
idempotent-rename, rename. | DEBUG | LoggingLevel
diff --git a/components/camel-ftp/src/main/docs/ftps-component.adoc
b/components/camel-ftp/src/main/docs/ftps-component.adoc
index 575ae79..d605dca 100644
--- a/components/camel-ftp/src/main/docs/ftps-component.adoc
+++ b/components/camel-ftp/src/main/docs/ftps-component.adoc
@@ -148,7 +148,7 @@ with the following path and query parameters:
| *minDepth* (filter) | The minimum depth to start processing when recursively
processing a directory. Using minDepth=1 means the base directory. Using
minDepth=2 means the first sub directory. | | int
| *move* (filter) | Expression (such as Simple Language) used to dynamically
set the filename when moving it after processing. To move files into a .done
subdirectory just enter .done. | | String
| *exclusiveReadLockStrategy* (lock) | Pluggable read-lock as a
org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy
implementation. | | GenericFileExclusive ReadLockStrategy
-| *readLock* (lock) | Used by consumer, to only poll the files if it has
exclusive read-lock on the file (i.e. the file is not in-progress or being
written). Camel will wait until the file lock is granted. This option provides
the build in strategies: none - No read lock is in use markerFile - Camel
creates a marker file (fileName.camelLock) and then holds a lock on it. This
option is not available for the FTP component changed - Changed is using file
length/modification timestamp to det [...]
+| *readLock* (lock) | Used by consumer, to only poll the files if it has
exclusive read-lock on the file (i.e. the file is not in-progress or being
written). Camel will wait until the file lock is granted. This option provides
the build in strategies: none - No read lock is in use markerFile - Camel
creates a marker file (fileName.camelLock) and then holds a lock on it. This
option is not available for the FTP component changed - Changed is using file
length/modification timestamp to det [...]
| *readLockCheckInterval* (lock) | Interval in millis for the read-lock, if
supported by the read lock. This interval is used for sleeping between attempts
to acquire the read lock. For example when using the changed read lock, you can
set a higher interval period to cater for slow writes. The default of 1 sec.
may be too fast if the producer is very slow writing the file. Notice: For FTP
the default readLockCheckInterval is 5000. The readLockTimeout value must be
higher than readLockChe [...]
| *readLockDeleteOrphanLock Files* (lock) | Whether or not read lock with
marker files should upon startup delete any orphan read lock files, which may
have been left on the file system, if Camel was not properly shutdown (such as
a JVM crash). If turning this option to false then any orphaned lock file will
cause Camel to not attempt to pickup that file, this could also be due another
node is concurrently reading files from the same shared directory. | true |
boolean
| *readLockIdempotentRelease Async* (lock) | Whether the delayed release task
should be synchronous or asynchronous. See more details at the
readLockIdempotentReleaseDelay option. | false | boolean
diff --git a/components/camel-ftp/src/main/docs/sftp-component.adoc
b/components/camel-ftp/src/main/docs/sftp-component.adoc
index d2168d7..5052fb4 100644
--- a/components/camel-ftp/src/main/docs/sftp-component.adoc
+++ b/components/camel-ftp/src/main/docs/sftp-component.adoc
@@ -140,7 +140,7 @@ with the following path and query parameters:
| *minDepth* (filter) | The minimum depth to start processing when recursively
processing a directory. Using minDepth=1 means the base directory. Using
minDepth=2 means the first sub directory. | | int
| *move* (filter) | Expression (such as Simple Language) used to dynamically
set the filename when moving it after processing. To move files into a .done
subdirectory just enter .done. | | String
| *exclusiveReadLockStrategy* (lock) | Pluggable read-lock as a
org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy
implementation. | | GenericFileExclusive ReadLockStrategy
-| *readLock* (lock) | Used by consumer, to only poll the files if it has
exclusive read-lock on the file (i.e. the file is not in-progress or being
written). Camel will wait until the file lock is granted. This option provides
the build in strategies: none - No read lock is in use markerFile - Camel
creates a marker file (fileName.camelLock) and then holds a lock on it. This
option is not available for the FTP component changed - Changed is using file
length/modification timestamp to det [...]
+| *readLock* (lock) | Used by consumer, to only poll the files if it has
exclusive read-lock on the file (i.e. the file is not in-progress or being
written). Camel will wait until the file lock is granted. This option provides
the build in strategies: none - No read lock is in use markerFile - Camel
creates a marker file (fileName.camelLock) and then holds a lock on it. This
option is not available for the FTP component changed - Changed is using file
length/modification timestamp to det [...]
| *readLockCheckInterval* (lock) | Interval in millis for the read-lock, if
supported by the read lock. This interval is used for sleeping between attempts
to acquire the read lock. For example when using the changed read lock, you can
set a higher interval period to cater for slow writes. The default of 1 sec.
may be too fast if the producer is very slow writing the file. Notice: For FTP
the default readLockCheckInterval is 5000. The readLockTimeout value must be
higher than readLockChe [...]
| *readLockDeleteOrphanLock Files* (lock) | Whether or not read lock with
marker files should upon startup delete any orphan read lock files, which may
have been left on the file system, if Camel was not properly shutdown (such as
a JVM crash). If turning this option to false then any orphaned lock file will
cause Camel to not attempt to pickup that file, this could also be due another
node is concurrently reading files from the same shared directory. | true |
boolean
| *readLockIdempotentRelease Async* (lock) | Whether the delayed release task
should be synchronous or asynchronous. See more details at the
readLockIdempotentReleaseDelay option. | false | boolean
diff --git
a/components/camel-websocket-jsr356/src/main/docs/websocket-jsr356-component.adoc
b/components/camel-websocket-jsr356/src/main/docs/websocket-jsr356-component.adoc
index c2629e9..2815b6d 100644
---
a/components/camel-websocket-jsr356/src/main/docs/websocket-jsr356-component.adoc
+++
b/components/camel-websocket-jsr356/src/main/docs/websocket-jsr356-component.adoc
@@ -47,7 +47,7 @@ The Javax Websocket component supports 2 options, which are
listed below.
The Javax Websocket endpoint is configured using URI syntax:
----
-websocket-jsr356:/resourceUri
+websocket-jsr356:websocketPathOrUri
----
with the following path and query parameters:
diff --git a/components/readme.adoc b/components/readme.adoc
index 7750e56..708be32 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -1,7 +1,7 @@
==== Components
// components: START
-Number of Components: 296 in 233 JAR artifacts (0 deprecated)
+Number of Components: 287 in 226 JAR artifacts (0 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
@@ -106,9 +106,6 @@ Number of Components: 296 in 233 JAR artifacts (0
deprecated)
| link:camel-aws-msk/src/main/docs/aws-msk-component.adoc[AWS MSK]
(camel-aws-msk) +
`aws-msk:label` | 3.0 | The aws-kms is used for managing Amazon KMS
-| link:camel-aws-s3/src/main/docs/aws-s3-component.adoc[AWS S3 Storage
Service] (camel-aws-s3) +
-`aws-s3:bucketNameOrArn` | 2.8 | The aws-s3 component is used for storing and
retrieving objecct from Amazon S3 Storage Service.
-
| link:camel-aws-ses/src/main/docs/aws-ses-component.adoc[AWS Simple Email
Service] (camel-aws-ses) +
`aws-ses:from` | 2.9 | The aws-ses component is used for sending emails with
Amazon's SES service.
@@ -181,14 +178,11 @@ Number of Components: 296 in 233 JAR artifacts (0
deprecated)
| link:camel-cometd/src/main/docs/cometd-component.adoc[CometD] (camel-cometd)
+
`cometd:host:port/channelName` | 2.0 | The cometd component is a transport for
working with the Jetty implementation of the cometd/bayeux protocol.
-| link:camel-consul/src/main/docs/consul-component.adoc[Consul] (camel-consul)
+
-`consul:apiEndpoint` | 2.18 | The camel consul component allows you to work
with Consul, a distributed, highly available, datacenter-aware, service
discovery and configuration system.
-
| link:camel-controlbus/src/main/docs/controlbus-component.adoc[Control Bus]
(camel-controlbus) +
`controlbus:command:language` | 2.11 | The controlbus component provides easy
management of Camel applications based on the Control Bus EIP pattern.
| link:camel-corda/src/main/docs/corda-component.adoc[corda] (camel-corda) +
-`corda:url` | 2.23 | The corda component uses the corda-rpc to interact with
corda nodes.
+`corda:configuration` | 2.23 | The corda component uses the corda-rpc to
interact with corda nodes.
| link:camel-couchbase/src/main/docs/couchbase-component.adoc[Couchbase]
(camel-couchbase) +
`couchbase:protocol:hostname:port` | 2.19 | Represents a Couchbase endpoint
that can query Views with a Poll strategy and/or produce various type of
operations.
@@ -322,12 +316,6 @@ Number of Components: 296 in 233 JAR artifacts (0
deprecated)
| link:camel-google-pubsub/src/main/docs/google-pubsub-component.adoc[Google
Pubsub] (camel-google-pubsub) +
`google-pubsub:projectId:destinationName` | 2.19 | Messaging client for Google
Cloud Platform PubSub Service
-| link:camel-google-sheets/src/main/docs/google-sheets-component.adoc[Google
Sheets] (camel-google-sheets) +
-`google-sheets:apiName/methodName` | 2.23 | The google-sheets component
provides access to Google Sheets.
-
-|
link:camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc[Google
Sheets Stream] (camel-google-sheets) +
-`google-sheets-stream:apiName` | 2.23 | The google-sheets component provides
access to Google Sheets.
-
| link:camel-gora/src/main/docs/gora-component.adoc[Gora] (camel-gora) +
`gora:name` | 2.14 | The gora component allows you to work with NoSQL
databases using the Apache Gora framework.
@@ -431,7 +419,7 @@ Number of Components: 296 in 233 JAR artifacts (0
deprecated)
`ironmq:queueName` | 2.17 | The ironmq provides integration with IronMQ an
elastic and durable hosted message queue as a service.
|
link:camel-websocket-jsr356/src/main/docs/websocket-jsr356-component.adoc[Javax
Websocket] (camel-websocket-jsr356) +
-`websocket-jsr356:/resourceUri` | 2.23 | Camel WebSocket using JSR356 (javax)
+`websocket-jsr356:websocketPathOrUri` | 2.23 | Camel WebSocket using JSR356
(javax)
| link:camel-jbpm/src/main/docs/jbpm-component.adoc[JBPM] (camel-jbpm) +
`jbpm:connectionURL` | 2.6 | The jbpm component provides integration with jBPM
(Business Process Management).
@@ -445,9 +433,6 @@ Number of Components: 296 in 233 JAR artifacts (0
deprecated)
| link:camel-jcr/src/main/docs/jcr-component.adoc[JCR] (camel-jcr) +
`jcr:host/base` | 1.3 | The jcr component allows you to add/read nodes to/from
a JCR compliant content repository.
-| link:camel-jdbc/src/main/docs/jdbc-component.adoc[JDBC] (camel-jdbc) +
-`jdbc:dataSourceName` | 1.2 | The jdbc component enables you to access
databases through JDBC, where SQL queries are sent in the message body.
-
| link:camel-jetty/src/main/docs/jetty-component.adoc[Jetty] (camel-jetty) +
`jetty:httpUri` | 1.2 | The jetty component provides HTTP-based endpoints for
consuming and producing HTTP requests.
@@ -487,9 +472,6 @@ Number of Components: 296 in 233 JAR artifacts (0
deprecated)
| link:camel-jt400/src/main/docs/jt400-component.adoc[JT400] (camel-jt400) +
`jt400:userID:password/systemName/objectPath.type` | 1.5 | The jt400 component
allows you to exchanges messages with an AS/400 system using data queues or
program call.
-| link:camel-kafka/src/main/docs/kafka-component.adoc[Kafka] (camel-kafka) +
-`kafka:topic` | 2.13 | The kafka component allows messages to be sent to (or
consumed from) Apache Kafka brokers.
-
|
link:camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc[Kubernetes
ConfigMap] (camel-kubernetes) +
`kubernetes-config-maps:masterUrl` | 2.17 | The Kubernetes Configmaps
component provides a producer to execute kubernetes configmap operations.
@@ -601,9 +583,6 @@ Number of Components: 296 in 233 JAR artifacts (0
deprecated)
| link:camel-nagios/src/main/docs/nagios-component.adoc[Nagios] (camel-nagios)
+
`nagios:host:port` | 2.3 | To send passive checks to Nagios using JSendNSCA.
-| link:camel-nats/src/main/docs/nats-component.adoc[Nats] (camel-nats) +
-`nats:servers` | 2.17 | The nats component allows you produce and consume
messages from NATS.
-
| link:camel-netty4/src/main/docs/netty4-component.adoc[Netty4] (camel-netty4)
+
`netty4:protocol:host:port` | 2.14 | Socket level networking using TCP or UDP
with the Netty 4.x library.
@@ -790,12 +769,6 @@ Number of Components: 296 in 233 JAR artifacts (0
deprecated)
| link:camel-spring-ws/src/main/docs/spring-ws-component.adoc[Spring
WebService] (camel-spring-ws) +
`spring-ws:type:lookupKey:webServiceEndpointUri` | 2.6 | The spring-ws
component is used for SOAP WebServices using Spring WebServices.
-| link:camel-sql/src/main/docs/sql-component.adoc[SQL] (camel-sql) +
-`sql:query` | 1.4 | The sql component allows you to work with databases using
JDBC SQL queries.
-
-| link:camel-sql/src/main/docs/sql-stored-component.adoc[SQL Stored Procedure]
(camel-sql) +
-`sql-stored:template` | 2.17 | The sql component allows you to work with
databases using JDBC Stored Procedure queries.
-
| link:camel-ssh/src/main/docs/ssh-component.adoc[SSH] (camel-ssh) +
`ssh:host:port` | 2.10 | The ssh component enables access to SSH servers such
that you can send an SSH command, and process the response.
@@ -902,7 +875,7 @@ Number of Components: 296 in 233 JAR artifacts (0
deprecated)
==== Data Formats
// dataformats: START
-Number of Data Formats: 45 in 37 JAR artifacts (0 deprecated)
+Number of Data Formats: 43 in 35 JAR artifacts (0 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
@@ -946,16 +919,12 @@ Number of Data Formats: 45 in 37 JAR artifacts (0
deprecated)
| link:camel-ical/src/main/docs/ical-dataformat.adoc[iCal] (camel-ical) | 2.12
| The iCal dataformat is used for working with iCalendar messages.
-| link:camel-jacksonxml/src/main/docs/jacksonxml-dataformat.adoc[JacksonXML]
(camel-jacksonxml) | 2.16 | JacksonXML data format is used for unmarshal a XML
payload to POJO or to marshal POJO back to XML payload.
-
| link:camel-jaxb/src/main/docs/jaxb-dataformat.adoc[JAXB] (camel-jaxb) | 1.0
| JAXB data format uses the JAXB2 XML marshalling standard to unmarshal an XML
payload into Java objects or to marshal Java objects into an XML payload.
| link:camel-fastjson/src/main/docs/json-fastjson-dataformat.adoc[JSon
Fastjson] (camel-fastjson) | 2.20 | JSon data format is used for unmarshal a
JSon payload to POJO or to marshal POJO back to JSon payload.
| link:camel-gson/src/main/docs/json-gson-dataformat.adoc[JSon GSon]
(camel-gson) | 2.10 | JSon data format is used for unmarshal a JSon payload to
POJO or to marshal POJO back to JSon payload.
-| link:camel-jackson/src/main/docs/json-jackson-dataformat.adoc[JSon Jackson]
(camel-jackson) | 2.0 | JSon data format is used for unmarshal a JSon payload
to POJO or to marshal POJO back to JSon payload.
-
| link:camel-johnzon/src/main/docs/json-johnzon-dataformat.adoc[JSon Johnzon]
(camel-johnzon) | 2.18 | JSon data format is used for unmarshal a JSon payload
to POJO or to marshal POJO back to JSon payload.
| link:camel-xstream/src/main/docs/json-xstream-dataformat.adoc[JSon XStream]
(camel-xstream) | 2.0 | JSon data format is used for unmarshal a JSon payload
to POJO or to marshal POJO back to JSon payload.
diff --git
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FtpEndpointBuilderFactory.java
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FtpEndpointBuilderFactory.java
index f219346..89af936 100644
---
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FtpEndpointBuilderFactory.java
+++
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FtpEndpointBuilderFactory.java
@@ -956,12 +956,12 @@ public interface FtpEndpointBuilderFactory {
* JDK IO API cannot always determine whether a file is currently being
* used by another process. The option readLockCheckInterval can be
used
* to set the check frequency. fileLock - is for using
- * java.nio.channels.FileLock. This option is not avail for the FTP
- * component. This approach should be avoided when accessing a remote
- * file system via a mount/share unless that file system supports
- * distributed file locks. rename - rename is for using a try to rename
- * the file as a test if we can get exclusive read-lock. idempotent -
- * (only for file component) idempotent is for using a
+ * java.nio.channels.FileLock. This option is not avail for Windows OS
+ * and the FTP component. This approach should be avoided when
accessing
+ * a remote file system via a mount/share unless that file system
+ * supports distributed file locks. rename - rename is for using a try
+ * to rename the file as a test if we can get exclusive read-lock.
+ * idempotent - (only for file component) idempotent is for using a
* idempotentRepository as the read-lock. This allows to use read locks
* that supports clustering if the idempotent repository implementation
* supports that. idempotent-changed - (only for file component)
diff --git
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java
index 3145630..800bb9e 100644
---
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java
+++
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java
@@ -958,12 +958,12 @@ public interface FtpsEndpointBuilderFactory {
* JDK IO API cannot always determine whether a file is currently being
* used by another process. The option readLockCheckInterval can be
used
* to set the check frequency. fileLock - is for using
- * java.nio.channels.FileLock. This option is not avail for the FTP
- * component. This approach should be avoided when accessing a remote
- * file system via a mount/share unless that file system supports
- * distributed file locks. rename - rename is for using a try to rename
- * the file as a test if we can get exclusive read-lock. idempotent -
- * (only for file component) idempotent is for using a
+ * java.nio.channels.FileLock. This option is not avail for Windows OS
+ * and the FTP component. This approach should be avoided when
accessing
+ * a remote file system via a mount/share unless that file system
+ * supports distributed file locks. rename - rename is for using a try
+ * to rename the file as a test if we can get exclusive read-lock.
+ * idempotent - (only for file component) idempotent is for using a
* idempotentRepository as the read-lock. This allows to use read locks
* that supports clustering if the idempotent repository implementation
* supports that. idempotent-changed - (only for file component)
diff --git
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SftpEndpointBuilderFactory.java
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SftpEndpointBuilderFactory.java
index 1592ac9..1a6e457 100644
---
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SftpEndpointBuilderFactory.java
+++
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SftpEndpointBuilderFactory.java
@@ -848,12 +848,12 @@ public interface SftpEndpointBuilderFactory {
* JDK IO API cannot always determine whether a file is currently being
* used by another process. The option readLockCheckInterval can be
used
* to set the check frequency. fileLock - is for using
- * java.nio.channels.FileLock. This option is not avail for the FTP
- * component. This approach should be avoided when accessing a remote
- * file system via a mount/share unless that file system supports
- * distributed file locks. rename - rename is for using a try to rename
- * the file as a test if we can get exclusive read-lock. idempotent -
- * (only for file component) idempotent is for using a
+ * java.nio.channels.FileLock. This option is not avail for Windows OS
+ * and the FTP component. This approach should be avoided when
accessing
+ * a remote file system via a mount/share unless that file system
+ * supports distributed file locks. rename - rename is for using a try
+ * to rename the file as a test if we can get exclusive read-lock.
+ * idempotent - (only for file component) idempotent is for using a
* idempotentRepository as the read-lock. This allows to use read locks
* that supports clustering if the idempotent repository implementation
* supports that. idempotent-changed - (only for file component)
diff --git a/docs/components/modules/ROOT/pages/corda-component.adoc
b/docs/components/modules/ROOT/pages/corda-component.adoc
index 3d23f20..526797e 100644
--- a/docs/components/modules/ROOT/pages/corda-component.adoc
+++ b/docs/components/modules/ROOT/pages/corda-component.adoc
@@ -48,7 +48,7 @@ The corda component supports 3 options, which are listed
below.
The corda endpoint is configured using URI syntax:
----
-corda:url
+corda:configuration
----
with the following path and query parameters:
diff --git a/docs/components/modules/ROOT/pages/file-component.adoc
b/docs/components/modules/ROOT/pages/file-component.adoc
index 0d39623..54ba798 100644
--- a/docs/components/modules/ROOT/pages/file-component.adoc
+++ b/docs/components/modules/ROOT/pages/file-component.adoc
@@ -151,7 +151,7 @@ with the following path and query parameters:
| *minDepth* (filter) | The minimum depth to start processing when recursively
processing a directory. Using minDepth=1 means the base directory. Using
minDepth=2 means the first sub directory. | | int
| *move* (filter) | Expression (such as Simple Language) used to dynamically
set the filename when moving it after processing. To move files into a .done
subdirectory just enter .done. | | String
| *exclusiveReadLockStrategy* (lock) | Pluggable read-lock as a
org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy
implementation. | | GenericFileExclusive ReadLockStrategy
-| *readLock* (lock) | Used by consumer, to only poll the files if it has
exclusive read-lock on the file (i.e. the file is not in-progress or being
written). Camel will wait until the file lock is granted. This option provides
the build in strategies: none - No read lock is in use markerFile - Camel
creates a marker file (fileName.camelLock) and then holds a lock on it. This
option is not available for the FTP component changed - Changed is using file
length/modification timestamp to det [...]
+| *readLock* (lock) | Used by consumer, to only poll the files if it has
exclusive read-lock on the file (i.e. the file is not in-progress or being
written). Camel will wait until the file lock is granted. This option provides
the build in strategies: none - No read lock is in use markerFile - Camel
creates a marker file (fileName.camelLock) and then holds a lock on it. This
option is not available for the FTP component changed - Changed is using file
length/modification timestamp to det [...]
| *readLockCheckInterval* (lock) | Interval in millis for the read-lock, if
supported by the read lock. This interval is used for sleeping between attempts
to acquire the read lock. For example when using the changed read lock, you can
set a higher interval period to cater for slow writes. The default of 1 sec.
may be too fast if the producer is very slow writing the file. Notice: For FTP
the default readLockCheckInterval is 5000. The readLockTimeout value must be
higher than readLockChe [...]
| *readLockDeleteOrphanLock Files* (lock) | Whether or not read lock with
marker files should upon startup delete any orphan read lock files, which may
have been left on the file system, if Camel was not properly shutdown (such as
a JVM crash). If turning this option to false then any orphaned lock file will
cause Camel to not attempt to pickup that file, this could also be due another
node is concurrently reading files from the same shared directory. | true |
boolean
| *readLockIdempotentRelease Async* (lock) | Whether the delayed release task
should be synchronous or asynchronous. See more details at the
readLockIdempotentReleaseDelay option. | false | boolean
diff --git a/docs/components/modules/ROOT/pages/ftp-component.adoc
b/docs/components/modules/ROOT/pages/ftp-component.adoc
index ccc1aff..efb87c9 100644
--- a/docs/components/modules/ROOT/pages/ftp-component.adoc
+++ b/docs/components/modules/ROOT/pages/ftp-component.adoc
@@ -189,7 +189,7 @@ with the following path and query parameters:
| *minDepth* (filter) | The minimum depth to start processing when recursively
processing a directory. Using minDepth=1 means the base directory. Using
minDepth=2 means the first sub directory. | | int
| *move* (filter) | Expression (such as Simple Language) used to dynamically
set the filename when moving it after processing. To move files into a .done
subdirectory just enter .done. | | String
| *exclusiveReadLockStrategy* (lock) | Pluggable read-lock as a
org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy
implementation. | | GenericFileExclusive ReadLockStrategy
-| *readLock* (lock) | Used by consumer, to only poll the files if it has
exclusive read-lock on the file (i.e. the file is not in-progress or being
written). Camel will wait until the file lock is granted. This option provides
the build in strategies: none - No read lock is in use markerFile - Camel
creates a marker file (fileName.camelLock) and then holds a lock on it. This
option is not available for the FTP component changed - Changed is using file
length/modification timestamp to det [...]
+| *readLock* (lock) | Used by consumer, to only poll the files if it has
exclusive read-lock on the file (i.e. the file is not in-progress or being
written). Camel will wait until the file lock is granted. This option provides
the build in strategies: none - No read lock is in use markerFile - Camel
creates a marker file (fileName.camelLock) and then holds a lock on it. This
option is not available for the FTP component changed - Changed is using file
length/modification timestamp to det [...]
| *readLockCheckInterval* (lock) | Interval in millis for the read-lock, if
supported by the read lock. This interval is used for sleeping between attempts
to acquire the read lock. For example when using the changed read lock, you can
set a higher interval period to cater for slow writes. The default of 1 sec.
may be too fast if the producer is very slow writing the file. Notice: For FTP
the default readLockCheckInterval is 5000. The readLockTimeout value must be
higher than readLockChe [...]
| *readLockDeleteOrphanLock Files* (lock) | Whether or not read lock with
marker files should upon startup delete any orphan read lock files, which may
have been left on the file system, if Camel was not properly shutdown (such as
a JVM crash). If turning this option to false then any orphaned lock file will
cause Camel to not attempt to pickup that file, this could also be due another
node is concurrently reading files from the same shared directory. | true |
boolean
| *readLockLoggingLevel* (lock) | Logging level used when a read lock could
not be acquired. By default a DEBUG is logged. You can change this level, for
example to OFF to not have any logging. This option is only applicable for
readLock of types: changed, fileLock, idempotent, idempotent-changed,
idempotent-rename, rename. | DEBUG | LoggingLevel
diff --git a/docs/components/modules/ROOT/pages/ftps-component.adoc
b/docs/components/modules/ROOT/pages/ftps-component.adoc
index 575ae79..d605dca 100644
--- a/docs/components/modules/ROOT/pages/ftps-component.adoc
+++ b/docs/components/modules/ROOT/pages/ftps-component.adoc
@@ -148,7 +148,7 @@ with the following path and query parameters:
| *minDepth* (filter) | The minimum depth to start processing when recursively
processing a directory. Using minDepth=1 means the base directory. Using
minDepth=2 means the first sub directory. | | int
| *move* (filter) | Expression (such as Simple Language) used to dynamically
set the filename when moving it after processing. To move files into a .done
subdirectory just enter .done. | | String
| *exclusiveReadLockStrategy* (lock) | Pluggable read-lock as a
org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy
implementation. | | GenericFileExclusive ReadLockStrategy
-| *readLock* (lock) | Used by consumer, to only poll the files if it has
exclusive read-lock on the file (i.e. the file is not in-progress or being
written). Camel will wait until the file lock is granted. This option provides
the build in strategies: none - No read lock is in use markerFile - Camel
creates a marker file (fileName.camelLock) and then holds a lock on it. This
option is not available for the FTP component changed - Changed is using file
length/modification timestamp to det [...]
+| *readLock* (lock) | Used by consumer, to only poll the files if it has
exclusive read-lock on the file (i.e. the file is not in-progress or being
written). Camel will wait until the file lock is granted. This option provides
the build in strategies: none - No read lock is in use markerFile - Camel
creates a marker file (fileName.camelLock) and then holds a lock on it. This
option is not available for the FTP component changed - Changed is using file
length/modification timestamp to det [...]
| *readLockCheckInterval* (lock) | Interval in millis for the read-lock, if
supported by the read lock. This interval is used for sleeping between attempts
to acquire the read lock. For example when using the changed read lock, you can
set a higher interval period to cater for slow writes. The default of 1 sec.
may be too fast if the producer is very slow writing the file. Notice: For FTP
the default readLockCheckInterval is 5000. The readLockTimeout value must be
higher than readLockChe [...]
| *readLockDeleteOrphanLock Files* (lock) | Whether or not read lock with
marker files should upon startup delete any orphan read lock files, which may
have been left on the file system, if Camel was not properly shutdown (such as
a JVM crash). If turning this option to false then any orphaned lock file will
cause Camel to not attempt to pickup that file, this could also be due another
node is concurrently reading files from the same shared directory. | true |
boolean
| *readLockIdempotentRelease Async* (lock) | Whether the delayed release task
should be synchronous or asynchronous. See more details at the
readLockIdempotentReleaseDelay option. | false | boolean
diff --git a/docs/components/modules/ROOT/pages/mail-component.adoc
b/docs/components/modules/ROOT/pages/mail-component.adoc
index 34f58c5..792df33 100644
--- a/docs/components/modules/ROOT/pages/mail-component.adoc
+++ b/docs/components/modules/ROOT/pages/mail-component.adoc
@@ -217,7 +217,7 @@ When using Spring Boot make sure to use the following Maven
dependency to have s
----
-The component supports 50 options, which are listed below.
+The component supports 49 options, which are listed below.
@@ -237,7 +237,6 @@ The component supports 50 options, which are listed below.
| *camel.component.mail.configuration.debug-mode* | Enable debug mode on the
underlying mail framework. The SUN Mail framework logs the debug messages to
System.out by default. | false | Boolean
| *camel.component.mail.configuration.delete* | Deletes the messages after
they have been processed. This is done by setting the DELETED flag on the mail
message. If false, the SEEN flag is set instead. As of Camel 2.10 you can
override this configuration option by setting a header with the key delete to
determine if the mail should be deleted or not. | false | Boolean
| *camel.component.mail.configuration.disconnect* | Whether the consumer
should disconnect after polling. If enabled this forces Camel to connect on
each poll. | false | Boolean
-| *camel.component.mail.configuration.dummy-trust-manager* | To use a dummy
security setting for trusting all certificates. Should only be used for
development mode, and not production. | false | Boolean
| *camel.component.mail.configuration.fetch-size* | Sets the maximum number of
messages to consume during a poll. This can be used to avoid overloading a mail
server, if a mailbox folder contains a lot of messages. Default value of -1
means no fetch size and all messages will be consumed. Setting the value to 0
is a special corner case, where Camel will not consume any messages at all. |
-1 | Integer
| *camel.component.mail.configuration.folder-name* | The folder to poll. |
INBOX | String
| *camel.component.mail.configuration.from* | The from email address |
camel@localhost | String
diff --git a/docs/components/modules/ROOT/pages/sftp-component.adoc
b/docs/components/modules/ROOT/pages/sftp-component.adoc
index d2168d7..5052fb4 100644
--- a/docs/components/modules/ROOT/pages/sftp-component.adoc
+++ b/docs/components/modules/ROOT/pages/sftp-component.adoc
@@ -140,7 +140,7 @@ with the following path and query parameters:
| *minDepth* (filter) | The minimum depth to start processing when recursively
processing a directory. Using minDepth=1 means the base directory. Using
minDepth=2 means the first sub directory. | | int
| *move* (filter) | Expression (such as Simple Language) used to dynamically
set the filename when moving it after processing. To move files into a .done
subdirectory just enter .done. | | String
| *exclusiveReadLockStrategy* (lock) | Pluggable read-lock as a
org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy
implementation. | | GenericFileExclusive ReadLockStrategy
-| *readLock* (lock) | Used by consumer, to only poll the files if it has
exclusive read-lock on the file (i.e. the file is not in-progress or being
written). Camel will wait until the file lock is granted. This option provides
the build in strategies: none - No read lock is in use markerFile - Camel
creates a marker file (fileName.camelLock) and then holds a lock on it. This
option is not available for the FTP component changed - Changed is using file
length/modification timestamp to det [...]
+| *readLock* (lock) | Used by consumer, to only poll the files if it has
exclusive read-lock on the file (i.e. the file is not in-progress or being
written). Camel will wait until the file lock is granted. This option provides
the build in strategies: none - No read lock is in use markerFile - Camel
creates a marker file (fileName.camelLock) and then holds a lock on it. This
option is not available for the FTP component changed - Changed is using file
length/modification timestamp to det [...]
| *readLockCheckInterval* (lock) | Interval in millis for the read-lock, if
supported by the read lock. This interval is used for sleeping between attempts
to acquire the read lock. For example when using the changed read lock, you can
set a higher interval period to cater for slow writes. The default of 1 sec.
may be too fast if the producer is very slow writing the file. Notice: For FTP
the default readLockCheckInterval is 5000. The readLockTimeout value must be
higher than readLockChe [...]
| *readLockDeleteOrphanLock Files* (lock) | Whether or not read lock with
marker files should upon startup delete any orphan read lock files, which may
have been left on the file system, if Camel was not properly shutdown (such as
a JVM crash). If turning this option to false then any orphaned lock file will
cause Camel to not attempt to pickup that file, this could also be due another
node is concurrently reading files from the same shared directory. | true |
boolean
| *readLockIdempotentRelease Async* (lock) | Whether the delayed release task
should be synchronous or asynchronous. See more details at the
readLockIdempotentReleaseDelay option. | false | boolean
diff --git a/docs/components/modules/ROOT/pages/websocket-jsr356-component.adoc
b/docs/components/modules/ROOT/pages/websocket-jsr356-component.adoc
index c2629e9..2815b6d 100644
--- a/docs/components/modules/ROOT/pages/websocket-jsr356-component.adoc
+++ b/docs/components/modules/ROOT/pages/websocket-jsr356-component.adoc
@@ -47,7 +47,7 @@ The Javax Websocket component supports 2 options, which are
listed below.
The Javax Websocket endpoint is configured using URI syntax:
----
-websocket-jsr356:/resourceUri
+websocket-jsr356:websocketPathOrUri
----
with the following path and query parameters:
