Set chmod to files AND directories

Author: ofayau

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

@@ -22,10 +22,13 @@
 import org.codehaus.plexus.archiver.ResourceIterator;
 import org.codehaus.plexus.archiver.util.ArchiveEntryUtils;
 import org.codehaus.plexus.archiver.util.ResourceUtils;
+import org.codehaus.plexus.archiver.UnixStat;
 import org.codehaus.plexus.components.io.attributes.SymlinkUtils;
 import org.codehaus.plexus.components.io.functions.SymlinkDestinationSupplier;
 import org.codehaus.plexus.components.io.resources.PlexusIoResource;
 
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.io.File;
 import java.io.IOException;
 
@@ -141,11 +144,6 @@ protected void copyFile( final ArchiveEntry entry, final String vPath )
                 }
             }
             ResourceUtils.copyFile( entry.getInputStream(), outFile );
-
-            if ( !isIgnorePermissions() )
-            {
-                ArchiveEntryUtils.chmod( outFile, entry.getMode(), getLogger(), isUseJvmChmod() );
-            }
         }
         else
         { // file is a directory
@@ -166,6 +164,15 @@ else if ( !outFile.mkdirs() )
             }
         }
 
+	    if ( !isIgnorePermissions() )
+	    {
+		// compute relative path
+		String relative = outFile.getAbsolutePath().replaceFirst(getDestFile().getAbsolutePath(), ".");
+		getLogger().info( "Set chmod " + Integer.toOctalString( 0x0fff & entry.getMode() ) + " for " + relative );
+		// call chmod (java or system)		
+		ArchiveEntryUtils.chmod( outFile, entry.getMode(), getLogger(), isUseJvmChmod() );
+	    }
+
         outFile.setLastModified( inLastModified == PlexusIoResource.UNKNOWN_MODIFICATION_DATE ? System.currentTimeMillis()
                         : inLastModified );
     }