svn commit: r1397568 - /maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileFormatter.java

[dennisl]

Author: dennisl
Date: Fri Oct 12 13:56:34 2012
New Revision: 1397568

URL: http://svn.apache.org/viewvc?rev=1397568&view=rev
Log:
Start using the methods in maven-filtering that uses Parameter Objects. That 
way we can tweak how filtering is done in more ways. This is a preparation for 
fixing some issues regarding filtering.

Modified:
    
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileFormatter.java

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileFormatter.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileFormatter.java?rev=1397568&r1=1397567&r2=1397568&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileFormatter.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileFormatter.java
 Fri Oct 12 13:56:34 2012
@@ -21,6 +21,7 @@ package org.apache.maven.plugin.assembly
 
 import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
 import org.apache.maven.plugin.assembly.utils.AssemblyFileUtils;
+import org.apache.maven.shared.filtering.MavenFileFilterRequest;
 import org.apache.maven.shared.filtering.MavenFilteringException;
 import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.util.FileUtils;
@@ -93,8 +94,10 @@ public class FileFormatter
             //@todo this test can be improved
             boolean isPropertiesFile = source.getName().toLowerCase( 
Locale.ENGLISH ).endsWith( ".properties" );
 
-            configSource.getMavenFileFilter().copyFile( source, target, true, 
configSource.getProject(),
-                    configSource.getFilters(), isPropertiesFile, encoding, 
configSource.getMavenSession() );
+            MavenFileFilterRequest filterRequest = new MavenFileFilterRequest( 
source, target, true, configSource.getProject(),
+                    configSource.getFilters(), isPropertiesFile, encoding, 
configSource.getMavenSession(), null );
+            filterRequest.setInjectProjectBuildFilters( true );
+            configSource.getMavenFileFilter().copyFile( filterRequest );
 
             return target;
         }