You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2011/11/14 20:42:38 UTC
svn commit: r1201849 - in /camel/branches/camel-2.8.x: ./
components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java
components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
Author: dkulp
Date: Mon Nov 14 19:42:38 2011
New Revision: 1201849
URL: http://svn.apache.org/viewvc?rev=1201849&view=rev
Log:
Merged revisions 1195143 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1195143 | davsclaus | 2011-10-30 06:20:43 -0400 (Sun, 30 Oct 2011) | 1 line
CAMEL-4522: Added compression option to SFTP. Thanks to Eugene for patch.
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java
camel/branches/camel-2.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java?rev=1201849&r1=1201848&r2=1201849&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java (original)
+++ camel/branches/camel-2.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java Mon Nov 14 19:42:38 2011
@@ -33,7 +33,8 @@ public class SftpConfiguration extends R
private String chmod;
// comma separated list of ciphers.
// null means default jsch list will be used
- private String ciphers;
+ private String ciphers;
+ private int compression;
public SftpConfiguration() {
setProtocol("sftp");
@@ -112,4 +113,11 @@ public class SftpConfiguration extends R
return ciphers;
}
+ public int getCompression() {
+ return compression;
+ }
+
+ public void setCompression(int compression) {
+ this.compression = compression;
+ }
}
Modified: camel/branches/camel-2.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java?rev=1201849&r1=1201848&r2=1201849&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java (original)
+++ camel/branches/camel-2.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java Mon Nov 14 19:42:38 2011
@@ -146,17 +146,15 @@ public class SftpOperations implements R
SftpConfiguration sftpConfig = (SftpConfiguration) configuration;
if (isNotEmpty(sftpConfig.getCiphers())) {
- LOG.debug("Using ciphers: " + sftpConfig.getCiphers());
+ LOG.debug("Using ciphers: {}", sftpConfig.getCiphers());
Hashtable<String, String> ciphers = new Hashtable<String, String>();
-
ciphers.put("cipher.s2c", sftpConfig.getCiphers());
ciphers.put("cipher.c2s", sftpConfig.getCiphers());
-
JSch.setConfig(ciphers);
}
if (isNotEmpty(sftpConfig.getPrivateKeyFile())) {
- LOG.debug("Using private keyfile: " + sftpConfig.getPrivateKeyFile());
+ LOG.debug("Using private keyfile: {}", sftpConfig.getPrivateKeyFile());
if (isNotEmpty(sftpConfig.getPrivateKeyFilePassphrase())) {
jsch.addIdentity(sftpConfig.getPrivateKeyFile(), sftpConfig.getPrivateKeyFilePassphrase());
} else {
@@ -165,20 +163,28 @@ public class SftpOperations implements R
}
if (isNotEmpty(sftpConfig.getKnownHostsFile())) {
- LOG.debug("Using knownhosts file: " + sftpConfig.getKnownHostsFile());
+ LOG.debug("Using knownhosts file: {}", sftpConfig.getKnownHostsFile());
jsch.setKnownHosts(sftpConfig.getKnownHostsFile());
}
final Session session = jsch.getSession(configuration.getUsername(), configuration.getHost(), configuration.getPort());
if (isNotEmpty(sftpConfig.getStrictHostKeyChecking())) {
- LOG.debug("Using StrickHostKeyChecking: " + sftpConfig.getStrictHostKeyChecking());
+ LOG.debug("Using StrickHostKeyChecking: {}", sftpConfig.getStrictHostKeyChecking());
session.setConfig("StrictHostKeyChecking", sftpConfig.getStrictHostKeyChecking());
}
session.setServerAliveInterval(sftpConfig.getServerAliveInterval());
session.setServerAliveCountMax(sftpConfig.getServerAliveCountMax());
+ // compression
+ if (sftpConfig.getCompression() > 0) {
+ LOG.debug("Using compression: {}", sftpConfig.getCompression());
+ session.setConfig("compression.s2c","zlib@openssh.com,zlib,none");
+ session.setConfig("compression.c2s","zlib@openssh.com,zlib,none");
+ session.setConfig("compression_level", Integer.toString(sftpConfig.getCompression()));
+ }
+
// set user information
session.setUserInfo(new ExtendedUserInfo() {
public String getPassphrase() {