You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2008/03/14 01:45:31 UTC
svn commit: r636940 -
/maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/ResourceExtractor.java
Author: brianf
Date: Thu Mar 13 17:45:30 2008
New Revision: 636940
URL: http://svn.apache.org/viewvc?rev=636940&view=rev
Log:
rolling back changes
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=636940&r1=636939&r2=636940&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 Thu Mar 13 17:45:30 2008
@@ -20,23 +20,11 @@
public static File simpleExtractResources(Class cl, String resourcePath) throws IOException {
String tempDirPath = System.getProperty( "maven.test.tmpdir", System.getProperty( "java.io.tmpdir" ) );
- 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 tempDir = new File(tempDirPath);
+
File testDir = new File( tempDir, resourcePath );
- if (!Os.isFamily( "windows" ))
- {
- FileUtils.deleteDirectory( testDir );
- }
+ FileUtils.deleteDirectory( testDir );
testDir = ResourceExtractor.extractResourcePath(cl, resourcePath, tempDir, false);
return testDir;