Made directory archiver support creating directories containing files even if write permissions are not present on archiver

Author: krosenvold

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

@@ -28,13 +28,18 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * A plexus archiver implementation that stores the files to archive in a directory.
  */
 public class DirectoryArchiver
     extends AbstractArchiver
 {
+
+    private final List<Runnable> directoryChmods = new ArrayList<Runnable>();
+
     public void resetArchiver()
         throws IOException
     {
@@ -93,6 +98,11 @@ public void execute()
                     copyFile( f, fileName );
                 }
             }
+
+            for ( Runnable directoryChmod : directoryChmods )
+            {
+                directoryChmod.run();
+            }
         }
         catch ( final IOException ioe )
         {
@@ -141,6 +151,8 @@ protected void copyFile( final ArchiveEntry entry, final String vPath )
                 }
             }
             ResourceUtils.copyFile( entry.getInputStream(), outFile );
+
+            setFileModes( entry, outFile, inLastModified );
         }
         else
         { // file is a directory
@@ -159,8 +171,21 @@ else if ( !outFile.mkdirs() )
                 // Failure, unable to create specified directory for some unknown reason.
                 throw new ArchiverException( "Unable to create directory or parent directory of " + outFile );
             }
+
+            directoryChmods.add( new Runnable()
+            {
+                @Override
+                public void run()
+                {
+                    setFileModes( entry, outFile, inLastModified );
+                }
+            } );
         }
 
+    }
+
+    private void setFileModes( ArchiveEntry entry, File outFile, long inLastModified )
+    {
         if ( !isIgnorePermissions() )
         {
             ArchiveEntryUtils.chmod( outFile, entry.getMode(), getLogger(), isUseJvmChmod() );

…s/plexus/archiver/jar/UnpackJarTest.java …/jar/DirectoryArchiverUnpackJarTest.javasrc/test/java/org/codehaus/plexus/archiver/jar/UnpackJarTest.java renamed to src/test/java/org/codehaus/plexus/archiver/jar/DirectoryArchiverUnpackJarTest.java src/test/java/org/codehaus/plexus/archiver/jar/UnpackJarTest.java renamed to src/test/java/org/codehaus/plexus/archiver/jar/DirectoryArchiverUnpackJarTest.java

@@ -1,23 +1,20 @@
 package org.codehaus.plexus.archiver.jar;
 
-import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
-import org.apache.commons.compress.archivers.zip.ZipFile;
 import org.codehaus.plexus.PlexusTestCase;
 import org.codehaus.plexus.archiver.Archiver;
 import org.codehaus.plexus.archiver.util.DefaultArchivedFileSet;
-import org.codehaus.plexus.components.io.filemappers.IdentityMapper;
+import org.codehaus.plexus.components.io.attributes.Java7AttributeUtils;
 import org.codehaus.plexus.components.io.functions.InputStreamTransformer;
 import org.codehaus.plexus.components.io.resources.PlexusIoResource;
-import org.junit.Test;
 
 import javax.annotation.Nonnull;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
-import java.util.Enumeration;
 
-public class UnpackJarTest extends PlexusTestCase
+public class DirectoryArchiverUnpackJarTest
+    extends PlexusTestCase
 {
 
     public static final String[] DEFAULT_INCLUDES_ARRAY = { "**/*" };
@@ -37,24 +34,30 @@ public InputStream transform( @Nonnull PlexusIoResource resource, @Nonnull Input
         }
     }
 
-
     public void test_dependency_sets_depSet_unpacked_rdonly()
         throws Exception
     {
-        if (true) return;
-        File src = new File("src/test/resources/unpack_issue.jar");
-        assertTrue( src.exists());
+        File src = new File( "src/test/resources/unpack_issue.jar" );
+        assertTrue( src.exists() );
         DefaultArchivedFileSet afs = DefaultArchivedFileSet.archivedFileSet( src );
         afs.setIncludes( DEFAULT_INCLUDES_ARRAY );
         afs.setExcludes( null );
         afs.setPrefix( "child-1/" );
         afs.setStreamTransformer( new IdentityTransformer() );
-        Archiver archiver = (Archiver)lookup( Archiver.ROLE, "dir" );
+        Archiver archiver = (Archiver) lookup( Archiver.ROLE, "dir" );
         archiver.setDefaultDirectoryMode( 0555 );
-       archiver.setDirectoryMode( 0555 ); // causes permission denied
+        archiver.setDirectoryMode( 0555 ); // causes permission denied if bug is not fixed.
         archiver.setDestFile( new File( "target/depset_unpack" ) );
-        archiver.addArchivedFileSet( afs, Charset.forName("UTF-8" ));
+        archiver.addArchivedFileSet( afs, Charset.forName( "UTF-8" ) );
         archiver.createArchive();
-        assertTrue( new File("target/depset_unpack/child-1/META-INF/MANIFEST.MF").exists());
+        assertTrue( new File( "target/depset_unpack/child-1/META-INF/MANIFEST.MF" ).exists() );
+
+
+        // make them writeable or mvn clean will fail
+        Java7AttributeUtils.chmod( new File("target/depset_unpack/child-1/META-INF"), 0777);
+        Java7AttributeUtils.chmod( new File("target/depset_unpack/child-1/META-INF/maven"), 0777);
+        Java7AttributeUtils.chmod( new File("target/depset_unpack/child-1/META-INF/maven/test"), 0777);
+        Java7AttributeUtils.chmod( new File("target/depset_unpack/child-1/META-INF/maven/test/child1"), 0777);
+        Java7AttributeUtils.chmod( new File("target/depset_unpack/child-1/assembly-resources"), 0777);
     }
 }