Author: rgoers
Date: Wed Feb 4 08:06:28 2009
New Revision: 740653
URL: http://svn.apache.org/viewvc?rev=740653&view=rev
Log:
Add webdav to providers automatically configured
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/impl/providers.xml
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/webdav/WebdavFileProvider.java
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs/util/DelegatingFileSystemOptionsBuilderTest.java
commons/proper/vfs/trunk/sandbox/src/main/resources/META-INF/vfs-providers.xml
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/impl/providers.xml
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/impl/providers.xml?rev=740653&r1=740652&r2=740653&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/impl/providers.xml
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/impl/providers.xml
Wed Feb 4 08:06:28 2009
@@ -67,6 +67,11 @@
<provider
class-name="org.apache.commons.vfs.provider.res.ResourceFileProvider">
<scheme name="res"/>
</provider>
+ <provider
class-name="org.apache.commons.vfs.provider.webdav.WebdavFileProvider">
+ <scheme name="webdav"/>
+ <if-available class-name="org.apache.commons.httpclient.HttpClient"/>
+ <if-available
class-name="org.apache.jackrabbit.webdav.client.methods.DavMethod"/>
+ </provider>
<!--
<provider class-name="org.apache.commons.vfs.provider.svn.SvnFileProvider">
<scheme name="svnhttps"/>
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/webdav/WebdavFileProvider.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/webdav/WebdavFileProvider.java?rev=740653&r1=740652&r2=740653&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/webdav/WebdavFileProvider.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/webdav/WebdavFileProvider.java
Wed Feb 4 08:06:28 2009
@@ -25,12 +25,9 @@
import org.apache.commons.vfs.UserAuthenticationData;
import org.apache.commons.vfs.FileSystemConfigBuilder;
import org.apache.commons.vfs.util.UserAuthenticatorUtils;
-import org.apache.commons.vfs.provider.AbstractOriginatingFileProvider;
import org.apache.commons.vfs.provider.GenericFileName;
-import org.apache.commons.vfs.provider.http.HttpFileNameParser;
import org.apache.commons.vfs.provider.http.HttpFileProvider;
import org.apache.commons.vfs.provider.http.HttpClientFactory;
-import org.apache.commons.vfs.provider.http.HttpFileSystemConfigBuilder;
import java.util.Arrays;
import java.util.Collection;
Modified:
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs/util/DelegatingFileSystemOptionsBuilderTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs/util/DelegatingFileSystemOptionsBuilderTest.java?rev=740653&r1=740652&r2=740653&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs/util/DelegatingFileSystemOptionsBuilderTest.java
(original)
+++
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs/util/DelegatingFileSystemOptionsBuilderTest.java
Wed Feb 4 08:06:28 2009
@@ -39,7 +39,7 @@
protected void setUp() throws Exception
{
- super.tearDown();
+ super.setUp();
// get a full blown, fully functional manager
fsm = new StandardFileSystemManager();
@@ -114,4 +114,17 @@
assertEquals(e.getCode(),
"vfs.provider/config-value-invalid.error");
}
}
+
+ private static String[] schemes = new String[]
+ {
+ "webdav", "http", "ftp", "file", "zip", "tar", "tgz", "bz2", "gz",
"jar", "tmp", "ram"
+ };
+
+ public void testConfiguration() throws Exception
+ {
+ for (int i=0; i < schemes.length; ++i)
+ {
+ assertTrue("Missing" + schemes[i] + " provider",
fsm.hasProvider(schemes[i]));
+ }
+ }
}
Modified:
commons/proper/vfs/trunk/sandbox/src/main/resources/META-INF/vfs-providers.xml
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/sandbox/src/main/resources/META-INF/vfs-providers.xml?rev=740653&r1=740652&r2=740653&view=diff
==============================================================================
---
commons/proper/vfs/trunk/sandbox/src/main/resources/META-INF/vfs-providers.xml
(original)
+++
commons/proper/vfs/trunk/sandbox/src/main/resources/META-INF/vfs-providers.xml
Wed Feb 4 08:06:28 2009
@@ -4,12 +4,6 @@
<scheme name="smb"/>
<if-available class-name="jcifs.smb.SmbFile"/>
</provider>
-
- <provider
class-name="org.apache.commons.vfs.provider.webdav.WebdavFileProvider">
- <scheme name="webdav"/>
- <if-available
class-name="org.apache.webdav.lib.WebdavResource"/>
- <if-available
class-name="org.apache.commons.httpclient.HttpClient"/>
- </provider>
<provider
class-name="org.apache.commons.vfs.provider.mime.MimeFileProvider">
<scheme name="mime"/>
