|
27 | 27 | import org.apache.commons.compress.archivers.zip.*;
|
28 | 28 | import org.apache.commons.compress.utils.BoundedInputStream;
|
29 | 29 | import org.codehaus.plexus.archiver.ArchivedFileSet;
|
| 30 | +import org.apache.commons.compress.archivers.zip.ExtraFieldUtils; |
| 31 | +import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; |
| 32 | +import org.apache.commons.compress.archivers.zip.ZipExtraField; |
30 | 33 | import org.codehaus.plexus.archiver.Archiver;
|
31 | 34 | import org.codehaus.plexus.archiver.ArchiverException;
|
32 | 35 | import org.codehaus.plexus.archiver.BasePlexusArchiverTest;
|
| 36 | +import org.codehaus.plexus.archiver.UnArchiver; |
33 | 37 | import org.codehaus.plexus.archiver.UnixStat;
|
34 | 38 | import org.codehaus.plexus.archiver.util.ArchiveEntryUtils;
|
35 | 39 | import org.codehaus.plexus.archiver.util.DefaultArchivedFileSet;
|
36 | 40 | import org.codehaus.plexus.archiver.util.DefaultFileSet;
|
37 | 41 | import org.codehaus.plexus.archiver.util.Streams;
|
| 42 | +import org.codehaus.plexus.components.io.attributes.Java7FileAttributes; |
38 | 43 | import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributeUtils;
|
39 | 44 | import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes;
|
40 | 45 | import org.codehaus.plexus.components.io.functions.InputStreamTransformer;
|
|
46 | 51 | import org.codehaus.plexus.util.IOUtil;
|
47 | 52 | import org.codehaus.plexus.util.Os;
|
48 | 53 |
|
49 |
| -import java.io.*; |
| 54 | +import java.io.ByteArrayInputStream; |
| 55 | +import java.io.ByteArrayOutputStream; |
| 56 | +import java.io.File; |
| 57 | +import java.io.FileWriter; |
| 58 | +import java.io.IOException; |
| 59 | +import java.io.InputStream; |
50 | 60 | import java.util.Arrays;
|
51 | 61 | import java.util.Date;
|
52 | 62 | import java.util.Enumeration;
|
@@ -229,10 +239,16 @@ private ZipArchiver getZipArchiver()
|
229 | 239 | private ZipArchiver getZipArchiver(File destFile)
|
230 | 240 | {
|
231 | 241 | final ZipArchiver zipArchiver = getZipArchiver();
|
232 |
| - zipArchiver.setDestFile( destFile ); |
| 242 | + zipArchiver.setDestFile( destFile ); |
233 | 243 | return zipArchiver;
|
234 | 244 | }
|
235 | 245 |
|
| 246 | + private ZipUnArchiver getZipUnArchiver(File testJar) throws Exception { |
| 247 | + ZipUnArchiver zu = (ZipUnArchiver) lookup( UnArchiver.ROLE, "zip" ); |
| 248 | + zu.setSourceFile( testJar ); |
| 249 | + return zu; |
| 250 | + } |
| 251 | + |
236 | 252 | private void writeFile( File dir, String fname, int mode )
|
237 | 253 | throws IOException, ArchiverException
|
238 | 254 | {
|
@@ -367,6 +383,26 @@ else if ( ze.getName().equals( "two.txt" ) )
|
367 | 383 | }
|
368 | 384 | }
|
369 | 385 |
|
| 386 | + public void testSymlinkZip() throws Exception { |
| 387 | + final File zipFile = getTestFile("target/output/pasymlinks.zip"); |
| 388 | + final ZipArchiver zipArchiver = getZipArchiver(zipFile); |
| 389 | + PlexusIoFileResourceCollection files = new PlexusIoFileResourceCollection(); |
| 390 | + files.setFollowingSymLinks( false ); |
| 391 | + files.setBaseDir( new File( "src/test/resources/symlinks" ) ); |
| 392 | + files.setPrefix( "plexus/" ); |
| 393 | + zipArchiver.addResources( files ); |
| 394 | + zipArchiver.createArchive(); |
| 395 | + final File output = getTestFile("target/output/unzipped"); |
| 396 | + output.mkdirs(); |
| 397 | + final ZipUnArchiver zipUnArchiver = getZipUnArchiver(zipFile); |
| 398 | + zipUnArchiver.setDestFile( output ); |
| 399 | + zipUnArchiver.extract(); |
| 400 | + File symDir = new File("target/output/unzipped/plexus/src/symDir"); |
| 401 | + PlexusIoResourceAttributes fa= Java7FileAttributes.uncached(symDir); |
| 402 | + assertTrue( fa.isSymbolicLink() ); |
| 403 | + } |
| 404 | + |
| 405 | + |
370 | 406 | public void testForced()
|
371 | 407 | throws Exception
|
372 | 408 | {
|
|
0 commit comments