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/18 12:40:34 UTC

svn commit: r407515 - in /maven/plugins/trunk/maven-assembly-plugin/src: main/java/org/apache/maven/plugin/assembly/ test/java/org/apache/maven/plugin/assembly/ test/java/org/apache/maven/plugin/assembly/stubs/ test/plugin-configs/assembly/ test/plugin...

Author: epunzalan
Date: Thu May 18 03:40:31 2006
New Revision: 407515

URL: http://svn.apache.org/viewvc?rev=407515&view=rev
Log:
PR: MASSEMBLY-88

Adding more test cases with some exception tests

Added:
    maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/NoSuchArchiverException-plugin-config.xml   (with props)
    maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileItem-filter-file-plugin-config.xml   (with props)
    maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/manifestFile-FileNotFoundException-plugin-config.xml   (with props)
    maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/attached/
    maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/attached/min-plugin-config.xml   (with props)
    maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/NoSuchArchiverException.xml   (with props)
    maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileItem-filter-file.xml   (with props)
Modified:
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java
    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/stubs/ArchiverManagerStub.java

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java?rev=407515&r1=407514&r2=407515&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java Thu May 18 03:40:31 2006
@@ -1619,6 +1619,7 @@
         assembly.addFileSet( siteFileSet );
     }
 
+    //@todo should only run once or know when it has already initialized
     private void initializeFiltering()
         throws MojoExecutionException
     {

Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java?rev=407515&r1=407514&r2=407515&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 Thu May 18 03:40:31 2006
@@ -18,6 +18,8 @@
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.Mojo;
 import org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub;
 import org.apache.maven.plugin.assembly.stubs.JarArchiverStub;
 import org.apache.maven.plugin.assembly.stubs.ReactorMavenProjectStub;
@@ -28,6 +30,7 @@
 import org.codehaus.plexus.archiver.jar.Manifest;
 import org.codehaus.plexus.archiver.tar.TarArchiver;
 import org.codehaus.plexus.archiver.tar.TarLongFileMode;
+import org.codehaus.plexus.archiver.ArchiverException;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
@@ -678,7 +681,7 @@
         assertTrue( "Test if archived file exists", archivedFile.exists() );
 
         String contents = FileUtils.fileRead( archivedFile.getAbsolutePath() );
-        
+
         assertTrue( "Test if file filtering is disabled", contents.indexOf( "${project.artifactId}" ) >= 0 );
     }
 
@@ -702,6 +705,34 @@
         assertTrue( "Test if file filtering is enabled", contents.indexOf( "${project.artifactId}" ) < 0 );
     }
 
+    public void testFileItemFilteringWithFilterFile()
+        throws Exception
+    {
+        generateTestFileSets( "\n" );
+
+        File filterFile = new File( basedir, "target/test-classes/fileSet/filterFile.properties" );
+
+        String fileContents = "sentence=This sentence came from a filter file.";
+
+        FileUtils.fileWrite( filterFile.getAbsolutePath(), fileContents );
+
+        executeMojo( "fileItem-filter-file-plugin-config.xml" );
+
+        Map archiverFiles = ArchiverManagerStub.archiverStub.getFiles();
+
+        assertEquals( "Test archive files", 1, archiverFiles.size() );
+
+        File archivedFile = (File) archiverFiles.keySet().iterator().next();
+
+        assertTrue( "Test if archived file exists", archivedFile.exists() );
+
+        String contents = FileUtils.fileRead( archivedFile.getAbsolutePath() );
+
+        assertTrue( "Test if file filtering for ${project} is enabled", contents.indexOf( "${project.artifactId}" ) < 0 );
+
+        assertTrue( "Test if file filtering for ${sentence} is enabled", contents.indexOf( "${sentence}" ) < 0 );
+    }
+
     public void testFileItemLineEndings()
         throws Exception
     {
@@ -1148,7 +1179,7 @@
 
         File fileSetDir = new File( PlexusTestCase.getBasedir(), "target/test-classes/fileSet" );
         assertNotNull( "Test if FileSet is in the archive", archivedFiles.remove( fileSetDir ) );
-        
+
         File readme = new File( PlexusTestCase.getBasedir(), "target/test-classes/fileSet/README.txt" );
         assertNotNull( "Test if FileItem README.txt is in the archive", archivedFiles.remove( readme ) );
 
@@ -1275,6 +1306,111 @@
         manifest.write( new PrintWriter( System.out ) );
     }
 
+    public void testManifestFileNotFoundException()
+        throws Exception
+    {
+        try
+        {
+            executeMojo( "manifestFile-FileNotFoundException-plugin-config.xml" );
+
+            fail( "Expected exception not thrown" );
+        }
+        catch ( MojoFailureException e )
+        {
+            assertTrue( "Test for expected exception", e.getMessage().startsWith( "Manifest not found: " ) );
+        }
+    }
+
+    public void testNoSuchArchiverException()
+        throws Exception
+    {
+        try
+        {
+            executeMojo( "NoSuchArchiverException-plugin-config.xml" );
+
+            fail( "Expected exception not thrown" );
+        }
+        catch ( MojoFailureException e )
+        {
+            assertTrue( "Test for expected exception", e.getMessage().startsWith( "Unable to obtain archiver for extension" ) );
+        }
+    }
+
+    public void testArchiverExceptionOnAddDirectoryMethod()
+        throws Exception
+    {
+        generateTestFileSets( "\n" );
+
+        AssemblyMojo mojo = getMojo( "fileSet-plugin-config.xml" );
+
+        ArchiverManagerStub.archiverStub = new JarArchiverStub()
+        {
+            public void addDirectory( File file, String string, String[] includes, String[] excludes )
+                throws ArchiverException
+            {
+                throw new ArchiverException( "Intentional exception" );
+            }
+        };
+
+        try
+        {
+            mojo.execute();
+
+            fail( "Expected exception not thrown" );
+        }
+        catch ( MojoExecutionException e )
+        {
+            assertTrue( "Test thrown exception", e.getMessage().startsWith( "Error adding directory to archive: ") );
+        }
+    }
+
+    public void testArchiverExceptionInModuleSet()
+        throws Exception
+    {
+        AssemblyMojo mojo = getMojo( "moduleSet-plugin-config.xml" );
+
+        MavenProject project = (MavenProject) getVariableValueFromObject( mojo, "executedProject" );
+
+        List reactorProjectsList = (List) getVariableValueFromObject( mojo, "reactorProjects" );
+
+        for ( Iterator reactorProjects = reactorProjectsList.iterator(); reactorProjects.hasNext(); )
+        {
+            MavenProject reactorProject = (MavenProject) reactorProjects.next();
+
+            reactorProject.setParent( project );
+        }
+
+        ArchiverManagerStub.archiverStub = new JarArchiverStub()
+        {
+            public void addDirectory( File file, String string, String[] includes, String[] excludes )
+                throws ArchiverException
+            {
+                throw new ArchiverException( "Intentional exception" );
+            }
+        };
+
+        try
+        {
+            mojo.execute();
+
+            fail( "Expected exception not thrown" );
+        }
+        catch ( MojoExecutionException e )
+        {
+            assertTrue( "Test thrown exception", e.getMessage().startsWith( "Error adding directory to archive: ") );
+        }
+    }
+
+    public void testAttachedMojo()
+        throws Exception
+    {
+        Mojo mojo = lookupMojo( "attached", basedir + "/src/test/plugin-configs/attached/min-plugin-config.xml" );
+
+        mojo.execute();
+
+        assertTrue( "Test an archive was created", ArchiverManagerStub.archiverStub.getDestFile().exists() );
+    }
+
     private AssemblyMojo getMojo( String pluginXml )
         throws Exception
     {
@@ -1318,12 +1454,12 @@
     {
         generateTestFileSets( basedir, lineEnding );
     }
-    
+
     static void generateTestFileSets( String basedir, String lineEnding )
         throws Exception
     {
         String fileSetDir = basedir + "/target/test-classes/fileSet";
-     
+
         /* ensure that we start with a fresh dir, else we get all manner of dross from other tests */
         FileUtils.deleteDirectory(fileSetDir);
 
@@ -1345,7 +1481,7 @@
             "limitations under the License.";
         FileUtils.fileWrite( fileSetDir + "/LICENSE.txt", fileContents );
 
-        fileContents = "Readme file with only one line for ${project.artifactId}.";
+        fileContents = "Readme file with only one line for ${project.artifactId}. ${sentence}";
         FileUtils.fileWrite( fileSetDir + "/README.txt", fileContents );
 
         fileContents = "sample configuration file line 1" + lineEnding + "sample configuration file line 2" +

Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/ArchiverManagerStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/ArchiverManagerStub.java?rev=407515&r1=407514&r2=407515&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 Thu May 18 03:40:31 2006
@@ -57,9 +57,14 @@
             {
                 archiverStub = new WarArchiverStub();
             }
-            else
+            else if ( "zip".equals( string ) ||
+                      "jar".equals( string ) )
             {
                 archiverStub = new JarArchiverStub();
+            }
+            else
+            {
+                throw new NoSuchArchiverException( string );
             }
         }
 

Added: maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/NoSuchArchiverException-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/NoSuchArchiverException-plugin-config.xml?rev=407515&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/NoSuchArchiverException-plugin-config.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/NoSuchArchiverException-plugin-config.xml Thu May 18 03:40:31 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/NoSuchArchiverException/target</outputDirectory>
+          <finalName>assembly</finalName>
+          <workDirectory>${basedir}/target/test-harness/assembly/NoSuchArchiverException/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/NoSuchArchiverException.xml</descriptor>
+          <tarLongFileMode>warn</tarLongFileMode>
+          <basedir>${basedir}</basedir>
+          <tempRoot>${basedir}/target/test-harness/assembly/NoSuchArchiverException/archive-tmp</tempRoot>
+          <siteDirectory>${basedir}/target/test-harness/assembly/NoSuchArchiverException/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/NoSuchArchiverException-plugin-config.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileItem-filter-file-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileItem-filter-file-plugin-config.xml?rev=407515&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileItem-filter-file-plugin-config.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileItem-filter-file-plugin-config.xml Thu May 18 03:40:31 2006
@@ -0,0 +1,48 @@
+<!--
+  ~ 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/fileItem-filter-file/target</outputDirectory>
+          <finalName>assembly</finalName>
+          <workDirectory>${basedir}/target/test-harness/assembly/fileItem-filter-file/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" />
+          <descriptorRefs>
+            <descriptorRef>fileItem-filter-file</descriptorRef>
+          </descriptorRefs>
+          <tarLongFileMode>warn</tarLongFileMode>
+          <filters>
+            <filter>target/test-classes/fileSet/filterFile.properties</filter>
+          </filters>
+          <basedir>${basedir}</basedir>
+          <tempRoot>${basedir}/target/test-harness/assembly/fileItem-filter-file/archive-tmp</tempRoot>
+          <siteDirectory>${basedir}/target/test-harness/assembly/fileItem-filter-file/site</siteDirectory>
+          <includeSite>false</includeSite>
+          <appendAssemblyId>true</appendAssemblyId>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Propchange: maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileItem-filter-file-plugin-config.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/manifestFile-FileNotFoundException-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/manifestFile-FileNotFoundException-plugin-config.xml?rev=407515&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/manifestFile-FileNotFoundException-plugin-config.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/manifestFile-FileNotFoundException-plugin-config.xml Thu May 18 03:40:31 2006
@@ -0,0 +1,46 @@
+<!--
+  ~ 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/manifestFile-NoSuchFileException/target</outputDirectory>
+          <finalName>assembly</finalName>
+          <workDirectory>${basedir}/target/test-harness/assembly/manifestFile-NoSuchFileException/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/manifestFile-NoSuchFileException/archive-tmp</tempRoot>
+          <siteDirectory>${basedir}/target/test-harness/assembly/manifestFile-NoSuchFileException/site</siteDirectory>
+          <includeSite>false</includeSite>
+          <appendAssemblyId>false</appendAssemblyId>
+          <archive>
+            <manifestFile>${basedir}/target/test-harness/assembly/manifestFile/no-such-manifest.file</manifestFile>
+          </archive>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Propchange: maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/manifestFile-FileNotFoundException-plugin-config.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/attached/min-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/attached/min-plugin-config.xml?rev=407515&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/attached/min-plugin-config.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/attached/min-plugin-config.xml Thu May 18 03:40:31 2006
@@ -0,0 +1,42 @@
+<!--
+  ~ 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/attached/min/target</outputDirectory>
+          <finalName>assembly</finalName>
+          <workDirectory>${basedir}/target/test-harness/attached/min/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" />
+          <descriptor>${basedir}/src/test/resources/assemblies/simple.xml</descriptor>
+          <tarLongFileMode>warn</tarLongFileMode>
+          <basedir>${basedir}</basedir>
+          <tempRoot>${basedir}/target/test-harness/attached/min/archive-tmp</tempRoot>
+          <siteDirectory>${basedir}/target/test-harness/attached/min/site</siteDirectory>
+          <includeSite>false</includeSite>
+          <appendAssemblyId>false</appendAssemblyId>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Propchange: maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/attached/min-plugin-config.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/NoSuchArchiverException.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/NoSuchArchiverException.xml?rev=407515&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/NoSuchArchiverException.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/NoSuchArchiverException.xml Thu May 18 03:40:31 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>txt</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <directory>target/test-harness/assembly/min/target</directory>
+      <includes>
+        <include>*.jar</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+</assembly>

Propchange: maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/NoSuchArchiverException.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileItem-filter-file.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileItem-filter-file.xml?rev=407515&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileItem-filter-file.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileItem-filter-file.xml Thu May 18 03:40:31 2006
@@ -0,0 +1,28 @@
+<!--
+  ~ 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>fileItem</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <files>
+    <file>
+      <source>target/test-classes/fileSet/README.txt</source>
+      <filtered>true</filtered>
+    </file>
+  </files>
+</assembly>

Propchange: maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileItem-filter-file.xml
------------------------------------------------------------------------------
    svn:eol-style = native