Made directoryArchiver obey InputStream contract

Author: krosenvold

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

@@ -355,7 +355,7 @@ public void addSymlink(String symlinkName, int permissions, String symlinkDestin
     }
 
     protected ArchiveEntry asArchiveEntry( @Nonnull final PlexusIoResource resource, final String destFileName,
-                                           final int permissions )
+                                           final int permissions,  PlexusIoResourceCollection collection)
         throws ArchiverException
     {
         if ( !resource.isExisting() )
@@ -365,7 +365,7 @@ protected ArchiveEntry asArchiveEntry( @Nonnull final PlexusIoResource resource,
 
         if ( resource.isFile() )
         {
-            return ArchiveEntry.createFileEntry( destFileName, resource, permissions );
+            return ArchiveEntry.createFileEntry( destFileName, resource, permissions, collection );
         }
         else
         {
@@ -392,7 +392,7 @@ protected ArchiveEntry asArchiveEntry( final PlexusIoResourceCollection collecti
                 }
             }
 
-            return asArchiveEntry( resource, destFileName, permissions );
+            return asArchiveEntry( resource, destFileName, permissions, collection );
         }
         catch ( final IOException e )
         {
@@ -403,7 +403,7 @@ protected ArchiveEntry asArchiveEntry( final PlexusIoResourceCollection collecti
     public void addResource( final PlexusIoResource resource, final String destFileName, final int permissions )
         throws ArchiverException
     {
-        resources.add( asArchiveEntry( resource, destFileName, permissions ) );
+        resources.add( asArchiveEntry( resource, destFileName, permissions, null ) );
     }
 
     public void addFile( @Nonnull final File inputFile, @Nonnull String destFileName, int permissions )

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

@@ -29,6 +29,7 @@
 import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes;
 import org.codehaus.plexus.components.io.resources.PlexusIoFileResource;
 import org.codehaus.plexus.components.io.resources.PlexusIoResource;
+import org.codehaus.plexus.components.io.resources.PlexusIoResourceCollection;
 import org.codehaus.plexus.components.io.resources.PlexusIoResourceWithAttributes;
 
 /**
@@ -43,6 +44,9 @@ public class ArchiveEntry
     public static final int DIRECTORY = 2;
 
     public static final int SYMLINK = 3;
+
+    private PlexusIoResourceCollection collection;
+
     @Nonnull private PlexusIoResource resource;
 
     private final String name;
@@ -59,11 +63,14 @@ public class ArchiveEntry
      * @param resource original filename
      * @param type     FILE or DIRECTORY
      * @param mode     octal unix style permissions
+     * @param collection
      */
-    private ArchiveEntry( String name, @Nonnull PlexusIoResource resource, int type, int mode )
+    private ArchiveEntry( String name, @Nonnull PlexusIoResource resource, int type, int mode,
+                          PlexusIoResourceCollection collection )
     {
         this.name = name;
         this.resource = resource;
+        this.collection = collection;
         this.attributes = ( resource instanceof PlexusIoResourceWithAttributes )
             ? ( (PlexusIoResourceWithAttributes) resource ).getAttributes() : null;
         this.type = type;
@@ -108,7 +115,7 @@ public File getFile()
     public InputStream getInputStream()
         throws IOException
     {
-        return resource.getContents();
+        return collection != null ? collection.getInputStream( resource ) : resource.getContents();
     }
 
     /**
@@ -139,15 +146,16 @@ public int getMode()
             ( type == FILE ? UnixStat.FILE_FLAG : type == SYMLINK ? UnixStat.LINK_FLAG : UnixStat.DIR_FLAG );
     }
 
-    public static ArchiveEntry createFileEntry( String target, PlexusIoResource resource, int permissions )
+    public static ArchiveEntry createFileEntry( String target, PlexusIoResource resource, int permissions,
+                                                PlexusIoResourceCollection collection )
         throws ArchiverException
     {
         if ( resource.isDirectory() )
         {
             throw new ArchiverException( "Not a file: " + resource.getName() );
         }
         final int type = resource.isSymbolicLink() ? SYMLINK : FILE;
-        return new ArchiveEntry( target, resource, type, permissions );
+        return new ArchiveEntry( target, resource, type, permissions, collection );
     }
 
     public static ArchiveEntry createFileEntry( String target, File file, int permissions )
@@ -169,7 +177,7 @@ public static ArchiveEntry createFileEntry( String target, File file, int permis
         }
 
         final PlexusIoFileResource res =  PlexusIoFileResource.justAFile( file, attrs );
-        return new ArchiveEntry( target, res, FILE, permissions );
+        return new ArchiveEntry( target, res, FILE, permissions, null );
     }
 
     public static ArchiveEntry createDirectoryEntry( String target, @Nonnull PlexusIoResource resource, int permissions )
@@ -180,7 +188,7 @@ public static ArchiveEntry createDirectoryEntry( String target, @Nonnull PlexusI
             throw new ArchiverException( "Not a directory: " + resource.getName() );
         }
         final int type = resource.isSymbolicLink() ? SYMLINK : DIRECTORY;
-        return new ArchiveEntry( target, resource, type, permissions );
+        return new ArchiveEntry( target, resource, type, permissions, null );
     }
 
     public static ArchiveEntry createDirectoryEntry( String target, final File file, int permissions )
@@ -192,7 +200,7 @@ public static ArchiveEntry createDirectoryEntry( String target, final File file,
         }
 
 		final PlexusIoFileResource res = new PlexusIoFileResource( file, ArchiverAttributeUtils.getFileAttributes(file));
-        return new ArchiveEntry( target, res, DIRECTORY, permissions );
+        return new ArchiveEntry( target, res, DIRECTORY, permissions, null );
     }
 
     public static ArchiveEntry createEntry( String target, File file, int filePerm, int dirPerm )
@@ -215,7 +223,8 @@ else if ( file.isFile() )
     public static ArchiveEntry createSymlinkEntry(String symlinkName, int permissions, String symlinkDestination)
     {
 		File symlinkFile = new File(symlinkName);
-		final ArchiveEntry archiveEntry = new ArchiveEntry(symlinkName, new PlexusIoVirtualSymlinkResource(symlinkFile, symlinkDestination), SYMLINK, permissions);
+		final ArchiveEntry archiveEntry = new ArchiveEntry(symlinkName, new PlexusIoVirtualSymlinkResource(symlinkFile, symlinkDestination), SYMLINK, permissions,
+                                                           null );
 		return archiveEntry;
     }
 

src/main/java/org/codehaus/plexus/archiver/dir/DirectoryArchiver.java

@@ -131,7 +131,7 @@ protected void copyFile( final ArchiveEntry entry, final String vPath )
                     throw new ArchiverException( "Unable to create directory or parent directory of " + outFile );
                 }
             }
-            ResourceUtils.copyFile( in, outFile );
+            ResourceUtils.copyFile( entry.getInputStream(), outFile );
 
             if ( !isIgnorePermissions() )
             {

src/main/java/org/codehaus/plexus/archiver/util/ResourceUtils.java

@@ -92,6 +92,25 @@ public static void copyFile( PlexusIoResource in, File outFile )
         }
     }
 
+    /**
+     * Copies the sources contents to the given destination file.
+     */
+    public static void copyFile( InputStream input, File outFile )
+        throws IOException
+    {
+        OutputStream output = null;
+        try
+        {
+            output = new FileOutputStream( outFile );
+            IOUtil.copy( input, output );
+        }
+        finally
+        {
+            IOUtil.close( input );
+            IOUtil.close( output );
+        }
+    }
+
     /**
      * Checks, whether the resource and the file are identical.
      */