svn commit: r808215 - /maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java

[olamy]

Author: olamy
Date: Wed Aug 26 23:00:06 2009
New Revision: 808215

URL: http://svn.apache.org/viewvc?rev=808215&view=rev
Log:
[MSHARED-125] Current incremental build implementation failed when resources 
are removed from target folder

Modified:
    
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java

Modified: 
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java?rev=808215&r1=808214&r2=808215&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
 (original)
+++ 
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
 Wed Aug 26 23:00:06 2009
@@ -213,13 +213,18 @@
             // this part is required in case the user specified "../something" 
as destination
             // see MNG-1345
             File outputDirectory = 
mavenResourcesExecution.getOutputDirectory();
-            if ( !outputDirectory.exists() && !outputDirectory.mkdirs() )
+            boolean outputExists = outputDirectory.exists();
+            if ( !outputExists && !outputDirectory.mkdirs() )
             {
                 throw new MavenFilteringException( "Cannot create resource 
output directory: " + outputDirectory );
-
             }
-
-            Scanner scanner = buildContext.newScanner( resourceDirectory, 
buildContext.hasDelta( mavenResourcesExecution.getFileFilters() ) );
+            
+            boolean ignoreDelta =
+                buildContext.hasDelta( 
mavenResourcesExecution.getFileFilters() )
+                    || buildContext.hasDelta( 
mavenResourcesExecution.getOutputDirectory().getPath() )
+                    || !outputExists;
+            getLogger().info( "ignoreDelta " + ignoreDelta );
+            Scanner scanner = buildContext.newScanner( resourceDirectory, 
ignoreDelta );
 
             setupScanner(resource, scanner);