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:35:06 UTC
svn commit: r833601 - in /commons/proper/vfs/trunk:
core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpClientFactory.java
core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpFileSystemConfigBuilder.java
xdocs/changes.xml
Author: rgoers
Date: Fri Nov 6 23:35:06 2009
New Revision: 833601
URL: http://svn.apache.org/viewvc?rev=833601&view=rev
Log:
Apply patch for VFS-282
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpClientFactory.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpFileSystemConfigBuilder.java
commons/proper/vfs/trunk/xdocs/changes.xml
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpClientFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpClientFactory.java?rev=833601&r1=833600&r2=833601&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpClientFactory.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpClientFactory.java Fri Nov 6 23:35:06 2009
@@ -157,6 +157,13 @@
{
config.setProperty("StrictHostKeyChecking", strictHostKeyChecking);
}
+ //set PreferredAuthentications property
+ String preferredAuthentications = SftpFileSystemConfigBuilder.getInstance().
+ getPreferredAuthentications(fileSystemOptions);
+ if(preferredAuthentications!=null)
+ {
+ config.setProperty("PreferredAuthentications",preferredAuthentications);
+ }
//set compression property
String compression = SftpFileSystemConfigBuilder.getInstance().getCompression(fileSystemOptions);
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpFileSystemConfigBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpFileSystemConfigBuilder.java?rev=833601&r1=833600&r2=833601&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpFileSystemConfigBuilder.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpFileSystemConfigBuilder.java Fri Nov 6 23:35:06 2009
@@ -310,4 +310,20 @@
{
return (ProxyType) getParam(opts, "proxyType");
}
+
+ /**
+ * Configure authentication order
+ */
+ public void setPreferredAuthentications(FileSystemOptions opts, String preferredAuthentications)
+ {
+ setParam(opts,"PreferredAuthentications",preferredAuthentications);
+ }
+
+ /**
+ * Get authentication order
+ */
+ public String getPreferredAuthentications(FileSystemOptions opts)
+ {
+ return (String) getParam(opts,"PreferredAuthentications");
+ }
}
Modified: commons/proper/vfs/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/xdocs/changes.xml?rev=833601&r1=833600&r2=833601&view=diff
==============================================================================
--- commons/proper/vfs/trunk/xdocs/changes.xml (original)
+++ commons/proper/vfs/trunk/xdocs/changes.xml Fri Nov 6 23:35:06 2009
@@ -23,9 +23,12 @@
<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>
+ </action>
<action dev="rgoers" type="fix" issue="VFS-287" due-to="Mircea-Eugen Ionica">
LocalFileName objects are not released from AbstractFileSystem.listenerMap when all listeners are removed.
</action>