svn commit: r515812 - in /incubator/ivy/core/trunk/src/java/org/apache/ivy: plugins/repository/file/FileRepository.java util/FileUtil.java

[xa...@apache.org]

Author: xavier
Date: Wed Mar  7 14:32:20 2007
New Revision: 515812

URL: http://svn.apache.org/viewvc?view=rev&rev=515812
Log:
FIX: PublishTest failing due to IVY-420 modification

Modified:
    incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/file/FileRepository.java
    incubator/ivy/core/trunk/src/java/org/apache/ivy/util/FileUtil.java

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/file/FileRepository.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/file/FileRepository.java?view=diff&rev=515812&r1=515811&r2=515812
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/file/FileRepository.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/file/FileRepository.java Wed Mar  7 14:32:20 2007
@@ -59,7 +59,13 @@
     private void copy(File src, File destination, boolean overwrite) throws IOException {
         try {
             _progress.setTotalLength(new Long(src.length()));
-            FileUtil.copy(src, destination, _progress, overwrite);
+            if (!FileUtil.copy(src, destination, _progress, overwrite)) {
+            	if (!overwrite) {
+            		throw new IOException("file copy not done from "+src+" to "+destination+": destination probably already exists and overwrite is false");
+            	} else {
+            		throw new IOException("file copy not done from "+src+" to "+destination);
+            	}
+            }
         } catch (IOException ex) {
             fireTransferError(ex);
             throw ex;

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/util/FileUtil.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/util/FileUtil.java?view=diff&rev=515812&r1=515811&r2=515812
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/util/FileUtil.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/util/FileUtil.java Wed Mar  7 14:32:20 2007
@@ -93,10 +93,10 @@
         }
     }
   
-    public static void copy(File src, File dest, CopyProgressListener l) throws IOException {
-        copy(src, dest, l, false);
+    public static boolean copy(File src, File dest, CopyProgressListener l) throws IOException {
+        return copy(src, dest, l, false);
     }
-    public static void copy(File src, File dest, CopyProgressListener l, boolean overwrite) throws IOException {
+    public static boolean copy(File src, File dest, CopyProgressListener l, boolean overwrite) throws IOException {
         if (dest.exists()) {
         	if (!dest.isFile()) {
         		throw new IOException("impossible to copy: destination is not a file: "+dest);
@@ -107,7 +107,7 @@
         		} // if dest is writable, the copy will overwrite it without requiring a delete
         	} else {
         		Message.verbose(dest+" already exists, nothing done");
-        		return;
+        		return false;
         	}
         }
         copy(new FileInputStream(src), dest, l);
@@ -120,6 +120,7 @@
         			+ "(" + destLen + ") - please retry");
         }
         dest.setLastModified(src.lastModified());
+        return true;
     }
 
     public static void copy(URL src, File dest, CopyProgressListener l) throws IOException {