Author: jdcasey
Date: Tue Aug 8 10:12:21 2006
New Revision: 429736
URL: http://svn.apache.org/viewvc?rev=429736&view=rev
Log:
Adding another functional/integration test.
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child1/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child1/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child1/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child1/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child1/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child1/src/main/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child1/src/main/java/test/App.java
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child1/src/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child1/src/test/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child1/src/test/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child1/src/test/java/test/AppTest.java
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child2/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child2/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child2/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child2/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child2/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child2/src/main/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child2/src/main/java/test/App.java
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child2/src/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child2/src/test/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child2/src/test/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child2/src/test/java/test/AppTest.java
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/goals.txt
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/src/assemble/
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/src/assemble/bin.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/test.properties
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/verify.bsh
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml
Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=429736&r1=429735&r2=429736&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Tue Aug 8 10:12:21 2006
@@ -113,7 +113,6 @@
</filesets>
</configuration>
</plugin>
-<!--
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
<configuration>
@@ -126,6 +125,7 @@
<pomExclude>**/child*/pom.xml</pomExclude>
</pomExcludes>
</configuration>
+<!--
<executions>
<execution>
<id>functional-test</id>
@@ -135,8 +135,8 @@
</goals>
</execution>
</executions>
- </plugin>
-->
+ </plugin>
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child1/pom.xml?rev=429736&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child1/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child1/pom.xml
Tue Aug 8 10:12:21 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-assembly-with-module-binaries/child1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child1/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-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-assembly-with-module-binaries/child1/src/main/java/test/App.java?rev=429736&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child1/src/main/java/test/App.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child1/src/main/java/test/App.java
Tue Aug 8 10:12:21 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-assembly-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-assembly-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-assembly-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-assembly-with-module-binaries/child1/src/test/java/test/AppTest.java?rev=429736&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child1/src/test/java/test/AppTest.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child1/src/test/java/test/AppTest.java
Tue Aug 8 10:12:21 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-assembly-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-assembly-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-assembly-with-module-binaries/child2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child2/pom.xml?rev=429736&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child2/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child2/pom.xml
Tue Aug 8 10:12:21 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-assembly-with-module-binaries/child2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child2/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-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-assembly-with-module-binaries/child2/src/main/java/test/App.java?rev=429736&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child2/src/main/java/test/App.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child2/src/main/java/test/App.java
Tue Aug 8 10:12:21 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-assembly-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-assembly-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-assembly-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-assembly-with-module-binaries/child2/src/test/java/test/AppTest.java?rev=429736&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child2/src/test/java/test/AppTest.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/child2/src/test/java/test/AppTest.java
Tue Aug 8 10:12:21 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-assembly-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-assembly-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-assembly-with-module-binaries/goals.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/goals.txt?rev=429736&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/goals.txt
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/goals.txt
Tue Aug 8 10:12:21 2006
@@ -0,0 +1 @@
+package assembly:assembly
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/goals.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/pom.xml?rev=429736&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/pom.xml
Tue Aug 8 10:12:21 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-assembly-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-assembly-with-module-binaries/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/src/assemble/bin.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/src/assemble/bin.xml?rev=429736&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/src/assemble/bin.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/src/assemble/bin.xml
Tue Aug 8 10:12:21 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-assembly-with-module-binaries/src/assemble/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-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-assembly-with-module-binaries/test.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/test.properties?rev=429736&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/test.properties
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/test.properties
Tue Aug 8 10:12:21 2006
@@ -0,0 +1 @@
+descriptor=src/assemble/bin.xml
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/test.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/test.properties
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/verify.bsh?rev=429736&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/verify.bsh
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/verify.bsh
Tue Aug 8 10:12:21 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-assembly-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-assembly-with-module-binaries-1.0/modules/child1.jar" ) == null )
+ {
+ System.err.println( "child1 entry is missing." );
+ result = false;
+ }
+
+ if ( zf.getEntry(
"assembly-assembly-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;
