You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/10/28 13:18:56 UTC
[2/6] git commit: CAMEL-6908: camel-ftp ftpClient.xxx options now
support refernece lookup (eg # syntax)
CAMEL-6908: camel-ftp ftpClient.xxx options now support refernece lookup (eg # syntax)
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2e05ae0a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2e05ae0a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2e05ae0a
Branch: refs/heads/master
Commit: 2e05ae0a1665282168d5822c004c624f46d09d58
Parents: 9041192
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Oct 28 13:18:35 2013 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Oct 28 13:18:35 2013 +0100
----------------------------------------------------------------------
.../org/apache/camel/component/file/remote/FtpEndpoint.java | 5 ++---
.../org/apache/camel/component/file/remote/FtpsEndpoint.java | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2e05ae0a/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 77ee093..03b14b5 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
@@ -24,7 +24,6 @@ import org.apache.camel.Processor;
import org.apache.camel.component.file.GenericFileConfiguration;
import org.apache.camel.component.file.GenericFileProducer;
import org.apache.camel.component.file.remote.RemoteFileConfiguration.PathSeparator;
-import org.apache.camel.util.IntrospectionSupport;
import org.apache.commons.net.ftp.FTPClient;
import org.apache.commons.net.ftp.FTPClientConfig;
import org.apache.commons.net.ftp.FTPFile;
@@ -100,7 +99,7 @@ public class FtpEndpoint<T extends FTPFile> extends RemoteFileEndpoint<FTPFile>
if (timeout != null) {
dataTimeout = getCamelContext().getTypeConverter().convertTo(int.class, dataTimeout);
}
- IntrospectionSupport.setProperties(client, ftpClientParameters);
+ setProperties(client, ftpClientParameters);
}
if (ftpClientConfigParameters != null) {
@@ -108,7 +107,7 @@ public class FtpEndpoint<T extends FTPFile> extends RemoteFileEndpoint<FTPFile>
if (ftpClientConfig == null) {
ftpClientConfig = new FTPClientConfig();
}
- IntrospectionSupport.setProperties(ftpClientConfig, ftpClientConfigParameters);
+ setProperties(ftpClientConfig, ftpClientConfigParameters);
}
if (dataTimeout > 0) {
http://git-wip-us.apache.org/repos/asf/camel/blob/2e05ae0a/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 1f0c6a2..1b4e6d3 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
@@ -27,7 +27,6 @@ import javax.net.ssl.SSLSocket;
import javax.net.ssl.TrustManagerFactory;
import org.apache.camel.util.IOHelper;
-import org.apache.camel.util.IntrospectionSupport;
import org.apache.camel.util.jsse.SSLContextParameters;
import org.apache.commons.net.ftp.FTPClient;
import org.apache.commons.net.ftp.FTPClientConfig;
@@ -165,7 +164,7 @@ public class FtpsEndpoint extends FtpEndpoint<FTPFile> {
if (timeout != null) {
dataTimeout = getCamelContext().getTypeConverter().convertTo(int.class, dataTimeout);
}
- IntrospectionSupport.setProperties(client, ftpClientParameters);
+ setProperties(client, ftpClientParameters);
}
if (ftpClientConfigParameters != null) {
@@ -173,7 +172,7 @@ public class FtpsEndpoint extends FtpEndpoint<FTPFile> {
if (ftpClientConfig == null) {
ftpClientConfig = new FTPClientConfig();
}
- IntrospectionSupport.setProperties(ftpClientConfig, ftpClientConfigParameters);
+ setProperties(ftpClientConfig, ftpClientConfigParameters);
}
if (dataTimeout > 0) {