camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [1/3] camel git commit: CAMEL-9131: Component docs assign labels to options and fix wrong desc.
Date Tue, 27 Sep 2016 13:28:58 GMT
Repository: camel
Updated Branches:
  refs/heads/master eccd7dc9f -> ff81d94df


CAMEL-9131: Component docs assign labels to options and fix wrong desc.


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

Branch: refs/heads/master
Commit: 9ef98ee81fb981f317c1aa5f176ab12475313b7b
Parents: eccd7dc
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Tue Sep 27 15:18:38 2016 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Tue Sep 27 15:18:38 2016 +0200

----------------------------------------------------------------------
 .../camel-ftp/src/main/docs/ftp-component.adoc  | 10 +++++-----
 .../camel-ftp/src/main/docs/ftps-component.adoc | 10 +++++-----
 .../camel-ftp/src/main/docs/sftp-component.adoc | 10 +++++-----
 .../file/remote/RemoteFileEndpoint.java         | 15 +++++++--------
 .../src/main/docs/weather-component.adoc        | 18 +++++++++---------
 .../component/weather/WeatherConfiguration.java | 20 ++++++++++----------
 .../camel/component/weather/WeatherQuery.java   |  1 -
 7 files changed, 41 insertions(+), 43 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/9ef98ee8/components/camel-ftp/src/main/docs/ftp-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/main/docs/ftp-component.adoc b/components/camel-ftp/src/main/docs/ftp-component.adoc
index 6e809ae..a2b1548 100644
--- a/components/camel-ftp/src/main/docs/ftp-component.adoc
+++ b/components/camel-ftp/src/main/docs/ftp-component.adoc
@@ -131,15 +131,11 @@ The FTP component supports 104 endpoint options which are listed below:
 | binary | common | false | boolean | Specifies the file transfer mode BINARY or ASCII. Default
is ASCII (false).
 | 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.
 | disconnect | common | false | boolean | Whether or not to disconnect from remote FTP server
right after use. Disconnect will only disconnect the current connection to the FTP server.
If you have a consumer which you want to stop then you need to stop the consumer/route instead.
-| disconnectOnBatchComplete | common | false | boolean | Whether or not to disconnect from
remote FTP server right after a Batch is complete. disconnectOnBatchComplete will only disconnect
the current connection to the FTP server. If you have a consumer which you want to stop then
you need to stop the consumer/route instead.
 | doneFileName | common |  | String | Producer: 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. Consumer: If
provided Camel will only consume files if a done file exists. This option configures what
file name to use. Either you can specify a fixed name. Or you can use dynamic placeholders.The
done file is always expected in the same folder as the original file. Only $file.name and
$file.name.noext is supported as dynamic placeholders.
-| download | common | false | boolean | Whether the FTP consumer should download the file.
If this option is set to false then the message body will be null but the consumer will still
trigger a Camel Exchange that has details about the file such as file name file size etc.
It's just that the file will not be downloaded.
-| fastExistsCheck | common | false | boolean | If set this option to be true camel-ftp will
use the list file directly to check if the file exists. Since some FTP server may not support
to list the file directly if the option is false camel-ftp will use the old way to list the
directory and check if the file exists. This option also influences readLock=changed to control
whether it performs a fast check to update file information or not. This can be used to speed
up the process if the FTP server has a lot of files.
 | 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.
-| maximumReconnectAttempts | common |  | int | Specifies the maximum reconnect attempts Camel
performs when it tries to connect to the remote FTP server. Use 0 to disable this behavior.
 | passiveMode | common | false | boolean | Sets passive mode connections. Default is active
mode connections.
-| reconnectDelay | common |  | long | Delay in millis Camel will wait before performing a
reconnect attempt.
 | separator | common | UNIX | PathSeparator | Sets the path separator to be used. UNIX =
Uses unix style path separator Windows = Uses windows style path separator Auto = (is default)
Use existing path separator in file name
+| fastExistsCheck | common (advanced) | false | boolean | If set this option to be true camel-ftp
will use the list file directly to check if the file exists. Since some FTP server may not
support to list the file directly if the option is false camel-ftp will use the old way to
list the directory and check if the file exists. This option also influences readLock=changed
to control whether it performs a fast check to update file information or not. This can be
used to speed up the process if the FTP server has a lot of files.
 | 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.
 | moveFailed | consumer |  | String | Sets the move failure expression based on Simple language.
For example to move files into a .error subdirectory use: .error. Note: When moving the files
to the fail location Camel will handle the error and will not pick up the file again.
@@ -149,6 +145,7 @@ The FTP component supports 104 endpoint options which are listed below:
 | sendEmptyMessageWhenIdle | consumer | false | boolean | If the polling consumer did not
poll any files you can enable this option to send an empty message (no body) instead.
 | streamDownload | consumer | false | boolean | Sets the download method to use when not
using a local working directory. If set to true the remote files are streamed to the route
as they are read. When set to false the remote files are loaded into memory before being sent
into the route.
 | directoryMustExist | consumer (advanced) | false | boolean | Similar to startingDirectoryMustExist
but this applies during polling recursive sub directories.
+| download | consumer (advanced) | false | boolean | Whether the FTP consumer should download
the file. If this option is set to false then the message body will be null but the consumer
will still trigger a Camel Exchange that has details about the file such as file name file
size etc. It's just that the file will not be downloaded.
 | exceptionHandler | consumer (advanced) |  | ExceptionHandler | To let the consumer use
a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this options
is not in use. By default the consumer will deal with exceptions that will be logged at WARN/ERROR
level and ignored.
 | exchangePattern | consumer (advanced) |  | ExchangePattern | Sets the exchange pattern
when the consumer creates an exchange.
 | ignoreFileNotFoundOrPermissionError | consumer (advanced) | false | boolean | Whether to
ignore when trying to download a file which does not exist or due to permission error. By
default when a file does not exists or insufficient permission then an exception is thrown.
Setting this option to true allows to ignore that instead.
@@ -166,6 +163,7 @@ The FTP component supports 104 endpoint options which are listed below:
 | tempFileName | producer |  | String | The same as tempPrefix option but offering a more
fine grained control on the naming of the temporary filename as it uses the File Language.
 | tempPrefix | producer |  | String | This option is used to write the file using a temporary
name and then after the write is complete rename it to the real name. Can be used to identify
files being written and also avoid consumers (not using exclusive read locks) reading in progress
files. Is often used by FTP when uploading big files.
 | allowNullBody | producer (advanced) | false | boolean | Used to specify if a null body
is allowed during file writing. If set to true then an empty file will be created when set
to false and attempting to send a null body to the file component a GenericFileWriteException
of 'Cannot write null body to file.' will be thrown. If the fileExist option is set to 'Override'
then the file will be truncated and if set to append the file will remain unchanged.
+| disconnectOnBatchComplete | producer (advanced) | false | boolean | Whether or not to disconnect
from remote FTP server right after a Batch upload is complete. disconnectOnBatchComplete will
only disconnect the current connection to the FTP server.
 | eagerDeleteTargetFile | producer (advanced) | true | boolean | Whether or not to eagerly
delete any existing target file. This option only applies when you use fileExists=Override
and the tempFileName option as well. You can use this to disable (set it to false) deleting
the target file before the temp file is written. For example you may write big files and want
the target file to exists during the temp file is being written. This ensure the target file
is only deleted until the very last moment just before the temp file is being renamed to the
target filename. This option is also used to control whether to delete any existing files
when fileExist=Move is enabled and an existing file exists. If this option copyAndDeleteOnRenameFails
false then an exception will be thrown if an existing file existed if its true then the existing
file is deleted before the move operation.
 | keepLastModified | producer (advanced) | false | boolean | Will keep the last modified
timestamp from the source file (if any). Will use the Exchange.FILE_LAST_MODIFIED header to
located the timestamp. This header can contain either a java.util.Date or long with the timestamp.
If the timestamp exists and the option is enabled it will set this timestamp on the written
file. Note: This option only applies to the file producer. You cannot use this option with
any of the ftp producers.
 | sendNoop | producer (advanced) | true | boolean | Whether to send a noop command as a pre-write
check before uploading files to the FTP server. This is enabled by default as a validation
of the connection is still valid which allows to silently re-connect to be able to upload
the file. However if this causes problems you can turn this option off.
@@ -177,6 +175,8 @@ The FTP component supports 104 endpoint options which are listed below:
 | ftpClientConfig | advanced |  | FTPClientConfig | To use a custom instance of FTPClientConfig
to configure the FTP client the endpoint should use.
 | ftpClientConfigParameters | advanced |  | Map | Used by FtpComponent to provide additional
parameters for the FTPClientConfig
 | ftpClientParameters | advanced |  | Map | Used by FtpComponent to provide additional parameters
for the FTPClient
+| maximumReconnectAttempts | advanced |  | int | Specifies the maximum reconnect attempts
Camel performs when it tries to connect to the remote FTP server. Use 0 to disable this behavior.
+| reconnectDelay | advanced |  | long | Delay in millis Camel will wait before performing
a reconnect attempt.
 | siteCommand | advanced |  | String | Sets optional site command(s) to be executed after
successful login. Multiple site commands can be separated using a new line character (\n).
 | soTimeout | advanced | 300000 | int | Sets the so timeout Used only by FTPClient
 | stepwise | advanced | true | boolean | Sets whether we should stepwise change directories
while traversing file structures when downloading files or as well when uploading a file to
a directory. You can disable this if you for example are in a situation where you cannot change
directory on the FTP server due security reasons.

http://git-wip-us.apache.org/repos/asf/camel/blob/9ef98ee8/components/camel-ftp/src/main/docs/ftps-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/main/docs/ftps-component.adoc b/components/camel-ftp/src/main/docs/ftps-component.adoc
index 6a634a7..8929d77 100644
--- a/components/camel-ftp/src/main/docs/ftps-component.adoc
+++ b/components/camel-ftp/src/main/docs/ftps-component.adoc
@@ -44,15 +44,11 @@ The FTPS component supports 112 endpoint options which are listed below:
 | binary | common | false | boolean | Specifies the file transfer mode BINARY or ASCII. Default
is ASCII (false).
 | 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.
 | disconnect | common | false | boolean | Whether or not to disconnect from remote FTP server
right after use. Disconnect will only disconnect the current connection to the FTP server.
If you have a consumer which you want to stop then you need to stop the consumer/route instead.
-| disconnectOnBatchComplete | common | false | boolean | Whether or not to disconnect from
remote FTP server right after a Batch is complete. disconnectOnBatchComplete will only disconnect
the current connection to the FTP server. If you have a consumer which you want to stop then
you need to stop the consumer/route instead.
 | doneFileName | common |  | String | Producer: 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. Consumer: If
provided Camel will only consume files if a done file exists. This option configures what
file name to use. Either you can specify a fixed name. Or you can use dynamic placeholders.The
done file is always expected in the same folder as the original file. Only $file.name and
$file.name.noext is supported as dynamic placeholders.
-| download | common | false | boolean | Whether the FTP consumer should download the file.
If this option is set to false then the message body will be null but the consumer will still
trigger a Camel Exchange that has details about the file such as file name file size etc.
It's just that the file will not be downloaded.
-| fastExistsCheck | common | false | boolean | If set this option to be true camel-ftp will
use the list file directly to check if the file exists. Since some FTP server may not support
to list the file directly if the option is false camel-ftp will use the old way to list the
directory and check if the file exists. This option also influences readLock=changed to control
whether it performs a fast check to update file information or not. This can be used to speed
up the process if the FTP server has a lot of files.
 | 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.
-| maximumReconnectAttempts | common |  | int | Specifies the maximum reconnect attempts Camel
performs when it tries to connect to the remote FTP server. Use 0 to disable this behavior.
 | passiveMode | common | false | boolean | Sets passive mode connections. Default is active
mode connections.
-| reconnectDelay | common |  | long | Delay in millis Camel will wait before performing a
reconnect attempt.
 | separator | common | UNIX | PathSeparator | Sets the path separator to be used. UNIX =
Uses unix style path separator Windows = Uses windows style path separator Auto = (is default)
Use existing path separator in file name
+| fastExistsCheck | common (advanced) | false | boolean | If set this option to be true camel-ftp
will use the list file directly to check if the file exists. Since some FTP server may not
support to list the file directly if the option is false camel-ftp will use the old way to
list the directory and check if the file exists. This option also influences readLock=changed
to control whether it performs a fast check to update file information or not. This can be
used to speed up the process if the FTP server has a lot of files.
 | 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.
 | moveFailed | consumer |  | String | Sets the move failure expression based on Simple language.
For example to move files into a .error subdirectory use: .error. Note: When moving the files
to the fail location Camel will handle the error and will not pick up the file again.
@@ -62,6 +58,7 @@ The FTPS component supports 112 endpoint options which are listed below:
 | sendEmptyMessageWhenIdle | consumer | false | boolean | If the polling consumer did not
poll any files you can enable this option to send an empty message (no body) instead.
 | streamDownload | consumer | false | boolean | Sets the download method to use when not
using a local working directory. If set to true the remote files are streamed to the route
as they are read. When set to false the remote files are loaded into memory before being sent
into the route.
 | directoryMustExist | consumer (advanced) | false | boolean | Similar to startingDirectoryMustExist
but this applies during polling recursive sub directories.
+| download | consumer (advanced) | false | boolean | Whether the FTP consumer should download
the file. If this option is set to false then the message body will be null but the consumer
will still trigger a Camel Exchange that has details about the file such as file name file
size etc. It's just that the file will not be downloaded.
 | exceptionHandler | consumer (advanced) |  | ExceptionHandler | To let the consumer use
a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this options
is not in use. By default the consumer will deal with exceptions that will be logged at WARN/ERROR
level and ignored.
 | exchangePattern | consumer (advanced) |  | ExchangePattern | Sets the exchange pattern
when the consumer creates an exchange.
 | ignoreFileNotFoundOrPermissionError | consumer (advanced) | false | boolean | Whether to
ignore when trying to download a file which does not exist or due to permission error. By
default when a file does not exists or insufficient permission then an exception is thrown.
Setting this option to true allows to ignore that instead.
@@ -79,6 +76,7 @@ The FTPS component supports 112 endpoint options which are listed below:
 | tempFileName | producer |  | String | The same as tempPrefix option but offering a more
fine grained control on the naming of the temporary filename as it uses the File Language.
 | tempPrefix | producer |  | String | This option is used to write the file using a temporary
name and then after the write is complete rename it to the real name. Can be used to identify
files being written and also avoid consumers (not using exclusive read locks) reading in progress
files. Is often used by FTP when uploading big files.
 | allowNullBody | producer (advanced) | false | boolean | Used to specify if a null body
is allowed during file writing. If set to true then an empty file will be created when set
to false and attempting to send a null body to the file component a GenericFileWriteException
of 'Cannot write null body to file.' will be thrown. If the fileExist option is set to 'Override'
then the file will be truncated and if set to append the file will remain unchanged.
+| disconnectOnBatchComplete | producer (advanced) | false | boolean | Whether or not to disconnect
from remote FTP server right after a Batch upload is complete. disconnectOnBatchComplete will
only disconnect the current connection to the FTP server.
 | eagerDeleteTargetFile | producer (advanced) | true | boolean | Whether or not to eagerly
delete any existing target file. This option only applies when you use fileExists=Override
and the tempFileName option as well. You can use this to disable (set it to false) deleting
the target file before the temp file is written. For example you may write big files and want
the target file to exists during the temp file is being written. This ensure the target file
is only deleted until the very last moment just before the temp file is being renamed to the
target filename. This option is also used to control whether to delete any existing files
when fileExist=Move is enabled and an existing file exists. If this option copyAndDeleteOnRenameFails
false then an exception will be thrown if an existing file existed if its true then the existing
file is deleted before the move operation.
 | keepLastModified | producer (advanced) | false | boolean | Will keep the last modified
timestamp from the source file (if any). Will use the Exchange.FILE_LAST_MODIFIED header to
located the timestamp. This header can contain either a java.util.Date or long with the timestamp.
If the timestamp exists and the option is enabled it will set this timestamp on the written
file. Note: This option only applies to the file producer. You cannot use this option with
any of the ftp producers.
 | sendNoop | producer (advanced) | true | boolean | Whether to send a noop command as a pre-write
check before uploading files to the FTP server. This is enabled by default as a validation
of the connection is still valid which allows to silently re-connect to be able to upload
the file. However if this causes problems you can turn this option off.
@@ -90,6 +88,8 @@ The FTPS component supports 112 endpoint options which are listed below:
 | ftpClientConfig | advanced |  | FTPClientConfig | To use a custom instance of FTPClientConfig
to configure the FTP client the endpoint should use.
 | ftpClientConfigParameters | advanced |  | Map | Used by FtpComponent to provide additional
parameters for the FTPClientConfig
 | ftpClientParameters | advanced |  | Map | Used by FtpComponent to provide additional parameters
for the FTPClient
+| maximumReconnectAttempts | advanced |  | int | Specifies the maximum reconnect attempts
Camel performs when it tries to connect to the remote FTP server. Use 0 to disable this behavior.
+| reconnectDelay | advanced |  | long | Delay in millis Camel will wait before performing
a reconnect attempt.
 | siteCommand | advanced |  | String | Sets optional site command(s) to be executed after
successful login. Multiple site commands can be separated using a new line character (\n).
 | soTimeout | advanced | 300000 | int | Sets the so timeout Used only by FTPClient
 | stepwise | advanced | true | boolean | Sets whether we should stepwise change directories
while traversing file structures when downloading files or as well when uploading a file to
a directory. You can disable this if you for example are in a situation where you cannot change
directory on the FTP server due security reasons.

http://git-wip-us.apache.org/repos/asf/camel/blob/9ef98ee8/components/camel-ftp/src/main/docs/sftp-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/main/docs/sftp-component.adoc b/components/camel-ftp/src/main/docs/sftp-component.adoc
index 2985fa9..e5d9e56 100644
--- a/components/camel-ftp/src/main/docs/sftp-component.adoc
+++ b/components/camel-ftp/src/main/docs/sftp-component.adoc
@@ -43,15 +43,11 @@ The SFTP component supports 112 endpoint options which are listed below:
 | directoryName | common |  | String | 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.
 | disconnect | common | false | boolean | Whether or not to disconnect from remote FTP server
right after use. Disconnect will only disconnect the current connection to the FTP server.
If you have a consumer which you want to stop then you need to stop the consumer/route instead.
-| disconnectOnBatchComplete | common | false | boolean | Whether or not to disconnect from
remote FTP server right after a Batch is complete. disconnectOnBatchComplete will only disconnect
the current connection to the FTP server. If you have a consumer which you want to stop then
you need to stop the consumer/route instead.
 | doneFileName | common |  | String | Producer: 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. Consumer: If
provided Camel will only consume files if a done file exists. This option configures what
file name to use. Either you can specify a fixed name. Or you can use dynamic placeholders.The
done file is always expected in the same folder as the original file. Only $file.name and
$file.name.noext is supported as dynamic placeholders.
-| download | common | false | boolean | Whether the FTP consumer should download the file.
If this option is set to false then the message body will be null but the consumer will still
trigger a Camel Exchange that has details about the file such as file name file size etc.
It's just that the file will not be downloaded.
-| fastExistsCheck | common | false | boolean | If set this option to be true camel-ftp will
use the list file directly to check if the file exists. Since some FTP server may not support
to list the file directly if the option is false camel-ftp will use the old way to list the
directory and check if the file exists. This option also influences readLock=changed to control
whether it performs a fast check to update file information or not. This can be used to speed
up the process if the FTP server has a lot of files.
 | 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.
 | jschLoggingLevel | common | WARN | LoggingLevel | The logging level to use for JSCH activity
logging. As JSCH is verbose at by default at INFO level the threshold is WARN by default.
-| maximumReconnectAttempts | common |  | int | Specifies the maximum reconnect attempts Camel
performs when it tries to connect to the remote FTP server. Use 0 to disable this behavior.
-| reconnectDelay | common |  | long | Delay in millis Camel will wait before performing a
reconnect attempt.
 | separator | common | UNIX | PathSeparator | Sets the path separator to be used. UNIX =
Uses unix style path separator Windows = Uses windows style path separator Auto = (is default)
Use existing path separator in file name
+| fastExistsCheck | common (advanced) | false | boolean | If set this option to be true camel-ftp
will use the list file directly to check if the file exists. Since some FTP server may not
support to list the file directly if the option is false camel-ftp will use the old way to
list the directory and check if the file exists. This option also influences readLock=changed
to control whether it performs a fast check to update file information or not. This can be
used to speed up the process if the FTP server has a lot of files.
 | 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.
 | moveFailed | consumer |  | String | Sets the move failure expression based on Simple language.
For example to move files into a .error subdirectory use: .error. Note: When moving the files
to the fail location Camel will handle the error and will not pick up the file again.
@@ -61,6 +57,7 @@ The SFTP component supports 112 endpoint options which are listed below:
 | sendEmptyMessageWhenIdle | consumer | false | boolean | If the polling consumer did not
poll any files you can enable this option to send an empty message (no body) instead.
 | streamDownload | consumer | false | boolean | Sets the download method to use when not
using a local working directory. If set to true the remote files are streamed to the route
as they are read. When set to false the remote files are loaded into memory before being sent
into the route.
 | directoryMustExist | consumer (advanced) | false | boolean | Similar to startingDirectoryMustExist
but this applies during polling recursive sub directories.
+| download | consumer (advanced) | false | boolean | Whether the FTP consumer should download
the file. If this option is set to false then the message body will be null but the consumer
will still trigger a Camel Exchange that has details about the file such as file name file
size etc. It's just that the file will not be downloaded.
 | exceptionHandler | consumer (advanced) |  | ExceptionHandler | To let the consumer use
a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this options
is not in use. By default the consumer will deal with exceptions that will be logged at WARN/ERROR
level and ignored.
 | exchangePattern | consumer (advanced) |  | ExchangePattern | Sets the exchange pattern
when the consumer creates an exchange.
 | ignoreFileNotFoundOrPermissionError | consumer (advanced) | false | boolean | Whether to
ignore when trying to download a file which does not exist or due to permission error. By
default when a file does not exists or insufficient permission then an exception is thrown.
Setting this option to true allows to ignore that instead.
@@ -77,6 +74,7 @@ The SFTP component supports 112 endpoint options which are listed below:
 | tempPrefix | producer |  | String | This option is used to write the file using a temporary
name and then after the write is complete rename it to the real name. Can be used to identify
files being written and also avoid consumers (not using exclusive read locks) reading in progress
files. Is often used by FTP when uploading big files.
 | allowNullBody | producer (advanced) | false | boolean | Used to specify if a null body
is allowed during file writing. If set to true then an empty file will be created when set
to false and attempting to send a null body to the file component a GenericFileWriteException
of 'Cannot write null body to file.' will be thrown. If the fileExist option is set to 'Override'
then the file will be truncated and if set to append the file will remain unchanged.
 | chmod | producer (advanced) |  | String | Allows you to set chmod on the stored file. For
example chmod=640.
+| disconnectOnBatchComplete | producer (advanced) | false | boolean | Whether or not to disconnect
from remote FTP server right after a Batch upload is complete. disconnectOnBatchComplete will
only disconnect the current connection to the FTP server.
 | eagerDeleteTargetFile | producer (advanced) | true | boolean | Whether or not to eagerly
delete any existing target file. This option only applies when you use fileExists=Override
and the tempFileName option as well. You can use this to disable (set it to false) deleting
the target file before the temp file is written. For example you may write big files and want
the target file to exists during the temp file is being written. This ensure the target file
is only deleted until the very last moment just before the temp file is being renamed to the
target filename. This option is also used to control whether to delete any existing files
when fileExist=Move is enabled and an existing file exists. If this option copyAndDeleteOnRenameFails
false then an exception will be thrown if an existing file existed if its true then the existing
file is deleted before the move operation.
 | keepLastModified | producer (advanced) | false | boolean | Will keep the last modified
timestamp from the source file (if any). Will use the Exchange.FILE_LAST_MODIFIED header to
located the timestamp. This header can contain either a java.util.Date or long with the timestamp.
If the timestamp exists and the option is enabled it will set this timestamp on the written
file. Note: This option only applies to the file producer. You cannot use this option with
any of the ftp producers.
 | sendNoop | producer (advanced) | true | boolean | Whether to send a noop command as a pre-write
check before uploading files to the FTP server. This is enabled by default as a validation
of the connection is still valid which allows to silently re-connect to be able to upload
the file. However if this causes problems you can turn this option off.
@@ -85,7 +83,9 @@ The SFTP component supports 112 endpoint options which are listed below:
 | bulkRequests | advanced |  | Integer | Specifies how many requests may be outstanding at
any one time. Increasing this value may slightly improve file transfer speed but will increase
memory usage.
 | compression | advanced |  | int | To use compression. Specify a level from 1 to 10. Important:
You must manually add the needed JSCH zlib JAR to the classpath for compression support.
 | connectTimeout | advanced | 10000 | int | Sets the connect timeout for waiting for a connection
to be established Used by both FTPClient and JSCH
+| maximumReconnectAttempts | advanced |  | int | Specifies the maximum reconnect attempts
Camel performs when it tries to connect to the remote FTP server. Use 0 to disable this behavior.
 | proxy | advanced |  | Proxy | To use a custom configured com.jcraft.jsch.Proxy. This proxy
is used to consume/send messages from the target SFTP host.
+| reconnectDelay | advanced |  | long | Delay in millis Camel will wait before performing
a reconnect attempt.
 | serverAliveCountMax | advanced | 1 | int | Allows you to set the serverAliveCountMax of
the sftp session
 | serverAliveInterval | advanced |  | int | Allows you to set the serverAliveInterval of
the sftp session
 | soTimeout | advanced | 300000 | int | Sets the so timeout Used only by FTPClient

http://git-wip-us.apache.org/repos/asf/camel/blob/9ef98ee8/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java
index f6e3641..884678a 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java
@@ -33,17 +33,17 @@ import org.apache.camel.util.ObjectHelper;
  */
 public abstract class RemoteFileEndpoint<T> extends GenericFileEndpoint<T> {
 
-    @UriParam
+    @UriParam(label = "advanced")
     private int maximumReconnectAttempts = 3;
-    @UriParam
+    @UriParam(label = "advanced")
     private long reconnectDelay = 1000;
-    @UriParam
+    @UriParam(label = "common")
     private boolean disconnect;
-    @UriParam
+    @UriParam(label = "producer,advanced")
     private boolean disconnectOnBatchComplete;   
-    @UriParam
+    @UriParam(label = "common,advanced")
     private boolean fastExistsCheck;
-    @UriParam
+    @UriParam(label = "consumer,advanced")
     private boolean download = true;
 
     public RemoteFileEndpoint() {
@@ -226,9 +226,8 @@ public abstract class RemoteFileEndpoint<T> extends GenericFileEndpoint<T>
{
     }
 
     /**
-     * Whether or not to disconnect from remote FTP server right after a Batch is complete.
+     * Whether or not to disconnect from remote FTP server right after a Batch upload is
complete.
      * disconnectOnBatchComplete will only disconnect the current connection to the FTP server.
-     * If you have a consumer which you want to stop, then you need to stop the consumer/route
instead.
      */
     public void setDisconnectOnBatchComplete(boolean disconnectOnBatchComplete) {
         this.disconnectOnBatchComplete = disconnectOnBatchComplete;

http://git-wip-us.apache.org/repos/asf/camel/blob/9ef98ee8/components/camel-weather/src/main/docs/weather-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-weather/src/main/docs/weather-component.adoc b/components/camel-weather/src/main/docs/weather-component.adoc
index 04d8b3c..d66100c 100644
--- a/components/camel-weather/src/main/docs/weather-component.adoc
+++ b/components/camel-weather/src/main/docs/weather-component.adoc
@@ -63,21 +63,12 @@ The Weather component supports 44 endpoint options which are listed below:
 | Name | Group | Default | Java Type | Description
 | name | common |  | String | *Required* The name value is not used.
 | appid | common |  | String | *Required* APPID ID used to authenticate the user connected
to the API Server
-| cnt | common |  | Integer | Number of results to be found
 | headerName | common |  | String | To store the weather result in this header instead of
the message body. This is useable if you want to keep current message body as-is.
-| ids | common |  | String | List of id's of city/stations. You can separate multiple ids
by comma.
 | language | common | en | WeatherLanguage | Language of the response.
-| lat | common |  | String | Latitude of location. You can use lat and lon options instead
of location. For boxed queries this is the bottom latitude.
-| location | common |  | String | If null Camel will try and determine your current location
using the geolocation of your ip address else specify the citycountry. For well known city
names Open Weather Map will determine the best fit but multiple results may be returned. Hence
specifying and country as well will return more accurate data. If you specify current as the
location then the component will try to get the current latitude and longitude and use that
to get the weather details. You can use lat and lon options instead of location.
-| lon | common |  | String | Longitude of location. You can use lat and lon options instead
of location. For boxed queries this is the left longtitude.
 | mode | common | JSON | WeatherMode | The output format of the weather data.
 | period | common |  | String | If null the current weather will be returned else use values
of 5 7 14 days. Only the numeric value for the forecast period is actually parsed so spelling
capitalisation of the time period is up to you (its ignored)
-| rightLon | common |  | String | For boxed queries this is the right longtitude. Needs to
be used in combination with topLat and zoom.
-| topLat | common |  | String | For boxed queries this is the top latitude. Needs to be used
in combination with rightLon and zoom.
 | units | common |  | WeatherUnits | The units for temperature measurement.
 | weatherApi | common |  | WeatherApi | The API to be use (current forecast/3 hour forecast
daily station)
-| zip | common |  | String | Zip-code e.g. 94040us
-| zoom | common |  | Integer | For boxed queries this is the zoom. Needs to be used in combination
with rightLon and topLat.
 | 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.
 | sendEmptyMessageWhenIdle | consumer | false | boolean | If the polling consumer did not
poll any files you can enable this option to send an empty message (no body) instead.
 | exceptionHandler | consumer (advanced) |  | ExceptionHandler | To let the consumer use
a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this options
is not in use. By default the consumer will deal with exceptions that will be logged at WARN/ERROR
level and ignored.
@@ -98,6 +89,15 @@ The Weather component supports 44 endpoint options which are listed below:
 | startScheduler | scheduler | true | boolean | Whether the scheduler should be auto started.
 | timeUnit | scheduler | MILLISECONDS | TimeUnit | Time unit for initialDelay and delay options.
 | useFixedDelay | scheduler | true | boolean | Controls if fixed delay or fixed rate is used.
See ScheduledExecutorService in JDK for details.
+| cnt | filter |  | Integer | Number of results to be found
+| ids | filter |  | String | List of id's of city/stations. You can separate multiple ids
by comma.
+| lat | filter |  | String | Latitude of location. You can use lat and lon options instead
of location. For boxed queries this is the bottom latitude.
+| location | filter |  | String | If null Camel will try and determine your current location
using the geolocation of your ip address else specify the citycountry. For well known city
names Open Weather Map will determine the best fit but multiple results may be returned. Hence
specifying and country as well will return more accurate data. If you specify current as the
location then the component will try to get the current latitude and longitude and use that
to get the weather details. You can use lat and lon options instead of location.
+| lon | filter |  | String | Longitude of location. You can use lat and lon options instead
of location. For boxed queries this is the left longtitude.
+| rightLon | filter |  | String | For boxed queries this is the right longtitude. Needs to
be used in combination with topLat and zoom.
+| topLat | filter |  | String | For boxed queries this is the top latitude. Needs to be used
in combination with rightLon and zoom.
+| zip | filter |  | String | Zip-code e.g. 94040us
+| zoom | filter |  | Integer | For boxed queries this is the zoom. Needs to be used in combination
with rightLon and topLat.
 | proxyAuthDomain | proxy |  | String | Domain for proxy NTLM authentication
 | proxyAuthHost | proxy |  | String | Optional host for proxy NTLM authentication
 | proxyAuthMethod | proxy |  | String | Authentication method for proxy either as Basic Digest
or NTLM.

http://git-wip-us.apache.org/repos/asf/camel/blob/9ef98ee8/components/camel-weather/src/main/java/org/apache/camel/component/weather/WeatherConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-weather/src/main/java/org/apache/camel/component/weather/WeatherConfiguration.java
b/components/camel-weather/src/main/java/org/apache/camel/component/weather/WeatherConfiguration.java
index 7c7be48..ea654ba 100644
--- a/components/camel-weather/src/main/java/org/apache/camel/component/weather/WeatherConfiguration.java
+++ b/components/camel-weather/src/main/java/org/apache/camel/component/weather/WeatherConfiguration.java
@@ -45,16 +45,18 @@ public class WeatherConfiguration {
     @UriParam @Metadata(required = "true")
     private String appid;
     @UriParam
+    private WeatherApi weatherApi;
+    @UriParam(label = "filter")
     private String location = "";
-    @UriParam
+    @UriParam(label = "filter")
     private String lat;
-    @UriParam
+    @UriParam(label = "filter")
     private String lon;
-    @UriParam
+    @UriParam(label = "filter")
     private String rightLon;
-    @UriParam
+    @UriParam(label = "filter")
     private String topLat;
-    @UriParam
+    @UriParam(label = "filter")
     private Integer zoom;
     @UriParam
     private String period = "";
@@ -66,14 +68,12 @@ public class WeatherConfiguration {
     private WeatherLanguage language = en;
     @UriParam
     private String headerName;
-    @UriParam
+    @UriParam(label = "filter")
     private String zip;
-    @UriParam(javaType = "java.lang.String")
+    @UriParam(label = "filter", javaType = "java.lang.String")
     private List<String> ids;
-    @UriParam
+    @UriParam(label = "filter")
     private Integer cnt;
-    @UriParam
-    private WeatherApi weatherApi;
 
     @UriParam(label = "proxy")
     private String proxyHost;

http://git-wip-us.apache.org/repos/asf/camel/blob/9ef98ee8/components/camel-weather/src/main/java/org/apache/camel/component/weather/WeatherQuery.java
----------------------------------------------------------------------
diff --git a/components/camel-weather/src/main/java/org/apache/camel/component/weather/WeatherQuery.java
b/components/camel-weather/src/main/java/org/apache/camel/component/weather/WeatherQuery.java
index 090a88a..d7230e3 100644
--- a/components/camel-weather/src/main/java/org/apache/camel/component/weather/WeatherQuery.java
+++ b/components/camel-weather/src/main/java/org/apache/camel/component/weather/WeatherQuery.java
@@ -101,7 +101,6 @@ public class WeatherQuery {
         }
 
         return answer;
-
     }
 
     private String createContext() {


Mime
View raw message