Author: bdemers
Date: Tue Nov 23 17:24:21 2010
New Revision: 1038212
URL: http://svn.apache.org/viewvc?rev=1038212&view=rev
Log:
Added tests for zip and tar assembly descriptor. Needed to update to 2.2 of
the assembly plugin in order to get tests working.
Added:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_ZipAndTarCreation.java
(with props)
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/pom.xml
(with props)
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/pom.xml
(with props)
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/src/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/src/main/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/src/main/java/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/src/main/java/org/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/src/main/java/org/apache/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/src/main/java/org/apache/assembly/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/src/main/java/org/apache/assembly/it/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/src/main/java/org/apache/assembly/it/App.java
(with props)
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/src/main/resources/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/src/main/resources/META-INF/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/src/main/resources/META-INF/plexus/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/src/main/resources/META-INF/plexus/components.xml
(with props)
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/src/test/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/src/test/java/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/src/test/java/org/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/src/test/java/org/apache/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/src/test/java/org/apache/assembly/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/src/test/java/org/apache/assembly/it/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/src/test/java/org/apache/assembly/it/AppTest.java
(with props)
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child2/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child2/pom.xml
(with props)
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child2/src/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child2/src/main/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child2/src/main/java/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child2/src/main/java/org/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child2/src/main/java/org/apache/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child2/src/main/java/org/apache/assembly/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child2/src/main/java/org/apache/assembly/it/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child2/src/main/java/org/apache/assembly/it/App.java
(with props)
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child2/src/test/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child2/src/test/java/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child2/src/test/java/org/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child2/src/test/java/org/apache/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child2/src/test/java/org/apache/assembly/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child2/src/test/java/org/apache/assembly/it/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child2/src/test/java/org/apache/assembly/it/AppTest.java
(with props)
Modified:
maven/resources/trunk/apache-source-release-assembly-descriptor/pom.xml
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_IncludeIdeFilesWithinSrcDir.java
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/util/TestUtils.java
Modified:
maven/resources/trunk/apache-source-release-assembly-descriptor/pom.xml
URL:
http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/pom.xml?rev=1038212&r1=1038211&r2=1038212&view=diff
==============================================================================
--- maven/resources/trunk/apache-source-release-assembly-descriptor/pom.xml
(original)
+++ maven/resources/trunk/apache-source-release-assembly-descriptor/pom.xml Tue
Nov 23 17:24:21 2010
@@ -65,6 +65,12 @@ under the License.
<version>1.2</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-archiver</artifactId>
+ <version>1.2</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -152,7 +158,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-4</version>
+ <version>2.2</version>
<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Modified:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_IncludeIdeFilesWithinSrcDir.java
URL:
http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_IncludeIdeFilesWithinSrcDir.java?rev=1038212&r1=1038211&r2=1038212&view=diff
==============================================================================
---
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_IncludeIdeFilesWithinSrcDir.java
(original)
+++
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_IncludeIdeFilesWithinSrcDir.java
Tue Nov 23 17:24:21 2010
@@ -66,10 +66,10 @@ public class IT_IncludeIdeFilesWithinSrc
required.add( archivePathFromProject( BASENAME, VERSION,
"/src/test/resources/ide-excludes.iml" ) );
required.add( archivePathFromProject( BASENAME, VERSION,
"/src/test/resources/ide-excludes.ipr" ) );
required.add( archivePathFromProject( BASENAME, VERSION,
"/src/test/resources/ide-excludes.iws" ) );
- required.add( archivePathFromProject( BASENAME, VERSION,
"/src/test/resources/.deployables" ) );
- required.add( archivePathFromProject( BASENAME, VERSION,
"/src/test/resources/.settings" ) );
- required.add( archivePathFromProject( BASENAME, VERSION,
"/src/test/resources/.wtpmodules" ) );
- required.add( archivePathFromProject( BASENAME, VERSION,
"/src/test/resources/.externalToolBuilders" ) );
+ required.add( archivePathFromProject( BASENAME, VERSION,
"/src/test/resources/.deployables/" ) );
+ required.add( archivePathFromProject( BASENAME, VERSION,
"/src/test/resources/.settings/" ) );
+ required.add( archivePathFromProject( BASENAME, VERSION,
"/src/test/resources/.wtpmodules/" ) );
+ required.add( archivePathFromProject( BASENAME, VERSION,
"/src/test/resources/.externalToolBuilders/" ) );
required.add( archivePathFromProject( BASENAME, VERSION,
"/src/test/resources/release.properties" ) );
required.add( archivePathFromProject( BASENAME, VERSION,
"/src/test/resources/pom.xml.releaseBackup" ) );
@@ -80,10 +80,10 @@ public class IT_IncludeIdeFilesWithinSrc
required.add( archivePathFromChild( BASENAME, VERSION, "child1",
"/src/test/resources/ide-excludes.iml" ) );
required.add( archivePathFromChild( BASENAME, VERSION, "child1",
"/src/test/resources/ide-excludes.ipr" ) );
required.add( archivePathFromChild( BASENAME, VERSION, "child1",
"/src/test/resources/ide-excludes.iws" ) );
- required.add( archivePathFromChild( BASENAME, VERSION, "child1",
"/src/test/resources/.deployables" ) );
- required.add( archivePathFromChild( BASENAME, VERSION, "child1",
"/src/test/resources/.settings" ) );
- required.add( archivePathFromChild( BASENAME, VERSION, "child1",
"/src/test/resources/.wtpmodules" ) );
- required.add( archivePathFromChild( BASENAME, VERSION, "child1",
"/src/test/resources/.externalToolBuilders" ) );
+ required.add( archivePathFromChild( BASENAME, VERSION, "child1",
"/src/test/resources/.deployables/" ) );
+ required.add( archivePathFromChild( BASENAME, VERSION, "child1",
"/src/test/resources/.settings/" ) );
+ required.add( archivePathFromChild( BASENAME, VERSION, "child1",
"/src/test/resources/.wtpmodules/" ) );
+ required.add( archivePathFromChild( BASENAME, VERSION, "child1",
"/src/test/resources/.externalToolBuilders/" ) );
required.add( archivePathFromChild( BASENAME, VERSION, "child1",
"/src/test/resources/release.properties" ) );
required.add( archivePathFromChild( BASENAME, VERSION, "child1",
"/src/test/resources/pom.xml.releaseBackup" ) );
Added:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_ZipAndTarCreation.java
URL:
http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_ZipAndTarCreation.java?rev=1038212&view=auto
==============================================================================
---
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_ZipAndTarCreation.java
(added)
+++
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_ZipAndTarCreation.java
Tue Nov 23 17:24:21 2010
@@ -0,0 +1,65 @@
+package org.apache.its;
+
+import static org.apache.its.util.TestUtils.archivePathFromChild;
+import static org.apache.its.util.TestUtils.archivePathFromProject;
+import static org.apache.its.util.TestUtils.assertZipContents;
+import static org.apache.its.util.TestUtils.assertTarContents;
+import static org.apache.its.util.TestUtils.getTestDir;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import junit.framework.Assert;
+
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.junit.Test;
+
+public class IT_ZipAndTarCreation
+{
+
+ private static final String BASENAME = "zip-and-tar";
+ private static final String VERSION = "1";
+
+ @Test
+ public void execute()
+ throws VerificationException, IOException, URISyntaxException
+ {
+ File testDir = getTestDir( BASENAME );
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+
+ verifier.executeGoal( "package" );
+
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ // make sure the tar did NOT get created by default
+ File tarAssemblyFile = new File( testDir, "target/" + BASENAME + "-" +
VERSION + "-source-release.tar.gz" );
+ Assert.assertTrue( "tar assembly should have been created",
tarAssemblyFile.exists() );
+
+ File zipAssemblyFile = new File( testDir, "target/" + BASENAME + "-" +
VERSION + "-source-release.zip" );
+ Assert.assertTrue( "zip assembly should have been created",
zipAssemblyFile.exists() );
+
+ Set<String> required = new HashSet<String>();
+
+ required.add( archivePathFromProject( BASENAME, VERSION, "/pom.xml" )
);
+ required.add( archivePathFromChild( BASENAME, VERSION, "child1",
"pom.xml" ) );
+ required.add( archivePathFromChild( BASENAME, VERSION, "child2",
"/pom.xml" ) );
+
+ required.add( archivePathFromChild( BASENAME, VERSION, "child1",
"/src/main/java/org/apache/assembly/it/App.java" ) );
+ required.add( archivePathFromChild( BASENAME, VERSION, "child1",
"/src/main/resources/META-INF/plexus/components.xml" ) );
+
+ required.add( archivePathFromChild( BASENAME, VERSION, "child2",
"/src/main/java/org/apache/assembly/it/App.java" ) );
+
+ Set<String> banned = Collections.emptySet();
+
+ assertZipContents( required, banned, zipAssemblyFile );
+ assertTarContents( required, banned, tarAssemblyFile );
+ }
+
+}
Propchange:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_ZipAndTarCreation.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_ZipAndTarCreation.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/util/TestUtils.java
URL:
http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/util/TestUtils.java?rev=1038212&r1=1038211&r2=1038212&view=diff
==============================================================================
---
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/util/TestUtils.java
(original)
+++
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/util/TestUtils.java
Tue Nov 23 17:24:21 2010
@@ -27,11 +27,19 @@ import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
+import java.util.Enumeration;
import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
import java.util.Set;
+import java.util.zip.ZipEntry;
import java.util.zip.ZipException;
import java.util.zip.ZipFile;
+import org.codehaus.plexus.archiver.tar.GZipTarFile;
+import org.codehaus.plexus.archiver.tar.TarEntry;
+import org.codehaus.plexus.archiver.tar.TarFile;
+
public class TestUtils
{
@@ -54,26 +62,70 @@ public class TestUtils
return ( artifactId + "-" + version + path );
}
+
+
+ public static void assertTarContents( Set<String> required, Set<String>
banned, File assembly )
+ throws IOException
+ {
+ assertTrue( "Assembly archive missing: " + assembly, assembly.isFile()
);
+
+ GZipTarFile tarFile = null;
+ try
+ {
+ tarFile = new GZipTarFile( assembly );
+
+ LinkedHashSet<String> pathSet = new LinkedHashSet<String>();
+
+ for ( @SuppressWarnings( "unchecked" )
+ Enumeration<TarEntry> enumeration = tarFile.getEntries();
enumeration.hasMoreElements(); )
+ {
+ pathSet.add( enumeration.nextElement().getName() );
+ }
+ assertArchiveContents( required, banned,
assembly.getAbsolutePath(), pathSet );
+ }
+ finally
+ {
+ if ( tarFile != null )
+ {
+ tarFile.close();
+ }
+ }
+ }
-// @SuppressWarnings( "unchecked" )
public static void assertZipContents( Set<String> required, Set<String>
banned, File assembly )
throws ZipException, IOException
{
assertTrue( "Assembly archive missing: " + assembly, assembly.isFile()
);
-
- ZipFile zf = new ZipFile( assembly );
-
-// System.out.println( "Contents of: " + assembly + ":\n\n" );
-// for( Enumeration<ZipEntry> e = (Enumeration<ZipEntry>) zf.entries();
e.hasMoreElements(); )
-// {
-// System.out.println( e.nextElement().getName() );
-// }
-// System.out.println( "\n\n" );
+ ZipFile zf = null;
+ try
+ {
+ zf = new ZipFile( assembly );
+
+ LinkedHashSet<String> pathSet = new LinkedHashSet<String>();
+
+ for ( Enumeration<? extends ZipEntry> enumeration = zf.entries();
enumeration.hasMoreElements(); )
+ {
+ pathSet.add( enumeration.nextElement().getName() );
+ }
+ assertArchiveContents( required, banned,
assembly.getAbsolutePath(), pathSet );
+ }
+ finally
+ {
+ if ( zf != null )
+ {
+ zf.close();
+ }
+ }
+ }
+
+ private static void assertArchiveContents(Set<String> required,
Set<String> banned, String assemblyName, Set<String> contents )
+ {
+
Set<String> missing = new HashSet<String>();
for ( String name : required )
{
- if ( zf.getEntry( name ) == null )
+ if ( !contents.contains( name ) )
{
missing.add( name );
}
@@ -82,19 +134,17 @@ public class TestUtils
Set<String> banViolations = new HashSet<String>();
for ( String name : banned )
{
- if ( zf.getEntry( name ) != null )
+ if ( contents.contains( name ) )
{
banViolations.add( name );
}
}
- zf.close();
-
if ( !missing.isEmpty() || !banViolations.isEmpty() )
{
StringBuffer msg = new StringBuffer();
msg.append( "The following errors were found in:\n\n" );
- msg.append( assembly );
+ msg.append( assemblyName );
msg.append( "\n");
msg.append( "\nThe following REQUIRED entries were missing from
the bundle archive:\n" );
@@ -123,9 +173,17 @@ public class TestUtils
msg.append( "\n" ).append( name );
}
}
+
+ msg.append( "\n" ).append( "Archive contents:\n" );
+ for ( String path : contents )
+ {
+ msg.append( "\n" ).append( path );
+ }
fail( msg.toString() );
}
+
+
}
public static File getTestDir( String name )
Added:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/pom.xml
URL:
http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/pom.xml?rev=1038212&view=auto
==============================================================================
---
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/pom.xml
(added)
+++
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/pom.xml
Tue Nov 23 17:24:21 2010
@@ -0,0 +1,50 @@
+<?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.assembly.it</groupId>
+ <artifactId>zip-and-tar</artifactId>
+ <version>1</version>
+ <packaging>pom</packaging>
+ <modules>
+ <module>zip-and-tar-child1</module>
+ <module>zip-and-tar-child2</module>
+ </modules>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.apache.resources</groupId>
+ <artifactId>apache-source-release-assembly-descriptor</artifactId>
+ <version>@project.version@</version>
+ </dependency>
+ </dependencies>
+
+ <executions>
+ <execution>
+ <id>source-release-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <!-- <tarLongFileFormat>gnu</tarLongFileFormat> -->
+ <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+ <descriptorRefs>
+ <descriptorRef>source-release-zip-tar</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Propchange:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/pom.xml?rev=1038212&view=auto
==============================================================================
---
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/pom.xml
(added)
+++
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/pom.xml
Tue Nov 23 17:24:21 2010
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>zip-and-tar</artifactId>
+ <groupId>org.apache.assembly.it</groupId>
+ <version>1</version>
+ </parent>
+
+ <artifactId>zip-and-tar-child1</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Propchange:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/src/main/java/org/apache/assembly/it/App.java
URL:
http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/src/main/java/org/apache/assembly/it/App.java?rev=1038212&view=auto
==============================================================================
---
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/src/main/java/org/apache/assembly/it/App.java
(added)
+++
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/src/main/java/org/apache/assembly/it/App.java
Tue Nov 23 17:24:21 2010
@@ -0,0 +1,13 @@
+package org.apache.assembly.it;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/src/main/java/org/apache/assembly/it/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/src/main/java/org/apache/assembly/it/App.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/src/main/resources/META-INF/plexus/components.xml?rev=1038212&view=auto
==============================================================================
---
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/src/main/resources/META-INF/plexus/components.xml
(added)
+++
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/src/main/resources/META-INF/plexus/components.xml
Tue Nov 23 17:24:21 2010
@@ -0,0 +1,4 @@
+<component-set>
+ <components>
+ </components>
+</component-set>
\ No newline at end of file
Propchange:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/src/test/java/org/apache/assembly/it/AppTest.java
URL:
http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/src/test/java/org/apache/assembly/it/AppTest.java?rev=1038212&view=auto
==============================================================================
---
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/src/test/java/org/apache/assembly/it/AppTest.java
(added)
+++
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/src/test/java/org/apache/assembly/it/AppTest.java
Tue Nov 23 17:24:21 2010
@@ -0,0 +1,38 @@
+package org.apache.assembly.it;
+
+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/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/src/test/java/org/apache/assembly/it/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child1/src/test/java/org/apache/assembly/it/AppTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child2/pom.xml?rev=1038212&view=auto
==============================================================================
---
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child2/pom.xml
(added)
+++
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child2/pom.xml
Tue Nov 23 17:24:21 2010
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>zip-and-tar</artifactId>
+ <groupId>org.apache.assembly.it</groupId>
+ <version>1</version>
+ </parent>
+
+ <artifactId>zip-and-tar-child2</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Propchange:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child2/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child2/src/main/java/org/apache/assembly/it/App.java
URL:
http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child2/src/main/java/org/apache/assembly/it/App.java?rev=1038212&view=auto
==============================================================================
---
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child2/src/main/java/org/apache/assembly/it/App.java
(added)
+++
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child2/src/main/java/org/apache/assembly/it/App.java
Tue Nov 23 17:24:21 2010
@@ -0,0 +1,13 @@
+package org.apache.assembly.it;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child2/src/main/java/org/apache/assembly/it/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child2/src/main/java/org/apache/assembly/it/App.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child2/src/test/java/org/apache/assembly/it/AppTest.java
URL:
http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child2/src/test/java/org/apache/assembly/it/AppTest.java?rev=1038212&view=auto
==============================================================================
---
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child2/src/test/java/org/apache/assembly/it/AppTest.java
(added)
+++
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child2/src/test/java/org/apache/assembly/it/AppTest.java
Tue Nov 23 17:24:21 2010
@@ -0,0 +1,38 @@
+package org.apache.assembly.it;
+
+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/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child2/src/test/java/org/apache/assembly/it/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/zip-and-tar-child2/src/test/java/org/apache/assembly/it/AppTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
