Added support for java7 setAttribtues

Author: krosenvold

src/main/java/org/codehaus/plexus/archiver/util/ArchiveEntryUtils.java

@@ -1,13 +1,16 @@
 package org.codehaus.plexus.archiver.util;
 
 import org.codehaus.plexus.archiver.ArchiverException;
+import org.codehaus.plexus.components.io.attributes.Java7AttributeUtils;
+import org.codehaus.plexus.components.io.attributes.Java7Reflector;
 import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.util.Os;
 import org.codehaus.plexus.util.cli.CommandLineException;
 import org.codehaus.plexus.util.cli.CommandLineUtils;
 import org.codehaus.plexus.util.cli.Commandline;
 
 import java.io.File;
+import java.io.IOException;
 import java.lang.reflect.Method;
 
 @SuppressWarnings("JavaDoc")
@@ -50,6 +53,18 @@ public static void chmod( final File file, final int mode, final Logger logger,
             return;
         }
 
+		if (Java7Reflector.isJava7())
+		{
+			try
+			{
+				Java7AttributeUtils.chmod(file, mode);
+				return;
+			} catch (IOException e)
+			{
+				throw new ArchiverException("Failed setting file attributes with java7+", e);
+			}
+		}
+
         final String m = Integer.toOctalString( mode & 0xfff );
 
         if ( useJvmChmod && !jvmFilePermAvailable )

src/test/java/org/codehaus/plexus/archiver/tar/TarFileAttributesTest.java

@@ -10,6 +10,7 @@
 import org.codehaus.plexus.archiver.Archiver;
 import org.codehaus.plexus.archiver.UnArchiver;
 import org.codehaus.plexus.archiver.util.DefaultArchivedFileSet;
+import org.codehaus.plexus.components.io.attributes.Java7Reflector;
 import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributeUtils;
 import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes;
 import org.codehaus.plexus.util.FileUtils;
@@ -138,8 +139,10 @@ public void testUseAttributesFromTarArchiveInputInTarArchiverOutput()
         PlexusIoResourceAttributes fileAttributes =
             PlexusIoResourceAttributeUtils.getFileAttributes( new File( tempTarDir, tempFile.getName() ) );
 
-        assertEquals( "This test will fail if your umask is not X2X (or more)",
-                      "644", fileAttributes.getOctalModeString() );
+		final String expected = Java7Reflector.isJava7() ? "660" : "644";
+
+		assertEquals( "This test will fail if your umask is not X2X (or more)",
+				expected, fileAttributes.getOctalModeString() );
     }
 
     public void testUseDetectedFileAttributes()
@@ -199,8 +202,10 @@ public void testUseDetectedFileAttributes()
 
         fileAttributes = PlexusIoResourceAttributeUtils.getFileAttributes( new File( tempTarDir, tempFile.getName() ) );
 
-        assertEquals( "This test will fail if your umask is not X2X (or more)",
-                      "444", fileAttributes.getOctalModeString() );
+		final String expected = Java7Reflector.isJava7() ? "440" : "444";
+
+		assertEquals( "This test will fail if your umask is not X2X (or more)",
+				expected, fileAttributes.getOctalModeString() );
     }
 
     private boolean checkForWindows()
@@ -262,8 +267,10 @@ public void testOverrideDetectedFileAttributes()
         PlexusIoResourceAttributes fileAttributes =
             PlexusIoResourceAttributeUtils.getFileAttributes( new File( tempTarDir, tempFile.getName() ) );
 
-        assertEquals( "This test will fail if your umask is not X2X (or more)",
-                      "644", fileAttributes.getOctalModeString() );
+		final String expected = Java7Reflector.isJava7() ? "660" : "644";
+
+		assertEquals( "This test will fail if your umask is not X2X (or more)",
+				expected, fileAttributes.getOctalModeString() );
     }
 
     public void testOverrideDetectedFileAttributesUsingFileMode()
@@ -320,8 +327,9 @@ public void testOverrideDetectedFileAttributesUsingFileMode()
         PlexusIoResourceAttributes fileAttributes =
             PlexusIoResourceAttributeUtils.getFileAttributes( new File( tempTarDir, tempFile.getName() ) );
 
-        assertEquals( "This test will fail if your umask is not X2X (or more)",
-                      "644", fileAttributes.getOctalModeString() );
+		final String expected = Java7Reflector.isJava7() ? "660" : "644";
+		assertEquals( "This test will fail if your umask is not X2X (or more)",
+				expected, fileAttributes.getOctalModeString() );
     }
 
 }

src/test/java/org/codehaus/plexus/archiver/util/ArchiveEntryUtilsTest.java

@@ -1,9 +1,11 @@
 package org.codehaus.plexus.archiver.util;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.HashMap;
 
 import org.codehaus.plexus.components.io.attributes.Java7FileAttributes;
+import org.codehaus.plexus.components.io.attributes.Java7Reflector;
 import org.codehaus.plexus.logging.console.ConsoleLogger;
 
 import junit.framework.TestCase;
@@ -14,18 +16,28 @@ public void testChmodForFileWithDollarPLXCOMP164() throws Exception
 	{
 
 		File temp = File.createTempFile("A$A", "BB$");
-
 		ArchiveEntryUtils.chmod( temp, 0770, new ConsoleLogger( org.codehaus.plexus.logging.Logger.LEVEL_DEBUG, "foo" ), false);
+		assert0770(temp);
+	}
 
-		Java7FileAttributes j7 = new Java7FileAttributes(temp, new HashMap<Integer, String>(), new HashMap<Integer, String>());
+	public void testChmodWithJava7() throws Exception
+	{
+		if (!Java7Reflector.isJava7()) return; // Require at least java7
 
+		File temp = File.createTempFile("D$D", "BB$");
+		ArchiveEntryUtils.chmod( temp, 0770, new ConsoleLogger( org.codehaus.plexus.logging.Logger.LEVEL_DEBUG, "foo" ));
+		assert0770(temp);
+	}
+
+	private void assert0770(File temp) throws IOException {
+		Java7FileAttributes j7 = new Java7FileAttributes(temp, new HashMap<Integer, String>(), new HashMap<Integer, String>());
 		assertTrue(j7.isGroupExecutable());
 		assertTrue(j7.isGroupReadable());
 		assertTrue(j7.isGroupWritable());
 
 		assertFalse(j7.isWorldExecutable());
 		assertFalse(j7.isWorldReadable());
 		assertFalse(j7.isWorldWritable());
-
 	}
-}
+
+}