Merge remote-tracking branch 'sonatype/272'

Conflicts:
	src/test/java/org/codehaus/plexus/archiver/zip/ZipArchiverTest.java

Author: krosenvold

src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipArchiver.java

@@ -37,6 +37,7 @@
 import org.codehaus.plexus.components.io.resources.PlexusIoSymlink;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.StringUtils;
 
 import static org.codehaus.plexus.archiver.util.Streams.bufferedOutputStream;
 import static org.codehaus.plexus.archiver.util.Streams.fileOutputStream;
@@ -641,6 +642,13 @@ protected void zipDir( PlexusIoResource dir, ZipArchiveOutputStream zOut, String
 
         if ( !skipWriting )
         {
+            final boolean isSymlink = dir instanceof PlexusIoSymlink;
+
+            if (isSymlink && vPath.endsWith(File.separator))
+            {
+                vPath= vPath.substring(0, vPath.length() -1);
+            }
+
             ZipArchiveEntry ze = new ZipArchiveEntry( vPath );
 
             /*
@@ -652,7 +660,6 @@ protected void zipDir( PlexusIoResource dir, ZipArchiveOutputStream zOut, String
              */
 
 
-            final boolean isSymlink = dir instanceof PlexusIoSymlink;
             if (isSymlink) mode = UnixStat.LINK_FLAG | mode;
 
 

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

@@ -27,14 +27,19 @@
 import org.apache.commons.compress.archivers.zip.*;
 import org.apache.commons.compress.utils.BoundedInputStream;
 import org.codehaus.plexus.archiver.ArchivedFileSet;
+import org.apache.commons.compress.archivers.zip.ExtraFieldUtils;
+import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
+import org.apache.commons.compress.archivers.zip.ZipExtraField;
 import org.codehaus.plexus.archiver.Archiver;
 import org.codehaus.plexus.archiver.ArchiverException;
 import org.codehaus.plexus.archiver.BasePlexusArchiverTest;
+import org.codehaus.plexus.archiver.UnArchiver;
 import org.codehaus.plexus.archiver.UnixStat;
 import org.codehaus.plexus.archiver.util.ArchiveEntryUtils;
 import org.codehaus.plexus.archiver.util.DefaultArchivedFileSet;
 import org.codehaus.plexus.archiver.util.DefaultFileSet;
 import org.codehaus.plexus.archiver.util.Streams;
+import org.codehaus.plexus.components.io.attributes.Java7FileAttributes;
 import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributeUtils;
 import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes;
 import org.codehaus.plexus.components.io.functions.InputStreamTransformer;
@@ -46,7 +51,12 @@
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.Os;
 
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.Enumeration;
@@ -229,10 +239,16 @@ private ZipArchiver getZipArchiver()
     private ZipArchiver getZipArchiver(File destFile)
     {
         final ZipArchiver zipArchiver = getZipArchiver();
-        zipArchiver.setDestFile(  destFile );
+        zipArchiver.setDestFile( destFile );
         return zipArchiver;
     }
 
+    private ZipUnArchiver getZipUnArchiver(File testJar) throws Exception {
+        ZipUnArchiver zu = (ZipUnArchiver) lookup( UnArchiver.ROLE, "zip" );
+        zu.setSourceFile( testJar );
+        return zu;
+    }
+
     private void writeFile( File dir, String fname, int mode )
         throws IOException, ArchiverException
     {
@@ -367,6 +383,26 @@ else if ( ze.getName().equals( "two.txt" ) )
         }
     }
 
+    public void testSymlinkZip() throws Exception {
+        final File zipFile = getTestFile("target/output/pasymlinks.zip");
+        final ZipArchiver zipArchiver = getZipArchiver(zipFile);
+        PlexusIoFileResourceCollection files = new PlexusIoFileResourceCollection();
+        files.setFollowingSymLinks( false );
+        files.setBaseDir( new File( "src/test/resources/symlinks" ) );
+        files.setPrefix( "plexus/" );
+        zipArchiver.addResources( files );
+        zipArchiver.createArchive();
+        final File output = getTestFile("target/output/unzipped");
+        output.mkdirs();
+        final ZipUnArchiver zipUnArchiver = getZipUnArchiver(zipFile);
+        zipUnArchiver.setDestFile( output );
+        zipUnArchiver.extract();
+        File symDir = new File("target/output/unzipped/plexus/src/symDir");
+        PlexusIoResourceAttributes fa= Java7FileAttributes.uncached(symDir);
+        assertTrue( fa.isSymbolicLink() );
+    }
+
+
     public void testForced()
         throws Exception
     {

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

@@ -25,8 +25,7 @@ public void testExtractingZipPreservesExecutableFlag()
 
         FileUtils.deleteDirectory( outputDirectory );
 
-        ZipUnArchiver zu = (ZipUnArchiver) lookup( UnArchiver.ROLE, "zip" );
-        zu.setSourceFile( testZip );
+        ZipUnArchiver zu = getZipUnArchiver(testZip);
         zu.extract( "", outputDirectory );
         File testScript = new File( outputDirectory, "test.sh" );
 
@@ -52,8 +51,7 @@ public void testZeroFileModeInZip()
 
         FileUtils.deleteDirectory( outputDirectory );
 
-        ZipUnArchiver zu = (ZipUnArchiver) lookup( UnArchiver.ROLE, "zip" );
-        zu.setSourceFile( testZip );
+        ZipUnArchiver zu = getZipUnArchiver(testZip);
         zu.setIgnorePermissions( false );
         zu.extract( "", outputDirectory );
 
@@ -80,8 +78,7 @@ private void runUnarchiver( String path, FileSelector[] selectors, boolean[] res
 
         File outputDirectory = new File( getBasedir(), s );
 
-        ZipUnArchiver zu = (ZipUnArchiver) lookup( UnArchiver.ROLE, "zip" );
-        zu.setSourceFile( testJar );
+        ZipUnArchiver zu = getZipUnArchiver(testJar);
         zu.setFileSelectors( selectors );
 
         FileUtils.deleteDirectory( outputDirectory );
@@ -101,6 +98,12 @@ private void runUnarchiver( String path, FileSelector[] selectors, boolean[] res
         assertEquals( results[2], f2.exists() );
     }
 
+    private ZipUnArchiver getZipUnArchiver(File testJar) throws Exception {
+        ZipUnArchiver zu = (ZipUnArchiver) lookup( UnArchiver.ROLE, "zip" );
+        zu.setSourceFile( testJar );
+        return zu;
+    }
+
     public void testExtractingADirectoryFromAJarFile()
         throws Exception
     {