You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2006/05/08 18:02:53 UTC
svn commit: r405081 - in /maven/plugins/trunk/maven-assembly-plugin/src:
main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java
test/resources/assemblies/fileSet-doesnt-exist.xml
Author: brett
Date: Mon May 8 09:02:21 2006
New Revision: 405081
URL: http://svn.apache.org/viewcvs?rev=405081&view=rev
Log:
[MASSEMBLY-92] check fileSet ignored if directory doesn't exist when line endings being replaced
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-doesnt-exist.xml
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java?rev=405081&r1=405080&r2=405081&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java Mon May 8 09:02:21 2006
@@ -1253,14 +1253,17 @@
archiveBaseDir = new File( basedir, directory );
}
- if ( lineEnding != null )
+ if ( archiveBaseDir.exists() )
{
- copySetReplacingLineEndings( archiveBaseDir, tmpDir, includes, excludes, lineEnding );
+ if ( lineEnding != null )
+ {
+ copySetReplacingLineEndings( archiveBaseDir, tmpDir, includes, excludes, lineEnding );
- archiveBaseDir = tmpDir;
+ archiveBaseDir = tmpDir;
+ }
+ getLog().debug( "Archive base directory: '" + archiveBaseDir.getAbsolutePath() + "'" );
+ addDirectory( archiver, archiveBaseDir, output, includes, excludesList );
}
- getLog().debug( "Archive base directory: '" + archiveBaseDir.getAbsolutePath() + "'" );
- addDirectory( archiver, archiveBaseDir, output, includes, excludesList );
}
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-doesnt-exist.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-doesnt-exist.xml?rev=405081&r1=405080&r2=405081&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-doesnt-exist.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-doesnt-exist.xml Mon May 8 09:02:21 2006
@@ -22,6 +22,7 @@
<fileSets>
<fileSet>
<directory>donkey</directory>
+ <lineEnding>unix</lineEnding>
</fileSet>
</fileSets>
</assembly>