[VFS][PATCH] fix broken get-deps and get ready for Java 1.5

[Michael Davey]

Hi,

I encountered some problems while trying to use VFS for the first time.  
Here is a patch:

 *  changed get-deps in build.xml to get slide-webdav from ibiblio.  
The code in CVS will
no longer build with Ant against the version of webdav in lib/slide/jars.

 *  took the opportunity to rename enum identifiers so that the code 
will now build under
Sun's Java 2 SDK 1.5.0-beta1.

 *  lib/slide can now be deleted from CVS.  In fact, I think the whole 
of lib can be deleted.

The changes were tested using Sun's SDK 1.4.2-b28 and Ant 1.5.3 with 
targets "", jar, test and
dist.

--
Michael

? lib-old
? patch
Index: build.xml
===================================================================
RCS file: /home/cvspublic/jakarta-commons-sandbox/vfs/build.xml,v
retrieving revision 1.18
diff -u -r1.18 build.xml
--- build.xml   3 Jul 2003 10:13:35 -0000       1.18
+++ build.xml   6 Mar 2004 18:39:42 -0000
@@ -190,7 +190,7 @@
     </get>
     <get dest="${libdir}/jcifs-0.7.8.jar" usetimestamp="true" ignoreerrors="true" 
src="http://www.ibiblio.org/maven/jcifs/jars/jcifs-0.7.8.jar";>
     </get>
-    <get dest="${libdir}/webdavlib-20030224.jar" usetimestamp="true" 
ignoreerrors="true" src="file://${basedir}/lib/slide/jars/webdavlib-20030224.jar">
+    <get dest="${libdir}/webdavlib-1.0.16.jar" usetimestamp="true" 
ignoreerrors="true" src="http://www.ibiblio.org/maven/slide/jars/webdavlib-1.0.16.jar";>
     </get>
     <get dest="${libdir}/commons-httpclient-2.0-beta1.jar" usetimestamp="true" 
ignoreerrors="true" 
src="http://www.ibiblio.org/maven/commons-httpclient/jars/commons-httpclient-2.0-beta1.jar";>
     </get>
@@ -199,4 +199,4 @@
     <get dest="${libdir}/xml-apis-1.0.b2.jar" usetimestamp="true" ignoreerrors="true" 
src="http://www.ibiblio.org/maven/xml-apis/jars/xml-apis-1.0.b2.jar";>
     </get>
   </target>
-</project>
\ No newline at end of file
+</project>
Index: src/java/org/apache/commons/vfs/provider/webdav/WebdavFileObject.java
===================================================================
RCS file: 
/home/cvspublic/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/webdav/WebdavFileObject.java,v
retrieving revision 1.12
diff -u -r1.12 WebdavFileObject.java
--- src/java/org/apache/commons/vfs/provider/webdav/WebdavFileObject.java       3 Mar 
2004 07:05:35 -0000       1.12
+++ src/java/org/apache/commons/vfs/provider/webdav/WebdavFileObject.java       6 Mar 
2004 18:39:42 -0000
@@ -87,9 +87,9 @@
 
         // Resource exists if we can do a GET on it
         boolean exists = false;
-        for ( Enumeration enum = optionsMethod.getAllowedMethods(); 
enum.hasMoreElements(); )
+        for ( Enumeration methodsEnum = optionsMethod.getAllowedMethods(); 
methodsEnum.hasMoreElements(); )
         {
-            final String method = (String)enum.nextElement();
+            final String method = (String)methodsEnum.nextElement();
             if ( method.equals( "GET" ) )
             {
                 exists = true;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]