You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2005/10/12 06:37:59 UTC

svn commit: r314779 - /maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java

Author: brett
Date: Tue Oct 11 21:37:55 2005
New Revision: 314779

URL: http://svn.apache.org/viewcvs?rev=314779&view=rev
Log:
PR: MNG-1132
Submitted by: Jerome Lacoste
Reviewed by:  Brett Porter
use output directory for unpack

Modified:
    maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java

Modified: maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java?rev=314779&r1=314778&r2=314779&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java Tue Oct 11 21:37:55 2005
@@ -300,6 +300,7 @@
                         // TODO: something like zipfileset in plexus-archiver
 //                        archiver.addJar(  )
 
+                        // TODO is the extension always 3 characters long?
                         File tempLocation = new File( workDirectory, name.substring( 0, name.length() - 4 ) );
                         boolean process = false;
                         if ( !tempLocation.exists() )
@@ -324,7 +325,7 @@
                                     "Unable to obtain unarchiver for file '" + artifact.getFile() + "'" );
                             }
                         }
-                        archiver.addDirectory( tempLocation, null, FileUtils.getDefaultExcludes() );
+                        archiver.addDirectory( tempLocation, output, null, FileUtils.getDefaultExcludes() );
                     }
                     else
                     {