Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PR: MNG-788 

bring back the "filtering" attribute in resources from m1


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@263841 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-08-28 07:18:35 +00:00
parent 9ef6cc7f50
commit 7a8c848b01
2 changed files with 22 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maven-model/maven.mdo
View File

@ -1935,7 +1935,7 @@
</field>
<field>
<name>filtering</name>
<version>3.0.0</version>
<version>3.0.0+</version>
<description><![CDATA[Boolean. Describe if resources are filtered or not.]]></description>
<type>boolean</type>
<defaultValue>false</defaultValue>

54
maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java
View File

@ -97,40 +97,14 @@ public class ResourcesMojo
public void execute()
throws MojoExecutionException
{
initializeFiltering();
copyResources( resources, outputDirectory );
}
protected void copyResources( List resources, String outputDirectory )
throws MojoExecutionException
{
try
{
for ( Iterator i = getJarResources( resources ).entrySet().iterator(); i.hasNext(); )
{
Map.Entry entry = (Map.Entry) i.next();
File source = (File) entry.getKey();
String destination = (String) entry.getValue();
initializeFiltering();
File destinationFile = new File( outputDirectory, destination );
if ( !destinationFile.getParentFile().exists() )
{
destinationFile.getParentFile().mkdirs();
}
copyFile( source, destinationFile );
}
}
catch ( Exception e )
{
// TODO: handle exception
throw new MojoExecutionException( "Error copying resources", e );
}
}
private Map getJarResources( List resources )
{
Map resourceEntries = new TreeMap();
for ( Iterator i = resources.iterator(); i.hasNext(); )
@ -170,18 +144,32 @@ public class ResourcesMojo
{
String name = (String) j.next();
String entryName = name;
String destination = name;
if ( targetPath != null )
{
entryName = targetPath + "/" + name;
destination = targetPath + "/" + name;
}
resourceEntries.put( new File( resource.getDirectory(), name ), entryName );
File source = new File( resource.getDirectory(), name );
File destinationFile = new File( outputDirectory, destination );
if ( !destinationFile.getParentFile().exists() )
{
destinationFile.getParentFile().mkdirs();
}
try
{
copyFile( source, destinationFile, resource.isFiltering() && filtering );
}
catch ( IOException e )
{
throw new MojoExecutionException( "Error copying resources", e );
}
}
}
return resourceEntries;
}
private void initializeFiltering()
@ -200,7 +188,7 @@ public class ResourcesMojo
}
}
private void copyFile( File from, File to )
private void copyFile( File from, File to, boolean filtering )
throws IOException
{
if ( !filtering )