Fixed 'addParentDirs' in ZipArchiver; it added the

actual directory itself too, which messed with the file permissions
if they were set for that specific directory.

Enhanced JUnit test for this case (setting perms on dirs).
TODO: enhance TarArchiver JUnit test too (although it works fine).

Author: neonics

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

@@ -475,6 +475,7 @@ protected final void addResources( Map resources, ZipOutputStream zOut )
             {
                 continue;
             }
+
             if ( entry.getFile().isDirectory() && !name.endsWith("/") )
             {
                 name = name + "/";
@@ -503,15 +504,20 @@ protected final void addParentDirs(File baseDir, String entry,
         if ( !doFilesonly )
         {
             Stack directories = new Stack();
-            int slashPos = entry.length();
+            
+            // Don't include the last entry itself if it's
+            // a dir; it will be added on its own.
+            int slashPos = entry.length() - ( entry.endsWith( "/" ) ? 1 : 0 );
 
             while ( ( slashPos = entry.lastIndexOf( '/', slashPos - 1 ) ) != -1 )
             {
                 String dir = entry.substring( 0, slashPos + 1 );
-                if ( addedDirs.get( prefix + dir ) != null)
+                
+                if ( addedDirs.contains( prefix + dir ) )
                 {
                     break;
                 }
+                
                 directories.push( dir );
             }
 

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

@@ -48,6 +48,13 @@ public void testCreateArchive()
         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( 0070 );
+        archiver.addDirectory( getTestFile( "src/test/resources/manifests/" ), "groupwritable" );
         archiver.setDestFile( getTestFile( "target/output/archive.zip" ) );
         archiver.createArchive();
 
@@ -59,7 +66,18 @@ public void testCreateArchive()
             ZipEntry ze = (ZipEntry) e.nextElement();
             if ( ze.isDirectory() )
             {
-            	assertEquals( 0500, UnixStat.PERM_MASK & ze.getUnixMode() );
+            	if ( ze.getName().equals( "worldwritable") )
+            	{
+            		assertEquals( 0777, UnixStat.PERM_MASK & ze.getUnixMode() );
+            	}
+            	if ( ze.getName().equals( "groupwritable") )
+            	{
+            		assertEquals( 0070, UnixStat.PERM_MASK & ze.getUnixMode() );
+            	}
+            	else
+            	{
+            		//assertEquals( 0500, UnixStat.PERM_MASK & ze.getUnixMode() );
+            	}
             }
             else
             {