This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to annotated tag maven-filtering-1.0-alpha-1 in repository https://gitbox.apache.org/repos/asf/maven-filtering.git
commit 0ff416e9b56827c5f62d0c718b5c18b311832341 Author: Oliver Lamy <[email protected]> AuthorDate: Sat Feb 9 23:07:04 2008 +0000 add a method which allow users to have their own list of FilterWrappers git-svn-id: https://svn.apache.org/repos/asf/maven/sandbox/trunk/shared/maven-filtering@620211 13f79535-47bb-0310-9956-ffa450edef68 --- .../shared/filtering/DefaultMavenResourcesFiltering.java | 16 ++++++++++++---- .../maven/shared/filtering/MavenResourcesFiltering.java | 12 +++++++++++- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java index d02f4ec..1d6aecc 100755 --- a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java +++ b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java @@ -54,6 +54,14 @@ public class DefaultMavenResourcesFiltering List fileFilters ) throws MavenFilteringException { + List filterWrappers = mavenFileFilter.getDefaultFilterWrappers( mavenProject, fileFilters, true ); + + filterResources( resources, outputDirectory, encoding, filterWrappers, mavenProject.getBasedir() ); + } + + public void filterResources( List resources, File outputDirectory, String encoding, List filterWrappers, File resourcesBaseDirectory ) + throws MavenFilteringException + { for ( Iterator i = resources.iterator(); i.hasNext(); ) { Resource resource = (Resource) i.next(); @@ -63,7 +71,7 @@ public class DefaultMavenResourcesFiltering File resourceDirectory = new File( resource.getDirectory() ); if ( !resourceDirectory.isAbsolute() ) { - resourceDirectory = new File( mavenProject.getBasedir(), resourceDirectory.getPath() ); + resourceDirectory = new File( resourcesBaseDirectory, resourceDirectory.getPath() ); } if ( !resourceDirectory.exists() ) @@ -103,8 +111,6 @@ public class DefaultMavenResourcesFiltering scanner.scan(); List includedFiles = Arrays.asList( scanner.getIncludedFiles() ); - - List filterWrappers = mavenFileFilter.getDefaultFilterWrappers( mavenProject, fileFilters, true ); for ( Iterator j = includedFiles.iterator(); j.hasNext(); ) { @@ -128,7 +134,9 @@ public class DefaultMavenResourcesFiltering mavenFileFilter.copyFile( source, destinationFile, resource.isFiltering(), filterWrappers, encoding ); } } - + } + + } diff --git a/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java b/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java index 9819db1..8ba557c 100755 --- a/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java +++ b/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java @@ -33,7 +33,7 @@ public interface MavenResourcesFiltering { /** - * @param resources {@link List} of {@link Resource} + * @param resources {@link List} of {@link org.apache.maven.model.Resource} * @param outputDirectory parent destination directory * @param mavenProject * @param encoding @@ -44,4 +44,14 @@ public interface MavenResourcesFiltering List fileFilters ) throws MavenFilteringException; + + /** + * @param resources {@link List} of {@link org.apache.maven.model.Resource} + * @param outputDirectory parent destination directory + * @param encoding + * @param filterWrappers {@link List} of FileUtils.FilterWrapper + * @throws MavenFilteringException + */ + void filterResources( List resources, File outputDirectory, String encoding, List filterWrappers, File resourcesBaseDirectory ) + throws MavenFilteringException; }
