Author: jdcasey
Date: Tue Aug 8 08:32:45 2006
New Revision: 429692
URL: http://svn.apache.org/viewvc?rev=429692&view=rev
Log:
working some kinks out of the system, and adding a new IT, for eventual use
with the new maven-invoker-plugin.
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/module-sourceIncludedBinaryNotIncluded/goals.txt
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child1/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child1/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child1/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child1/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child1/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child1/src/main/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child1/src/main/java/test/App.java
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child1/src/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child1/src/test/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child1/src/test/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child1/src/test/java/test/AppTest.java
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child2/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child2/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child2/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child2/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child2/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child2/src/main/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child2/src/main/java/test/App.java
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child2/src/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child2/src/test/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child2/src/test/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child2/src/test/java/test/AppTest.java
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/goals.txt
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/src/assemble/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/src/assemble/bin.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/test.properties
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/verify.bsh
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/module-sourceIncludedBinaryNotIncluded/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/module-sourceIncludedBinaryNotIncluded/src/assemble/bin.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/module-sourceNotIncludedBinaryIncluded/goals.txt
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/io/DefaultAssemblyReader.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=429692&r1=429691&r2=429692&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Tue Aug 8 08:32:45 2006
@@ -100,6 +100,44 @@
</executions>
</plugin>
<plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>src/it</directory>
+ <includes>
+ <include>**/target</include>
+ <include>**/build.log</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+<!--
+ <plugin>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <configuration>
+ <debug>true</debug>
+ <projectsDirectory>src/it</projectsDirectory>
+ <pomIncludes>
+ <pomInclude>**/pom.xml</pomInclude>
+ </pomIncludes>
+ <pomExcludes>
+ <pomExclude>**/child*/pom.xml</pomExclude>
+ </pomExcludes>
+ </configuration>
+ <executions>
+ <execution>
+ <id>functional-test</id>
+ <phase>functional-test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ -->
+ <plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
<version>1.0-alpha-8</version>
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/module-sourceIncludedBinaryNotIncluded/goals.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/module-sourceIncludedBinaryNotIncluded/goals.txt?rev=429692&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/module-sourceIncludedBinaryNotIncluded/goals.txt
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/module-sourceIncludedBinaryNotIncluded/goals.txt
Tue Aug 8 08:32:45 2006
@@ -0,0 +1 @@
+package
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/module-sourceIncludedBinaryNotIncluded/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/module-sourceIncludedBinaryNotIncluded/goals.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/module-sourceIncludedBinaryNotIncluded/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/module-sourceIncludedBinaryNotIncluded/pom.xml?rev=429692&r1=429691&r2=429692&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/module-sourceIncludedBinaryNotIncluded/pom.xml
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/module-sourceIncludedBinaryNotIncluded/pom.xml
Tue Aug 8 08:32:45 2006
@@ -27,7 +27,7 @@
</configuration>
<executions>
<execution>
- <id>assembly</id>
+ <id>package</id>
<phase>package</phase>
<goals>
<goal>directory-inline</goal>
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/module-sourceIncludedBinaryNotIncluded/src/assemble/bin.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/module-sourceIncludedBinaryNotIncluded/src/assemble/bin.xml?rev=429692&r1=429691&r2=429692&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/module-sourceIncludedBinaryNotIncluded/src/assemble/bin.xml
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/module-sourceIncludedBinaryNotIncluded/src/assemble/bin.xml
Tue Aug 8 08:32:45 2006
@@ -10,6 +10,10 @@
<includes>
<include>org.test:child1</include>
</includes>
+ <binaries>
+ <includeDependencies>true</includeDependencies>
+ <unpack>false</unpack>
+ </binaries>
</moduleSet>
</moduleSets>
</assembly>
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/module-sourceNotIncludedBinaryIncluded/goals.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/module-sourceNotIncludedBinaryIncluded/goals.txt?rev=429692&r1=429691&r2=429692&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/module-sourceNotIncludedBinaryIncluded/goals.txt
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/module-sourceNotIncludedBinaryIncluded/goals.txt
Tue Aug 8 08:32:45 2006
@@ -1 +1 @@
-clean package assembly:directory
+clean package assembly:directory-inline
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child1/pom.xml?rev=429692&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child1/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child1/pom.xml
Tue Aug 8 08:32:45 2006
@@ -0,0 +1,21 @@
+<?xml version="1.0"?><project>
+ <parent>
+ <artifactId>assembly-attached-with-module-binaries</artifactId>
+ <groupId>org.apache.maven.plugins.assembly.it</groupId>
+ <version>1.0</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>test</groupId>
+ <artifactId>child1</artifactId>
+ <name>Maven Quick Start Archetype</name>
+ <version>1.0-SNAPSHOT</version>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child1/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child1/src/main/java/test/App.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child1/src/main/java/test/App.java?rev=429692&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child1/src/main/java/test/App.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child1/src/main/java/test/App.java
Tue Aug 8 08:32:45 2006
@@ -0,0 +1,13 @@
+package 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/forking-tests/assembly-attached-with-module-binaries/child1/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child1/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child1/src/test/java/test/AppTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child1/src/test/java/test/AppTest.java?rev=429692&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child1/src/test/java/test/AppTest.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child1/src/test/java/test/AppTest.java
Tue Aug 8 08:32:45 2006
@@ -0,0 +1,38 @@
+package test;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child1/src/test/java/test/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child1/src/test/java/test/AppTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child2/pom.xml?rev=429692&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child2/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child2/pom.xml
Tue Aug 8 08:32:45 2006
@@ -0,0 +1,21 @@
+<?xml version="1.0"?><project>
+ <parent>
+ <artifactId>assembly-attached-with-module-binaries</artifactId>
+ <groupId>org.apache.maven.plugins.assembly.it</groupId>
+ <version>1.0</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>test</groupId>
+ <artifactId>child2</artifactId>
+ <name>Maven Quick Start Archetype</name>
+ <version>1.0-SNAPSHOT</version>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child2/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child2/src/main/java/test/App.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child2/src/main/java/test/App.java?rev=429692&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child2/src/main/java/test/App.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child2/src/main/java/test/App.java
Tue Aug 8 08:32:45 2006
@@ -0,0 +1,13 @@
+package 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/forking-tests/assembly-attached-with-module-binaries/child2/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child2/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child2/src/test/java/test/AppTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child2/src/test/java/test/AppTest.java?rev=429692&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child2/src/test/java/test/AppTest.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child2/src/test/java/test/AppTest.java
Tue Aug 8 08:32:45 2006
@@ -0,0 +1,38 @@
+package test;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child2/src/test/java/test/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/child2/src/test/java/test/AppTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/goals.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/goals.txt?rev=429692&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/goals.txt
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/goals.txt
Tue Aug 8 08:32:45 2006
@@ -0,0 +1 @@
+install assembly:attached
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/goals.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/pom.xml?rev=429692&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/pom.xml
Tue Aug 8 08:32:45 2006
@@ -0,0 +1,15 @@
+<?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>
+ <groupId>org.apache.maven.plugins.assembly.it</groupId>
+ <artifactId>assembly-attached-with-module-binaries</artifactId>
+
+ <version>1.0</version>
+
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>child1</module>
+ <module>child2</module>
+ </modules>
+</project>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/src/assemble/bin.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/src/assemble/bin.xml?rev=429692&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/src/assemble/bin.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/src/assemble/bin.xml
Tue Aug 8 08:32:45 2006
@@ -0,0 +1,16 @@
+<assembly>
+ <id>bin</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <moduleSets>
+ <moduleSet>
+ <binaries>
+ <outputDirectory>modules</outputDirectory>
+
<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
+</assembly>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/src/assemble/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/src/assemble/bin.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/test.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/test.properties?rev=429692&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/test.properties
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/test.properties
Tue Aug 8 08:32:45 2006
@@ -0,0 +1 @@
+descriptor=src/assemble/bin.xml
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/test.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/test.properties
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/verify.bsh?rev=429692&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/verify.bsh
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-attached-with-module-binaries/verify.bsh
Tue Aug 8 08:32:45 2006
@@ -0,0 +1,38 @@
+import java.io.*;
+import java.net.*;
+import java.util.zip.*;
+
+boolean result = true;
+
+try
+{
+ File zipFile = new File( basedir,
"target/assembly-attached-with-module-binaries-1.0-bin.zip" );
+
+ if ( !zipFile.exists() || zipFile.isDirectory() )
+ {
+ System.err.println( "zip-file is missing or a directory." );
+ result = false;
+ }
+
+ ZipFile zf = new ZipFile( zipFile );
+
+ if ( zf.getEntry(
"assembly-attached-with-module-binaries-1.0/modules/child1.jar" ) == null )
+ {
+ System.err.println( "child1 entry is missing." );
+ result = false;
+ }
+
+ if ( zf.getEntry(
"assembly-attached-with-module-binaries-1.0/modules/child2.jar" ) == null )
+ {
+ System.err.println( "child2 entry is missing." );
+ result = false;
+ }
+
+}
+catch( IOException e )
+{
+ e.printStackTrace();
+ result = false;
+}
+
+return result;
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=429692&r1=429691&r2=429692&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
Tue Aug 8 08:32:45 2006
@@ -207,7 +207,7 @@
{
MavenProject moduleProject = ( MavenProject ) j.next();
- getLogger().debug( "Processing sources for module project: " +
moduleProject.getId() );
+ getLogger().info( "Processing sources for module project: " +
moduleProject.getId() );
String sourcePath = sources.getDirectory();
@@ -226,7 +226,10 @@
else
{
sourcePath = moduleBasedir.getAbsolutePath();
+ sources.setDirectory( sourcePath );
}
+
+ getLogger().info( "module-sources source directory is: " +
sourcePath );
AddFileSetsTask task = new AddFileSetsTask(
Collections.singletonList( sources ) );
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java?rev=429692&r1=429691&r2=429692&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java
Tue Aug 8 08:32:45 2006
@@ -71,6 +71,7 @@
{
for ( int i = 0; i < descriptors.length; i++ )
{
+ getLogger().info( "Reading assembly descriptor: " +
descriptors[i] );
assemblies.add( getAssemblyFromDescriptorFile( descriptors[i],
configSource ) );
}
}
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java?rev=429692&r1=429691&r2=429692&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
Tue Aug 8 08:32:45 2006
@@ -34,6 +34,7 @@
import org.apache.maven.project.MavenProjectHelper;
import java.io.File;
+import java.io.IOException;
import java.util.Iterator;
import java.util.List;
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java?rev=429692&r1=429691&r2=429692&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
Tue Aug 8 08:32:45 2006
@@ -124,6 +124,9 @@
MockManager mm = new MockManager();
MockAndControlForLogger macLogger = new MockAndControlForLogger( mm );
+
+ macLogger.expectDebug( false, true );
+
MockAndControlForAddArtifactTask macTask = new
MockAndControlForAddArtifactTask( mm );
macTask.expectArtifactGetFile( true );
@@ -414,9 +417,6 @@
MockAndControlForAddFileSetsTask macTask = new
MockAndControlForAddFileSetsTask( mm, fileManager );
- MockAndControlForLogger macLogger = new MockAndControlForLogger( mm );
- macLogger.expectDebug( true, true );
-
MavenProject project = createProject( "group", "artifact", "version",
null );
Set projects = Collections.singleton( project );
@@ -435,8 +435,10 @@
false );
mm.replayAll();
+
+ Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
- createPhase( macLogger.logger, null ).addModuleSourceFileSets(
sources, projects, macTask.archiver,
+ createPhase( logger, null ).addModuleSourceFileSets( sources,
projects, macTask.archiver,
macTask.configSource, false );
mm.verifyAll();
