mirror of https://github.com/apache/maven.git
o make sure we account for times when we have resources entries like:
<resource> <directory>src/main/resource</directory> </resource> We want to pick up everything within the specified directory so the the implicit include is **/**. git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162613 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
1a697b0b16
commit
e8bccead0d
|
@ -92,6 +92,10 @@ public class ResourcesPlugin
|
|||
public void execute()
|
||||
throws Exception
|
||||
{
|
||||
System.out.println( "outputDirectory = " + outputDirectory );
|
||||
|
||||
System.out.println( "resources = " + resources );
|
||||
|
||||
for ( Iterator i = getJarResources( resources ).iterator(); i.hasNext(); )
|
||||
{
|
||||
ResourceEntry resourceEntry = (ResourceEntry) i.next();
|
||||
|
@ -125,8 +129,22 @@ public class ResourcesPlugin
|
|||
continue;
|
||||
}
|
||||
|
||||
// If we only have a directory then we want to include
|
||||
// everything we can find within that path.
|
||||
|
||||
String includes;
|
||||
|
||||
if ( resource.getIncludes().size() > 0 )
|
||||
{
|
||||
includes = listToString( resource.getIncludes() );
|
||||
}
|
||||
else
|
||||
{
|
||||
includes = "**/**";
|
||||
}
|
||||
|
||||
List files = FileUtils.getFileNames( resourceDirectory,
|
||||
listToString( resource.getIncludes() ),
|
||||
includes,
|
||||
listToString( resource.getExcludes() ),
|
||||
false );
|
||||
|
||||
|
@ -135,7 +153,6 @@ public class ResourcesPlugin
|
|||
String name = (String) j.next();
|
||||
|
||||
String entryName = name;
|
||||
;
|
||||
|
||||
if ( targetPath != null )
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue