svn commit: r1235569 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp: pom.xml src/test/java/org/apache/archiva/DownloadMergedIndexTest.java

[olamy]

Author: olamy
Date: Wed Jan 25 00:21:45 2012
New Revision: 1235569

URL: http://svn.apache.org/viewvc?rev=1235569&view=rev
Log:
avoid writing tmp files to sources tree

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1235569&r1=1235568&r2=1235569&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Wed Jan 25 
00:21:45 2012
@@ -845,6 +845,7 @@
             <redback.jdbc.url>${redbackTestJdbcUrl}</redback.jdbc.url>
             
<redback.jdbc.driver.name>${redbackTestJdbcDriver}</redback.jdbc.driver.name>
             <basedir>${basedir}</basedir>
+            <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
           </systemPropertyVariables>
         </configuration>
       </plugin>

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java?rev=1235569&r1=1235568&r2=1235569&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java
 Wed Jan 25 00:21:45 2012
@@ -29,14 +29,17 @@ import org.apache.archiva.rest.api.servi
 import org.apache.archiva.rest.api.services.RepositoriesService;
 import org.apache.archiva.rest.api.services.RepositoryGroupService;
 import org.apache.archiva.rest.api.services.SearchService;
+import org.apache.commons.io.FileUtils;
 import org.codehaus.redback.integration.security.role.RedbackRoleConstants;
 import org.codehaus.redback.rest.services.FakeCreateAdminService;
+import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
+import java.io.File;
 import java.util.Arrays;
 import java.util.List;
 
@@ -66,16 +69,34 @@ public class DownloadMergedIndexTest
         return "classpath*:META-INF/spring-context.xml 
classpath*:spring-context-merge-index-download.xml";
     }
 
+    @After
+    public void cleanup()
+        throws Exception
+    {
+        super.tearDown();
+        File tmpIndexDir = new File( System.getProperty( "java.io.tmpdir" ) + 
"/tmpIndex" );
+        if ( tmpIndexDir.exists() )
+        {
+            FileUtils.deleteDirectory( tmpIndexDir );
+        }
+    }
+
+
     @Test
     public void downloadMergedIndex()
         throws Exception
     {
+        File tmpIndexDir = new File( System.getProperty( "java.io.tmpdir" ) + 
"/tmpIndex" );
+        if ( tmpIndexDir.exists() )
+        {
+            FileUtils.deleteDirectory( tmpIndexDir );
+        }
         String id = Long.toString( System.currentTimeMillis() );
         ManagedRepository managedRepository = new ManagedRepository();
         managedRepository.setId( id );
         managedRepository.setName( "name of " + id );
         managedRepository.setLocation( "src/test/repositories/test-repo" );
-        managedRepository.setIndexDirectory( System.getProperty( 
"java.io.tmpdir" ) + "/target/tmpIndex/" + id );
+        managedRepository.setIndexDirectory( System.getProperty( 
"java.io.tmpdir" ) + "/tmpIndex/" + id );
 
         ManagedRepositoriesService managedRepositoriesService = 
getManagedRepositoriesService();
 
@@ -112,7 +133,7 @@ public class DownloadMergedIndexTest
         managedRepository.setId( id );
         managedRepository.setName( "name of " + id );
         managedRepository.setLocation( "src/test/repositories/test-repo" );
-        managedRepository.setIndexDirectory( System.getProperty( 
"java.io.tmpdir" ) + "/target/tmpIndex/" + id );
+        managedRepository.setIndexDirectory( System.getProperty( 
"java.io.tmpdir" ) + "/tmpIndex/" + id );
 
         if ( managedRepositoriesService.getManagedRepository( id ) != null )
         {