Repository: camel Updated Branches: refs/heads/camel-2.16.x bbbac65d5 -> 15856d24c refs/heads/master 4e1f3eec2 -> 8996d15d7
CAMEL-9472: Add multi value to component docs Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8fb2c831 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8fb2c831 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8fb2c831 Branch: refs/heads/master Commit: 8fb2c8313b7a78c9341b9c35455a8d88b8b3031b Parents: 4e1f3ee Author: Claus Ibsen <davscl...@apache.org> Authored: Mon Jan 4 17:42:41 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Jan 4 17:42:41 2016 +0100 ---------------------------------------------------------------------- .../camel/component/file/remote/FtpEndpoint.java | 13 ++++++++++--- .../camel/component/file/remote/FtpsEndpoint.java | 6 ++++-- 2 files changed, 14 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/8fb2c831/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java index 0b2e56d..e87e74b 100644 --- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java +++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java @@ -40,13 +40,17 @@ import org.apache.commons.net.ftp.FTPFile; syntax = "ftp:host:port/directoryName", consumerClass = FtpConsumer.class, label = "file") public class FtpEndpoint<T extends FTPFile> extends RemoteFileEndpoint<FTPFile> { protected FTPClient ftpClient; - protected FTPClientConfig ftpClientConfig; - protected Map<String, Object> ftpClientParameters; - protected Map<String, Object> ftpClientConfigParameters; protected int soTimeout; protected int dataTimeout; + @UriParam protected FtpConfiguration configuration; + @UriParam(label = "advanced") + protected FTPClientConfig ftpClientConfig; + @UriParam(label = "advanced", prefix = "ftpClientConfig.", multiValue = true) + protected Map<String, Object> ftpClientConfigParameters; + @UriParam(label = "advanced", prefix = "ftpClient.", multiValue = true) + protected Map<String, Object> ftpClientParameters; public FtpEndpoint() { } @@ -188,6 +192,9 @@ public class FtpEndpoint<T extends FTPFile> extends RemoteFileEndpoint<FTPFile> return ftpClientConfig; } + /** + * To use a custom instance of FTPClientConfig to configure the FTP client the endpoint should use. + */ public void setFtpClientConfig(FTPClientConfig ftpClientConfig) { this.ftpClientConfig = ftpClientConfig; } http://git-wip-us.apache.org/repos/asf/camel/blob/8fb2c831/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsEndpoint.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsEndpoint.java index 036d281..d2804cd 100644 --- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsEndpoint.java +++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsEndpoint.java @@ -42,12 +42,14 @@ import org.apache.commons.net.ftp.FTPSClient; @UriEndpoint(scheme = "ftps", extendsScheme = "file", title = "FTPS", syntax = "ftps:host:port/directoryName", consumerClass = FtpConsumer.class, label = "file") public class FtpsEndpoint extends FtpEndpoint<FTPFile> { - protected Map<String, Object> ftpClientKeyStoreParameters; - protected Map<String, Object> ftpClientTrustStoreParameters; @UriParam protected FtpsConfiguration configuration; @UriParam(label = "security") protected SSLContextParameters sslContextParameters; + @UriParam(label = "security", prefix = "ftpClient.keyStore.", multiValue = true) + protected Map<String, Object> ftpClientKeyStoreParameters; + @UriParam(label = "security", prefix = "ftpClient.trustStore.", multiValue = true) + protected Map<String, Object> ftpClientTrustStoreParameters; public FtpsEndpoint() { }
