Author: jdcasey
Date: Thu Sep 11 12:40:30 2008
New Revision: 694437
URL: http://svn.apache.org/viewvc?rev=694437&view=rev
Log:
[MASSEMBLY-293][MASSEMBLY-322][MASSEMBLY-340] Fixing file-set filtering.
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/child/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/child/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/child/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/child/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/child/src/main/assembly-resources/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/child/src/main/assembly-resources/test.txt
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/goals.txt
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/src/main/assembly/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/src/main/assembly/src.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/verify.bsh
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/child/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/child/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/child/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/child/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/child/src/main/assembly/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/child/src/main/assembly-resources/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/child/src/main/assembly-resources/test.txt
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/child/src/main/assembly/src.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/goals.txt
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/src/main/assembly/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/src/main/assembly/bin.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/src/main/java/org/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/src/main/java/org/apache/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/src/main/java/org/apache/maven/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/src/main/java/org/apache/maven/plugin/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/src/main/java/org/apache/maven/plugin/assembly/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/src/main/java/org/apache/maven/plugin/assembly/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/src/main/java/org/apache/maven/plugin/assembly/test/App.java
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/verify.bsh
(with props)
Modified:
maven/plugins/trunk/maven-assembly-plugin/integration-test-archetype/src/main/resources/archetype-resources/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileSetFormatter.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java
Modified:
maven/plugins/trunk/maven-assembly-plugin/integration-test-archetype/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/integration-test-archetype/src/main/resources/archetype-resources/pom.xml?rev=694437&r1=694436&r2=694437&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/integration-test-archetype/src/main/resources/archetype-resources/pom.xml
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/integration-test-archetype/src/main/resources/archetype-resources/pom.xml
Thu Sep 11 12:40:30 2008
@@ -23,7 +23,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>testing</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/bin.xml</descriptor>
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/child/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/child/pom.xml?rev=694437&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/child/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/child/pom.xml
Thu Sep 11 12:40:30 2008
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+
+ <artifactId>child</artifactId>
+ <packaging>jar</packaging>
+
+</project>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/child/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/child/src/main/assembly-resources/test.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/child/src/main/assembly-resources/test.txt?rev=694437&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/child/src/main/assembly-resources/test.txt
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/child/src/main/assembly-resources/test.txt
Thu Sep 11 12:40:30 2008
@@ -0,0 +1 @@
+${project.version}
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/child/src/main/assembly-resources/test.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/goals.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/goals.txt?rev=694437&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/goals.txt
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/goals.txt
Thu Sep 11 12:40:30 2008
@@ -0,0 +1,2 @@
+clean
+package
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/pom.xml?rev=694437&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/pom.xml
Thu Sep 11 12:40:30 2008
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+
+ <artifactId>parent</artifactId>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>child</module>
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>single-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/src/main/assembly/src.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/src/main/assembly/src.xml?rev=694437&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/src/main/assembly/src.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/src/main/assembly/src.xml
Thu Sep 11 12:40:30 2008
@@ -0,0 +1,23 @@
+<assembly>
+ <id>src</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <moduleSets>
+ <moduleSet>
+ <includes>
+ <include>org.apache.maven.plugin.assembly.test:child</include>
+ </includes>
+ <sources>
+ <fileSets>
+ <fileSet>
+ <outputDirectory>/</outputDirectory>
+ <directory>src/main/assembly-resources</directory>
+ <filtered>true</filtered>
+ </fileSet>
+ </fileSets>
+ </sources>
+ </moduleSet>
+ </moduleSets>
+</assembly>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/src/main/assembly/src.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/verify.bsh?rev=694437&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/verify.bsh
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/verify.bsh
Thu Sep 11 12:40:30 2008
@@ -0,0 +1,19 @@
+import java.io.*;
+
+File f = new File( basedir, "target/parent-1-src.dir/child/test.txt" );
+
+if ( !f.exists() )
+{
+ System.out.println( "Filtered file from file-set: " + f + " is
missing." );
+ return false;
+}
+
+String line = null;
+
+BufferedReader reader = new BufferedReader( new FileReader( f ) );
+line = reader.readLine();
+reader.close();
+
+System.out.println( "First line of test.txt: '" + line + "' should equal the
project version: '1'." );
+
+return "1".equals( line.trim() );
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/child/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/child/pom.xml?rev=694437&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/child/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/child/pom.xml
Thu Sep 11 12:40:30 2008
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+
+ <artifactId>child</artifactId>
+ <packaging>jar</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>single-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/child/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/child/src/main/assembly-resources/test.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/child/src/main/assembly-resources/test.txt?rev=694437&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/child/src/main/assembly-resources/test.txt
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/child/src/main/assembly-resources/test.txt
Thu Sep 11 12:40:30 2008
@@ -0,0 +1 @@
+${project.version}
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/child/src/main/assembly-resources/test.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/child/src/main/assembly/src.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/child/src/main/assembly/src.xml?rev=694437&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/child/src/main/assembly/src.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/child/src/main/assembly/src.xml
Thu Sep 11 12:40:30 2008
@@ -0,0 +1,14 @@
+<assembly>
+ <id>src</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <outputDirectory>/</outputDirectory>
+ <directory>src/main/assembly-resources</directory>
+ <filtered>true</filtered>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/child/src/main/assembly/src.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/goals.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/goals.txt?rev=694437&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/goals.txt
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/goals.txt
Thu Sep 11 12:40:30 2008
@@ -0,0 +1,2 @@
+clean
+package
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/pom.xml?rev=694437&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/pom.xml
Thu Sep 11 12:40:30 2008
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+
+ <artifactId>filtered-multimodule-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>child</module>
+ </modules>
+
+</project>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/src/main/assembly/bin.xml?rev=694437&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/src/main/assembly/bin.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/src/main/assembly/bin.xml
Thu Sep 11 12:40:30 2008
@@ -0,0 +1,15 @@
+<assembly>
+ <id>bin</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <scope>${test}</scope>
+ <outputDirectory>lib</outputDirectory>
+
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <unpack>false</unpack>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/src/main/assembly/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/src/main/java/org/apache/maven/plugin/assembly/test/App.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/src/main/java/org/apache/maven/plugin/assembly/test/App.java?rev=694437&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/src/main/java/org/apache/maven/plugin/assembly/test/App.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/src/main/java/org/apache/maven/plugin/assembly/test/App.java
Thu Sep 11 12:40:30 2008
@@ -0,0 +1,13 @@
+package org.apache.maven.plugin.assembly.test;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/src/main/java/org/apache/maven/plugin/assembly/test/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/verify.bsh?rev=694437&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/verify.bsh
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/verify.bsh
Thu Sep 11 12:40:30 2008
@@ -0,0 +1,19 @@
+import java.io.*;
+
+File f = new File( basedir, "child/target/child-1-src.dir/test.txt" );
+
+if ( !f.exists() )
+{
+ System.out.println( "Filtered file from file-set: " + f + " is
missing." );
+ return false;
+}
+
+String line = null;
+
+BufferedReader reader = new BufferedReader( new FileReader( f ) );
+line = reader.readLine();
+reader.close();
+
+System.out.println( "First line of test.txt: '" + line + "' should equal the
project version: '1'." );
+
+return "1".equals( line.trim() );
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java?rev=694437&r1=694436&r2=694437&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java
Thu Sep 11 12:40:30 2008
@@ -318,21 +318,23 @@
MavenProject moduleProject = ( MavenProject ) j.next();
getLogger().info( "Processing sources for module project: " +
moduleProject.getId() );
+
+ List moduleFileSets = new ArrayList();
for ( Iterator fsIterator = fileSets.iterator();
fsIterator.hasNext(); )
{
FileSet fileSet = ( FileSet ) fsIterator.next();
- FileSet moduleFileSet = createFileSet( fileSet, sources,
moduleProject, configSource );
-
- AddFileSetsTask task = new AddFileSetsTask(
Collections.singletonList( moduleFileSet ) );
+ moduleFileSets.add( createFileSet( fileSet, sources,
moduleProject, configSource ) );
+ }
+
+ AddFileSetsTask task = new AddFileSetsTask( moduleFileSets );
- task.setArtifactExpressionPrefix( "module." );
- task.setProject( moduleProject );
- task.setLogger( getLogger() );
+ task.setArtifactExpressionPrefix( "module." );
+ task.setProject( moduleProject );
+ task.setLogger( getLogger() );
- task.execute( archiver, configSource );
- }
+ task.execute( archiver, configSource );
}
}
@@ -419,7 +421,7 @@
}
fs.setExcludes( excludes );
-
+ fs.setFiltered( fileSet.isFiltered() );
fs.setFileMode( fileSet.getFileMode() );
fs.setIncludes( fileSet.getIncludes() );
fs.setLineEnding( fileSet.getLineEnding() );
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=694437&r1=694436&r2=694437&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 11 12:40:30 2008
@@ -58,14 +58,7 @@
FileSet fileSet = new FileSet();
fileSet.setLineEnding( lineEnding );
- if(set.getDirectory() == null)
- {
- fileSet.setDirectory(fileSetDir.getAbsolutePath());
- }
- else
- {
- fileSet.setDirectory( set.getDirectory() );
- }
+ fileSet.setDirectory(fileSetDir.getAbsolutePath());
fileSet.setIncludes( set.getIncludes() );
@@ -78,12 +71,14 @@
// if we don't have anything to process, let's just skip all of
this mess.
if ( ( files == null ) || ( files.length == 0 ) )
{
- logger.info( "No files selected for line-ending conversion.
Skipping: " + fileSet.getDirectory() );
+ logger.info( "No files selected for line-ending conversion or
filtering. Skipping: " + fileSet.getDirectory() );
}
else
{
File formattedDir =
FileUtils.createTempFile( "fileSetFormatter.", ".tmp",
configSource.getTemporaryRootDirectory() );
+
+ logger.debug( "Filtering files from: " + fileSetDir + " into
temp dir: " + formattedDir );
formattedDir.delete();
formattedDir.mkdirs();
@@ -92,6 +87,8 @@
for ( int i = 0; i < files.length; i++ )
{
String file = files[i];
+
+ logger.debug( "Filtering: " + file );
File targetFile = new File( formattedDir, file );
@@ -117,6 +114,10 @@
return formattedDir;
}
}
+ else
+ {
+ logger.debug( "NOT reformatting any files in " + fileSetDir );
+ }
return fileSetDir;
}
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java?rev=694437&r1=694436&r2=694437&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java
Thu Sep 11 12:40:30 2008
@@ -180,6 +180,9 @@
{
value = value.substring( 1 );
}
+
+ value = StringUtils.replace( value, "//", "/" );
+ value = StringUtils.replace( value, "\\\\", "\\" );
return value;
}
@@ -315,6 +318,9 @@
// Now, run the interpolation using the rules stated above.
value = interpolator.interpolate( value, "__artifact" );
+ value = StringUtils.replace( value, "//", "/" );
+ value = StringUtils.replace( value, "\\\\", "\\" );
+
return value;
}
