o Made ZipArchiver aware of the 'includeEmptyDirs' setting (which kind of overrides

  the 'filesOnly' setting; for now both 'work'.

o Made order in which the files/dirs are iterated predictable

o Reversed order of adding dirs/files in getFiles() so dirs are
  always specified first.

o Re-enable testcase where directory permissions are tested in ZipArchiver:
  Due to the non deterministic nature of 'addParentDirs' the last specified
  directoryMask was used for those files. Together with the abovementioned
  modifications the ZipArchiver now uses the default directory permissions
  in the correct time (effectively 'addParentDirs' doesn't have any real effect now..)

ZipArchiver is due for refactoring! I'm just not sure about the backward
compatibility requirements yet. If this isn't an issue it could get a lot
cleaner.

Author: neonics

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

@@ -23,7 +23,7 @@
 import org.codehaus.plexus.util.DirectoryScanner;
 
 import java.io.File;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**
@@ -48,9 +48,9 @@ public abstract class AbstractArchiver extends AbstractLogEnabled
 
     private File destFile;
 
-    private Map filesMap = new HashMap();
+    private Map filesMap = new LinkedHashMap();
 
-    private Map dirsMap = new HashMap();
+    private Map dirsMap = new LinkedHashMap();
 
     private int defaultFileMode = DEFAULT_FILE_MODE;
 
@@ -155,18 +155,7 @@ public void addDirectory( File directory, String prefix, String[] includes, Stri
         String basedir = directory.getAbsolutePath();
         scanner.setBasedir( basedir );
         scanner.scan();
-        String[] files = scanner.getIncludedFiles();
-        
-        for ( int i = 0; i < files.length; i++ )
-        {
-            String sourceFile = files[i].replace( '\\', '/' );
-            
-            String targetFile = ( prefix == null ? "" : prefix ) + sourceFile;
 
-            filesMap.put( targetFile, ArchiveEntry.createEntry( targetFile,
-                new File( basedir, sourceFile ), getDefaultFileMode(), getDefaultDirectoryMode() ) );
-        }
-        
         if ( includeEmptyDirs )
         {
             String [] dirs = scanner.getIncludedDirectories();
@@ -176,11 +165,24 @@ public void addDirectory( File directory, String prefix, String[] includes, Stri
                 String sourceDir = dirs[i].replace( '\\', '/' );
 
                 String targetDir = ( prefix == null ? "" : prefix ) + sourceDir;
-                
+
                 getDirs().put( targetDir, ArchiveEntry.createEntry( targetDir,
                         new File( basedir, sourceDir ), getDefaultFileMode(), getDefaultDirectoryMode() ) );
             }
         }
+
+        String[] files = scanner.getIncludedFiles();
+        
+        for ( int i = 0; i < files.length; i++ )
+        {
+            String sourceFile = files[i].replace( '\\', '/' );
+            
+            String targetFile = ( prefix == null ? "" : prefix ) + sourceFile;
+
+            filesMap.put( targetFile, ArchiveEntry.createEntry( targetFile,
+                new File( basedir, sourceFile ), getDefaultFileMode(), getDefaultDirectoryMode() ) );
+        }
+        
     }
 
     public void addFile( File inputFile, String destFileName )
@@ -208,14 +210,17 @@ public void addFile( File inputFile, String destFileName, int permissions )
     // the Name of the ArchiveEntry..?
     protected Map getFiles()
     {
-        if ( !includeEmptyDirs ) return filesMap;
+        if ( !includeEmptyDirs )
+        {
+        	return filesMap;
+        }
 
-        Map resources = new HashMap();
-
-        resources.putAll( filesMap );
+        Map resources = new LinkedHashMap();
 
         resources.putAll( getDirs() );
 
+        resources.putAll( filesMap );
+        
         return resources;
     }
 

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

@@ -501,7 +501,7 @@ protected final void addParentDirs(File baseDir, String entry,
                                        ZipOutputStream zOut, String prefix)
         throws IOException
     {
-        if ( !doFilesonly )
+        if ( !doFilesonly && getIncludeEmptyDirs() )
         {
             Stack directories = new Stack();
 

src/test/java/org/codehaus/plexus/archiver/zip/ZipArchiverTest.java

@@ -24,7 +24,6 @@
  * SOFTWARE.
  */
 
-import java.util.Date;
 import java.util.Enumeration;
 
 import org.codehaus.plexus.PlexusTestCase;
@@ -42,41 +41,46 @@ public void testCreateArchive()
         throws Exception
     {
         ZipArchiver archiver = (ZipArchiver) lookup( Archiver.ROLE, "zip" );
+        
         archiver.setDefaultDirectoryMode( 0500 );
         archiver.setDefaultFileMode( 0400 );
         archiver.addDirectory( getTestFile( "src" ) );
+        
         archiver.setDefaultFileMode( 0640 );
         archiver.addFile( getTestFile( "src/test/resources/manifests/manifest1.mf" ), "one.txt" );
         archiver.addFile( getTestFile( "src/test/resources/manifests/manifest2.mf" ), "two.txt", 0664 );
-        archiver.setDefaultDirectoryMode( 0777 );
 
         // reset default file mode for files included from now on
         archiver.setDefaultFileMode( 0400 );
-        archiver.addDirectory( getTestFile( "src/test/resources/manifests/" ), "worldwritable" );
+        archiver.setDefaultDirectoryMode( 0777 );
+        archiver.addDirectory( getTestFile( "src/test/resources/ww/" ), "worldwritable/" );
+        
         archiver.setDefaultDirectoryMode( 0070 );
-        archiver.addDirectory( getTestFile( "src/test/resources/manifests/" ), "groupwritable" );
+        archiver.addDirectory( getTestFile( "src/test/resources/gw/" ), "groupwritable/" );
+        
         archiver.setDestFile( getTestFile( "target/output/archive.zip" ) );
         archiver.createArchive();
 
         ZipFile zf = new ZipFile( archiver.getDestFile() );
 
         Enumeration e = zf.getEntries();
+
         while ( e.hasMoreElements() )
         {
             ZipEntry ze = (ZipEntry) e.nextElement();
             if ( ze.isDirectory() )
             {
-            	if ( ze.getName().equals( "worldwritable") )
+            	if ( ze.getName().startsWith( "worldwritable") )
             	{
             		assertEquals( 0777, UnixStat.PERM_MASK & ze.getUnixMode() );
             	}
-            	if ( ze.getName().equals( "groupwritable") )
+            	else if ( ze.getName().startsWith( "groupwritable") )
             	{
             		assertEquals( 0070, UnixStat.PERM_MASK & ze.getUnixMode() );
             	}
             	else
             	{
-            		//assertEquals( 0500, UnixStat.PERM_MASK & ze.getUnixMode() );
+            		assertEquals( 0500, UnixStat.PERM_MASK & ze.getUnixMode() );
             	}
             }
             else