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 2016/01/05 14:02:58 UTC
[1/2] camel git commit: Camel component docs
Repository: camel
Updated Branches:
refs/heads/camel-2.16.x d739530db -> c769389b5
refs/heads/master 3690b9d24 -> f80881c01
Camel component docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f80881c0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f80881c0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f80881c0
Branch: refs/heads/master
Commit: f80881c01ce654aea10c7926273adb3ca6aadac9
Parents: 3690b9d
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jan 5 13:49:00 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jan 5 13:49:00 2016 +0100
----------------------------------------------------------------------
.../org/apache/camel/component/file/remote/FtpEndpoint.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f80881c0/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 e87e74b..87152ac 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
@@ -39,7 +39,6 @@ import org.apache.commons.net.ftp.FTPFile;
@UriEndpoint(scheme = "ftp", extendsScheme = "file", title = "FTP",
syntax = "ftp:host:port/directoryName", consumerClass = FtpConsumer.class, label = "file")
public class FtpEndpoint<T extends FTPFile> extends RemoteFileEndpoint<FTPFile> {
- protected FTPClient ftpClient;
protected int soTimeout;
protected int dataTimeout;
@@ -51,6 +50,8 @@ public class FtpEndpoint<T extends FTPFile> extends RemoteFileEndpoint<FTPFile>
protected Map<String, Object> ftpClientConfigParameters;
@UriParam(label = "advanced", prefix = "ftpClient.", multiValue = true)
protected Map<String, Object> ftpClientParameters;
+ @UriParam(label = "advanced")
+ protected FTPClient ftpClient;
public FtpEndpoint() {
}
@@ -184,6 +185,9 @@ public class FtpEndpoint<T extends FTPFile> extends RemoteFileEndpoint<FTPFile>
return ftpClient;
}
+ /**
+ * To use a custom instance of FTPClient
+ */
public void setFtpClient(FTPClient ftpClient) {
this.ftpClient = ftpClient;
}
[2/2] camel git commit: Camel component docs
Posted by da...@apache.org.
Camel component docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c769389b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c769389b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c769389b
Branch: refs/heads/camel-2.16.x
Commit: c769389b5f7154fab327fd93ecf0c5b5f32428ea
Parents: d739530
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jan 5 13:49:00 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jan 5 14:02:51 2016 +0100
----------------------------------------------------------------------
.../org/apache/camel/component/file/remote/FtpEndpoint.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c769389b/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 99c7648..0646643 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
@@ -39,7 +39,6 @@ import org.apache.commons.net.ftp.FTPFile;
@UriEndpoint(scheme = "ftp", extendsScheme = "file", title = "FTP",
syntax = "ftp:host:port/directoryName", consumerClass = FtpConsumer.class, label = "file")
public class FtpEndpoint<T extends FTPFile> extends RemoteFileEndpoint<FTPFile> {
- protected FTPClient ftpClient;
protected int soTimeout;
protected int dataTimeout;
@@ -51,6 +50,8 @@ public class FtpEndpoint<T extends FTPFile> extends RemoteFileEndpoint<FTPFile>
protected Map<String, Object> ftpClientConfigParameters;
@UriParam(label = "advanced", prefix = "ftpClient.", multiValue = true)
protected Map<String, Object> ftpClientParameters;
+ @UriParam(label = "advanced")
+ protected FTPClient ftpClient;
public FtpEndpoint() {
}
@@ -184,6 +185,9 @@ public class FtpEndpoint<T extends FTPFile> extends RemoteFileEndpoint<FTPFile>
return ftpClient;
}
+ /**
+ * To use a custom instance of FTPClient
+ */
public void setFtpClient(FTPClient ftpClient) {
this.ftpClient = ftpClient;
}