You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/10/03 15:03:56 UTC
svn commit: r293327 -
/maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java
Author: brett
Date: Mon Oct 3 06:03:52 2005
New Revision: 293327
URL: http://svn.apache.org/viewcvs?rev=293327&view=rev
Log:
PR: MNG-644
remove deprecated filter settings
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=293327&r1=293326&r2=293327&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 Mon Oct 3 06:03:52 2005
@@ -67,22 +67,6 @@
private List resources;
/**
- * Wheter to apply filters during transfer.
- *
- * @parameter
- * @deprecated
- */
- private boolean filtering = true;
-
- /**
- * The name of the filter property file to use.
- *
- * @parameter expression="${basedir}/filter.properties"
- * @deprecated use the filters section of the POM.
- */
- private File filterPropertiesFile;
-
- /**
* @parameter expression="${project}"
* @required
* @readonly
@@ -166,7 +150,7 @@
try
{
- copyFile( source, destinationFile, resource.isFiltering() && filtering );
+ copyFile( source, destinationFile, resource.isFiltering() );
}
catch ( IOException e )
{
@@ -179,36 +163,18 @@
private void initializeFiltering()
throws MojoExecutionException
{
- if ( filtering )
+ filterProperties = new Properties();
+ for ( Iterator i = filters.iterator(); i.hasNext(); )
{
- if ( filters == null || filters.isEmpty() && filterPropertiesFile.exists() )
+ String filtersfile = (String) i.next();
+ try
{
- // Deprecated - remove
- try
- {
- filterProperties = PropertyUtils.loadPropertyFile( filterPropertiesFile, true, true );
- }
- catch ( IOException e )
- {
- throw new MojoExecutionException( "Error loading property file '" + filterPropertiesFile + "'", e );
- }
+ Properties properties = PropertyUtils.loadPropertyFile( new File( filtersfile ), true, true );
+ filterProperties.putAll( properties );
}
- else
+ catch ( IOException e )
{
- filterProperties = new Properties();
- 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 )
- {
- throw new MojoExecutionException( "Error loading property file '" + filtersfile + "'", e );
- }
- }
+ throw new MojoExecutionException( "Error loading property file '" + filtersfile + "'", e );
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org