You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/08/06 10:03:21 UTC
[camel] branch master updated (56880ea -> 2a849a9)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 56880ea CAMEL-13792 - Rename components to default names, Camel-mina2 to camel-mina - Fixed example camel-example-loadbalancing
new 41db898 CAMEL-13792 - Rename components to default names, Camel-http4 to Camel-http - Fixed migration guide a bit
new 05a132b CAMEL-13792 - Rename components to default names, Camel-http4 to Camel-http - Fixed service-call eip docs
new 2a849a9 Regen
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
MIGRATION.md | 2 +-
core/camel-core/src/main/docs/eips/serviceCall-eip.adoc | 6 +++---
docs/components/modules/ROOT/pages/file-component.adoc | 4 +++-
docs/components/modules/ROOT/pages/ftps-component.adoc | 6 +-----
docs/user-manual/modules/ROOT/pages/serviceCall-eip.adoc | 6 +++---
5 files changed, 11 insertions(+), 13 deletions(-)
[camel] 03/03: Regen
Posted by ac...@apache.org.
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 2a849a923d3169c92f56fdf4dca72ce795c6547e
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Aug 6 12:02:40 2019 +0200
Regen
---
docs/components/modules/ROOT/pages/file-component.adoc | 4 +++-
docs/components/modules/ROOT/pages/ftps-component.adoc | 6 +-----
docs/user-manual/modules/ROOT/pages/serviceCall-eip.adoc | 6 +++---
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/docs/components/modules/ROOT/pages/file-component.adoc b/docs/components/modules/ROOT/pages/file-component.adoc
index 09d8074..d6536e6 100644
--- a/docs/components/modules/ROOT/pages/file-component.adoc
+++ b/docs/components/modules/ROOT/pages/file-component.adoc
@@ -85,7 +85,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (90 parameters):
+=== Query Parameters (91 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -114,6 +114,8 @@ with the following path and query parameters:
| *processStrategy* (consumer) | A pluggable org.apache.camel.component.file.GenericFileProcessStrategy allowing you to implement your own readLock option or similar. Can also be used when special conditions must be met before a file can be consumed, such as a special ready file exists. If this option is set then the readLock option does not apply. | | GenericFileProcess Strategy
| *startingDirectoryMustExist* (consumer) | Whether the starting directory must exist. Mind that the autoCreate option is default enabled, which means the starting directory is normally auto created if it doesn't exist. You can disable autoCreate and enable this to ensure the starting directory must exist. Will thrown an exception if the directory doesn't exist. | false | boolean
| *startingDirectoryMustHave Access* (consumer) | Whether the starting directory has access permissions. Mind that the startingDirectoryMustExist parameter must be set to true in order to verify that the directory exists. Will thrown an exception if the directory doesn't have read and write permissions. | false | boolean
+| *appendChars* (producer) | Used to append characters (text) after writing files. This can for example be used to add new lines or other separators when writing and appending to existing files. To specify new-line (
+ or
) or tab ( ) characters then escape with an extra slash, eg \n | | String
| *fileExist* (producer) | What to do if a file already exists with the same name. Override, which is the default, replaces the existing file. Append - adds content to the existing file. Fail - throws a GenericFileOperationException, indicating that there is already an existing file. Ignore - silently ignores the problem and does not override the existing file, but assumes everything is okay. Move - option requires to use the moveExisting option to be configured as well. The option eager [...]
| *flatten* (producer) | Flatten is used to flatten the file name path to strip any leading paths, so it's just the file name. This allows you to consume recursively into sub-directories, but when you eg write the files to another directory they will be written in a single directory. Setting this to true on the producer enforces that any file name in CamelFileName header will be stripped for any leading paths. | false | boolean
| *jailStartingDirectory* (producer) | Used for jailing (restricting) writing files to the starting directory (and sub) only. This is enabled by default to not allow Camel to write files to outside directories (to be more secured out of the box). You can turn this off to allow writing files to directories outside the starting directory, such as parent or root folders. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/ftps-component.adoc b/docs/components/modules/ROOT/pages/ftps-component.adoc
index 64fb74b..456504a 100644
--- a/docs/components/modules/ROOT/pages/ftps-component.adoc
+++ b/docs/components/modules/ROOT/pages/ftps-component.adoc
@@ -61,7 +61,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (122 parameters):
+=== Query Parameters (118 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -151,10 +151,6 @@ with the following path and query parameters:
| *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
-| *readLockIdempotentRelease AsyncPoolSize* (lock) | The number of threads in the scheduled thread pool when using asynchronous release tasks. Using a default of 1 core threads should be sufficient in almost all use-cases, only set this to a higher value if either updating the idempotent repository is slow, or there are a lot of files to process. This option is not in-use if you use a shared thread pool by configuring the readLockIdempotentReleaseExecutorService option. See more details [...]
-| *readLockIdempotentRelease Delay* (lock) | Whether to delay the release task for a period of millis. This can be used to delay the release tasks to expand the window when a file is regarded as read-locked, in an active/active cluster scenario with a shared idempotent repository, to ensure other nodes cannot potentially scan and acquire the same file, due to race-conditions. By expanding the time-window of the release tasks helps prevents these situations. Note delaying is only needed i [...]
-| *readLockIdempotentRelease ExecutorService* (lock) | To use a custom and shared thread pool for asynchronous release tasks. See more details at the readLockIdempotentReleaseDelay option. | | ScheduledExecutor Service
| *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
| *readLockMarkerFile* (lock) | Whether to use marker file with the changed, rename, or exclusive read lock types. By default a marker file is used as well to guard against other processes picking up the same files. This behavior can be turned off by setting this option to false. For example if you do not want to write marker files to the file systems by the Camel application. | true | boolean
| *readLockMinAge* (lock) | This option is applied only for readLock=changed. It allows to specify a minimum age the file must be before attempting to acquire the read lock. For example use readLockMinAge=300s to require the file is at last 5 minutes old. This can speedup the changed read lock as it will only attempt to acquire files which are at least that given age. | 0 | long
diff --git a/docs/user-manual/modules/ROOT/pages/serviceCall-eip.adoc b/docs/user-manual/modules/ROOT/pages/serviceCall-eip.adoc
index 221d775..021aa8d 100644
--- a/docs/user-manual/modules/ROOT/pages/serviceCall-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/serviceCall-eip.adoc
@@ -51,9 +51,9 @@ The *service name* supports a limited uri like syntax, here some examples
|===
|Name |Resolution
-|foo | http4://host:port
-|foo/path | http4://host:port/path
-|foo/path?foo=bar | http4://host:port/path?foo=bar
+|foo | http://host:port
+|foo/path | http://host:port/path
+|foo/path?foo=bar | http://host:port/path?foo=bar
|===
[source,java]
[camel] 01/03: CAMEL-13792 - Rename components to default names,
Camel-http4 to Camel-http - Fixed migration guide a bit
Posted by ac...@apache.org.
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 41db8985a194f3d4e798086d4f4e7c90d6bd42c8
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Aug 6 11:55:00 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-http4 to Camel-http - Fixed migration guide a bit
---
MIGRATION.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/MIGRATION.md b/MIGRATION.md
index 62ced89..728eb2f 100644
--- a/MIGRATION.md
+++ b/MIGRATION.md
@@ -104,7 +104,7 @@ The properties component will now use OS environment variables as preferred valu
### Removed components
-We have removed all deprecated components from Camel 2.x, also including the old `camel-http` component. Instead you can use `camel-http4`.
+We have removed all deprecated components from Camel 2.x, also including the old `camel-http` component. `camel-http4` has been renamed to `camel-http`.
We removed `camel-jibx` component which wasn't working on JDK 8.
[camel] 02/03: CAMEL-13792 - Rename components to default names,
Camel-http4 to Camel-http - Fixed service-call eip docs
Posted by ac...@apache.org.
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 05a132b96cb04919986875006b4da55ed7a081fb
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Aug 6 11:55:42 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-http4 to Camel-http - Fixed service-call eip docs
---
core/camel-core/src/main/docs/eips/serviceCall-eip.adoc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/core/camel-core/src/main/docs/eips/serviceCall-eip.adoc b/core/camel-core/src/main/docs/eips/serviceCall-eip.adoc
index 221d775..021aa8d 100644
--- a/core/camel-core/src/main/docs/eips/serviceCall-eip.adoc
+++ b/core/camel-core/src/main/docs/eips/serviceCall-eip.adoc
@@ -51,9 +51,9 @@ The *service name* supports a limited uri like syntax, here some examples
|===
|Name |Resolution
-|foo | http4://host:port
-|foo/path | http4://host:port/path
-|foo/path?foo=bar | http4://host:port/path?foo=bar
+|foo | http://host:port
+|foo/path | http://host:port/path
+|foo/path?foo=bar | http://host:port/path?foo=bar
|===
[source,java]