[PLXCOMP-285] DirectoryArchiver does not support symlinks

Author: krosenvold

pom.xml

@@ -10,7 +10,7 @@
   </parent>
 
   <artifactId>plexus-archiver</artifactId>
-  <version>2.10-beta-2-SNAPSHOT</version>
+  <version>2.10-SNAPSHOT</version>
 
   <name>Plexus Archiver Component</name>
 

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

@@ -22,6 +22,8 @@
 import org.codehaus.plexus.archiver.ResourceIterator;
 import org.codehaus.plexus.archiver.util.ArchiveEntryUtils;
 import org.codehaus.plexus.archiver.util.ResourceUtils;
+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.io.File;
@@ -79,7 +81,14 @@ public void execute()
                 String fileName = f.getName();
                 final String destDir = destDirectory.getCanonicalPath();
                 fileName = destDir + File.separator + fileName;
-                copyFile( f, fileName );
+                PlexusIoResource resource = f.getResource();
+                if (resource instanceof SymlinkDestinationSupplier){
+                    String dest = ((SymlinkDestinationSupplier)resource).getSymlinkDestination();
+                    File target = new File(dest);
+                    SymlinkUtils.createSymbolicLink(new File(fileName), target);
+                } else {
+                    copyFile(f, fileName);
+                }
             }
         }
         catch ( final IOException ioe )

src/test/java/org/codehaus/plexus/archiver/SymlinkTest.java

@@ -1,11 +1,13 @@
 package org.codehaus.plexus.archiver;
 
 import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.archiver.dir.DirectoryArchiver;
 import org.codehaus.plexus.archiver.tar.TarArchiver;
 import org.codehaus.plexus.archiver.tar.TarLongFileMode;
 import org.codehaus.plexus.archiver.tar.TarUnArchiver;
 import org.codehaus.plexus.archiver.zip.ZipArchiver;
 import org.codehaus.plexus.archiver.zip.ZipUnArchiver;
+import org.codehaus.plexus.components.io.attributes.SymlinkUtils;
 import org.codehaus.plexus.util.Os;
 
 import java.io.File;
@@ -84,4 +86,21 @@ public void testSymlinkZip()
         unarchiver.setDestFile(  output );
         unarchiver.extract();
     }
+
+    public void testSymlinkDirArchiver()
+            throws Exception
+    {
+        DirectoryArchiver archiver = (DirectoryArchiver) lookup( Archiver.ROLE, "dir" );
+
+        File dummyContent = getTestFile( "src/test/resources/symlinks/src" );
+        archiver.addDirectory( dummyContent );
+        final File archiveFile = new File( "target/output/dirarchiver-symlink" );
+        archiveFile.mkdirs();
+        archiver.setDestFile( archiveFile );
+        archiver.createArchive();
+
+        assertTrue( Files.isSymbolicLink(new File("target/output/dirarchiver-symlink/symR").toPath()));
+        assertTrue(Files.isSymbolicLink(new File("target/output/dirarchiver-symlink/aDirWithALink/backOutsideToFileX").toPath()));
+    }
+
 }

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

@@ -12,6 +12,7 @@
 import java.io.*;
 
 @SuppressWarnings("ResultOfMethodCallIgnored")
+@Ignore
 public class ConcurrentJarCreatorTest {
     @Test
     public void concurrent()

src/test/resources/symlinks/src/aDirWithALink/backOutsideToFileX

@@ -0,0 +1 @@
+../fileX.txt