maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdca...@apache.org
Subject svn commit: r421628 [2/2] - in /maven/plugins/branches/MASSEMBLY-45: ./ src/main/java/org/apache/maven/plugin/assembly/ src/main/java/org/apache/maven/plugin/assembly/mappers/ src/main/mdo/ src/test/java/org/apache/maven/plugin/assembly/ src/test/java/...
Date Thu, 13 Jul 2006 13:46:07 GMT
Modified: maven/plugins/branches/MASSEMBLY-45/src/test/java/org/apache/maven/plugin/assembly/DirectoryInlineMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-45/src/test/java/org/apache/maven/plugin/assembly/DirectoryInlineMojoTest.java?rev=421628&r1=421417&r2=421628&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-45/src/test/java/org/apache/maven/plugin/assembly/DirectoryInlineMojoTest.java
(original)
+++ maven/plugins/branches/MASSEMBLY-45/src/test/java/org/apache/maven/plugin/assembly/DirectoryInlineMojoTest.java
Thu Jul 13 06:46:05 2006
@@ -1,14 +1,19 @@
 package org.apache.maven.plugin.assembly;
 
-import org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub;
-import org.apache.maven.plugin.testing.AbstractMojoTestCase;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.artifact.Artifact;
-
 import java.io.File;
+import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
-import java.util.Iterator;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.model.Model;
+import org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub;
+import org.apache.maven.plugin.assembly.stubs.CountingArchiver;
+import org.apache.maven.plugin.testing.AbstractMojoTestCase;
+import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.archiver.manager.ArchiverManager;
+import org.codehaus.plexus.util.FileUtils;
+import org.easymock.MockControl;
 
 /*
  * Copyright 2001-2006 The Apache Software Foundation.
@@ -27,25 +32,83 @@
  */
 
 public class DirectoryInlineMojoTest
-extends AbstractMojoTestCase
+    extends AbstractMojoTestCase
 {
+    private MockManager mockManager = new MockManager();
+
+    private MockControl archiverManagerControl;
+
+    private ArchiverManager archiverManager;
+
+    public void setUp()
+        throws Exception
+    {
+        super.setUp();
+
+        archiverManagerControl = MockControl.createControl( ArchiverManager.class );
+        mockManager.add( archiverManagerControl );
+
+        archiverManager = (ArchiverManager) archiverManagerControl.getMock();
+    }
+
+    public void tearDown()
+        throws Exception
+    {
+        super.tearDown();
+
+        TestUtils.cleanUp();
+    }
+
     public void testAssemblyDirectory()
         throws Exception
     {
-        File testPom = new File( getBasedir(),
-                                 "src/test/plugin-configs/directory-inline/min-plugin-config.xml"
);
+        File basedir = TestUtils.createTempBasedir();
 
-        DirectoryInlineMojo mojo = ( DirectoryInlineMojo ) lookupMojo( "directory-inline",
testPom );
+        // prepare the dir structure...
+        File fileSource = new File( basedir, "target/test-harness/assembly/min/target" );
+        fileSource.mkdirs();
+        
+        File sourceJar = TestUtils.findFileForClasspathResource( "test-fodder/assembly.jar"
);
+        FileUtils.copyFile( sourceJar, new File( fileSource, "assembly.jar" ) );
+        
+        DirectoryMojo mojo = new DirectoryMojo();
 
-        assertNotNull( mojo );
+        File descriptor = TestUtils.findFileForClasspathResource( "assemblies/simple.xml"
);
 
-        mojo.execute();
+        mojo.setDescriptor( descriptor );
 
-        Map filesArchived = ArchiverManagerStub.archiverStub.getFiles();
+        mojo.setBasedir( basedir );
+        mojo.setFinalName( "directory-inline-min" );
+        mojo.setAppendAssemblyId( true );
 
-        Set files = filesArchived.keySet();
+        Model model = new Model();
+
+        model.setGroupId( "directory-inline-tests" );
+        model.setArtifactId( "min" );
+        model.setVersion( "1.0" );
+
+        File outputDir = new File( basedir, "target/test-harness/directory-inline/min/target"
);
+
+        mojo.setOutputDirectory( outputDir );
+
+        MavenProject project = new MavenProject( model );
+
+        mojo.setProject( project );
+
+        CountingArchiver archiver = new CountingArchiver();
+
+        archiverManager.getArchiver( "dir" );
+        archiverManagerControl.setReturnValue( archiver );
+
+        mojo.setArchiverManager( archiverManager );
+
+        mockManager.replayAll();
+
+        mojo.execute();
+
+        assertEquals( 1, archiver.getFileCount() );
 
-        assertEquals( 1, files.size() );
+        mockManager.verifyAll();
     }
 
     public void testDependencySet()
@@ -54,11 +117,11 @@
         File testPom = new File( getBasedir(),
                                  "src/test/plugin-configs/directory-inline/dependency-set-plugin-config.xml"
);
 
-        DirectoryInlineMojo mojo = ( DirectoryInlineMojo ) lookupMojo( "directory-inline",
testPom );
+        DirectoryInlineMojo mojo = (DirectoryInlineMojo) lookupMojo( "directory-inline",
testPom );
 
         assertNotNull( mojo );
 
-        MavenProject project = ( MavenProject ) getVariableValueFromObject( mojo, "project"
);
+        MavenProject project = (MavenProject) getVariableValueFromObject( mojo, "project"
);
 
         Set artifacts = project.getArtifacts();
 
@@ -68,9 +131,9 @@
 
         Set files = filesArchived.keySet();
 
-        for( Iterator iter = artifacts.iterator(); iter.hasNext(); )
+        for ( Iterator iter = artifacts.iterator(); iter.hasNext(); )
         {
-            Artifact artifact = ( Artifact ) iter.next();
+            Artifact artifact = (Artifact) iter.next();
 
             assertTrue( files.contains( artifact.getFile() ) );
             assertTrue( artifact.getFile().getName().endsWith( ".jar" ) );

Modified: maven/plugins/branches/MASSEMBLY-45/src/test/java/org/apache/maven/plugin/assembly/DirectoryMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-45/src/test/java/org/apache/maven/plugin/assembly/DirectoryMojoTest.java?rev=421628&r1=421417&r2=421628&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-45/src/test/java/org/apache/maven/plugin/assembly/DirectoryMojoTest.java
(original)
+++ maven/plugins/branches/MASSEMBLY-45/src/test/java/org/apache/maven/plugin/assembly/DirectoryMojoTest.java
Thu Jul 13 06:46:05 2006
@@ -16,15 +16,22 @@
  * limitations under the License.
  */
 
-import org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub;
-import org.apache.maven.plugin.testing.AbstractMojoTestCase;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.artifact.Artifact;
-
 import java.io.File;
+import java.io.IOException;
+import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
-import java.util.Iterator;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.model.Model;
+import org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub;
+import org.apache.maven.plugin.assembly.stubs.CountingArchiver;
+import org.apache.maven.plugin.testing.AbstractMojoTestCase;
+import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.archiver.Archiver;
+import org.codehaus.plexus.archiver.ArchiverException;
+import org.codehaus.plexus.archiver.manager.ArchiverManager;
+import org.easymock.MockControl;
 
 /**
  * @author Allan Q. Ramirez
@@ -32,6 +39,29 @@
 public class DirectoryMojoTest
     extends AbstractMojoTestCase
 {
+    private MockManager mockManager = new MockManager();
+    
+    private MockControl archiverManagerControl;
+    
+    private ArchiverManager archiverManager;
+    
+    public void setUp() throws Exception
+    {
+        super.setUp();
+        
+        archiverManagerControl = MockControl.createControl( ArchiverManager.class );
+        mockManager.add( archiverManagerControl );
+        
+        archiverManager = (ArchiverManager) archiverManagerControl.getMock();
+    }
+    
+    public void tearDown() throws Exception
+    {
+        super.tearDown();
+        
+        TestUtils.cleanUp();
+    }
+
     public void testEnvironment()
         throws Exception
     {
@@ -46,22 +76,55 @@
     public void testAssemblyDirectory()
         throws Exception
     {
-        File testPom = new File( getBasedir(),
-                                 "src/test/plugin-configs/directory/min-plugin-config.xml"
);
-
-        DirectoryMojo mojo = ( DirectoryMojo ) lookupMojo( "directory", testPom );
+        // I'm assuming this test is meant to simply verify the bare-bones
+        // behavior of the directory mojo...
+        
+//        File testPom = new File( getBasedir(),
+//                                 "src/test/plugin-configs/directory/min-plugin-config.xml"
);
 
-        assertNotNull( mojo );
+        DirectoryMojo mojo = new DirectoryMojo();
+        
+        File descriptor = TestUtils.findFileForClasspathResource( "assemblies/fileSet.xml"
);
+        
+        mojo.setDescriptor( descriptor );
+        
+        File basedir = TestUtils.createTempBasedir();
+        
+        mojo.setBasedir( basedir );
+        mojo.setFinalName( "directory-min" );
+        mojo.setAppendAssemblyId( true );
+        
+        Model model = new Model();
+        
+        model.setGroupId( "directory-tests" );
+        model.setArtifactId( "min" );
+        model.setVersion( "1.0" );
+        
+        File outputDir = new File( basedir, "target/test-harness/directory/min/target" );
+        
+        mojo.setOutputDirectory( outputDir );
+        
+        MavenProject project = new MavenProject( model );
+        
+        mojo.setProject( project );
+        mojo.setExecutedProject( project );
+        
+        CountingArchiver archiver = new CountingArchiver();
+        
+        archiverManager.getArchiver( "dir" );
+        archiverManagerControl.setReturnValue( archiver );
+        
+        mojo.setArchiverManager( archiverManager );
 
-        AssemblyMojoTest.generateTestFileSets(getBasedir(), "\n");
+        AssemblyMojoTest.generateTestFileSets(basedir.getAbsolutePath(), "\n");
+        
+        mockManager.replayAll();
         
         mojo.execute();
 
-        Map filesArchived = ArchiverManagerStub.archiverStub.getFiles();
-
-        Set files = filesArchived.keySet();
-
-        assertEquals( 1, files.size() );
+        assertEquals( 4, archiver.getFileCount() );
+        
+        mockManager.verifyAll();
     }
 
     public void testAssemblyDirectoryWithAppendAssemblyIdAsFalse()
@@ -157,4 +220,5 @@
             //expected
         }
     }
+    
 }

Added: maven/plugins/branches/MASSEMBLY-45/src/test/java/org/apache/maven/plugin/assembly/MockManager.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-45/src/test/java/org/apache/maven/plugin/assembly/MockManager.java?rev=421628&view=auto
==============================================================================
--- maven/plugins/branches/MASSEMBLY-45/src/test/java/org/apache/maven/plugin/assembly/MockManager.java
(added)
+++ maven/plugins/branches/MASSEMBLY-45/src/test/java/org/apache/maven/plugin/assembly/MockManager.java
Thu Jul 13 06:46:05 2006
@@ -0,0 +1,39 @@
+package org.apache.maven.plugin.assembly;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.easymock.MockControl;
+
+public class MockManager
+{
+    
+    private List mockControls = new ArrayList();
+    
+    public void add( MockControl control )
+    {
+        mockControls.add( control );
+    }
+    
+    public void replayAll()
+    {
+        for ( Iterator it = mockControls.iterator(); it.hasNext(); )
+        {
+            MockControl control = (MockControl) it.next();
+            
+            control.replay();
+        }
+    }
+    
+    public void verifyAll()
+    {
+        for ( Iterator it = mockControls.iterator(); it.hasNext(); )
+        {
+            MockControl control = (MockControl) it.next();
+            
+            control.verify();
+        }
+    }
+
+}

Propchange: maven/plugins/branches/MASSEMBLY-45/src/test/java/org/apache/maven/plugin/assembly/MockManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/branches/MASSEMBLY-45/src/test/java/org/apache/maven/plugin/assembly/MockManager.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/plugins/branches/MASSEMBLY-45/src/test/java/org/apache/maven/plugin/assembly/TestUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-45/src/test/java/org/apache/maven/plugin/assembly/TestUtils.java?rev=421628&view=auto
==============================================================================
--- maven/plugins/branches/MASSEMBLY-45/src/test/java/org/apache/maven/plugin/assembly/TestUtils.java
(added)
+++ maven/plugins/branches/MASSEMBLY-45/src/test/java/org/apache/maven/plugin/assembly/TestUtils.java
Thu Jul 13 06:46:05 2006
@@ -0,0 +1,68 @@
+package org.apache.maven.plugin.assembly;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+import org.codehaus.plexus.util.FileUtils;
+
+public class TestUtils
+{
+    
+    private static Set toDelete = new HashSet();
+    
+    public static void cleanUp() throws IOException
+    {
+        
+        for ( Iterator it = toDelete.iterator(); it.hasNext(); )
+        {
+            File file = (File) it.next();
+            
+            if ( file.exists() )
+            {
+                if ( file.isDirectory() )
+                {
+                    FileUtils.deleteDirectory( file );
+                }
+                else
+                {
+                    file.delete();
+                }
+            }
+        }
+    }
+    
+    public static void markForDeletion( File file )
+    {
+        toDelete.add( file );
+    }
+
+    public static File createTempBasedir() throws InterruptedException
+    {
+        Thread.sleep( 100 );
+        
+        File basedir = new File( System.getProperty( "java.io.tmpdir" ), "basedir." + System.currentTimeMillis()
);
+        
+        toDelete.add( basedir );
+        
+        return basedir;
+    }
+
+    public static File findFileForClasspathResource( String resourceName )
+    {
+        ClassLoader cl = Thread.currentThread().getContextClassLoader();
+        
+        URL resource = cl.getResource( resourceName );
+        
+        if ( resource != null )
+        {
+            return new File( resource.getPath() );
+        }
+
+        return null;
+    }
+
+}

Propchange: maven/plugins/branches/MASSEMBLY-45/src/test/java/org/apache/maven/plugin/assembly/TestUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/branches/MASSEMBLY-45/src/test/java/org/apache/maven/plugin/assembly/TestUtils.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/plugins/branches/MASSEMBLY-45/src/test/java/org/apache/maven/plugin/assembly/stubs/CountingArchiver.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-45/src/test/java/org/apache/maven/plugin/assembly/stubs/CountingArchiver.java?rev=421628&view=auto
==============================================================================
--- maven/plugins/branches/MASSEMBLY-45/src/test/java/org/apache/maven/plugin/assembly/stubs/CountingArchiver.java
(added)
+++ maven/plugins/branches/MASSEMBLY-45/src/test/java/org/apache/maven/plugin/assembly/stubs/CountingArchiver.java
Thu Jul 13 06:46:05 2006
@@ -0,0 +1,115 @@
+package org.apache.maven.plugin.assembly.stubs;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Map;
+
+import org.codehaus.plexus.archiver.Archiver;
+import org.codehaus.plexus.archiver.ArchiverException;
+
+public class CountingArchiver implements Archiver
+{
+    
+    private int dirsAdded = 0;
+    private int filesAdded = 0;
+    private File destFile;
+
+    public void addDirectory( File arg0 )
+        throws ArchiverException
+    {
+        dirsAdded++;
+    }
+
+    public int getFileCount()
+    {
+        return filesAdded;
+    }
+    
+    public int getDirCount()
+    {
+        return dirsAdded;
+    }
+
+    public void addDirectory( File arg0, String arg1 )
+        throws ArchiverException
+    {
+        System.out.println( "Adding dir: " + arg0 );
+        dirsAdded++;
+    }
+
+    public void addDirectory( File arg0, String[] arg1, String[] arg2 )
+        throws ArchiverException
+    {
+        System.out.println( "Adding dir: " + arg0 );
+        dirsAdded++;
+    }
+
+    public void addDirectory( File arg0, String arg1, String[] arg2, String[] arg3 )
+        throws ArchiverException
+    {
+        System.out.println( "Adding dir: " + arg0 );
+        dirsAdded++;
+    }
+
+    public void addFile( File arg0, String arg1 )
+        throws ArchiverException
+    {
+        System.out.println( "Adding file: " + arg0 );
+        filesAdded++;
+    }
+
+    public void addFile( File arg0, String arg1, int arg2 )
+        throws ArchiverException
+    {
+        System.out.println( "Adding file: " + arg0 );
+        filesAdded++;
+    }
+
+    public void createArchive()
+        throws ArchiverException, IOException
+    {
+    }
+
+    public int getDefaultDirectoryMode()
+    {
+        return 0;
+    }
+
+    public int getDefaultFileMode()
+    {
+        return 0;
+    }
+
+    public File getDestFile()
+    {
+        return destFile;
+    }
+
+    public Map getFiles()
+    {
+        return null;
+    }
+
+    public boolean getIncludeEmptyDirs()
+    {
+        return false;
+    }
+
+    public void setDefaultDirectoryMode( int arg0 )
+    {
+    }
+
+    public void setDefaultFileMode( int arg0 )
+    {
+    }
+
+    public void setDestFile( File arg0 )
+    {
+        this.destFile = arg0;
+    }
+
+    public void setIncludeEmptyDirs( boolean arg0 )
+    {
+    }
+    
+}

Propchange: maven/plugins/branches/MASSEMBLY-45/src/test/java/org/apache/maven/plugin/assembly/stubs/CountingArchiver.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/branches/MASSEMBLY-45/src/test/java/org/apache/maven/plugin/assembly/stubs/CountingArchiver.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Modified: maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/components/dependencySet.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/components/dependencySet.xml?rev=421628&r1=421417&r2=421628&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/components/dependencySet.xml
(original)
+++ maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/components/dependencySet.xml
Thu Jul 13 06:46:05 2006
@@ -17,7 +17,6 @@
 <component>
   <dependencySets>
     <dependencySet>
-      <unpack>false</unpack>
       <outputDirectory></outputDirectory>
       <scope>test</scope>
     </dependencySet>

Modified: maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/dependencySet-default.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/dependencySet-default.xml?rev=421628&r1=421417&r2=421628&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/dependencySet-default.xml
(original)
+++ maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/dependencySet-default.xml
Thu Jul 13 06:46:05 2006
@@ -21,7 +21,6 @@
   </formats>
   <dependencySets>
     <dependencySet>
-      <unpack>false</unpack>
       <outputDirectory></outputDirectory>
       <scope>test</scope>
     </dependencySet>

Modified: maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/dependencySet-excludes.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/dependencySet-excludes.xml?rev=421628&r1=421417&r2=421628&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/dependencySet-excludes.xml
(original)
+++ maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/dependencySet-excludes.xml
Thu Jul 13 06:46:05 2006
@@ -21,7 +21,6 @@
   </formats>
   <dependencySets>
     <dependencySet>
-      <unpack>false</unpack>
       <outputDirectory></outputDirectory>
       <scope>test</scope>
       <excludes>

Modified: maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/dependencySet-filename-mapping-and-classifier.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/dependencySet-filename-mapping-and-classifier.xml?rev=421628&r1=421417&r2=421628&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/dependencySet-filename-mapping-and-classifier.xml
(original)
+++ maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/dependencySet-filename-mapping-and-classifier.xml
Thu Jul 13 06:46:05 2006
@@ -23,7 +23,6 @@
   <dependencySets>
     <dependencySet>
       <outputFileNameMapping>${version}.${artifactId}.${groupId}</outputFileNameMapping>
-      <unpack>false</unpack>
       <outputDirectory>libs</outputDirectory>
       <scope>test</scope>
     </dependencySet>

Modified: maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/dependencySet-filename-mapping.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/dependencySet-filename-mapping.xml?rev=421628&r1=421417&r2=421628&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/dependencySet-filename-mapping.xml
(original)
+++ maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/dependencySet-filename-mapping.xml
Thu Jul 13 06:46:05 2006
@@ -23,7 +23,6 @@
   <dependencySets>
     <dependencySet>
       <outputFileNameMapping>${version}-${artifactId}-${groupId}</outputFileNameMapping>
-      <unpack>false</unpack>
       <outputDirectory>libs</outputDirectory>
       <scope>test</scope>
     </dependencySet>

Modified: maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/dependencySet-includes.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/dependencySet-includes.xml?rev=421628&r1=421417&r2=421628&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/dependencySet-includes.xml
(original)
+++ maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/dependencySet-includes.xml
Thu Jul 13 06:46:05 2006
@@ -21,7 +21,6 @@
   </formats>
   <dependencySets>
     <dependencySet>
-      <unpack>false</unpack>
       <outputDirectory></outputDirectory>
       <scope>test</scope>
       <includes>

Modified: maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/dependencySet-scoped.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/dependencySet-scoped.xml?rev=421628&r1=421417&r2=421628&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/dependencySet-scoped.xml
(original)
+++ maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/dependencySet-scoped.xml
Thu Jul 13 06:46:05 2006
@@ -21,7 +21,6 @@
   </formats>
   <dependencySets>
     <dependencySet>
-      <unpack>false</unpack>
       <outputDirectory></outputDirectory>
     </dependencySet>
   </dependencySets>

Modified: maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/dependencySet-unpack.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/dependencySet-unpack.xml?rev=421628&r1=421417&r2=421628&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/dependencySet-unpack.xml
(original)
+++ maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/dependencySet-unpack.xml
Thu Jul 13 06:46:05 2006
@@ -21,7 +21,7 @@
   </formats>
   <dependencySets>
     <dependencySet>
-      <unpack>true</unpack>
+      <unpack/>
       <outputDirectory></outputDirectory>
       <scope>test</scope>
     </dependencySet>

Modified: maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/moduleSet-packed-including-dependencies.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/moduleSet-packed-including-dependencies.xml?rev=421628&r1=421417&r2=421628&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/moduleSet-packed-including-dependencies.xml
(original)
+++ maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/moduleSet-packed-including-dependencies.xml
Thu Jul 13 06:46:05 2006
@@ -22,7 +22,6 @@
   <moduleSets>
     <moduleSet>
       <binaries>
-        <unpack>false</unpack>
         <includeDependencies>true</includeDependencies>
       </binaries>
     </moduleSet>

Modified: maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/moduleSet-packed.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/moduleSet-packed.xml?rev=421628&r1=421417&r2=421628&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/moduleSet-packed.xml
(original)
+++ maven/plugins/branches/MASSEMBLY-45/src/test/resources/assemblies/moduleSet-packed.xml
Thu Jul 13 06:46:05 2006
@@ -21,9 +21,7 @@
   </formats>
   <moduleSets>
     <moduleSet>
-      <binaries>
-        <unpack>false</unpack>
-      </binaries>
+      <binaries/>
     </moduleSet>
   </moduleSets>
 </assembly>

Added: maven/plugins/branches/MASSEMBLY-45/src/test/resources/test-fodder/assembly.jar
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-45/src/test/resources/test-fodder/assembly.jar?rev=421628&view=auto
==============================================================================
    (empty)



Mime
View raw message