Repository: camel Updated Branches: refs/heads/master 2141b1981 -> 64e1b0a6b
CAMEL-8038 Fixed the test error of camel-ftp Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/64e1b0a6 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/64e1b0a6 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/64e1b0a6 Branch: refs/heads/master Commit: 64e1b0a6bda19c8f2e8af1d25529f079ac4e9621 Parents: 2141b19 Author: Willem Jiang <[email protected]> Authored: Fri Nov 28 09:22:02 2014 +0800 Committer: Willem Jiang <[email protected]> Committed: Fri Nov 28 09:22:23 2014 +0800 ---------------------------------------------------------------------- .../org/apache/camel/component/file/remote/FtpEndpoint.java | 3 ++- .../org/apache/camel/component/file/remote/FtpsEndpoint.java | 7 +++++-- .../org/apache/camel/component/file/remote/SftpEndpoint.java | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/64e1b0a6/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 674e306..6ae1b79 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 @@ -51,8 +51,9 @@ public class FtpEndpoint<T extends FTPFile> extends RemoteFileEndpoint<FTPFile> public FtpEndpoint() { } - public FtpEndpoint(String uri, RemoteFileComponent<FTPFile> component, RemoteFileConfiguration configuration) { + public FtpEndpoint(String uri, RemoteFileComponent<FTPFile> component, FtpConfiguration configuration) { super(uri, component, configuration); + this.configuration = configuration; } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/64e1b0a6/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 6965869..e410de0 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 @@ -28,6 +28,7 @@ import javax.net.ssl.SSLSocket; import javax.net.ssl.TrustManagerFactory; import org.apache.camel.spi.UriEndpoint; +import org.apache.camel.spi.UriParam; import org.apache.camel.util.IOHelper; import org.apache.camel.util.jsse.SSLContextParameters; import org.apache.commons.net.ftp.FTPClient; @@ -42,7 +43,8 @@ import org.apache.commons.net.ftp.FTPSClient; */ @UriEndpoint(scheme = "ftps", consumerClass = FtpConsumer.class, label = "file") public class FtpsEndpoint extends FtpEndpoint<FTPFile> { - + @UriParam + protected FtpsConfiguration configuration; protected Map<String, Object> ftpClientKeyStoreParameters; protected Map<String, Object> ftpClientTrustStoreParameters; protected SSLContextParameters sslContextParameters; @@ -50,8 +52,9 @@ public class FtpsEndpoint extends FtpEndpoint<FTPFile> { public FtpsEndpoint() { } - public FtpsEndpoint(String uri, RemoteFileComponent<FTPFile> remoteFileComponent, RemoteFileConfiguration configuration) { + public FtpsEndpoint(String uri, RemoteFileComponent<FTPFile> remoteFileComponent, FtpsConfiguration configuration) { super(uri, remoteFileComponent, configuration); + this.configuration = configuration; } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/64e1b0a6/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpEndpoint.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpEndpoint.java index c834d4f..e0c69ab 100644 --- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpEndpoint.java +++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpEndpoint.java @@ -38,8 +38,9 @@ public class SftpEndpoint extends RemoteFileEndpoint<ChannelSftp.LsEntry> { public SftpEndpoint() { } - public SftpEndpoint(String uri, SftpComponent component, RemoteFileConfiguration configuration) { + public SftpEndpoint(String uri, SftpComponent component, SftpConfiguration configuration) { super(uri, component, configuration); + this.configuration = configuration; } @Override
