[PLXCOMP-271] Take 2

krosenvold · krosenvold · commit e1cad369d77b · 2014-11-12T16:47:16.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -56,7 +56,7 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-io</artifactId>
-      <version>2.3.3</version>
+      <version>2.3.4</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
diff --git a/src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java b/src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java
@@ -350,7 +350,8 @@ public void addSymlink( String symlinkName, String symlinkDestination )
     public void addSymlink( String symlinkName, int permissions, String symlinkDestination )
         throws ArchiverException
     {
-        resources.add( ArchiveEntry.createSymlinkEntry( symlinkName, permissions, symlinkDestination ) );
+        resources.add( ArchiveEntry.createSymlinkEntry( symlinkName, permissions, symlinkDestination,
+                                                        getDirectoryMode() ) );
     }
 
     protected ArchiveEntry asArchiveEntry( @Nonnull final PlexusIoResource resource, final String destFileName,
@@ -364,11 +365,12 @@ protected ArchiveEntry asArchiveEntry( @Nonnull final PlexusIoResource resource,
 
         if ( resource.isFile() )
         {
-            return ArchiveEntry.createFileEntry( destFileName, resource, permissions, collection );
+            return ArchiveEntry.createFileEntry( destFileName, resource, permissions, collection,
+                                                 getDirectoryMode() );
         }
         else
         {
-            return ArchiveEntry.createDirectoryEntry( destFileName, resource, permissions );
+            return ArchiveEntry.createDirectoryEntry( destFileName, resource, permissions, getDirectoryMode() );
         }
     }
 
@@ -427,12 +429,14 @@ public void addFile( @Nonnull final File inputFile, @Nonnull String destFileName
 
                 if ( include( in, destFileName ) )
                 {
-                    resources.add( ArchiveEntry.createFileEntry( destFileName, inputFile, permissions ) );
+                    resources.add( ArchiveEntry.createFileEntry( destFileName, inputFile, permissions,
+                                                                 getDirectoryMode() ) );
                 }
             }
             else
             {
-                resources.add( ArchiveEntry.createFileEntry( destFileName, inputFile, permissions ) );
+                resources.add( ArchiveEntry.createFileEntry( destFileName, inputFile, permissions,
+                                                             getDirectoryMode() ) );
             }
         }
         catch ( final IOException e )
diff --git a/src/main/java/org/codehaus/plexus/archiver/ArchiveEntry.java b/src/main/java/org/codehaus/plexus/archiver/ArchiveEntry.java
@@ -55,6 +55,9 @@ public class ArchiveEntry
 
     private final int mode;
 
+    private final int defaultDirMode;  // Sometimes a directory needs to be created. Which mode should it be ?
+    // this mode is at the time of the creation of the archive entry, which is an important distinction
+
     private PlexusIoResourceAttributes attributes;
 
     /**
@@ -64,12 +67,14 @@ public class ArchiveEntry
      * @param type     FILE or DIRECTORY
      * @param mode     octal unix style permissions
      * @param collection
+     * @param defaultDirMode
      */
     private ArchiveEntry( String name, @Nonnull PlexusIoResource resource, int type, int mode,
-                          PlexusIoResourceCollection collection )
+                          PlexusIoResourceCollection collection, int defaultDirMode )
     {
         this.name = name;
         this.collection = collection;
+        this.defaultDirMode = defaultDirMode;
         try {
             this.resource = collection != null ? collection.resolve(resource) : resource;
         } catch (IOException e) {
@@ -151,18 +156,18 @@ public int getMode()
     }
 
     public static ArchiveEntry createFileEntry( String target, PlexusIoResource resource, int permissions,
-                                                PlexusIoResourceCollection collection )
+                                                PlexusIoResourceCollection collection, int defaultDirectoryPermissions )
         throws ArchiverException
     {
         if ( resource.isDirectory() )
         {
             throw new ArchiverException( "Not a file: " + resource.getName() );
         }
         final int type = resource.isSymbolicLink() ? SYMLINK : FILE;
-        return new ArchiveEntry( target, resource, type, permissions, collection );
+        return new ArchiveEntry( target, resource, type, permissions, collection, defaultDirectoryPermissions );
     }
 
-    public static ArchiveEntry createFileEntry( String target, File file, int permissions )
+    public static ArchiveEntry createFileEntry( String target, File file, int permissions, int defaultDirectoryPermissions )
         throws ArchiverException
     {
         if ( !file.isFile() )
@@ -181,21 +186,23 @@ public static ArchiveEntry createFileEntry( String target, File file, int permis
         }
         
         final PlexusIoFileResource res =  PlexusIoFileResource.justAFile( file, attrs );
-        return new ArchiveEntry( target, res, FILE, permissions, null );
+        return new ArchiveEntry( target, res, FILE, permissions, null, defaultDirectoryPermissions );
     }
 
-    public static ArchiveEntry createDirectoryEntry( String target, @Nonnull PlexusIoResource resource, int permissions )
+    public static ArchiveEntry createDirectoryEntry( String target, @Nonnull PlexusIoResource resource, int permissions,
+                                                     int defaultDirectoryPermissions )
         throws ArchiverException
     {
         if ( !resource.isDirectory() )
         {
             throw new ArchiverException( "Not a directory: " + resource.getName() );
         }
         final int type = resource.isSymbolicLink() ? SYMLINK : DIRECTORY;
-        return new ArchiveEntry( target, resource, type, permissions, null );
+        return new ArchiveEntry( target, resource, type, permissions, null, defaultDirectoryPermissions );
     }
 
-    public static ArchiveEntry createDirectoryEntry( String target, final File file, int permissions )
+    public static ArchiveEntry createDirectoryEntry( String target, final File file, int permissions,
+                                                     int defaultDirMode1 )
         throws ArchiverException
     {
         if ( !file.isDirectory() )
@@ -204,31 +211,33 @@ public static ArchiveEntry createDirectoryEntry( String target, final File file,
         }
 
 		final PlexusIoFileResource res = new PlexusIoFileResource( file, ArchiverAttributeUtils.getFileAttributes(file));
-        return new ArchiveEntry( target, res, DIRECTORY, permissions, null );
+        return new ArchiveEntry( target, res, DIRECTORY, permissions, null, defaultDirMode1 );
     }
 
-    public static ArchiveEntry createEntry( String target, File file, int filePerm, int dirPerm )
+    public static ArchiveEntry createEntry( String target, File file, int filePerm, int dirPerm, int defaultDirectoryPermissions )
         throws ArchiverException
     {
         if ( file.isDirectory() )
         {
-            return createDirectoryEntry( target, file, dirPerm );
+            return createDirectoryEntry( target, file, dirPerm, defaultDirectoryPermissions );
         }
         else if ( file.isFile() )
         {
-            return createFileEntry( target, file, filePerm );
+            return createFileEntry( target, file, filePerm, defaultDirectoryPermissions );
         }
         else // FIXME: handle symlinks?
         {
             throw new ArchiverException( "Neither a file nor a directory: " + file );
         }
     }
     
-    public static ArchiveEntry createSymlinkEntry(String symlinkName, int permissions, String symlinkDestination)
+    public static ArchiveEntry createSymlinkEntry( String symlinkName, int permissions, String symlinkDestination,
+                                                   int defaultDirectoryPermissions
+    )
     {
 		File symlinkFile = new File(symlinkName);
 		final ArchiveEntry archiveEntry = new ArchiveEntry(symlinkName, new PlexusIoVirtualSymlinkResource(symlinkFile, symlinkDestination), SYMLINK, permissions,
-                                                           null );
+                                                           null, defaultDirectoryPermissions );
 		return archiveEntry;
     }
 
@@ -246,4 +255,9 @@ public void setResourceAttributes( PlexusIoResourceAttributes attributes )
     {
         return resource;
     }
+
+    public int getDefaultDirMode()
+    {
+        return defaultDirMode;
+    }
 }
diff --git a/src/main/java/org/codehaus/plexus/archiver/Archiver.java b/src/main/java/org/codehaus/plexus/archiver/Archiver.java
@@ -211,12 +211,24 @@ void addResources( PlexusIoResourceCollection resources )
 
     int getDefaultFileMode();
 
+    /**
+     * This is the forced mode that should be used regardless if set, otherwise falls back to default.
+     * @param mode
+     */
     void setDirectoryMode( int mode );
 
+    /**
+     * Gets the forced mode for directories, falling back to default if none is forced.
+     * @return
+     */
     int getDirectoryMode();
 
     int getOverrideDirectoryMode();
 
+    /**
+     * This is the "default" value we should use if no other value is specified
+     * @param mode
+     */
     void setDefaultDirectoryMode( int mode );
 
     int getDefaultDirectoryMode();
diff --git a/src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipArchiver.java b/src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipArchiver.java
@@ -382,7 +382,7 @@ protected final void addResources( ResourceIterator resources, ZipArchiveOutputS
                 name = name + "/";
             }
 
-            addParentDirs( base, name, zOut, "" );
+            addParentDirs( entry, base, name, zOut, "" );
 
             if ( entry.getResource().isFile() )
             {
@@ -404,7 +404,8 @@ protected final void addResources( ResourceIterator resources, ZipArchiveOutputS
 	 *
      */
     @SuppressWarnings({"JavaDoc"})
-    protected final void addParentDirs( File baseDir, String entry, ZipArchiveOutputStream zOut, String prefix )
+    private void addParentDirs( ArchiveEntry archiveEntry, File baseDir, String entry, ZipArchiveOutputStream zOut,
+                                String prefix )
         throws IOException
     {
         if ( !doFilesonly && getIncludeEmptyDirs() )
@@ -442,7 +443,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, getDirectoryMode() );
+                zipDir( res, zOut, prefix + dir, archiveEntry.getDefaultDirMode() );
             }
         }
     }
diff --git a/src/test/java/org/codehaus/plexus/archiver/zip/ZipArchiverTest.java b/src/test/java/org/codehaus/plexus/archiver/zip/ZipArchiverTest.java
@@ -94,6 +94,10 @@ public void testImplicitPermissions()
         archiver.setDirectoryMode( 0641 );
         archiver.setFileMode( 0222 );
         archiver.addFile( new File( "pom.xml" ), "fizz/buzz/pom.xml" );
+        archiver.setDefaultDirectoryMode( 0530);
+        archiver.setDirectoryMode( -1 ); // Not forced mode
+        archiver.setFileMode( 0111 );
+        archiver.addFile( new File( "pom.xml" ), "fazz/bazz/pam.xml" );
         archiver.createArchive();
 
         assertTrue( zipFile.exists() );
@@ -103,6 +107,11 @@ public void testImplicitPermissions()
         ZipArchiveEntry pom = zf.getEntry( "fizz/buzz/pom.xml" );
         assertEquals( 0100222, pom.getUnixMode() );
 
+        ZipArchiveEntry fazz = zf.getEntry( "fazz/" );
+        assertEquals( 040530, fazz.getUnixMode() );
+        ZipArchiveEntry pam = zf.getEntry( "fazz/bazz/pam.xml" );
+        assertEquals( 0100111, pam.getUnixMode() );
+
 
     }
     public void testCreateArchiveWithDetectedModes()

Original file line number	Diff line number	Diff line change
`@@ -350,7 +350,8 @@ public void addSymlink( String symlinkName, String symlinkDestination )`
`350`	`350`	`public void addSymlink( String symlinkName, int permissions, String symlinkDestination )`
`351`	`351`	`throws ArchiverException`
`352`	`352`	`{`
`353`		`- resources.add( ArchiveEntry.createSymlinkEntry( symlinkName, permissions, symlinkDestination ) );`
	`353`	`+ resources.add( ArchiveEntry.createSymlinkEntry( symlinkName, permissions, symlinkDestination,`
	`354`	`+ getDirectoryMode() ) );`
`354`	`355`	`}`
`355`	`356`
`356`	`357`	`protected ArchiveEntry asArchiveEntry( @Nonnull final PlexusIoResource resource, final String destFileName,`
`@@ -364,11 +365,12 @@ protected ArchiveEntry asArchiveEntry( @Nonnull final PlexusIoResource resource,`
`364`	`365`
`365`	`366`	`if ( resource.isFile() )`
`366`	`367`	`{`
`367`		`- return ArchiveEntry.createFileEntry( destFileName, resource, permissions, collection );`
	`368`	`+ return ArchiveEntry.createFileEntry( destFileName, resource, permissions, collection,`
	`369`	`+ getDirectoryMode() );`
`368`	`370`	`}`
`369`	`371`	`else`
`370`	`372`	`{`
`371`		`- return ArchiveEntry.createDirectoryEntry( destFileName, resource, permissions );`
	`373`	`+ return ArchiveEntry.createDirectoryEntry( destFileName, resource, permissions, getDirectoryMode() );`
`372`	`374`	`}`
`373`	`375`	`}`
`374`	`376`
`@@ -427,12 +429,14 @@ public void addFile( @Nonnull final File inputFile, @Nonnull String destFileName`
`427`	`429`
`428`	`430`	`if ( include( in, destFileName ) )`
`429`	`431`	`{`
`430`		`- resources.add( ArchiveEntry.createFileEntry( destFileName, inputFile, permissions ) );`
	`432`	`+ resources.add( ArchiveEntry.createFileEntry( destFileName, inputFile, permissions,`
	`433`	`+ getDirectoryMode() ) );`
`431`	`434`	`}`
`432`	`435`	`}`
`433`	`436`	`else`
`434`	`437`	`{`
`435`		`- resources.add( ArchiveEntry.createFileEntry( destFileName, inputFile, permissions ) );`
	`438`	`+ resources.add( ArchiveEntry.createFileEntry( destFileName, inputFile, permissions,`
	`439`	`+ getDirectoryMode() ) );`
`436`	`440`	`}`
`437`	`441`	`}`
`438`	`442`	`catch ( final IOException e )`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,9 @@ public class ArchiveEntry`
`55`	`55`
`56`	`56`	`private final int mode;`
`57`	`57`
	`58`	`+ private final int defaultDirMode; // Sometimes a directory needs to be created. Which mode should it be ?`
	`59`	`+ // this mode is at the time of the creation of the archive entry, which is an important distinction`
	`60`	`+`
`58`	`61`	`private PlexusIoResourceAttributes attributes;`
`59`	`62`
`60`	`63`	`/**`
`@@ -64,12 +67,14 @@ public class ArchiveEntry`
`64`	`67`	`* @param type FILE or DIRECTORY`
`65`	`68`	`* @param mode octal unix style permissions`
`66`	`69`	`* @param collection`
	`70`	`+ * @param defaultDirMode`
`67`	`71`	`*/`
`68`	`72`	`private ArchiveEntry( String name, @Nonnull PlexusIoResource resource, int type, int mode,`
`69`		`- PlexusIoResourceCollection collection )`
	`73`	`+ PlexusIoResourceCollection collection, int defaultDirMode )`
`70`	`74`	`{`
`71`	`75`	`this.name = name;`
`72`	`76`	`this.collection = collection;`
	`77`	`+ this.defaultDirMode = defaultDirMode;`
`73`	`78`	`try {`
`74`	`79`	`this.resource = collection != null ? collection.resolve(resource) : resource;`
`75`	`80`	`} catch (IOException e) {`
`@@ -151,18 +156,18 @@ public int getMode()`
`151`	`156`	`}`
`152`	`157`
`153`	`158`	`public static ArchiveEntry createFileEntry( String target, PlexusIoResource resource, int permissions,`
`154`		`- PlexusIoResourceCollection collection )`
	`159`	`+ PlexusIoResourceCollection collection, int defaultDirectoryPermissions )`
`155`	`160`	`throws ArchiverException`
`156`	`161`	`{`
`157`	`162`	`if ( resource.isDirectory() )`
`158`	`163`	`{`
`159`	`164`	`throw new ArchiverException( "Not a file: " + resource.getName() );`
`160`	`165`	`}`
`161`	`166`	`final int type = resource.isSymbolicLink() ? SYMLINK : FILE;`
`162`		`- return new ArchiveEntry( target, resource, type, permissions, collection );`
	`167`	`+ return new ArchiveEntry( target, resource, type, permissions, collection, defaultDirectoryPermissions );`
`163`	`168`	`}`
`164`	`169`
`165`		`- public static ArchiveEntry createFileEntry( String target, File file, int permissions )`
	`170`	`+ public static ArchiveEntry createFileEntry( String target, File file, int permissions, int defaultDirectoryPermissions )`
`166`	`171`	`throws ArchiverException`
`167`	`172`	`{`
`168`	`173`	`if ( !file.isFile() )`
`@@ -181,21 +186,23 @@ public static ArchiveEntry createFileEntry( String target, File file, int permis`
`181`	`186`	`}`
`182`	`187`
`183`	`188`	`final PlexusIoFileResource res = PlexusIoFileResource.justAFile( file, attrs );`
`184`		`- return new ArchiveEntry( target, res, FILE, permissions, null );`
	`189`	`+ return new ArchiveEntry( target, res, FILE, permissions, null, defaultDirectoryPermissions );`
`185`	`190`	`}`
`186`	`191`
`187`		`- public static ArchiveEntry createDirectoryEntry( String target, @Nonnull PlexusIoResource resource, int permissions )`
	`192`	`+ public static ArchiveEntry createDirectoryEntry( String target, @Nonnull PlexusIoResource resource, int permissions,`
	`193`	`+ int defaultDirectoryPermissions )`
`188`	`194`	`throws ArchiverException`
`189`	`195`	`{`
`190`	`196`	`if ( !resource.isDirectory() )`
`191`	`197`	`{`
`192`	`198`	`throw new ArchiverException( "Not a directory: " + resource.getName() );`
`193`	`199`	`}`
`194`	`200`	`final int type = resource.isSymbolicLink() ? SYMLINK : DIRECTORY;`
`195`		`- return new ArchiveEntry( target, resource, type, permissions, null );`
	`201`	`+ return new ArchiveEntry( target, resource, type, permissions, null, defaultDirectoryPermissions );`
`196`	`202`	`}`
`197`	`203`
`198`		`- public static ArchiveEntry createDirectoryEntry( String target, final File file, int permissions )`
	`204`	`+ public static ArchiveEntry createDirectoryEntry( String target, final File file, int permissions,`
	`205`	`+ int defaultDirMode1 )`
`199`	`206`	`throws ArchiverException`
`200`	`207`	`{`
`201`	`208`	`if ( !file.isDirectory() )`
`@@ -204,31 +211,33 @@ public static ArchiveEntry createDirectoryEntry( String target, final File file,`
`204`	`211`	`}`
`205`	`212`
`206`	`213`	`final PlexusIoFileResource res = new PlexusIoFileResource( file, ArchiverAttributeUtils.getFileAttributes(file));`
`207`		`- return new ArchiveEntry( target, res, DIRECTORY, permissions, null );`
	`214`	`+ return new ArchiveEntry( target, res, DIRECTORY, permissions, null, defaultDirMode1 );`
`208`	`215`	`}`
`209`	`216`
`210`		`- public static ArchiveEntry createEntry( String target, File file, int filePerm, int dirPerm )`
	`217`	`+ public static ArchiveEntry createEntry( String target, File file, int filePerm, int dirPerm, int defaultDirectoryPermissions )`
`211`	`218`	`throws ArchiverException`
`212`	`219`	`{`
`213`	`220`	`if ( file.isDirectory() )`
`214`	`221`	`{`
`215`		`- return createDirectoryEntry( target, file, dirPerm );`
	`222`	`+ return createDirectoryEntry( target, file, dirPerm, defaultDirectoryPermissions );`
`216`	`223`	`}`
`217`	`224`	`else if ( file.isFile() )`
`218`	`225`	`{`
`219`		`- return createFileEntry( target, file, filePerm );`
	`226`	`+ return createFileEntry( target, file, filePerm, defaultDirectoryPermissions );`
`220`	`227`	`}`
`221`	`228`	`else // FIXME: handle symlinks?`
`222`	`229`	`{`
`223`	`230`	`throw new ArchiverException( "Neither a file nor a directory: " + file );`
`224`	`231`	`}`
`225`	`232`	`}`
`226`	`233`
`227`		`- public static ArchiveEntry createSymlinkEntry(String symlinkName, int permissions, String symlinkDestination)`
	`234`	`+ public static ArchiveEntry createSymlinkEntry( String symlinkName, int permissions, String symlinkDestination,`
	`235`	`+ int defaultDirectoryPermissions`
	`236`	`+ )`
`228`	`237`	`{`
`229`	`238`	`File symlinkFile = new File(symlinkName);`
`230`	`239`	`final ArchiveEntry archiveEntry = new ArchiveEntry(symlinkName, new PlexusIoVirtualSymlinkResource(symlinkFile, symlinkDestination), SYMLINK, permissions,`
`231`		`- null );`
	`240`	`+ null, defaultDirectoryPermissions );`
`232`	`241`	`return archiveEntry;`
`233`	`242`	`}`
`234`	`243`
`@@ -246,4 +255,9 @@ public void setResourceAttributes( PlexusIoResourceAttributes attributes )`
`246`	`255`	`{`
`247`	`256`	`return resource;`
`248`	`257`	`}`
	`258`	`+`
	`259`	`+ public int getDefaultDirMode()`
	`260`	`+ {`
	`261`	`+ return defaultDirMode;`
	`262`	`+ }`
`249`	`263`	`}`
Original file line number	Diff line number	Diff line change
`@@ -382,7 +382,7 @@ protected final void addResources( ResourceIterator resources, ZipArchiveOutputS`
`382`	`382`	`name = name + "/";`
`383`	`383`	`}`
`384`	`384`
`385`		`- addParentDirs( base, name, zOut, "" );`
	`385`	`+ addParentDirs( entry, base, name, zOut, "" );`
`386`	`386`
`387`	`387`	`if ( entry.getResource().isFile() )`
`388`	`388`	`{`
`@@ -404,7 +404,8 @@ protected final void addResources( ResourceIterator resources, ZipArchiveOutputS`
`404`	`404`	`*`
`405`	`405`	`*/`
`406`	`406`	`@SuppressWarnings({"JavaDoc"})`
`407`		`- protected final void addParentDirs( File baseDir, String entry, ZipArchiveOutputStream zOut, String prefix )`
	`407`	`+ private void addParentDirs( ArchiveEntry archiveEntry, File baseDir, String entry, ZipArchiveOutputStream zOut,`
	`408`	`+ String prefix )`
`408`	`409`	`throws IOException`
`409`	`410`	`{`
`410`	`411`	`if ( !doFilesonly && getIncludeEmptyDirs() )`
`@@ -442,7 +443,7 @@ protected final void addParentDirs( File baseDir, String entry, ZipArchiveOutput`
`442`	`443`	`// the`
`443`	`444`	`// At this point we could do something like read the atr`
`444`	`445`	`final PlexusIoResource res = new AnonymousResource( f);`
`445`		`- zipDir( res, zOut, prefix + dir, getDirectoryMode() );`
	`446`	`+ zipDir( res, zOut, prefix + dir, archiveEntry.getDefaultDirMode() );`
`446`	`447`	`}`
`447`	`448`	`}`
`448`	`449`	`}`