You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2008/02/25 11:51:37 UTC
svn commit: r630802 - in /maven/sandbox/trunk/shared/maven-filtering: ./
src/main/java/org/apache/maven/shared/filtering/
src/test/java/org/apache/maven/shared/filtering/
Author: olamy
Date: Mon Feb 25 02:51:37 2008
New Revision: 630802
URL: http://svn.apache.org/viewvc?rev=630802&view=rev
Log:
replace using System.getProperties() with mavenSession.getExecutionProperties()
Modified:
maven/sandbox/trunk/shared/maven-filtering/pom.xml
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java
maven/sandbox/trunk/shared/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
maven/sandbox/trunk/shared/maven-filtering/src/test/java/org/apache/maven/shared/filtering/TestReflectionProperties.java
Modified: maven/sandbox/trunk/shared/maven-filtering/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-filtering/pom.xml?rev=630802&r1=630801&r2=630802&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-filtering/pom.xml (original)
+++ maven/sandbox/trunk/shared/maven-filtering/pom.xml Mon Feb 25 02:51:37 2008
@@ -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>
Modified: maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java?rev=630802&r1=630801&r2=630802&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java (original)
+++ maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java Mon Feb 25 02:51:37 2008
@@ -28,6 +28,7 @@
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 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 List getDefaultFilterWrappers( final MavenProject mavenProject, List filters,
- final boolean escapedBackslashesInFilePath )
+ final boolean escapedBackslashesInFilePath, MavenSession mavenSession )
throws MavenFilteringException
{
@@ -91,9 +92,14 @@
// 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 @@
// 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 );
Modified: maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java?rev=630802&r1=630801&r2=630802&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java (original)
+++ maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java Mon Feb 25 02:51:37 2008
@@ -25,6 +25,7 @@
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 @@
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 );
Modified: maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java?rev=630802&r1=630801&r2=630802&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java (original)
+++ maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java Mon Feb 25 02:51:37 2008
@@ -22,7 +22,9 @@
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:olamy@apache.org">olamy</a>
@@ -44,7 +46,7 @@
* @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 @@
* @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;
}
Modified: maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java?rev=630802&r1=630801&r2=630802&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java (original)
+++ maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java Mon Feb 25 02:51:37 2008
@@ -22,6 +22,7 @@
import java.io.File;
import java.util.List;
+import org.apache.maven.execution.MavenSession;
import org.apache.maven.project.MavenProject;
/**
@@ -42,7 +43,7 @@
* @throws MavenFilteringException
*/
void filterResources( List resources, File outputDirectory, MavenProject mavenProject, String encoding,
- List fileFilters, List nonFilteredFileExtensions )
+ List fileFilters, List nonFilteredFileExtensions, MavenSession mavenSession )
throws MavenFilteringException;
/**
Modified: maven/sandbox/trunk/shared/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java?rev=630802&r1=630801&r2=630802&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java (original)
+++ maven/sandbox/trunk/shared/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java Mon Feb 25 02:51:37 2008
@@ -28,6 +28,7 @@
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 @@
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 @@
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 @@
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,
Modified: maven/sandbox/trunk/shared/maven-filtering/src/test/java/org/apache/maven/shared/filtering/TestReflectionProperties.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-filtering/src/test/java/org/apache/maven/shared/filtering/TestReflectionProperties.java?rev=630802&r1=630801&r2=630802&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-filtering/src/test/java/org/apache/maven/shared/filtering/TestReflectionProperties.java (original)
+++ maven/sandbox/trunk/shared/maven-filtering/src/test/java/org/apache/maven/shared/filtering/TestReflectionProperties.java Mon Feb 25 02:51:37 2008
@@ -56,7 +56,7 @@
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 @@
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 );