Return-Path: Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: (qmail 64848 invoked from network); 6 Nov 2009 23:35:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 6 Nov 2009 23:35:14 -0000 Received: (qmail 72493 invoked by uid 500); 6 Nov 2009 23:35:14 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 72410 invoked by uid 500); 6 Nov 2009 23:35:14 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 72401 invoked by uid 99); 6 Nov 2009 23:35:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Nov 2009 23:35:14 +0000 X-ASF-Spam-Status: No, hits=-2.6 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Nov 2009 23:35:12 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 14EA023888DC; Fri, 6 Nov 2009 23:34:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r833600 - in /commons/proper/vfs/branches/VFS281: core/src/main/java/org/apache/commons/vfs/provider/sftp/ xdocs/ Date: Fri, 06 Nov 2009 23:34:51 -0000 To: commits@commons.apache.org From: rgoers@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091106233452.14EA023888DC@eris.apache.org> 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 @@ + + SftpFileProvider and SftpFileSystemConfigBuilder can't change ssh authentication methods + HttpFileObject: unsupported content over 2GB length