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/06 05:01:55 UTC
svn commit: r306505 - in
/maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly:
AbstractUnpackingMojo.java AssemblyMojo.java UnpackMojo.java
Author: brett
Date: Wed Oct 5 20:01:50 2005
New Revision: 306505
URL: http://svn.apache.org/viewcvs?rev=306505&view=rev
Log:
PR: MNG-1099
Submitted by: Dan Tran
Reviewed by: Brett Porter
only attempt to unpack known dependencies
Modified:
maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractUnpackingMojo.java
maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java
maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/UnpackMojo.java
Modified: maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractUnpackingMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractUnpackingMojo.java?rev=306505&r1=306504&r2=306505&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractUnpackingMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractUnpackingMojo.java Wed Oct 5 20:01:50 2005
@@ -18,7 +18,6 @@
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.UnArchiver;
import org.codehaus.plexus.archiver.manager.ArchiverManager;
@@ -90,25 +89,16 @@
*/
protected void unpack( File file, File location )
- throws MojoExecutionException, MojoFailureException
+ throws MojoExecutionException, NoSuchArchiverException
{
String archiveExt = FileUtils.getExtension( file.getAbsolutePath() ).toLowerCase();
- this.getLog().info( "Look up archiver type: " + archiveExt );
-
- UnArchiver unArchiver;
-
try
{
+ UnArchiver unArchiver;
+
unArchiver = this.archiverManager.getUnArchiver( archiveExt );
- }
- catch ( NoSuchArchiverException e )
- {
- throw new MojoFailureException( "Unable to obtain unarchiver for extension '" + archiveExt + "'" );
- }
- try
- {
unArchiver.setSourceFile( file );
unArchiver.setDestDirectory( location );
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=306505&r1=306504&r2=306505&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 Wed Oct 5 20:01:50 2005
@@ -294,7 +294,15 @@
if ( process )
{
- unpack( artifact.getFile(), tempLocation );
+ try
+ {
+ unpack( artifact.getFile(), tempLocation );
+ }
+ catch ( NoSuchArchiverException e )
+ {
+ throw new MojoExecutionException(
+ "Unable to obtain unarchiver for file '" + artifact.getFile() + "'" );
+ }
}
archiver.addDirectory( tempLocation, null,
(String[]) getDefaultExcludes().toArray( EMPTY_STRING_ARRAY ) );
Modified: maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/UnpackMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/UnpackMojo.java?rev=306505&r1=306504&r2=306505&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/UnpackMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/UnpackMojo.java Wed Oct 5 20:01:50 2005
@@ -19,6 +19,7 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
import java.io.File;
import java.util.Iterator;
@@ -62,9 +63,17 @@
if ( process )
{
File file = artifact.getFile();
- unpack( file, tempLocation );
+ try
+ {
+ unpack( file, tempLocation );
+ }
+ catch ( NoSuchArchiverException e )
+ {
+ this.getLog().info( "Skip unpacking dependency file with unknown extension: " + file.getPath() );
+ }
}
}
}
+
}