You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wagon-commits@maven.apache.org by da...@apache.org on 2008/12/08 02:22:01 UTC

svn commit: r724228 - in /maven/wagon/trunk/wagon-providers/wagon-file/src: main/java/org/apache/maven/wagon/providers/file/FileWagon.java test/java/org/apache/maven/wagon/providers/file/FileWagonTest.java

Author: dantran
Date: Sun Dec  7 17:22:01 2008
New Revision: 724228

URL: http://svn.apache.org/viewvc?rev=724228&view=rev
Log:
WAGON-248: wagon-file's FileWagon.resourceExists should check for directory when requested resouce indicate it is a directory

Modified:
    maven/wagon/trunk/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java
    maven/wagon/trunk/wagon-providers/wagon-file/src/test/java/org/apache/maven/wagon/providers/file/FileWagonTest.java

Modified: maven/wagon/trunk/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java?rev=724228&r1=724227&r2=724228&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java Sun Dec  7 17:22:01 2008
@@ -254,6 +254,11 @@
 
         File file = resolveDestinationPath( resourceName );
 
+        if ( resourceName.endsWith( "/" ) )
+        {
+            return file.isDirectory();
+        }
+        
         return file.exists();
     }
 }

Modified: maven/wagon/trunk/wagon-providers/wagon-file/src/test/java/org/apache/maven/wagon/providers/file/FileWagonTest.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-file/src/test/java/org/apache/maven/wagon/providers/file/FileWagonTest.java?rev=724228&r1=724227&r2=724228&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-file/src/test/java/org/apache/maven/wagon/providers/file/FileWagonTest.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-file/src/test/java/org/apache/maven/wagon/providers/file/FileWagonTest.java Sun Dec  7 17:22:01 2008
@@ -70,4 +70,22 @@
     {
         return new File( repository.getBasedir(), resource.getName() ).lastModified();
     }
+    
+    public void testResourceExists()
+        throws Exception
+    {
+        String url = "file://" + getBasedir();
+        
+        Wagon wagon = new FileWagon();
+        Repository repository = new Repository( "someID", url );
+        wagon.connect( repository );
+        
+        assertTrue( wagon.resourceExists( "target" ) );
+        assertTrue( wagon.resourceExists( "target/" ) );
+        assertTrue( wagon.resourceExists( "pom.xml" ) );
+        
+        assertFalse( wagon.resourceExists( "pom.xml/" ) );
+        
+        wagon.disconnect();
+    }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: wagon-commits-unsubscribe@maven.apache.org
For additional commands, e-mail: wagon-commits-help@maven.apache.org