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/05/08 19:48:49 UTC
svn commit: r405104 - 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/
Author: dantran
Date: Mon May 8 10:48:47 2006
New Revision: 405104
URL: http://svn.apache.org/viewcvs?rev=405104&view=rev
Log:
MASSEMBLY-95:support tar.gz,tar.bz2, tgz, and tbz2 unpack types
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractUnpackingMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/ArchiverManagerStub.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/ArchiverManagerWithExceptionStub.java
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractUnpackingMojo.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractUnpackingMojo.java?rev=405104&r1=405103&r2=405104&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractUnpackingMojo.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractUnpackingMojo.java Mon May 8 10:48:47 2006
@@ -25,7 +25,6 @@
import org.codehaus.plexus.archiver.UnArchiver;
import org.codehaus.plexus.archiver.manager.ArchiverManager;
import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
-import org.codehaus.plexus.util.FileUtils;
import java.io.File;
import java.io.IOException;
@@ -146,11 +145,9 @@
protected void unpack( File file, File location )
throws MojoExecutionException, NoSuchArchiverException
{
- String archiveExt = FileUtils.getExtension( file.getAbsolutePath() ).toLowerCase();
-
try
{
- UnArchiver unArchiver = this.archiverManager.getUnArchiver( archiveExt );
+ UnArchiver unArchiver = this.archiverManager.getUnArchiver( file );
unArchiver.setSourceFile( file );
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java?rev=405104&r1=405103&r2=405104&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java Mon May 8 10:48:47 2006
@@ -97,7 +97,7 @@
{
FileLoggingArchiverManagerStub archiverManager = (FileLoggingArchiverManagerStub) getVariableValueFromObject( mojo, "archiverManager" );
- FileLoggingArchiverStub archiver = (FileLoggingArchiverStub) archiverManager.getArchiver( null );
+ FileLoggingArchiverStub archiver = (FileLoggingArchiverStub) archiverManager.getArchiver( (File)null );
Set addedFiles = archiver.getAddedFiles();
@@ -154,6 +154,18 @@
// TODO Auto-generated method stub
return null;
}
+
+ public UnArchiver getUnArchiver( File arg0 ) throws NoSuchArchiverException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Archiver getArchiver( File arg0 ) throws NoSuchArchiverException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
public static final class FileLoggingArchiverStub
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/ArchiverManagerStub.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/ArchiverManagerStub.java?rev=405104&r1=405103&r2=405104&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 Mon May 8 10:48:47 2006
@@ -16,6 +16,8 @@
* limitations under the License.
*/
+import java.io.File;
+
import org.codehaus.plexus.archiver.manager.ArchiverManager;
import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
import org.codehaus.plexus.archiver.Archiver;
@@ -72,6 +74,27 @@
return unArchiverStub;
}
+ public UnArchiver getUnArchiver( File string )
+ throws NoSuchArchiverException
+ {
+ if ( unArchiverStub == null )
+ {
+ unArchiverStub = new UnArchiverStub();
+ }
+
+ return unArchiverStub;
+ }
+
+ public Archiver getArchiver( File string )
+ throws NoSuchArchiverException
+ {
+ if ( archiverStub == null )
+ {
+ archiverStub = new ArchiverStub();
+ }
+
+ return archiverStub;
+ }
public void setUnArchiver( UnArchiverStub unArchiver )
{
unArchiverStub = unArchiver;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/ArchiverManagerWithExceptionStub.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/ArchiverManagerWithExceptionStub.java?rev=405104&r1=405103&r2=405104&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/ArchiverManagerWithExceptionStub.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/ArchiverManagerWithExceptionStub.java Mon May 8 10:48:47 2006
@@ -1,5 +1,7 @@
package org.apache.maven.plugin.assembly.stubs;
+import java.io.File;
+
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.UnArchiver;
import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
@@ -33,6 +35,18 @@
}
public Archiver getArchiver( String string )
+ throws NoSuchArchiverException
+ {
+ throw new NoSuchArchiverException( "Expected exception" );
+ }
+
+ public UnArchiver getUnArchiver( File string )
+ throws NoSuchArchiverException
+ {
+ throw new NoSuchArchiverException( "Expected exception" );
+ }
+
+ public Archiver getArchiver( File string )
throws NoSuchArchiverException
{
throw new NoSuchArchiverException( "Expected exception" );