Solving parts of PLX-148.

Applying patches from Edwin Punzalan and Daniel Krisher.
o Adding a field to optionally remove empty directories. This used to be the
  default.

Author: trygvis

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

@@ -44,8 +44,12 @@ public abstract class AbstractArchiver extends AbstractLogEnabled
     private File destFile;
 
     private Map filesMap = new HashMap();
+    
+    private Map dirsMap = new HashMap();
 
     private String prefix;
+    
+    private boolean includeEmptyDirs = true;
 
     public void addDirectory( File directory )
         throws ArchiverException
@@ -64,7 +68,7 @@ public void addDirectory( File directory, String[] includes, String[] excludes )
     {
         addDirectory( directory, "", includes, excludes );
     }
-
+    
     public void addDirectory( File directory, String prefix, String[] includes, String[] excludes )
         throws ArchiverException
     {
@@ -133,6 +137,23 @@ public void addDirectory( File directory, String prefix, String[] includes, Stri
                 filesMap.put( file, new File( basedir, file ) );
             }
         }
+        
+        if ( includeEmptyDirs )
+        {
+            String[] dirs = scanner.getIncludedDirectories();
+            for ( int i = 0; i < dirs.length; i++ ) {
+                String dir = dirs[i];
+                dir = dir.replace( '\\', '/' );
+                if ( prefix != null )
+                {
+                    getDirs().put( prefix + dir, new File( basedir, dir ) );
+                }
+                else
+                {
+                    getDirs().put( dir, new File( basedir, dir ) );
+                }
+            }
+        }
     }
 
     public void addFile( File inputFile, String destFileName )
@@ -149,7 +170,15 @@ public void addFile( File inputFile, String destFileName )
 
     protected Map getFiles()
     {
-        return filesMap;
+        if ( !includeEmptyDirs ) return filesMap;
+        
+        Map resources = new HashMap();
+
+        resources.putAll( filesMap );
+
+        resources.putAll( getDirs() );
+        
+        return resources;
     }
 
     public File getDestFile()
@@ -179,4 +208,19 @@ protected Logger getLogger()
 
         return logger;
     }
+
+    public boolean getIncludeEmptyDirs()
+    {
+        return includeEmptyDirs;
+    }
+
+    public void setIncludeEmptyDirs(boolean includeEmptyDirs)
+    {
+        this.includeEmptyDirs = includeEmptyDirs;
+    }
+
+    public Map getDirs()
+    {
+        return dirsMap;
+    }
 }

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

@@ -484,7 +484,14 @@ protected final void addResources( Map resources, ZipOutputStream zOut )
 
             addParentDirs(base, name, zOut, "", dirMode);
 
-            zipFile(resource, zOut, name, fileMode);
+            if ( resource.isFile() )
+            {
+                zipFile(resource, zOut, name, fileMode);
+            }
+            else
+            {
+                zipDir( resource, zOut, name, dirMode );
+            }
         }
     }
 

src/test/java/org/codehaus/plexus/archiver/EmptyDirectoryTest.java

@@ -0,0 +1,81 @@
+package org.codehaus.plexus.archiver;
+
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2004, The Codehaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.archiver.zip.ZipArchiver;
+import org.codehaus.plexus.archiver.zip.ZipUnArchiver;
+
+import java.io.File;
+
+/**
+ * @author Daniel Krisher
+ * @version $Id$
+ */
+public class EmptyDirectoryTest
+    extends PlexusTestCase
+{
+    public void testEmptyDirectory()
+        throws Exception
+    {
+        ZipArchiver archiver = (ZipArchiver) lookup( Archiver.ROLE, "zip" );
+
+        //Should default to true...
+        assertTrue( archiver.getIncludeEmptyDirs() );
+
+        //create an empty directory to store in the zip archive
+        File emptyDir = getTestFile( "target/output/emptyTest/TmpEmptyDir" );
+        //delete it if it exists to ensure it is actually empty
+        if ( emptyDir.exists() )
+        {
+            emptyDir.delete();
+        }
+        emptyDir.mkdirs();
+        archiver.addDirectory( emptyDir.getParentFile() );
+
+        File archive = getTestFile( "target/output/emptyDirArchive.zip" );
+        if ( archive.exists() )
+        {
+            archive.delete();
+        }
+
+        archiver.setDestFile( archive );
+        archiver.createArchive();
+
+        //delete the empty dir, we will extract it from the archive
+        emptyDir.delete();
+
+        //Check the content of the archive by extracting it
+
+        ZipUnArchiver unArchiver = (ZipUnArchiver) lookup( UnArchiver.ROLE, "zip" );
+        unArchiver.setSourceFile( archive );
+
+        unArchiver.setDestDirectory( getTestFile( "target/output/emptyTest" ) );
+        unArchiver.extract();
+
+        assertTrue( emptyDir.exists() );
+        assertTrue( emptyDir.isDirectory() );
+    }
+}