Mailing-List: contact commits-help@camel.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@camel.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: davsclaus@apache.org
To: commits@camel.apache.org
Date: Tue, 02 Aug 2016 07:00:55 -0000
Message-Id: <7da4f6f75f0e4d4ba8cbefc5e01b1d6a@git.apache.org>
In-Reply-To: <f448b6de3dad429a8793adbd0202e9e9@git.apache.org>
References: <f448b6de3dad429a8793adbd0202e9e9@git.apache.org>
Subject: [2/3] camel git commit: Updated docs
archived-at: Tue, 02 Aug 2016 07:00:56 -0000

Updated docs


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/357dfe36
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/357dfe36
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/357dfe36

Branch: refs/heads/master
Commit: 357dfe36a05365522172c5cbc9663b941449a61e
Parents: 9943e77
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Tue Aug 2 08:57:18 2016 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Tue Aug 2 08:57:18 2016 +0200

----------------------------------------------------------------------
 camel-core/src/main/docs/file.adoc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/357dfe36/camel-core/src/main/docs/file.adoc
----------------------------------------------------------------------
diff --git a/camel-core/src/main/docs/file.adoc b/camel-core/src/main/docs/file.adoc
index eaf44bb..0236e8c 100644
--- a/camel-core/src/main/docs/file.adoc
+++ b/camel-core/src/main/docs/file.adoc
@@ -64,6 +64,7 @@ The File component has no options.
 
 
+
 // endpoint options: START
 The File component supports 81 endpoint options which are listed below:
 
@@ -73,6 +74,7 @@ The File component supports 81 endpoint options which are listed below:
 | Name | Group | Default | Java Type | Description
 | directoryName | common |  | File | *Required* The starting directory
 | charset | common |  | String | This option is used to specify the encoding of the file. You can use this on the consumer to specify the encodings of the files which allow Camel to know the charset it should load the file content in case the file content is being accessed. Likewise when writing a file you can use this option to specify which charset to write the file as well.
+| doneFileName | common |  | String | If provided then Camel will write a 2nd done file when the original file has been written. The done file will be empty. This option configures what file name to use. Either you can specify a fixed name. Or you can use dynamic placeholders. The done file will always be written in the same folder as the original file. Only $file.name and $file.name.noext is supported as dynamic placeholders.
 | fileName | common |  | String | Use Expression such as File Language to dynamically set the filename. For consumers it's used as a filename filter. For producers it's used to evaluate the filename to write. If an expression is set it take precedence over the CamelFileName header. (Note: The header itself can also be an Expression). The expression options support both String and Expression types. If the expression is a String type it is always evaluated using the File Language. If the expression is an Expression type the specified Expression type is used - this allows you for instance to use OGNL expressions. For the consumer you can use it to filter filenames so you can for instance consume today's file using the File Language syntax: mydata-$date:now:yyyyMMdd.txt. The producers support the CamelOverruleFileName header which takes precedence over any existing CamelFileName header; the CamelOverruleFileName is a header that is used only once and makes it easier as this avoids to te
 mporary store CamelFileName and have to restore it afterwards.
 | bridgeErrorHandler | consumer | false | boolean | Allows for bridging the consumer to the Camel routing Error Handler which mean any exceptions occurred while the consumer is trying to pickup incoming messages or the likes will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions that will be logged at WARN/ERROR level and ignored.
 | delete | consumer | false | boolean | If true the file will be deleted after it is processed successfully.
@@ -91,7 +93,6 @@ The File component supports 81 endpoint options which are listed below:
 | probeContentType | consumer (advanced) | false | boolean | Whether to enable probing of the content type. If enable then the consumer uses link FilesprobeContentType(java.nio.file.Path) to determine the content-type of the file and store that as a header with key link ExchangeFILE_CONTENT_TYPE on the Message.
 | processStrategy | consumer (advanced) |  | GenericFileProcessStrategy<T> | 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.
 | startingDirectoryMustExist | consumer (advanced) | false | boolean | 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.
-| doneFileName | producer |  | String | If provided then Camel will write a 2nd done file when the original file has been written. The done file will be empty. This option configures what file name to use. Either you can specify a fixed name. Or you can use dynamic placeholders. The done file will always be written in the same folder as the original file. Only $file.name and $file.name.noext is supported as dynamic placeholders.
 | fileExist | producer | Override | GenericFileExist | 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 eagerDeleteTargetFile can be used to control what to do if an moving the file and there exists already an existing file otherwise causing the move operation to fail. The Move option will move any existing files before writing the target file. TryRename Camel is only applicable if tempFileName option is in use. This allows to try renaming the file from the temporary name to the actual name without doing any exists check.This check may be faster on some file systems and especially FT
 P servers.
 | flatten | producer | false | boolean | 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.
 | moveExisting | producer |  | String | Expression (such as File Language) used to compute file name to use when fileExist=Move is configured. To move files into a backup subdirectory just enter backup. This option only supports the following File Language tokens: file:name file:name.ext file:name.noext file:onlyname file:onlyname.noext file:ext and file:parent. Notice the file:parent is not supported by the FTP component as the FTP component can only move any existing files to a relative directory based on current dir as base.
@@ -157,6 +158,7 @@ The File component supports 81 endpoint options which are listed below:
 // endpoint options: END
 
 
+
 [[File2-Defaultbehaviorforfileproducer]]
 Default behavior for file producer
 ++++++++++++++++++++++++++++++++++