Author: rgoers
Date: Sun Nov 8 05:16:14 2009
New Revision: 833829
URL: http://svn.apache.org/viewvc?rev=833829&view=rev
Log:
Apply patch for VFS-276
Modified:
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs/provider/test/JunctionProviderConfig.java
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs/test/AbstractProviderTestCase.java
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs/test/AbstractProviderTestConfig.java
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs/test/AbstractTestSuite.java
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs/test/ProviderTestConfig.java
commons/proper/vfs/trunk/xdocs/changes.xml
Modified:
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs/provider/test/JunctionProviderConfig.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs/provider/test/JunctionProviderConfig.java?rev=833829&r1=833828&r2=833829&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs/provider/test/JunctionProviderConfig.java
(original)
+++
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs/provider/test/JunctionProviderConfig.java
Sun Nov 8 05:16:14 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/trunk/core/src/test/java/org/apache/commons/vfs/test/AbstractProviderTestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs/test/AbstractProviderTestCase.java?rev=833829&r1=833828&r2=833829&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs/test/AbstractProviderTestCase.java
(original)
+++
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs/test/AbstractProviderTestCase.java
Sun Nov 8 05:16:14 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/trunk/core/src/test/java/org/apache/commons/vfs/test/AbstractProviderTestConfig.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs/test/AbstractProviderTestConfig.java?rev=833829&r1=833828&r2=833829&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs/test/AbstractProviderTestConfig.java
(original)
+++
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs/test/AbstractProviderTestConfig.java
Sun Nov 8 05:16:14 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/trunk/core/src/test/java/org/apache/commons/vfs/test/AbstractTestSuite.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs/test/AbstractTestSuite.java?rev=833829&r1=833828&r2=833829&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs/test/AbstractTestSuite.java
(original)
+++
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs/test/AbstractTestSuite.java
Sun Nov 8 05:16:14 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/trunk/core/src/test/java/org/apache/commons/vfs/test/ProviderTestConfig.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs/test/ProviderTestConfig.java?rev=833829&r1=833828&r2=833829&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs/test/ProviderTestConfig.java
(original)
+++
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs/test/ProviderTestConfig.java
Sun Nov 8 05:16:14 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/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/xdocs/changes.xml?rev=833829&r1=833828&r2=833829&view=diff
==============================================================================
--- commons/proper/vfs/trunk/xdocs/changes.xml (original)
+++ commons/proper/vfs/trunk/xdocs/changes.xml Sun Nov 8 05:16:14 2009
@@ -23,9 +23,12 @@
<body>
<release version="2.0" date="in SVN" description="">
+ <action dev="rgoers" type="fix" issue="VFS-276" due-to="Vince Bonfanti">
+ add ProviderTestConfig.getDefaultFileSystemManager() method
+ </action>
<action dev="rgoers" type="fix" issue="VFS-282" due-to="Alexey">
SftpFileProvider and SftpFileSystemConfigBuilder can't change ssh
authentication methods
- </action>
+ </action>
<action dev="rgoers" type="fix" issue="VFS-269" due-to="Marek Zawirski">
HttpFileObject: unsupported content over 2GB length
</action>