svn commit: r635721 - /maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/ResourceExtractor.java

[br...@apache.org]

Author: brianf
Date: Mon Mar 10 15:09:11 2008
New Revision: 635721

URL: http://svn.apache.org/viewvc?rev=635721&view=rev
Log:
work around windows issues

Modified:
    maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/ResourceExtractor.java

Modified: maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/ResourceExtractor.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/ResourceExtractor.java?rev=635721&r1=635720&r2=635721&view=diff
==============================================================================
--- maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/ResourceExtractor.java (original)
+++ maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/ResourceExtractor.java Mon Mar 10 15:09:11 2008
@@ -4,10 +4,15 @@
  */
 package org.apache.maven.it.util;
 
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.util.zip.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
 
 
 /* @todo this can be replaced with plexus-archiver */
@@ -15,9 +20,24 @@
     
     public static File simpleExtractResources(Class cl, String resourcePath) throws IOException {
         String tempDirPath = System.getProperty( "maven.test.tmpdir", System.getProperty( "java.io.tmpdir" ) );
-        File tempDir = new File(tempDirPath);
+        File tempDir = null;
+        if (Os.isFamily( "windows" ))
+        {
+           //there are issues deleting on windows. use a random path.
+            tempDir = new File(tempDirPath,""+ Math.round( Math.random()*100000000 ));
+        }
+        else
+        {
+            tempDir = new File(tempDirPath);
+        }
+        
         File testDir = new File( tempDir, resourcePath );
-        FileUtils.deleteDirectory( testDir );
+
+        if (!Os.isFamily( "windows" ))
+        {
+            FileUtils.deleteDirectory( testDir );
+        }
+        
         testDir = ResourceExtractor.extractResourcePath(cl, resourcePath, tempDir, false);
         return testDir;
     }