svn commit: r600202 - in /maven/plugins/trunk/maven-invoker-plugin/src: main/java/org/apache/maven/plugin/invoker/InvokerMojo.java test/java/org/apache/maven/plugin/invoker/InterpolationTest.java

[olamy]

Author: olamy
Date: Sat Dec  1 14:10:12 2007
New Revision: 600202

URL: http://svn.apache.org/viewvc?rev=600202&view=rev
Log:
use deleteOnExit() for temporary interpolated  pom files

Modified:
    
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
    
maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InterpolationTest.java

Modified: 
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java?rev=600202&r1=600201&r2=600202&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
 Sat Dec  1 14:10:12 2007
@@ -241,9 +241,6 @@
      * @since 1.1
      */    
     private String invokerTest;
-    
-    // list to store interpolated pom for delete at the end
-    private List/*File*/ interpolatedPomFiles = new ArrayList();
 
     public void execute()
         throws MojoExecutionException, MojoFailureException
@@ -310,20 +307,13 @@
 
         final List failures = new ArrayList();
 
-        try
+        for ( int i = 0; i < includedPoms.length; i++ )
         {
-            for ( int i = 0; i < includedPoms.length; i++ )
-            {
-                final String pom = includedPoms[i];
+            final String pom = includedPoms[i];
 
-                runBuild( projectsDir, pom, failures );
-            }
-        }
-        finally
-        {
-            // interpolated files cleanup
-            cleanupInterpolatedPomFiles();
+            runBuild( projectsDir, pom, failures );
         }
+        
 
         if ( !suppressSummaries )
         {
@@ -955,7 +945,7 @@
         throws MojoExecutionException
     {
         File interpolatedPomFile = new File( targetDirectory, 
"interpolated-pom.xml" );
-        interpolatedPomFiles.add( interpolatedPomFile );
+        interpolatedPomFile.deleteOnExit();
         Map composite = new CompositeMap( this.project, 
this.interpolationsProperties );
 
         try
@@ -1006,23 +996,4 @@
         }
         return interpolatedPomFile;
     }
-    
-    private void cleanupInterpolatedPomFiles()
-    {
-        for ( Iterator iterator = this.interpolatedPomFiles.iterator(); 
iterator.hasNext(); )
-        {
-            File file = (File) iterator.next();
-            if ( file.exists() )
-            {
-                try
-                {
-                FileUtils.forceDelete( file );
-                } catch (IOException e)
-                {
-                    getLog().warn( "fail to clean file " + file.getPath() );
-                }
-            }
-        }
-    }
-
 }

Modified: 
maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InterpolationTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InterpolationTest.java?rev=600202&r1=600201&r2=600202&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InterpolationTest.java
 (original)
+++ 
maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InterpolationTest.java
 Sat Dec  1 14:10:12 2007
@@ -110,10 +110,6 @@
             {
                 fileReader.close();
             }
-            if ( interpolatedPomFile != null )
-            {
-                interpolatedPomFile.delete();
-            }
         }
     }
 }