From 4f1e896b554af62b1e10909f1ba90f82651d319f Mon Sep 17 00:00:00 2001 From: Plamen Totev Date: Mon, 23 Nov 2015 22:36:43 +0200 Subject: [PATCH 1/4] Add one second tolerance for ZIP entries when compared in tests When ZIP file is created the last modified time is stored in MS-DOS formated date(if it's in the valid range for MS-DOS time), but when it's read the last modification time from extra field data is used. When ZIP file is created from the content of other ZIP file created with third-party tool the last modified time might differ with one second. Modify ArchiveFileComparator so two ZIP files are still considered equal if their entries' last modified time vary only by one second. --- .../codehaus/plexus/archiver/zip/ArchiveFileComparator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/java/org/codehaus/plexus/archiver/zip/ArchiveFileComparator.java b/src/test/java/org/codehaus/plexus/archiver/zip/ArchiveFileComparator.java index 12b37c545..20301ca54 100644 --- a/src/test/java/org/codehaus/plexus/archiver/zip/ArchiveFileComparator.java +++ b/src/test/java/org/codehaus/plexus/archiver/zip/ArchiveFileComparator.java @@ -98,7 +98,8 @@ private static void assertEquals( ZipFile file1, ZipArchiveEntry entry1, throws Exception { Assert.assertEquals( entry1.isDirectory(), entry2.isDirectory() ); - Assert.assertEquals( entry1.getLastModifiedDate().getTime(), entry2.getLastModifiedDate().getTime() ); + long timeDelta = entry1.getLastModifiedDate().getTime() - entry2.getLastModifiedDate().getTime(); + Assert.assertTrue( Math.abs( timeDelta ) <= 1000 ); final InputStream is1 = file1.getInputStream( entry1 ); final InputStream is2 = file2.getInputStream( entry2 ); From 356473d1c6765a8e09d0e1b4a2eaa0f0bb09ce8c Mon Sep 17 00:00:00 2001 From: Plamen Totev Date: Mon, 23 Nov 2015 22:47:34 +0200 Subject: [PATCH 2/4] Add symbolic links check when comparing archives --- .../org/codehaus/plexus/archiver/zip/ArchiveFileComparator.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/java/org/codehaus/plexus/archiver/zip/ArchiveFileComparator.java b/src/test/java/org/codehaus/plexus/archiver/zip/ArchiveFileComparator.java index 20301ca54..a17a40f5b 100644 --- a/src/test/java/org/codehaus/plexus/archiver/zip/ArchiveFileComparator.java +++ b/src/test/java/org/codehaus/plexus/archiver/zip/ArchiveFileComparator.java @@ -83,6 +83,7 @@ private static void assertEquals( ArchiveFile file1, TarArchiveEntry entry1, throws IOException { Assert.assertEquals( entry1.isDirectory(), entry2.isDirectory() ); + Assert.assertEquals( entry1.isSymbolicLink(), entry2.isSymbolicLink() ); Assert.assertEquals( entry1.getModTime().getTime(), entry2.getModTime().getTime() ); final InputStream is1 = file1.getInputStream( entry1 ); @@ -98,6 +99,7 @@ private static void assertEquals( ZipFile file1, ZipArchiveEntry entry1, throws Exception { Assert.assertEquals( entry1.isDirectory(), entry2.isDirectory() ); + Assert.assertEquals( entry1.isUnixSymlink(), entry2.isUnixSymlink() ); long timeDelta = entry1.getLastModifiedDate().getTime() - entry2.getLastModifiedDate().getTime(); Assert.assertTrue( Math.abs( timeDelta ) <= 1000 ); From b272c12881c1460322b91b3dc1cc638eb134c803 Mon Sep 17 00:00:00 2001 From: Plamen Totev Date: Mon, 23 Nov 2015 22:58:24 +0200 Subject: [PATCH 3/4] Add support for symbolic links in ZIP file resource collections --- ...exusArchiverZipFileResourceCollection.java | 4 +- .../archiver/zip/ZipSymlinkResource.java | 41 +++++++++++++++++++ .../plexus/archiver/zip/ZipArchiverTest.java | 14 +++++++ 3 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 src/main/java/org/codehaus/plexus/archiver/zip/ZipSymlinkResource.java diff --git a/src/main/java/org/codehaus/plexus/archiver/zip/PlexusArchiverZipFileResourceCollection.java b/src/main/java/org/codehaus/plexus/archiver/zip/PlexusArchiverZipFileResourceCollection.java index 6f723a910..80d6bb670 100644 --- a/src/main/java/org/codehaus/plexus/archiver/zip/PlexusArchiverZipFileResourceCollection.java +++ b/src/main/java/org/codehaus/plexus/archiver/zip/PlexusArchiverZipFileResourceCollection.java @@ -57,7 +57,9 @@ public PlexusIoResource next() { final ZipArchiveEntry entry = (ZipArchiveEntry) en.nextElement(); - return new ZipResource( zipFile, entry, getStreamTransformer() ); + return !entry.isUnixSymlink() + ? new ZipResource( zipFile, entry, getStreamTransformer() ) + : new ZipSymlinkResource( zipFile, entry, getStreamTransformer() ); } public void remove() diff --git a/src/main/java/org/codehaus/plexus/archiver/zip/ZipSymlinkResource.java b/src/main/java/org/codehaus/plexus/archiver/zip/ZipSymlinkResource.java new file mode 100644 index 000000000..52b01318b --- /dev/null +++ b/src/main/java/org/codehaus/plexus/archiver/zip/ZipSymlinkResource.java @@ -0,0 +1,41 @@ +package org.codehaus.plexus.archiver.zip; + +import java.io.IOException; + +import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; +import org.apache.commons.compress.archivers.zip.ZipFile; +import org.codehaus.plexus.components.io.functions.InputStreamTransformer; +import org.codehaus.plexus.components.io.functions.SymlinkDestinationSupplier; + +/** + * A {@link ZipResource} that represents symbolic link. + */ +public class ZipSymlinkResource + extends ZipResource + implements SymlinkDestinationSupplier +{ + private final String symlinkDestination; + + public ZipSymlinkResource(ZipFile zipFile, ZipArchiveEntry entry, InputStreamTransformer streamTransformer) + { + super(zipFile, entry, streamTransformer); + try { + symlinkDestination = zipFile.getUnixSymlink(entry); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + @Override + public String getSymlinkDestination() throws IOException + { + return symlinkDestination; + } + + @Override + public boolean isSymbolicLink() + { + return true; + } + +} diff --git a/src/test/java/org/codehaus/plexus/archiver/zip/ZipArchiverTest.java b/src/test/java/org/codehaus/plexus/archiver/zip/ZipArchiverTest.java index a561e2bab..67a50b81c 100644 --- a/src/test/java/org/codehaus/plexus/archiver/zip/ZipArchiverTest.java +++ b/src/test/java/org/codehaus/plexus/archiver/zip/ZipArchiverTest.java @@ -533,6 +533,20 @@ public void testSymlinkFileSet() assertTrue( fa.isSymbolicLink() ); } + public void testSymlinkArchivedFileSet() + throws Exception + { + final File zipFile = getTestFile( "src/test/resources/symlinks/symlinks.zip" ); + final File zipFile2 = getTestFile( "target/output/pasymlinks-archivedFileset.zip" ); + final ZipArchiver zipArchiver = getZipArchiver( zipFile2 ); + zipArchiver.addArchivedFileSet( zipFile ); + zipArchiver.createArchive(); + + final ZipFile cmp1 = new ZipFile( zipFile ); + final ZipFile cmp2 = new ZipFile( zipFile2 ); + ArchiveFileComparator.assertEquals( cmp1, cmp2, "" ); + } + /* */ From f713c5d81708c862138e5c60f07dc6189691bdc3 Mon Sep 17 00:00:00 2001 From: Plamen Totev Date: Mon, 23 Nov 2015 22:58:53 +0200 Subject: [PATCH 4/4] Add support for symbolic links in tar file resource collections --- .../PlexusIoTarFileResourceCollection.java | 4 ++- .../archiver/tar/TarSymlinkResource.java | 32 +++++++++++++++++++ .../plexus/archiver/tar/TarArchiverTest.java | 18 +++++++++++ 3 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 src/main/java/org/codehaus/plexus/archiver/tar/TarSymlinkResource.java diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTarFileResourceCollection.java b/src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTarFileResourceCollection.java index 3e79f7b92..c79efa649 100644 --- a/src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTarFileResourceCollection.java +++ b/src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTarFileResourceCollection.java @@ -54,7 +54,9 @@ public boolean hasNext() public PlexusIoResource next() { final TarArchiveEntry entry = (TarArchiveEntry) en.nextElement(); - return new TarResource( tarFile, entry ); + return !entry.isSymbolicLink() + ? new TarResource( tarFile, entry ) + : new TarSymlinkResource( tarFile, entry ); } public void remove() diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/TarSymlinkResource.java b/src/main/java/org/codehaus/plexus/archiver/tar/TarSymlinkResource.java new file mode 100644 index 000000000..9ac6f13e7 --- /dev/null +++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarSymlinkResource.java @@ -0,0 +1,32 @@ +package org.codehaus.plexus.archiver.tar; + +import java.io.IOException; + +import org.apache.commons.compress.archivers.tar.TarArchiveEntry; +import org.codehaus.plexus.components.io.functions.SymlinkDestinationSupplier; + +/** + * A {@link TarResource} that represents symbolic link. + */ +public class TarSymlinkResource + extends TarResource + implements SymlinkDestinationSupplier +{ + private final String symlinkDestination; + + public TarSymlinkResource(TarFile tarFile, TarArchiveEntry entry) { + super(tarFile, entry); + symlinkDestination = entry.getLinkName(); + } + + @Override + public String getSymlinkDestination() throws IOException { + return symlinkDestination; + } + + @Override + public boolean isSymbolicLink() { + return true; + } + +} diff --git a/src/test/java/org/codehaus/plexus/archiver/tar/TarArchiverTest.java b/src/test/java/org/codehaus/plexus/archiver/tar/TarArchiverTest.java index cf3d0a190..f982c7a21 100644 --- a/src/test/java/org/codehaus/plexus/archiver/tar/TarArchiverTest.java +++ b/src/test/java/org/codehaus/plexus/archiver/tar/TarArchiverTest.java @@ -34,6 +34,7 @@ import org.codehaus.plexus.archiver.gzip.GZipCompressor; import org.codehaus.plexus.archiver.util.ArchiveEntryUtils; import org.codehaus.plexus.archiver.util.Compressor; +import org.codehaus.plexus.archiver.util.DefaultArchivedFileSet; import org.codehaus.plexus.archiver.zip.ArchiveFileComparator; import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributeUtils; import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes; @@ -533,4 +534,21 @@ private void testCreateResourceCollection( TarHandler tarHandler ) cmp1.close(); cmp2.close(); } + + public void testSymlinkArchivedFileSet() + throws Exception + { + final File tarFile = getTestFile( "src/test/resources/symlinks/symlinks.tar" ); + final File tarFile2 = getTestFile( "target/output/pasymlinks-archivedFileset.tar" ); + final TarArchiver tarArchiver = getPosixTarArchiver(); + tarArchiver.setDestFile( tarFile2 ); + DefaultArchivedFileSet archivedFileSet = DefaultArchivedFileSet.archivedFileSet( tarFile ); + archivedFileSet.setUsingDefaultExcludes( false ); + tarArchiver.addArchivedFileSet( archivedFileSet ); + tarArchiver.createArchive(); + + final TarFile cmp1 = new TarFile( tarFile ); + final TarFile cmp2 = new TarFile( tarFile2 ); + ArchiveFileComparator.assertEquals( cmp1, cmp2, "" ); + } }