Fixed default modes

Author: krosenvold

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

@@ -442,7 +442,7 @@ protected final void addParentDirs( File baseDir, String entry, ZipArchiveOutput
 				// the
 				// At this point we could do something like read the atr
 				final PlexusIoResource res = new AnonymousResource( f);
-                zipDir( res, zOut, prefix + dir, getRawDefaultDirectoryMode() );
+                zipDir( res, zOut, prefix + dir, getDirectoryMode() );
             }
         }
     }

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

@@ -82,7 +82,29 @@ public void setUp()
 
         logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
     }
-    
+
+    public void testImplicitPermissions()
+        throws IOException
+    {
+        File zipFile = getTestFile( "target/output/zip-with-implicit-dirmode.zip" );
+
+        ZipArchiver archiver = getZipArchiver(zipFile);
+
+        archiver.setDefaultDirectoryMode( 0777 );
+        archiver.setDirectoryMode( 0641 );
+        archiver.setFileMode( 0222 );
+        archiver.addFile( new File( "pom.xml" ), "fizz/buzz/pom.xml" );
+        archiver.createArchive();
+
+        assertTrue( zipFile.exists() );
+        ZipFile zf = new ZipFile( zipFile );
+        ZipArchiveEntry fizz = zf.getEntry( "fizz/" );
+        assertEquals( 040641, fizz.getUnixMode() );
+        ZipArchiveEntry pom = zf.getEntry( "fizz/buzz/pom.xml" );
+        assertEquals( 0100222, pom.getUnixMode() );
+
+
+    }
     public void testCreateArchiveWithDetectedModes()
         throws Exception
     {
@@ -133,31 +155,31 @@ public void testCreateArchiveWithDetectedModes()
 			}
 
             {
-                Map attributesByPath = PlexusIoResourceAttributeUtils.getFileAttributesByPath( tmpDir );
+                Map<String, PlexusIoResourceAttributes> attributesByPath = PlexusIoResourceAttributeUtils.getFileAttributesByPath( tmpDir );
 				for (String path : executablePaths) {
-					PlexusIoResourceAttributes attrs = (PlexusIoResourceAttributes) attributesByPath.get(path);
+					PlexusIoResourceAttributes attrs = attributesByPath.get(path);
 					if (attrs == null) {
-						attrs = (PlexusIoResourceAttributes) attributesByPath.get(new File(tmpDir, path).getAbsolutePath());
+						attrs = attributesByPath.get(new File(tmpDir, path).getAbsolutePath());
 					}
 
 					assertNotNull(attrs);
 					assertEquals("Wrong mode for: " + path + "; expected: " + exeMode, exeMode, attrs.getOctalMode());
 				}
 
 				for (String path : confPaths) {
-					PlexusIoResourceAttributes attrs = (PlexusIoResourceAttributes) attributesByPath.get(path);
+					PlexusIoResourceAttributes attrs = attributesByPath.get(path);
 					if (attrs == null) {
-						attrs = (PlexusIoResourceAttributes) attributesByPath.get(new File(tmpDir, path).getAbsolutePath());
+						attrs = attributesByPath.get(new File(tmpDir, path).getAbsolutePath());
 					}
 
 					assertNotNull(attrs);
 					assertEquals("Wrong mode for: " + path + "; expected: " + confMode, confMode, attrs.getOctalMode());
 				}
 
 				for (String path : logPaths) {
-					PlexusIoResourceAttributes attrs = (PlexusIoResourceAttributes) attributesByPath.get(path);
+					PlexusIoResourceAttributes attrs = attributesByPath.get(path);
 					if (attrs == null) {
-						attrs = (PlexusIoResourceAttributes) attributesByPath.get(new File(tmpDir, path).getAbsolutePath());
+						attrs = attributesByPath.get(new File(tmpDir, path).getAbsolutePath());
 					}
 
 					assertNotNull(attrs);
@@ -182,7 +204,7 @@ public void testCreateArchiveWithDetectedModes()
             archiver.addArchivedFileSet( zipFile );
             archiver.createArchive();
 
-            org.apache.commons.compress.archivers.zip.ZipFile zf = new org.apache.commons.compress.archivers.zip.ZipFile( zipFile2 );
+            ZipFile zf = new ZipFile( zipFile2 );
 
 			for (String path : executablePaths) {
 				ZipArchiveEntry ze = zf.getEntry(path);
@@ -370,7 +392,7 @@ private void createArchive( ZipArchiver archiver )
     {
         archiver.createArchive();
 
-        org.apache.commons.compress.archivers.zip.ZipFile zf = new org.apache.commons.compress.archivers.zip.ZipFile( archiver.getDestFile() );
+        ZipFile zf = new ZipFile( archiver.getDestFile() );
 
         Enumeration e = zf.getEntries();
 
@@ -545,8 +567,8 @@ public void testCreateResourceCollection()
         FileUtils.removePath( zipFile2.getPath() );
         zipArchiver2.createArchive();
 
-        final org.apache.commons.compress.archivers.zip.ZipFile cmp1 = new org.apache.commons.compress.archivers.zip.ZipFile( zipFile );
-        final org.apache.commons.compress.archivers.zip.ZipFile cmp2 = new org.apache.commons.compress.archivers.zip.ZipFile( zipFile2 );
+        final ZipFile cmp1 = new ZipFile( zipFile );
+        final ZipFile cmp2 = new ZipFile( zipFile2 );
         ArchiveFileComparator.assertEquals( cmp1, cmp2, "prfx/" );
         cmp1.close();
         cmp2.close();