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 60725beadc42645a23b0720910ad0239f73dd556 Author: Oliver Lamy <[email protected]> AuthorDate: Mon Feb 25 10:51:37 2008 +0000 replace using System.getProperties() with mavenSession.getExecutionProperties() git-svn-id: https://svn.apache.org/repos/asf/maven/sandbox/trunk/shared/maven-filtering@630802 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 5 ++++ .../shared/filtering/DefaultMavenFileFilter.java | 28 ++++++++++++++-------- .../filtering/DefaultMavenResourcesFiltering.java | 5 ++-- .../maven/shared/filtering/MavenFileFilter.java | 6 +++-- .../shared/filtering/MavenResourcesFiltering.java | 3 ++- .../DefaultMavenResourcesFilteringTest.java | 10 +++++--- .../shared/filtering/TestReflectionProperties.java | 4 ++-- 7 files changed, 41 insertions(+), 20 deletions(-) diff --git a/pom.xml b/pom.xml index a5eff30..f3d17cf 100755 --- a/pom.xml +++ b/pom.xml @@ -67,6 +67,11 @@ <version>2.0.6</version> </dependency> <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + <version>2.0.6</version> + </dependency> + <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> <version>1.4.9</version> diff --git a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java index 848a257..30f8dc7 100755 --- a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java +++ b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java @@ -28,6 +28,7 @@ import java.util.Iterator; import java.util.List; import java.util.Properties; +import org.apache.maven.execution.MavenSession; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.InterpolationFilterReader; @@ -45,10 +46,10 @@ public class DefaultMavenFileFilter { public void copyFile( File from, File to, boolean filtering, MavenProject mavenProject, List filters, - boolean escapedBackslashesInFilePath, String encoding ) + boolean escapedBackslashesInFilePath, String encoding, MavenSession mavenSession ) throws MavenFilteringException { - List filterWrappers = getDefaultFilterWrappers( mavenProject, filters, escapedBackslashesInFilePath ); + List filterWrappers = getDefaultFilterWrappers( mavenProject, filters, escapedBackslashesInFilePath, mavenSession ); copyFile( from, to, filtering, filterWrappers, encoding ); } @@ -77,7 +78,7 @@ public class DefaultMavenFileFilter } public List getDefaultFilterWrappers( final MavenProject mavenProject, List filters, - final boolean escapedBackslashesInFilePath ) + final boolean escapedBackslashesInFilePath, MavenSession mavenSession ) throws MavenFilteringException { @@ -91,9 +92,14 @@ public class DefaultMavenFileFilter // Project properties baseProps.putAll( mavenProject.getProperties() == null ? Collections.EMPTY_MAP : mavenProject - .getProperties() ); - // System properties wins - baseProps.putAll( System.getProperties() ); + .getProperties() ); + // TODO this is NPE free but do we consider this as normal + // or do we have to throw an MavenFilteringException with mavenSession cannot be null + if ( mavenSession != null ) + { + // execution properties wins + baseProps.putAll( mavenSession.getExecutionProperties() ); + } // now we build properties to use for resources interpolation @@ -107,10 +113,12 @@ public class DefaultMavenFileFilter // Project properties filterProperties.putAll( mavenProject.getProperties() == null ? Collections.EMPTY_MAP : mavenProject - .getProperties() ); - // System properties wins - filterProperties.putAll( System.getProperties() ); - + .getProperties() ); + if ( mavenSession != null ) + { + // execution properties wins + filterProperties.putAll( mavenSession.getExecutionProperties() ); + } List defaultFilterWrappers = new ArrayList( 3 ); 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 3449e2f..b4df098 100755 --- a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java +++ b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java @@ -25,6 +25,7 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; +import org.apache.maven.execution.MavenSession; import org.apache.maven.model.Resource; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable; @@ -75,10 +76,10 @@ public class DefaultMavenResourcesFiltering private MavenFileFilter mavenFileFilter; public void filterResources( List resources, File outputDirectory, MavenProject mavenProject, String encoding, - List fileFilters, List nonFilteredFileExtensions ) + List fileFilters, List nonFilteredFileExtensions, MavenSession mavenSession ) throws MavenFilteringException { - List filterWrappers = mavenFileFilter.getDefaultFilterWrappers( mavenProject, fileFilters, true ); + List filterWrappers = mavenFileFilter.getDefaultFilterWrappers( mavenProject, fileFilters, true, mavenSession ); filterResources( resources, outputDirectory, encoding, filterWrappers, mavenProject.getBasedir(), nonFilteredFileExtensions ); diff --git a/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java b/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java index 8c17c08..b525918 100755 --- a/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java +++ b/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java @@ -22,7 +22,9 @@ package org.apache.maven.shared.filtering; import java.io.File; import java.util.List; +import org.apache.maven.execution.MavenSession; import org.apache.maven.project.MavenProject; +import org.apache.maven.settings.MavenSettingsBuilder; /** * @author <a href="mailto:[email protected]";>olamy</a> @@ -44,7 +46,7 @@ public interface MavenFileFilter * @throws IOException */ void copyFile( File from, final File to, boolean filtering, MavenProject mavenProject, List filters, - boolean escapedBackslashesInFilePath, String encoding ) + boolean escapedBackslashesInFilePath, String encoding, MavenSession mavenSession ) throws MavenFilteringException; /** @@ -73,6 +75,6 @@ public interface MavenFileFilter * @return {@link List} of FileUtils.FilterWrapper * */ - List getDefaultFilterWrappers( MavenProject mavenProject, List filters, boolean escapedBackslashesInFilePath ) + List getDefaultFilterWrappers( MavenProject mavenProject, List filters, boolean escapedBackslashesInFilePath, MavenSession mavenSession ) throws MavenFilteringException; } 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 498b936..4e6998a 100755 --- a/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java +++ b/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java @@ -22,6 +22,7 @@ package org.apache.maven.shared.filtering; import java.io.File; import java.util.List; +import org.apache.maven.execution.MavenSession; import org.apache.maven.project.MavenProject; /** @@ -42,7 +43,7 @@ public interface MavenResourcesFiltering * @throws MavenFilteringException */ void filterResources( List resources, File outputDirectory, MavenProject mavenProject, String encoding, - List fileFilters, List nonFilteredFileExtensions ) + List fileFilters, List nonFilteredFileExtensions, MavenSession mavenSession ) throws MavenFilteringException; /** diff --git a/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java b/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java index 059eff8..383b27f 100755 --- a/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java +++ b/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java @@ -28,6 +28,7 @@ import java.util.Collections; import java.util.List; import java.util.Properties; +import org.apache.maven.execution.MavenSession; import org.apache.maven.model.Resource; import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.util.FileUtils; @@ -88,7 +89,9 @@ public class DefaultMavenResourcesFilteringTest filtersFile.add( getBasedir() + "/src/test/units-files/maven-resources-filtering/empty-maven-resources-filtering.txt" ); List nonFilteredFileExtensions = Collections.singletonList( "gif" ); - mavenResourcesFiltering.filterResources( resources, outputDirectory, mavenProject, null, filtersFile, nonFilteredFileExtensions ); + + mavenResourcesFiltering.filterResources( resources, outputDirectory, mavenProject, null, filtersFile, + nonFilteredFileExtensions, new StubMavenSession() ); assertEquals( 3, outputDirectory.listFiles().length ); Properties result = PropertyUtils.loadPropertyFile( new File(outputDirectory, "empty-maven-resources-filtering.txt"), null ); @@ -147,7 +150,8 @@ public class DefaultMavenResourcesFilteringTest List nonFilteredFileExtensions = Collections.singletonList( "gif" ); MavenFileFilter mavenFileFilter = (MavenFileFilter) lookup( MavenFileFilter.class.getName(), "default" ); - List defaultFilterWrappers = mavenFileFilter.getDefaultFilterWrappers( mavenProject, null, true ); + List defaultFilterWrappers = mavenFileFilter.getDefaultFilterWrappers( mavenProject, null, true, + new StubMavenSession() ); List filterWrappers = new ArrayList( ); filterWrappers.addAll( defaultFilterWrappers ); @@ -188,7 +192,7 @@ public class DefaultMavenResourcesFilteringTest resource.setDirectory( unitFilesDir ); resource.setFiltering( false ); mavenResourcesFiltering.filterResources( resources, outputDirectory, mavenProject, null, null, - Collections.EMPTY_LIST ); + Collections.EMPTY_LIST, new StubMavenSession() ); assertEquals( 3, outputDirectory.listFiles().length ); Properties result = PropertyUtils.loadPropertyFile( new File( outputDirectory, diff --git a/src/test/java/org/apache/maven/shared/filtering/TestReflectionProperties.java b/src/test/java/org/apache/maven/shared/filtering/TestReflectionProperties.java index 4784f6e..dc8a510 100755 --- a/src/test/java/org/apache/maven/shared/filtering/TestReflectionProperties.java +++ b/src/test/java/org/apache/maven/shared/filtering/TestReflectionProperties.java @@ -56,7 +56,7 @@ public class TestReflectionProperties to.delete(); } - mavenFileFilter.copyFile( from, to, true, mavenProject, null, false, null ); + mavenFileFilter.copyFile( from, to, true, mavenProject, null, false, null, new StubMavenSession() ); Properties reading = new Properties(); readFileInputStream = new FileInputStream( to ); @@ -98,7 +98,7 @@ public class TestReflectionProperties to.delete(); } - mavenFileFilter.copyFile( from, to, false, mavenProject, null, false, null ); + mavenFileFilter.copyFile( from, to, false, mavenProject, null, false, null, new StubMavenSession() ); Properties reading = new Properties(); readFileInputStream = new FileInputStream( to );
