You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2005/10/21 01:38:53 UTC
svn commit: r327041 -
/maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java
Author: jvanzyl
Date: Thu Oct 20 16:38:51 2005
New Revision: 327041
URL: http://svn.apache.org/viewcvs?rev=327041&view=rev
Log:
o fix for MNG-1194 using project.properties in filtering process
Modified:
maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java
Modified: maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java?rev=327041&r1=327040&r2=327041&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java Thu Oct 20 16:38:51 2005
@@ -182,13 +182,20 @@
private void initializeFiltering()
throws MojoExecutionException
{
+ // System properties
filterProperties = new Properties( System.getProperties() );
+
+ // Project properties
+ filterProperties.putAll( project.getProperties() );
+
for ( Iterator i = filters.iterator(); i.hasNext(); )
{
String filtersfile = (String) i.next();
+
try
{
Properties properties = PropertyUtils.loadPropertyFile( new File( filtersfile ), true, true );
+
filterProperties.putAll( properties );
}
catch ( IOException e )
@@ -223,9 +230,11 @@
else
{
FileInputStream instream = new FileInputStream( from );
+
FileOutputStream outstream = new FileOutputStream( to );
fileReader = new BufferedReader( new InputStreamReader( instream, encoding ) );
+
fileWriter = new OutputStreamWriter( outstream, encoding );
}