Return-Path: Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: (qmail 56719 invoked from network); 8 Nov 2009 05:16:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 8 Nov 2009 05:16:51 -0000 Received: (qmail 97456 invoked by uid 500); 8 Nov 2009 05:16:50 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 97379 invoked by uid 500); 8 Nov 2009 05:16:50 -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 97370 invoked by uid 99); 8 Nov 2009 05:16:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 08 Nov 2009 05:16:50 +0000 X-ASF-Spam-Status: No, hits=-2.6 required=5.0 tests=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; Sun, 08 Nov 2009 05:16:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BFBD8238899C; Sun, 8 Nov 2009 05:16:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r833830 - in /commons/proper/vfs/branches/VFS281: core/src/test/java/org/apache/commons/vfs/provider/test/ core/src/test/java/org/apache/commons/vfs/test/ xdocs/ Date: Sun, 08 Nov 2009 05:16:27 -0000 To: commits@commons.apache.org From: rgoers@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091108051627.BFBD8238899C@eris.apache.org> Author: rgoers Date: Sun Nov 8 05:16:27 2009 New Revision: 833830 URL: http://svn.apache.org/viewvc?rev=833830&view=rev Log: Apply patch for VFS-276 Modified: commons/proper/vfs/branches/VFS281/core/src/test/java/org/apache/commons/vfs/provider/test/JunctionProviderConfig.java commons/proper/vfs/branches/VFS281/core/src/test/java/org/apache/commons/vfs/test/AbstractProviderTestCase.java commons/proper/vfs/branches/VFS281/core/src/test/java/org/apache/commons/vfs/test/AbstractProviderTestConfig.java commons/proper/vfs/branches/VFS281/core/src/test/java/org/apache/commons/vfs/test/AbstractTestSuite.java commons/proper/vfs/branches/VFS281/core/src/test/java/org/apache/commons/vfs/test/ProviderTestConfig.java commons/proper/vfs/branches/VFS281/xdocs/changes.xml Modified: commons/proper/vfs/branches/VFS281/core/src/test/java/org/apache/commons/vfs/provider/test/JunctionProviderConfig.java URL: http://svn.apache.org/viewvc/commons/proper/vfs/branches/VFS281/core/src/test/java/org/apache/commons/vfs/provider/test/JunctionProviderConfig.java?rev=833830&r1=833829&r2=833830&view=diff ============================================================================== --- commons/proper/vfs/branches/VFS281/core/src/test/java/org/apache/commons/vfs/provider/test/JunctionProviderConfig.java (original) +++ commons/proper/vfs/branches/VFS281/core/src/test/java/org/apache/commons/vfs/provider/test/JunctionProviderConfig.java Sun Nov 8 05:16:27 2009 @@ -39,6 +39,13 @@ { this.config = config; } + + /** + * Returns a DefaultFileSystemManager instance (or subclass instance). + */ + public DefaultFileSystemManager getDefaultFileSystemManager() { + return config.getDefaultFileSystemManager(); + } public FilesCache getFilesCache() { Modified: commons/proper/vfs/branches/VFS281/core/src/test/java/org/apache/commons/vfs/test/AbstractProviderTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/vfs/branches/VFS281/core/src/test/java/org/apache/commons/vfs/test/AbstractProviderTestCase.java?rev=833830&r1=833829&r2=833830&view=diff ============================================================================== --- commons/proper/vfs/branches/VFS281/core/src/test/java/org/apache/commons/vfs/test/AbstractProviderTestCase.java (original) +++ commons/proper/vfs/branches/VFS281/core/src/test/java/org/apache/commons/vfs/test/AbstractProviderTestCase.java Sun Nov 8 05:16:27 2009 @@ -103,7 +103,7 @@ */ protected DefaultFileSystemManager createManager() throws Exception { - DefaultFileSystemManager fs = new DefaultFileSystemManager(); + DefaultFileSystemManager fs = getProviderConfig().getDefaultFileSystemManager(); fs.setFilesCache(getProviderConfig().getFilesCache()); getProviderConfig().prepare(fs); if (!fs.hasProvider("file")) Modified: commons/proper/vfs/branches/VFS281/core/src/test/java/org/apache/commons/vfs/test/AbstractProviderTestConfig.java URL: http://svn.apache.org/viewvc/commons/proper/vfs/branches/VFS281/core/src/test/java/org/apache/commons/vfs/test/AbstractProviderTestConfig.java?rev=833830&r1=833829&r2=833830&view=diff ============================================================================== --- commons/proper/vfs/branches/VFS281/core/src/test/java/org/apache/commons/vfs/test/AbstractProviderTestConfig.java (original) +++ commons/proper/vfs/branches/VFS281/core/src/test/java/org/apache/commons/vfs/test/AbstractProviderTestConfig.java Sun Nov 8 05:16:27 2009 @@ -30,6 +30,13 @@ implements ProviderTestConfig { private FilesCache cache = null; + + /** + * Returns a DefaultFileSystemManager instance (or subclass instance). + */ + public DefaultFileSystemManager getDefaultFileSystemManager() { + return new DefaultFileSystemManager(); + } /** * Prepares the file system manager. This implementation does nothing. Modified: commons/proper/vfs/branches/VFS281/core/src/test/java/org/apache/commons/vfs/test/AbstractTestSuite.java URL: http://svn.apache.org/viewvc/commons/proper/vfs/branches/VFS281/core/src/test/java/org/apache/commons/vfs/test/AbstractTestSuite.java?rev=833830&r1=833829&r2=833830&view=diff ============================================================================== --- commons/proper/vfs/branches/VFS281/core/src/test/java/org/apache/commons/vfs/test/AbstractTestSuite.java (original) +++ commons/proper/vfs/branches/VFS281/core/src/test/java/org/apache/commons/vfs/test/AbstractTestSuite.java Sun Nov 8 05:16:27 2009 @@ -148,7 +148,7 @@ checkTempDir("Temp dir not empty before test"); // Create the file system manager - manager = new DefaultFileSystemManager(); + manager = providerConfig.getDefaultFileSystemManager(); manager.setFilesCache(providerConfig.getFilesCache()); final DefaultFileReplicator replicator = new DefaultFileReplicator(tempDir); Modified: commons/proper/vfs/branches/VFS281/core/src/test/java/org/apache/commons/vfs/test/ProviderTestConfig.java URL: http://svn.apache.org/viewvc/commons/proper/vfs/branches/VFS281/core/src/test/java/org/apache/commons/vfs/test/ProviderTestConfig.java?rev=833830&r1=833829&r2=833830&view=diff ============================================================================== --- commons/proper/vfs/branches/VFS281/core/src/test/java/org/apache/commons/vfs/test/ProviderTestConfig.java (original) +++ commons/proper/vfs/branches/VFS281/core/src/test/java/org/apache/commons/vfs/test/ProviderTestConfig.java Sun Nov 8 05:16:27 2009 @@ -29,6 +29,11 @@ */ public interface ProviderTestConfig { + /** + * Returns a DefaultFileSystemManager instance (or subclass instance). + */ + public DefaultFileSystemManager getDefaultFileSystemManager(); + /** * Prepares the file system manager. */ Modified: commons/proper/vfs/branches/VFS281/xdocs/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/vfs/branches/VFS281/xdocs/changes.xml?rev=833830&r1=833829&r2=833830&view=diff ============================================================================== --- commons/proper/vfs/branches/VFS281/xdocs/changes.xml (original) +++ commons/proper/vfs/branches/VFS281/xdocs/changes.xml Sun Nov 8 05:16:27 2009 @@ -23,6 +23,9 @@ + + add ProviderTestConfig.getDefaultFileSystemManager() method + SftpFileProvider and SftpFileSystemConfigBuilder can't change ssh authentication methods