You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by da...@apache.org on 2006/01/13 07:24:40 UTC

svn commit: r368611 - in /maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly: DirectoryMojo.java archiver/

Author: dantran
Date: Thu Jan 12 22:24:39 2006
New Revision: 368611

URL: http://svn.apache.org/viewcvs?rev=368611&view=rev
Log:
Use Plexus' DirectoryArchiver, MASSEMBLY-60

Removed:
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archiver/
Modified:
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/DirectoryMojo.java

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/DirectoryMojo.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/DirectoryMojo.java?rev=368611&r1=368610&r2=368611&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/DirectoryMojo.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/DirectoryMojo.java Thu Jan 12 22:24:39 2006
@@ -23,6 +23,7 @@
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.archiver.Archiver;
 import org.codehaus.plexus.archiver.ArchiverException;
+import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
 import java.io.IOException;
@@ -78,9 +79,14 @@
 
         try
         {
-            Archiver archiver = new DirectoryArchiver();
+            Archiver archiver = this.archiverManager.getArchiver( "dir" );
 
             createArchive( archiver, assembly, fullName );
+        }
+        
+        catch ( NoSuchArchiverException e )
+        {
+            throw new MojoExecutionException( "Error creating assembly", e );
         }
         catch ( ArchiverException e )
         {