You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2008/09/04 18:41:43 UTC
svn commit: r692149 - in /maven/plugins/trunk/maven-assembly-plugin/src:
it/projects/file-sets/default-directory-unspecified/
it/projects/file-sets/default-directory-unspecified/src/
it/projects/file-sets/default-directory-unspecified/src/main/ it/proj...
Author: jdcasey
Date: Thu Sep 4 09:41:42 2008
New Revision: 692149
URL: http://svn.apache.org/viewvc?rev=692149&view=rev
Log:
[MASSEMBLY-342] Guard against fileSet that doesn't specify a directory.
Submitted by: Petar Tahchiev
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/goals.txt (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/pom.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/src/main/assembly/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/src/main/assembly/src.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/verify.bsh (with props)
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileSetFormatter.java
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/goals.txt?rev=692149&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/goals.txt (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/goals.txt Thu Sep 4 09:41:42 2008
@@ -0,0 +1,2 @@
+clean
+org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/pom.xml?rev=692149&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/pom.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/pom.xml Thu Sep 4 09:41:42 2008
@@ -0,0 +1,27 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>test</groupId>
+ <artifactId>default-directory-unspecified</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/src/main/assembly/src.xml?rev=692149&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/src/main/assembly/src.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/src/main/assembly/src.xml Thu Sep 4 09:41:42 2008
@@ -0,0 +1,14 @@
+<assembly>
+ <id>src</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>*.*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/src/main/assembly/src.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/verify.bsh?rev=692149&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/verify.bsh (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/verify.bsh Thu Sep 4 09:41:42 2008
@@ -0,0 +1,10 @@
+import java.io.*;
+
+boolean result = true;
+
+String assemblyDir = "target/default-directory-unspecified-1.0-SNAPSHOT-src.dir/";
+
+result = result && new File( basedir, assemblyDir + "build.log" ).exists();
+result = result && !new File( basedir, assemblyDir + ".svn" ).exists();
+
+return result;
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileSetFormatter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileSetFormatter.java?rev=692149&r1=692148&r2=692149&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileSetFormatter.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileSetFormatter.java Thu Sep 4 09:41:42 2008
@@ -57,7 +57,16 @@
FileSet fileSet = new FileSet();
fileSet.setLineEnding( lineEnding );
- fileSet.setDirectory( set.getDirectory() );
+
+ if(set.getDirectory() == null)
+ {
+ fileSet.setDirectory(archiveBaseDir.getAbsolutePath());
+ }
+ else
+ {
+ fileSet.setDirectory( set.getDirectory() );
+ }
+
fileSet.setIncludes( set.getIncludes() );
fileSet.setExcludes( set.getExcludes() );