|
24 | 24 | * SOFTWARE.
|
25 | 25 | */
|
26 | 26 |
|
27 |
| -import org.apache.commons.compress.archivers.zip.*; |
| 27 | +import org.apache.commons.compress.archivers.zip.ExtraFieldUtils; |
| 28 | +import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; |
| 29 | +import org.apache.commons.compress.archivers.zip.ZipExtraField; |
28 | 30 | import org.codehaus.plexus.archiver.Archiver;
|
29 | 31 | import org.codehaus.plexus.archiver.ArchiverException;
|
30 | 32 | import org.codehaus.plexus.archiver.BasePlexusArchiverTest;
|
| 33 | +import org.codehaus.plexus.archiver.UnArchiver; |
31 | 34 | import org.codehaus.plexus.archiver.UnixStat;
|
32 | 35 | import org.codehaus.plexus.archiver.util.ArchiveEntryUtils;
|
33 | 36 | import org.codehaus.plexus.archiver.util.Streams;
|
| 37 | +import org.codehaus.plexus.components.io.attributes.Java7FileAttributes; |
34 | 38 | import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributeUtils;
|
35 | 39 | import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes;
|
| 40 | +import org.codehaus.plexus.components.io.resources.PlexusIoFileResourceCollection; |
36 | 41 | import org.codehaus.plexus.logging.Logger;
|
37 | 42 | import org.codehaus.plexus.logging.console.ConsoleLogger;
|
38 | 43 | import org.codehaus.plexus.util.FileUtils;
|
39 | 44 | import org.codehaus.plexus.util.IOUtil;
|
40 | 45 | import org.codehaus.plexus.util.Os;
|
41 | 46 |
|
42 |
| -import java.io.*; |
| 47 | +import java.io.ByteArrayInputStream; |
| 48 | +import java.io.ByteArrayOutputStream; |
| 49 | +import java.io.File; |
| 50 | +import java.io.FileWriter; |
| 51 | +import java.io.IOException; |
| 52 | +import java.io.InputStream; |
43 | 53 | import java.util.Arrays;
|
44 | 54 | import java.util.Date;
|
45 | 55 | import java.util.Enumeration;
|
@@ -222,10 +232,16 @@ private ZipArchiver getZipArchiver()
|
222 | 232 | private ZipArchiver getZipArchiver(File destFile)
|
223 | 233 | {
|
224 | 234 | final ZipArchiver zipArchiver = getZipArchiver();
|
225 |
| - zipArchiver.setDestFile( destFile ); |
| 235 | + zipArchiver.setDestFile( destFile ); |
226 | 236 | return zipArchiver;
|
227 | 237 | }
|
228 | 238 |
|
| 239 | + private ZipUnArchiver getZipUnArchiver(File testJar) throws Exception { |
| 240 | + ZipUnArchiver zu = (ZipUnArchiver) lookup( UnArchiver.ROLE, "zip" ); |
| 241 | + zu.setSourceFile( testJar ); |
| 242 | + return zu; |
| 243 | + } |
| 244 | + |
229 | 245 | private void writeFile( File dir, String fname, int mode )
|
230 | 246 | throws IOException, ArchiverException
|
231 | 247 | {
|
@@ -326,6 +342,26 @@ else if ( ze.getName().equals( "two.txt" ) )
|
326 | 342 | }
|
327 | 343 | }
|
328 | 344 |
|
| 345 | + public void testSymlinkZip() throws Exception { |
| 346 | + final File zipFile = getTestFile("target/output/pasymlinks.zip"); |
| 347 | + final ZipArchiver zipArchiver = getZipArchiver(zipFile); |
| 348 | + PlexusIoFileResourceCollection files = new PlexusIoFileResourceCollection(); |
| 349 | + files.setFollowingSymLinks( false ); |
| 350 | + files.setBaseDir( new File( "src/test/resources/symlinks" ) ); |
| 351 | + files.setPrefix( "plexus/" ); |
| 352 | + zipArchiver.addResources( files ); |
| 353 | + zipArchiver.createArchive(); |
| 354 | + final File output = getTestFile("target/output/unzipped"); |
| 355 | + output.mkdirs(); |
| 356 | + final ZipUnArchiver zipUnArchiver = getZipUnArchiver(zipFile); |
| 357 | + zipUnArchiver.setDestFile( output ); |
| 358 | + zipUnArchiver.extract(); |
| 359 | + File symDir = new File("target/output/unzipped/plexus/src/symDir"); |
| 360 | + PlexusIoResourceAttributes fa= Java7FileAttributes.uncached(symDir); |
| 361 | + assertTrue( fa.isSymbolicLink() ); |
| 362 | + } |
| 363 | + |
| 364 | + |
329 | 365 | public void testForced()
|
330 | 366 | throws Exception
|
331 | 367 | {
|
|
0 commit comments