You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by rg...@apache.org on 2009/11/07 00:34:51 UTC
svn commit: r833600 - in /commons/proper/vfs/branches/VFS281:
core/src/main/java/org/apache/commons/vfs/provider/sftp/ xdocs/
Author: rgoers
Date: Fri Nov 6 23:34:51 2009
New Revision: 833600
URL: http://svn.apache.org/viewvc?rev=833600&view=rev
Log:
Apply patch for VFS-282
Modified:
commons/proper/vfs/branches/VFS281/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpClientFactory.java
commons/proper/vfs/branches/VFS281/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpFileSystemConfigBuilder.java
commons/proper/vfs/branches/VFS281/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpFileSystemOptions.java
commons/proper/vfs/branches/VFS281/xdocs/changes.xml
Modified: commons/proper/vfs/branches/VFS281/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpClientFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/branches/VFS281/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpClientFactory.java?rev=833600&r1=833599&r2=833600&view=diff
==============================================================================
--- commons/proper/vfs/branches/VFS281/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpClientFactory.java (original)
+++ commons/proper/vfs/branches/VFS281/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpClientFactory.java Fri Nov 6 23:34:51 2009
@@ -159,6 +159,13 @@
config.setProperty("StrictHostKeyChecking", strictHostKeyChecking);
}
+ //set PreferredAuthentications property
+ String preferredAuthentications = options.getPreferredAuthentications();
+ if(preferredAuthentications!=null)
+ {
+ config.setProperty("PreferredAuthentications", preferredAuthentications);
+ }
+
//set compression property
String compression = options.getCompression();
if (compression != null)
Modified: commons/proper/vfs/branches/VFS281/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpFileSystemConfigBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/branches/VFS281/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpFileSystemConfigBuilder.java?rev=833600&r1=833599&r2=833600&view=diff
==============================================================================
--- commons/proper/vfs/branches/VFS281/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpFileSystemConfigBuilder.java (original)
+++ commons/proper/vfs/branches/VFS281/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpFileSystemConfigBuilder.java Fri Nov 6 23:34:51 2009
@@ -266,4 +266,19 @@
{
return SftpFileSystemOptions.getInstance(opts).getProxyType();
}
+
+ /**
+ * Configure authentication order
+ */
+ public void setPreferredAuthentications(FileSystemOptions opts, String preferredAuthentications)
+ {
+ SftpFileSystemOptions.getInstance(opts).setPreferredAuthentications(preferredAuthentications);
+ }
+ /**
+ * Get authentication order
+ */
+ public String getPreferredAuthentications(FileSystemOptions opts)
+ {
+ return SftpFileSystemOptions.getInstance(opts).getPreferredAuthentications();
+ }
}
Modified: commons/proper/vfs/branches/VFS281/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpFileSystemOptions.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/branches/VFS281/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpFileSystemOptions.java?rev=833600&r1=833599&r2=833600&view=diff
==============================================================================
--- commons/proper/vfs/branches/VFS281/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpFileSystemOptions.java (original)
+++ commons/proper/vfs/branches/VFS281/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpFileSystemOptions.java Fri Nov 6 23:34:51 2009
@@ -274,4 +274,19 @@
{
return (ProxyType) getParam("proxyType");
}
+
+ /**
+ * Configure authentication order
+ */
+ public void setPreferredAuthentications(String preferredAuthentications)
+ {
+ setParam("PreferredAuthentications", preferredAuthentications);
+ }
+ /**
+ * Get authentication order
+ */
+ public String getPreferredAuthentications()
+ {
+ return (String) getParam("PreferredAuthentications");
+ }
}
\ No newline at end of file
Modified: commons/proper/vfs/branches/VFS281/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/vfs/branches/VFS281/xdocs/changes.xml?rev=833600&r1=833599&r2=833600&view=diff
==============================================================================
--- commons/proper/vfs/branches/VFS281/xdocs/changes.xml (original)
+++ commons/proper/vfs/branches/VFS281/xdocs/changes.xml Fri Nov 6 23:34:51 2009
@@ -23,6 +23,9 @@
<body>
<release version="2.0" date="in SVN" description="">
+ <action dev="rgoers" type="fix" issue="VFS-282" due-to="Alexey">
+ SftpFileProvider and SftpFileSystemConfigBuilder can't change ssh authentication methods
+ </action>
<action dev="rgoers" type="fix" issue="VFS-269" due-to="Marek Zawirski">
HttpFileObject: unsupported content over 2GB length
</action>