You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ep...@apache.org on 2006/05/16 08:41:51 UTC
svn commit: r406856 - in /maven/plugins/trunk/maven-assembly-plugin/src/test:
java/org/apache/maven/plugin/assembly/
java/org/apache/maven/plugin/assembly/stubs/ plugin-configs/assembly/
resources/assemblies/
Author: epunzalan
Date: Mon May 15 23:41:46 2006
New Revision: 406856
URL: http://svn.apache.org/viewcvs?rev=406856&view=rev
Log:
PR: MASSEMBLY-88
Adding more test cases and see if it fixes the continuum build error in the last commit
Added:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/JarArchiverStub.java
- copied, changed from r406791, maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/ArchiverStub.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/TarArchiverStub.java (with props)
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/WarArchiverStub.java (with props)
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/includeSite-plugin-config.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/tar-bz2-plugin-config.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/tar-gz-plugin-config.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/war-plugin-config.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/tar-bz2.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/tar-gz.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/war.xml (with props)
Removed:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/ArchiverStub.java
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/ArchiverManagerStub.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/DirectoryArchiverStub.java
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java?rev=406856&r1=406855&r2=406856&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java Mon May 15 23:41:46 2006
@@ -19,11 +19,14 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub;
-import org.apache.maven.plugin.assembly.stubs.ArchiverStub;
+import org.apache.maven.plugin.assembly.stubs.JarArchiverStub;
import org.apache.maven.plugin.assembly.stubs.ReactorMavenProjectStub;
+import org.apache.maven.plugin.assembly.stubs.WarArchiverStub;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.archiver.tar.TarArchiver;
+import org.codehaus.plexus.archiver.tar.TarLongFileMode;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
@@ -90,8 +93,8 @@
assertTrue( "Test expected dependency artifacts in archive", archivedFiles.contains( expected.getFile() ) );
assertTrue( "Test expected dependency is not unpacked", expected.getFile().getName().endsWith( ".jar" ) );
- ArchiverStub.ArchiverFile archiveFile =
- (ArchiverStub.ArchiverFile) archiveMap.get( project.getArtifact().getFile() );
+ JarArchiverStub.ArchiverFile archiveFile =
+ (JarArchiverStub.ArchiverFile) archiveMap.get( project.getArtifact().getFile() );
String archivePath = archiveFile.getOutputName();
assertTrue( "Test includeBaseDirectory", archivePath.startsWith( "assembly/" ) );
}
@@ -99,8 +102,8 @@
assertTrue( "Test project is in archive", archivedFiles.contains( project.getArtifact().getFile() ) );
assertTrue( "Test project is not unpacked", project.getArtifact().getFile().getName().endsWith( ".jar" ) );
- ArchiverStub.ArchiverFile archiveFile =
- (ArchiverStub.ArchiverFile) archiveMap.get( project.getArtifact().getFile() );
+ JarArchiverStub.ArchiverFile archiveFile =
+ (JarArchiverStub.ArchiverFile) archiveMap.get( project.getArtifact().getFile() );
String archivePath = archiveFile.getOutputName();
assertTrue( "Test includeBaseDirectory", archivePath.startsWith( "assembly/" ) );
}
@@ -127,7 +130,7 @@
assertTrue( "Test expected dependency artifacts in archive", archivedFiles.contains( expected.getFile() ) );
assertTrue( "Test expected dependency is not unpacked", expected.getFile().getName().endsWith( ".jar" ) );
- ArchiverStub.ArchiverFile archiveFile = (ArchiverStub.ArchiverFile) archiveMap.get( expected.getFile() );
+ JarArchiverStub.ArchiverFile archiveFile = (JarArchiverStub.ArchiverFile) archiveMap.get( expected.getFile() );
String archivePath = archiveFile.getOutputName();
String expectedName =
"libs/" + expected.getVersion() + "-" + expected.getArtifactId() + "-" + expected.getGroupId();
@@ -138,8 +141,8 @@
assertTrue( "Test project is in archive", archivedFiles.contains( project.getArtifact().getFile() ) );
assertTrue( "Test project is not unpacked", project.getArtifact().getFile().getName().endsWith( ".jar" ) );
- ArchiverStub.ArchiverFile archiveFile =
- (ArchiverStub.ArchiverFile) archiveMap.get( project.getArtifact().getFile() );
+ JarArchiverStub.ArchiverFile archiveFile =
+ (JarArchiverStub.ArchiverFile) archiveMap.get( project.getArtifact().getFile() );
String archivePath = archiveFile.getOutputName();
assertFalse( "Test includeBaseDirectory", archivePath.startsWith( "assembly/" ) );
}
@@ -166,7 +169,7 @@
assertTrue( "Test expected dependency artifacts in archive", archivedFiles.contains( expected.getFile() ) );
assertTrue( "Test expected dependency is not unpacked", expected.getFile().getName().endsWith( ".jar" ) );
- ArchiverStub.ArchiverFile archiveFile = (ArchiverStub.ArchiverFile) archiveMap.get( expected.getFile() );
+ JarArchiverStub.ArchiverFile archiveFile = (JarArchiverStub.ArchiverFile) archiveMap.get( expected.getFile() );
String archivePath = archiveFile.getOutputName();
String expectedName;
if ( StringUtils.isEmpty( expected.getClassifier() ) )
@@ -189,8 +192,8 @@
assertTrue( "Test project is in archive", archivedFiles.contains( project.getArtifact().getFile() ) );
assertTrue( "Test project is not unpacked", project.getArtifact().getFile().getName().endsWith( ".jar" ) );
- ArchiverStub.ArchiverFile archiveFile =
- (ArchiverStub.ArchiverFile) archiveMap.get( project.getArtifact().getFile() );
+ JarArchiverStub.ArchiverFile archiveFile =
+ (JarArchiverStub.ArchiverFile) archiveMap.get( project.getArtifact().getFile() );
String archivePath = archiveFile.getOutputName();
assertFalse( "Test includeBaseDirectory", archivePath.startsWith( "assembly/" ) );
}
@@ -219,8 +222,8 @@
assertTrue( "Test expected dependency is not unpacked",
expected.getFile().getName().endsWith( ".jar" ) );
- ArchiverStub.ArchiverFile archiveFile =
- (ArchiverStub.ArchiverFile) archiveMap.get( project.getArtifact().getFile() );
+ JarArchiverStub.ArchiverFile archiveFile =
+ (JarArchiverStub.ArchiverFile) archiveMap.get( project.getArtifact().getFile() );
String archivePath = archiveFile.getOutputName();
assertTrue( "Test includeBaseDirectory", archivePath.startsWith( "assembly/" ) );
}
@@ -234,8 +237,8 @@
assertTrue( "Test project is in archive", archivedFiles.contains( project.getArtifact().getFile() ) );
assertTrue( "Test project is not unpacked", project.getArtifact().getFile().getName().endsWith( ".jar" ) );
- ArchiverStub.ArchiverFile archiveFile =
- (ArchiverStub.ArchiverFile) archiveMap.get( project.getArtifact().getFile() );
+ JarArchiverStub.ArchiverFile archiveFile =
+ (JarArchiverStub.ArchiverFile) archiveMap.get( project.getArtifact().getFile() );
String archivePath = archiveFile.getOutputName();
assertTrue( "Test includeBaseDirectory", archivePath.startsWith( "assembly/" ) );
}
@@ -287,7 +290,7 @@
assertEquals( "Test archive adds", archiverFiles.size(), 1 );
File key = new File( basedir, "target/test-classes/fileSet" );
- ArchiverStub.ArchiverFile file = (ArchiverStub.ArchiverFile) archiverFiles.get( key );
+ JarArchiverStub.ArchiverFile file = (JarArchiverStub.ArchiverFile) archiverFiles.get( key );
assertNotNull( "Test expected FileSet", file );
assertNull( "Test includes", file.getIncludes() );
@@ -307,7 +310,7 @@
assertEquals( "Test archive adds", archiverFiles.size(), 1 );
File key = new File( basedir, "target/test-classes/fileSet" );
- ArchiverStub.ArchiverFile file = (ArchiverStub.ArchiverFile) archiverFiles.get( key );
+ JarArchiverStub.ArchiverFile file = (JarArchiverStub.ArchiverFile) archiverFiles.get( key );
assertNotNull( "Test expected FileSet", file );
assertNull( "Test includes", file.getIncludes() );
@@ -327,7 +330,7 @@
assertEquals( "Test archive adds", archiverFiles.size(), 1 );
File key = new File( basedir, "target/test-classes/fileSet" );
- ArchiverStub.ArchiverFile file = (ArchiverStub.ArchiverFile) archiverFiles.get( key );
+ JarArchiverStub.ArchiverFile file = (JarArchiverStub.ArchiverFile) archiverFiles.get( key );
assertNotNull( "Test expected FileSet", file );
assertTrue( "Test includes", assertEquals( new String[]{"**/*.txt"}, file.getIncludes() ) );
@@ -351,7 +354,7 @@
assertEquals( "Test archive adds", archiverFiles.size(), 1 );
File key = new File( basedir, "target/test-classes/fileSet" );
- ArchiverStub.ArchiverFile file = (ArchiverStub.ArchiverFile) archiverFiles.get( key );
+ JarArchiverStub.ArchiverFile file = (JarArchiverStub.ArchiverFile) archiverFiles.get( key );
assertNull( "Test original FileSet is not in archive", file );
File tempRoot = (File) getVariableValueFromObject( mojo, "tempRoot" );
@@ -391,7 +394,7 @@
assertEquals( "Test archive adds", archiverFiles.size(), 1 );
File key = new File( basedir, "target/test-classes/fileSet" );
- ArchiverStub.ArchiverFile file = (ArchiverStub.ArchiverFile) archiverFiles.get( key );
+ JarArchiverStub.ArchiverFile file = (JarArchiverStub.ArchiverFile) archiverFiles.get( key );
assertNull( "Test original FileSet is not in archive", file );
File tempRoot = (File) getVariableValueFromObject( mojo, "tempRoot" );
@@ -431,7 +434,7 @@
assertEquals( "Test archive adds", archiverFiles.size(), 1 );
File key = new File( basedir, "target/test-classes/fileSet" );
- ArchiverStub.ArchiverFile file = (ArchiverStub.ArchiverFile) archiverFiles.get( key );
+ JarArchiverStub.ArchiverFile file = (JarArchiverStub.ArchiverFile) archiverFiles.get( key );
assertNull( "Test original FileSet is not in archive", file );
File tempRoot = (File) getVariableValueFromObject( mojo, "tempRoot" );
@@ -471,7 +474,7 @@
assertEquals( "Test archive adds", archiverFiles.size(), 1 );
File key = new File( basedir, "target/test-classes/fileSet" );
- ArchiverStub.ArchiverFile file = (ArchiverStub.ArchiverFile) archiverFiles.get( key );
+ JarArchiverStub.ArchiverFile file = (JarArchiverStub.ArchiverFile) archiverFiles.get( key );
assertNull( "Test original FileSet is not in archive", file );
File tempRoot = (File) getVariableValueFromObject( mojo, "tempRoot" );
@@ -570,7 +573,7 @@
File archivedFile = (File) archiverFiles.keySet().iterator().next();
- ArchiverStub.ArchiverFile file = (ArchiverStub.ArchiverFile) archiverFiles.get( archivedFile );
+ JarArchiverStub.ArchiverFile file = (JarArchiverStub.ArchiverFile) archiverFiles.get( archivedFile );
assertEquals( "Test archive file path", "assembly/output/READTHIS.txt", file.getOutputName() );
@@ -636,7 +639,7 @@
assertTrue( "Test if archived file exists", archivedFile.exists() );
- ArchiverStub.ArchiverFile file = (ArchiverStub.ArchiverFile) archiverFiles.get( archivedFile );
+ JarArchiverStub.ArchiverFile file = (JarArchiverStub.ArchiverFile) archiverFiles.get( archivedFile );
assertEquals( "Test file mode", 777, file.getFileMode() );
}
@@ -1071,7 +1074,7 @@
Map files = ArchiverManagerStub.archiverStub.getFiles();
- File fileSetDir = new File( PlexusTestCase.getBasedir(), "target/test-classes/fileSet" );
+ File fileSetDir = new File( PlexusTestCase.getBasedir() + "/target/test-classes/fileSet" );
assertNotNull( "Test if FileSet is in the archive", files.remove( fileSetDir ) );
File componentXml = (File) files.keySet().iterator().next();
@@ -1081,6 +1084,62 @@
assertNotNull( "Test if componentXml is correctly created", Xpp3DomBuilder.build( fileReader ) );
assertTrue( "Test there are no more files in the archive", files.isEmpty() );
+ }
+
+ public void testIncludeSiteDirectory()
+ throws Exception
+ {
+ AssemblyMojo mojo = getMojo( "includeSite-plugin-config.xml" );
+
+ File siteDir = (File) getVariableValueFromObject( mojo, "siteDirectory" );
+
+ siteDir.mkdirs();
+
+ mojo.execute();
+
+ assertTrue( "Test an archive was created", ArchiverManagerStub.archiverStub.getDestFile().exists() );
+
+ Map files = ArchiverManagerStub.archiverStub.getFiles();
+
+ assertTrue( "Test if site directory was added", files.containsKey( siteDir ) );
+ }
+
+ public void testTarGzipArchive()
+ throws Exception
+ {
+ executeMojo( "tar-gz-plugin-config.xml" );
+
+ TarArchiver.TarCompressionMethod method = (TarArchiver.TarCompressionMethod) getVariableValueFromObject( ArchiverManagerStub.archiverStub, "tarCompressionMethod" );
+
+ assertEquals( "Test Tar compression method", "gzip", method.getValue() );
+
+ TarLongFileMode longFileMode = (TarLongFileMode) getVariableValueFromObject( ArchiverManagerStub.archiverStub, "longFileMode" );
+
+ assertTrue( "Test tar long file mode default", longFileMode.isWarnMode() );
+ }
+
+ public void testTarBzip2Archive()
+ throws Exception
+ {
+ executeMojo( "tar-bz2-plugin-config.xml" );
+
+ TarArchiver.TarCompressionMethod method = (TarArchiver.TarCompressionMethod) getVariableValueFromObject( ArchiverManagerStub.archiverStub, "tarCompressionMethod" );
+
+ assertEquals( "Test Tar compression method", "bzip2", method.getValue() );
+
+ TarLongFileMode longFileMode = (TarLongFileMode) getVariableValueFromObject( ArchiverManagerStub.archiverStub, "longFileMode" );
+
+ assertTrue( "Test tar long file mode default", longFileMode.isFailMode() );
+ }
+
+ public void testWarArchive()
+ throws Exception
+ {
+ executeMojo( "war-plugin-config.xml" );
+
+ WarArchiverStub archiver = (WarArchiverStub) ArchiverManagerStub.archiverStub;
+
+ assertFalse( "Test that web.xml is not ignored", archiver.getIgnoreWebxml() );
}
private AssemblyMojo getMojo( String pluginXml )
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java?rev=406856&r1=406855&r2=406856&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java Mon May 15 23:41:46 2006
@@ -10,12 +10,8 @@
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.model.Model;
import org.apache.maven.plugin.Mojo;
-import org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub;
-import org.apache.maven.plugin.assembly.stubs.ArchiverStub;
-import org.apache.maven.plugin.testing.stubs.ArtifactStub;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
-import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.UnArchiver;
@@ -31,7 +27,6 @@
import java.io.IOException;
import java.io.Writer;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/ArchiverManagerStub.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/ArchiverManagerStub.java?rev=406856&r1=406855&r2=406856&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/ArchiverManagerStub.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/ArchiverManagerStub.java Mon May 15 23:41:46 2006
@@ -29,7 +29,7 @@
public class ArchiverManagerStub
implements ArchiverManager
{
- public static ArchiverStub archiverStub;
+ public static Archiver archiverStub;
public static UnArchiverStub unArchiverStub;
@@ -49,20 +49,24 @@
{
archiverStub = new DirectoryArchiverStub();
}
- else if ( "jar".equals( string ) )
+ else if ( "tar".equals( string ) )
{
-
+ archiverStub = new TarArchiverStub();
+ }
+ else if ( "war".equals( string ) )
+ {
+ archiverStub = new WarArchiverStub();
}
else
{
- archiverStub = new ArchiverStub();
+ archiverStub = new JarArchiverStub();
}
}
return archiverStub;
}
- public void setArchiver( ArchiverStub archiver )
+ public void setArchiver( JarArchiverStub archiver )
{
archiverStub = archiver;
}
@@ -103,7 +107,7 @@
{
if ( archiverStub == null )
{
- archiverStub = new ArchiverStub();
+ archiverStub = new JarArchiverStub();
}
return archiverStub;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/DirectoryArchiverStub.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/DirectoryArchiverStub.java?rev=406856&r1=406855&r2=406856&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/DirectoryArchiverStub.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/DirectoryArchiverStub.java Mon May 15 23:41:46 2006
@@ -24,7 +24,7 @@
* @author Allan Ramirez
*/
public class DirectoryArchiverStub
- extends ArchiverStub
+ extends JarArchiverStub
{
public void createArchive()
throws ArchiverException, IOException
Copied: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/JarArchiverStub.java (from r406791, maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/ArchiverStub.java)
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/JarArchiverStub.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/JarArchiverStub.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/ArchiverStub.java&r1=406791&r2=406856&rev=406856&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/ArchiverStub.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/JarArchiverStub.java Mon May 15 23:41:46 2006
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.jar.JarArchiver;
@@ -28,7 +27,7 @@
/**
* @author Edwin Punzalan
*/
-public class ArchiverStub
+public class JarArchiverStub
extends JarArchiver
{
private Map files = new HashMap();
Added: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/TarArchiverStub.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/TarArchiverStub.java?rev=406856&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/TarArchiverStub.java (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/TarArchiverStub.java Mon May 15 23:41:46 2006
@@ -0,0 +1,227 @@
+package org.apache.maven.plugin.assembly.stubs;
+
+/*
+ * Copyright 2001-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.codehaus.plexus.archiver.tar.TarArchiver;
+import org.codehaus.plexus.archiver.tar.TarLongFileMode;
+import org.codehaus.plexus.archiver.ArchiverException;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * @author Edwin Punzalan
+ */
+public class TarArchiverStub
+ extends TarArchiver
+{
+ private Map files = new HashMap();
+
+ private File destFile;
+
+ private int fileMode = 0;
+
+ private int dirMode = 0;
+
+ private boolean includeEmptyDirs = false;
+
+ private TarCompressionMethod tarCompressionMethod;
+
+ private TarLongFileMode longFileMode;
+
+ public void setLongfile( TarLongFileMode mode )
+ {
+ this.longFileMode = mode;
+ }
+
+ public void setCompression( TarCompressionMethod mode )
+ {
+ tarCompressionMethod = mode;
+ }
+
+ public void createArchive()
+ throws ArchiverException, IOException
+ {
+ destFile.getParentFile().mkdirs();
+ destFile.delete();
+
+ if ( !destFile.createNewFile() )
+ {
+ throw new ArchiverException( "Unable to create archive file: " + destFile.getAbsolutePath() );
+ }
+ }
+
+ public void addDirectory( File file )
+ throws ArchiverException
+ {
+ addDirectory( file, "" );
+ }
+
+ public void addDirectory( File file, String string )
+ throws ArchiverException
+ {
+ addDirectory( file, string, null, null );
+ }
+
+ public void addDirectory( File file, String[] strings, String[] strings1 )
+ throws ArchiverException
+ {
+ addDirectory( file, file.getName(), strings, strings1 );
+ }
+
+ public void addDirectory( File file, String string, String[] includes, String[] excludes )
+ throws ArchiverException
+ {
+ System.out.println( "Adding dir " + file.getPath() );
+
+ files.put( file, new ArchiverFile( file, string, includes, excludes ) );
+ }
+
+ public void addFile( File file, String string )
+ throws ArchiverException
+ {
+ addFile( file, string, 0 );
+ }
+
+ public void addFile( File file, String string, int i )
+ throws ArchiverException
+ {
+ System.out.println( "Adding file " + file.getPath() );
+
+ ArchiverFile archiverFile = new ArchiverFile( file, string, null, null );
+
+ archiverFile.setFileMode( i );
+
+ files.put( file, archiverFile );
+ }
+
+ public File getDestFile()
+ {
+ return destFile;
+ }
+
+ public void setDestFile( File file )
+ {
+ destFile = file;
+ }
+
+ public void setDefaultFileMode( int i )
+ {
+ fileMode = i;
+ }
+
+ public int getDefaultFileMode()
+ {
+ return fileMode;
+ }
+
+ public void setDefaultDirectoryMode( int i )
+ {
+ dirMode = i;
+ }
+
+ public int getDefaultDirectoryMode()
+ {
+ return dirMode;
+ }
+
+ public boolean getIncludeEmptyDirs()
+ {
+ return includeEmptyDirs;
+ }
+
+ public void setIncludeEmptyDirs( boolean b )
+ {
+ includeEmptyDirs = b;
+ }
+
+ public Map getFiles()
+ {
+ return files;
+ }
+
+ public class ArchiverFile
+ {
+ private File file;
+
+ private String outputName;
+
+ private String[] includes, excludes;
+
+ private int fileMode;
+
+ private ArchiverFile( File file, String outputName, String[] includes, String[] excludes )
+ {
+ this.file = file;
+ this.outputName = outputName;
+ this.includes = includes;
+ this.excludes = excludes;
+ }
+
+ public File getFile()
+ {
+ return file;
+ }
+
+ public void setFile( File file )
+ {
+ this.file = file;
+ }
+
+ public String getOutputName()
+ {
+ return outputName;
+ }
+
+ public void setOutputName( String outputName )
+ {
+ this.outputName = outputName;
+ }
+
+ public String[] getIncludes()
+ {
+ return includes;
+ }
+
+ public void setIncludes( String[] includes )
+ {
+ this.includes = includes;
+ }
+
+ public String[] getExcludes()
+ {
+ return excludes;
+ }
+
+ public void setExcludes( String[] excludes )
+ {
+ this.excludes = excludes;
+ }
+
+ public int getFileMode()
+ {
+ return fileMode;
+ }
+
+ public void setFileMode( int fileMode )
+ {
+ this.fileMode = fileMode;
+ }
+ }
+}
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/TarArchiverStub.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/WarArchiverStub.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/WarArchiverStub.java?rev=406856&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/WarArchiverStub.java (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/WarArchiverStub.java Mon May 15 23:41:46 2006
@@ -0,0 +1,224 @@
+package org.apache.maven.plugin.assembly.stubs;
+
+/*
+ * Copyright 2001-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.codehaus.plexus.archiver.war.WarArchiver;
+import org.codehaus.plexus.archiver.ArchiverException;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * @author Edwin Punzalan
+ */
+public class WarArchiverStub
+ extends WarArchiver
+{
+ private Map files = new HashMap();
+
+ private File destFile;
+
+ private int fileMode = 0;
+
+ private int dirMode = 0;
+
+ private boolean includeEmptyDirs = false;
+
+ private boolean ignoreWebxml = false;
+
+ public void createArchive()
+ throws ArchiverException, IOException
+ {
+ destFile.getParentFile().mkdirs();
+ destFile.delete();
+
+ if ( !destFile.createNewFile() )
+ {
+ throw new ArchiverException( "Unable to create archive file: " + destFile.getAbsolutePath() );
+ }
+ }
+
+ public void addDirectory( File file )
+ throws ArchiverException
+ {
+ addDirectory( file, "" );
+ }
+
+ public void addDirectory( File file, String string )
+ throws ArchiverException
+ {
+ addDirectory( file, string, null, null );
+ }
+
+ public void addDirectory( File file, String[] strings, String[] strings1 )
+ throws ArchiverException
+ {
+ addDirectory( file, file.getName(), strings, strings1 );
+ }
+
+ public void addDirectory( File file, String string, String[] includes, String[] excludes )
+ throws ArchiverException
+ {
+ System.out.println( "Adding dir " + file.getPath() );
+
+ files.put( file, new ArchiverFile( file, string, includes, excludes ) );
+ }
+
+ public void addFile( File file, String string )
+ throws ArchiverException
+ {
+ addFile( file, string, 0 );
+ }
+
+ public void addFile( File file, String string, int i )
+ throws ArchiverException
+ {
+ System.out.println( "Adding file " + file.getPath() );
+
+ ArchiverFile archiverFile = new ArchiverFile( file, string, null, null );
+
+ archiverFile.setFileMode( i );
+
+ files.put( file, archiverFile );
+ }
+
+ public File getDestFile()
+ {
+ return destFile;
+ }
+
+ public void setDestFile( File file )
+ {
+ destFile = file;
+ }
+
+ public void setDefaultFileMode( int i )
+ {
+ fileMode = i;
+ }
+
+ public int getDefaultFileMode()
+ {
+ return fileMode;
+ }
+
+ public void setDefaultDirectoryMode( int i )
+ {
+ dirMode = i;
+ }
+
+ public int getDefaultDirectoryMode()
+ {
+ return dirMode;
+ }
+
+ public boolean getIncludeEmptyDirs()
+ {
+ return includeEmptyDirs;
+ }
+
+ public void setIncludeEmptyDirs( boolean b )
+ {
+ includeEmptyDirs = b;
+ }
+
+ public Map getFiles()
+ {
+ return files;
+ }
+
+ public void setIgnoreWebxml( boolean ignore )
+ {
+ this.ignoreWebxml = ignore;
+ }
+
+ public boolean getIgnoreWebxml()
+ {
+ return ignoreWebxml;
+ }
+
+ public class ArchiverFile
+ {
+ private File file;
+
+ private String outputName;
+
+ private String[] includes, excludes;
+
+ private int fileMode;
+
+ private ArchiverFile( File file, String outputName, String[] includes, String[] excludes )
+ {
+ this.file = file;
+ this.outputName = outputName;
+ this.includes = includes;
+ this.excludes = excludes;
+ }
+
+ public File getFile()
+ {
+ return file;
+ }
+
+ public void setFile( File file )
+ {
+ this.file = file;
+ }
+
+ public String getOutputName()
+ {
+ return outputName;
+ }
+
+ public void setOutputName( String outputName )
+ {
+ this.outputName = outputName;
+ }
+
+ public String[] getIncludes()
+ {
+ return includes;
+ }
+
+ public void setIncludes( String[] includes )
+ {
+ this.includes = includes;
+ }
+
+ public String[] getExcludes()
+ {
+ return excludes;
+ }
+
+ public void setExcludes( String[] excludes )
+ {
+ this.excludes = excludes;
+ }
+
+ public int getFileMode()
+ {
+ return fileMode;
+ }
+
+ public void setFileMode( int fileMode )
+ {
+ this.fileMode = fileMode;
+ }
+ }
+}
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/WarArchiverStub.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/includeSite-plugin-config.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/includeSite-plugin-config.xml?rev=406856&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/includeSite-plugin-config.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/includeSite-plugin-config.xml Mon May 15 23:41:46 2006
@@ -0,0 +1,43 @@
+<!--
+ ~ Copyright 2001-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <outputDirectory>${basedir}/target/test-harness/assembly/includeSite/target</outputDirectory>
+ <finalName>assembly</finalName>
+ <workDirectory>${basedir}/target/test-harness/assembly/includeSite/work</workDirectory>
+ <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
+ <localRepository>${localRepository}</localRepository>
+ <reactorProjects></reactorProjects>
+ <classifier></classifier>
+ <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
+ <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
+ <descriptor>${basedir}/src/test/resources/assemblies/simple.xml</descriptor>
+ <tarLongFileMode>warn</tarLongFileMode>
+ <basedir>${basedir}</basedir>
+ <tempRoot>${basedir}/target/test-harness/assembly/includeSite/archive-tmp</tempRoot>
+ <siteDirectory>${basedir}/target/test-harness/assembly/includeSite/site</siteDirectory>
+ <includeSite>true</includeSite>
+ <appendAssemblyId>false</appendAssemblyId>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/includeSite-plugin-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/tar-bz2-plugin-config.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/tar-bz2-plugin-config.xml?rev=406856&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/tar-bz2-plugin-config.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/tar-bz2-plugin-config.xml Mon May 15 23:41:46 2006
@@ -0,0 +1,43 @@
+<!--
+ ~ Copyright 2001-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <outputDirectory>${basedir}/target/test-harness/assembly/tar-bz2/target</outputDirectory>
+ <finalName>assembly</finalName>
+ <workDirectory>${basedir}/target/test-harness/assembly/tar-bz2/work</workDirectory>
+ <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
+ <localRepository>${localRepository}</localRepository>
+ <reactorProjects></reactorProjects>
+ <classifier></classifier>
+ <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
+ <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
+ <descriptor>${basedir}/src/test/resources/assemblies/tar-bz2.xml</descriptor>
+ <tarLongFileMode>fail</tarLongFileMode>
+ <basedir>${basedir}</basedir>
+ <tempRoot>${basedir}/target/test-harness/assembly/tar-bz2/archive-tmp</tempRoot>
+ <siteDirectory>${basedir}/target/test-harness/assembly/tar-bz2/site</siteDirectory>
+ <includeSite>false</includeSite>
+ <appendAssemblyId>false</appendAssemblyId>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/tar-bz2-plugin-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/tar-gz-plugin-config.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/tar-gz-plugin-config.xml?rev=406856&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/tar-gz-plugin-config.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/tar-gz-plugin-config.xml Mon May 15 23:41:46 2006
@@ -0,0 +1,43 @@
+<!--
+ ~ Copyright 2001-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <outputDirectory>${basedir}/target/test-harness/assembly/tar-gz/target</outputDirectory>
+ <finalName>assembly</finalName>
+ <workDirectory>${basedir}/target/test-harness/assembly/tar-gz/work</workDirectory>
+ <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
+ <localRepository>${localRepository}</localRepository>
+ <reactorProjects></reactorProjects>
+ <classifier></classifier>
+ <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
+ <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
+ <descriptor>${basedir}/src/test/resources/assemblies/tar-gz.xml</descriptor>
+ <tarLongFileMode>warn</tarLongFileMode>
+ <basedir>${basedir}</basedir>
+ <tempRoot>${basedir}/target/test-harness/assembly/tar-gz/archive-tmp</tempRoot>
+ <siteDirectory>${basedir}/target/test-harness/assembly/tar-gz/site</siteDirectory>
+ <includeSite>false</includeSite>
+ <appendAssemblyId>false</appendAssemblyId>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/tar-gz-plugin-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/war-plugin-config.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/war-plugin-config.xml?rev=406856&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/war-plugin-config.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/war-plugin-config.xml Mon May 15 23:41:46 2006
@@ -0,0 +1,43 @@
+<!--
+ ~ Copyright 2001-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <outputDirectory>${basedir}/target/test-harness/assembly/war/target</outputDirectory>
+ <finalName>assembly</finalName>
+ <workDirectory>${basedir}/target/test-harness/assembly/war/work</workDirectory>
+ <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
+ <localRepository>${localRepository}</localRepository>
+ <reactorProjects></reactorProjects>
+ <classifier></classifier>
+ <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
+ <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
+ <descriptor>${basedir}/src/test/resources/assemblies/war.xml</descriptor>
+ <tarLongFileMode>warn</tarLongFileMode>
+ <basedir>${basedir}</basedir>
+ <tempRoot>${basedir}/target/test-harness/assembly/war/archive-tmp</tempRoot>
+ <siteDirectory>${basedir}/target/test-harness/assembly/war/site</siteDirectory>
+ <includeSite>false</includeSite>
+ <appendAssemblyId>false</appendAssemblyId>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/war-plugin-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/tar-bz2.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/tar-bz2.xml?rev=406856&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/tar-bz2.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/tar-bz2.xml Mon May 15 23:41:46 2006
@@ -0,0 +1,30 @@
+<!--
+ ~ Copyright 2001-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<assembly>
+ <id>simple</id>
+ <formats>
+ <format>tar.bz2</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>target/test-harness/assembly/tar-bz2/target</directory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/tar-bz2.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/tar-gz.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/tar-gz.xml?rev=406856&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/tar-gz.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/tar-gz.xml Mon May 15 23:41:46 2006
@@ -0,0 +1,30 @@
+<!--
+ ~ Copyright 2001-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<assembly>
+ <id>simple</id>
+ <formats>
+ <format>tar.gz</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>target/test-harness/assembly/tar-gz/target</directory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/tar-gz.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/war.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/war.xml?rev=406856&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/war.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/war.xml Mon May 15 23:41:46 2006
@@ -0,0 +1,30 @@
+<!--
+ ~ Copyright 2001-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<assembly>
+ <id>simple</id>
+ <formats>
+ <format>war</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>target/test-harness/assembly/war/target</directory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/war.xml
------------------------------------------------------------------------------
svn:eol-style = native