PLXCOMP-232. Unpacking .tar.gz fails

Author: sadovnikov

src/main/java/org/codehaus/plexus/archiver/AbstractUnArchiver.java

@@ -17,15 +17,17 @@
  *  limitations under the License.
  */
 
+import org.codehaus.plexus.archiver.util.ArchiveEntryUtils;
 import org.codehaus.plexus.archiver.util.FilterSupport;
 import org.codehaus.plexus.components.io.fileselectors.FileSelector;
 import org.codehaus.plexus.components.io.resources.PlexusIoResource;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.IOUtil;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
@@ -287,4 +289,57 @@ public void setIgnorePermissions( final boolean ignorePermissions )
         this.ignorePermissions = ignorePermissions;
     }
 
+    protected void extractFile( final File srcF, final File dir, final InputStream compressedInputStream,
+                                final String entryName, final Date entryDate, final boolean isDirectory,
+                                final Integer mode )
+            throws IOException, ArchiverException
+    {
+        final File f = FileUtils.resolveFile(dir, entryName);
+
+        try
+        {
+            if ( !isOverwrite() && f.exists() && ( f.lastModified() >= entryDate.getTime() ) )
+            {
+                return;
+            }
+
+            // create intermediary directories - sometimes zip don't add them
+            final File dirF = f.getParentFile();
+            if ( dirF != null )
+            {
+                dirF.mkdirs();
+            }
+
+            if ( isDirectory )
+            {
+                f.mkdirs();
+            }
+            else
+            {
+                OutputStream out = null;
+                try
+                {
+                    out = new FileOutputStream( f );
+
+                    IOUtil.copy(compressedInputStream, out);
+                }
+                finally
+                {
+                    IOUtil.close( out );
+                }
+            }
+
+            f.setLastModified( entryDate.getTime() );
+
+            if ( !isIgnorePermissions() && mode != null && !isDirectory)
+            {
+                ArchiveEntryUtils.chmod(f, mode, getLogger(), isUseJvmChmod());
+            }
+        }
+        catch ( final FileNotFoundException ex )
+        {
+            getLogger().warn( "Unable to expand to file " + f.getPath() );
+        }
+    }
+
 }

src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java

@@ -18,9 +18,9 @@
  */
 
 import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
+import org.codehaus.plexus.archiver.AbstractUnArchiver;
 import org.codehaus.plexus.archiver.ArchiverException;
 import org.codehaus.plexus.archiver.util.EnumeratedAttribute;
-import org.codehaus.plexus.archiver.zip.AbstractZipUnArchiver;
 import org.codehaus.plexus.util.IOUtil;
 
 import java.io.BufferedInputStream;
@@ -35,7 +35,7 @@
  * @version $Revision$ $Date$
  */
 public class TarUnArchiver
-    extends AbstractZipUnArchiver
+    extends AbstractUnArchiver
 {
     public TarUnArchiver()
     {
@@ -78,20 +78,30 @@ public void setEncoding( String encoding )
 
     protected void execute()
         throws ArchiverException
+    {
+        execute(getSourceFile(), getDestDirectory());
+    }
+
+    protected void execute( String path, File outputDirectory )
+    {
+        execute( new File(path), getDestDirectory());
+    }
+
+    protected void execute( File sourceFile, File outputDirectory )
     {
         TarInputStream tis = null;
         try
         {
-            getLogger().info( "Expanding: " + getSourceFile() + " into " + getDestDirectory() );
-            tis = new TarInputStream( compression.decompress( getSourceFile(),
-                                                              new BufferedInputStream(
-                                                                  new FileInputStream( getSourceFile() ) ) ) );
+            getLogger().info( "Expanding: " + sourceFile + " into " + outputDirectory );
+            tis = new TarInputStream( compression.decompress( sourceFile,
+                    new BufferedInputStream(
+                            new FileInputStream( sourceFile ) ) ) );
             TarEntry te;
 
             while ( ( te = tis.getNextEntry() ) != null )
             {
-                extractFile( getSourceFile(), getDestDirectory(), tis, te.getName(), te.getModTime(),
-                             te.isDirectory(), te.getMode() != 0 ? te.getMode() : null);
+                extractFile( sourceFile, outputDirectory, tis, te.getName(), te.getModTime(),
+                        te.isDirectory(), te.getMode() != 0 ? te.getMode() : null);
             }
             getLogger().debug( "expand complete" );
 
@@ -197,4 +207,5 @@ else if ( BZIP2.equals( value ) )
             return istream;
         }
     }
+
 }

src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipUnArchiver.java

@@ -191,59 +191,6 @@ private void extractFileIfIncluded( final File sourceFile, final File destDirect
         }
     }
 
-    protected void extractFile( final File srcF, final File dir, final InputStream compressedInputStream,
-                                final String entryName, final Date entryDate, final boolean isDirectory,
-                                final Integer mode )
-        throws IOException, ArchiverException
-    {
-        final File f = FileUtils.resolveFile( dir, entryName );
-
-        try
-        {
-            if ( !isOverwrite() && f.exists() && ( f.lastModified() >= entryDate.getTime() ) )
-            {
-                return;
-            }
-
-            // create intermediary directories - sometimes zip don't add them
-            final File dirF = f.getParentFile();
-            if ( dirF != null )
-            {
-                dirF.mkdirs();
-            }
-
-            if ( isDirectory )
-            {
-                f.mkdirs();
-            }
-            else
-            {
-                OutputStream out = null;
-                try
-                {
-                    out = new FileOutputStream( f );
-
-                    IOUtil.copy( compressedInputStream, out );
-                }
-                finally
-                {
-                    IOUtil.close( out );
-                }
-            }
-
-            f.setLastModified( entryDate.getTime() );
-
-            if ( !isIgnorePermissions() && mode != null && !isDirectory)
-            {
-                ArchiveEntryUtils.chmod( f, mode, getLogger(), isUseJvmChmod() );
-            }
-        }
-        catch ( final FileNotFoundException ex )
-        {
-            getLogger().warn( "Unable to expand to file " + f.getPath() );
-        }
-    }
-
     protected void execute( final String path, final File outputDirectory )
         throws ArchiverException
     {