Converted to commons-compress for all archivers, upgraded to cc 1.8.1

A lot of semi-internal files have been removed. Clients using these files will generally
find compatible eplacements with similar names in commons-compress or java.util.zip

Author: krosenvold

pom.xml

@@ -60,7 +60,7 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-compress</artifactId>
-      <version>1.5</version>
+      <version>1.8.1</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java

@@ -250,7 +250,7 @@ public void setIncludeEmptyDirs( final boolean includeEmptyDirs )
     public void addDirectory( final File directory )
         throws ArchiverException
     {
-        addDirectory( directory, "" );
+        addDirectory(directory, "");
     }
 
     public void addDirectory( final File directory, final String prefix )
@@ -262,7 +262,7 @@ public void addDirectory( final File directory, final String prefix )
     public void addDirectory( final File directory, final String[] includes, final String[] excludes )
         throws ArchiverException
     {
-        addDirectory( directory, "", includes, excludes );
+        addDirectory(directory, "", includes, excludes);
     }
 
     public void addDirectory( final File directory, final String prefix, final String[] includes,
@@ -323,7 +323,7 @@ public void addFile( final File inputFile, final String destFileName )
     {
         final int fileMode = getOverrideFileMode();
 
-        addFile( inputFile, destFileName, fileMode );
+        addFile(inputFile, destFileName, fileMode);
     }
 
     protected ArchiveEntry asArchiveEntry( final PlexusIoResource resource, final String destFileName,
@@ -686,7 +686,7 @@ protected PlexusIoResourceCollection asResourceCollection( final ArchivedFileSet
     public void addResources( final PlexusIoResourceCollection collection )
         throws ArchiverException
     {
-        resources.add( collection );
+        resources.add(collection);
     }
 
     public void addArchivedFileSet( final ArchivedFileSet fileSet )
@@ -727,7 +727,7 @@ public void addArchivedFileSet( final File archiveFile, final String prefix )
     public void addArchivedFileSet( final File archiveFile, final String[] includes, final String[] excludes )
         throws ArchiverException
     {
-        addArchivedFileSet( archiveFile, null, includes, excludes );
+        addArchivedFileSet(archiveFile, null, includes, excludes);
     }
 
     /**
@@ -768,7 +768,7 @@ public void setForced( final boolean forced )
         this.forced = forced;
     }
 
-    public void setArchiveFilters( final List filters )
+    public void setArchiveFilters(final List filters)
     {
         filterSupport = new FilterSupport( filters, getLogger() );
     }

src/main/java/org/codehaus/plexus/archiver/AbstractUnArchiver.java

@@ -129,7 +129,7 @@ public final void extract( final String path, final File outputDirectory )
         runArchiveFinalizers();
     }
 
-    public void setArchiveFilters( final List filters )
+    public void setArchiveFilters(final List filters)
     {
         filterSupport = new FilterSupport( filters, getLogger() );
     }

src/main/java/org/codehaus/plexus/archiver/ArchiveFile.java

@@ -42,14 +42,15 @@ public interface Entry
     /**
      * Returns an enumeration with the archive files entries.
      * Any element returned by the enumeration is an instance
-     * of {@link Entry}.
+     * of {@link org.apache.commons.compress.archivers.ArchiveEntry}.
      */
-    public Enumeration getEntries()
+    public Enumeration<? extends org.apache.commons.compress.archivers.ArchiveEntry> getEntries()
         throws IOException;
 
     /**
      * Returns an {@link InputStream} with the given entries contents.
+     * org.apache.commons.compress.archivers.ArchiveEntry
      */
-    InputStream getInputStream( Entry entry )
+    InputStream getInputStream(org.apache.commons.compress.archivers.ArchiveEntry entry )
         throws IOException;
 }

src/main/java/org/codehaus/plexus/archiver/FilterEnabled.java

@@ -9,6 +9,6 @@
 public interface FilterEnabled
 {
 
-    void setArchiveFilters( List filters );
+    void setArchiveFilters(List filters);
 
 }

src/main/java/org/codehaus/plexus/archiver/ear/EarArchiver.java

@@ -17,11 +17,11 @@
  *
  */
 
+import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
 import org.codehaus.plexus.archiver.ArchiveEntry;
 import org.codehaus.plexus.archiver.ArchiverException;
 import org.codehaus.plexus.archiver.jar.JarArchiver;
 import org.codehaus.plexus.archiver.util.ResourceUtils;
-import org.codehaus.plexus.archiver.zip.ZipOutputStream;
 
 import java.io.File;
 import java.io.IOException;
@@ -79,7 +79,7 @@ public void addArchives( File directoryName, String[] includes, String[] exclude
         addDirectory( directoryName, "/", includes, excludes );
     }
 
-    protected void initZipOutputStream( ZipOutputStream zOut )
+    protected void initZipOutputStream( ZipArchiveOutputStream zOut )
         throws IOException, ArchiverException
     {
         // If no webxml file is specified, it's an error.
@@ -94,7 +94,7 @@ protected void initZipOutputStream( ZipOutputStream zOut )
     /**
      * Overridden from ZipArchiver class to deal with application.xml
      */
-    protected void zipFile( ArchiveEntry entry, ZipOutputStream zOut, String vPath, int mode )
+    protected void zipFile( ArchiveEntry entry, ZipArchiveOutputStream zOut, String vPath, int mode )
         throws IOException, ArchiverException
     {
         // If the file being added is META-INF/application.xml, we

src/main/java/org/codehaus/plexus/archiver/jar/JarArchiver.java

@@ -39,12 +39,12 @@
 import java.util.StringTokenizer;
 import java.util.TreeMap;
 import java.util.Vector;
+
+import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
+import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
 import org.codehaus.plexus.archiver.ArchiverException;
 import org.codehaus.plexus.archiver.util.EnumeratedAttribute;
 import org.codehaus.plexus.archiver.zip.ZipArchiver;
-import org.codehaus.plexus.archiver.zip.ZipEntry;
-import org.codehaus.plexus.archiver.zip.ZipFile;
-import org.codehaus.plexus.archiver.zip.ZipOutputStream;
 import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.logging.console.ConsoleLogger;
 import org.codehaus.plexus.util.IOUtil;
@@ -284,7 +284,7 @@ public void addConfiguredIndexJars( File indexJar )
         indexJars.add( indexJar.getAbsolutePath() );
     }
 
-    protected void initZipOutputStream( ZipOutputStream zOut )
+    protected void initZipOutputStream( ZipArchiveOutputStream zOut )
         throws IOException, ArchiverException
     {
         if ( !skipWriting )
@@ -334,7 +334,7 @@ private Manifest createManifest()
         return finalManifest;
     }
 
-    private void writeManifest( ZipOutputStream zOut, Manifest manifest )
+    private void writeManifest( ZipArchiveOutputStream zOut, Manifest manifest )
         throws IOException, ArchiverException
     {
         for ( Enumeration e = manifest.getWarnings(); e.hasMoreElements(); )
@@ -352,7 +352,7 @@ private void writeManifest( ZipOutputStream zOut, Manifest manifest )
         super.initZipOutputStream( zOut );
     }
 
-    protected void finalizeZipOutputStream( ZipOutputStream zOut )
+    protected void finalizeZipOutputStream( ZipArchiveOutputStream zOut )
         throws IOException, ArchiverException
     {
         if ( index )
@@ -373,7 +373,7 @@ protected void finalizeZipOutputStream( ZipOutputStream zOut )
      * @throws org.codehaus.plexus.archiver.ArchiverException
      *                     .
      */
-    private void createIndexList( ZipOutputStream zOut )
+    private void createIndexList( ZipArchiveOutputStream zOut )
         throws IOException, ArchiverException
     {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -455,7 +455,7 @@ private void createIndexList( ZipOutputStream zOut )
     /**
      * Overridden from Zip class to deal with manifests and index lists.
      */
-    protected void zipFile( InputStream is, ZipOutputStream zOut, String vPath, long lastModified, File fromArchive,
+    protected void zipFile( InputStream is, ZipArchiveOutputStream zOut, String vPath, long lastModified, File fromArchive,
                             int mode )
         throws IOException, ArchiverException
     {
@@ -534,21 +534,21 @@ protected boolean createEmptyZip( File zipFile )
             return true;
         }
 
-        ZipOutputStream zOut = null;
+        ZipArchiveOutputStream zOut = null;
         try
         {
             getLogger().debug( "Building MANIFEST-only jar: " + getDestFile().getAbsolutePath() );
             FileOutputStream out = new FileOutputStream( getDestFile() );
-            zOut = new ZipOutputStream( new BufferedOutputStream( out, 65536) );
+            zOut = new ZipArchiveOutputStream( new BufferedOutputStream( out, 65536) );
 
             zOut.setEncoding( getEncoding() );
             if ( isCompress() )
             {
-                zOut.setMethod( ZipOutputStream.DEFLATED );
+                zOut.setMethod( ZipArchiveOutputStream.DEFLATED );
             }
             else
             {
-                zOut.setMethod( ZipOutputStream.STORED );
+                zOut.setMethod( ZipArchiveOutputStream.STORED );
             }
             initZipOutputStream( zOut );
             finalizeZipOutputStream( zOut );
@@ -748,15 +748,15 @@ else if ( zipFile.isDirectory() )
         }
         else
         {
-            ZipFile zf = null;
+            org.apache.commons.compress.archivers.zip.ZipFile zf = null;
             try
             {
-                zf = new ZipFile( file, "utf-8" );
-                Enumeration<ZipEntry> entries = zf.getEntries();
+                zf = new org.apache.commons.compress.archivers.zip.ZipFile( file, "utf-8" );
+                Enumeration<ZipArchiveEntry> entries = zf.getEntries();
                 HashSet<String> dirSet = new HashSet<String>();
                 while ( entries.hasMoreElements() )
                 {
-                    ZipEntry ze = entries.nextElement();
+                    ZipArchiveEntry ze = entries.nextElement();
                     String name = ze.getName();
                     // avoid index for manifest-only jars.
                     if ( !name.equals( META_INF_NAME ) && !name.equals( META_INF_NAME + '/' ) && !name.equals(

src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTarFileResourceCollection.java

@@ -4,6 +4,8 @@
 import java.io.IOException;
 import java.util.Enumeration;
 import java.util.Iterator;
+
+import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.codehaus.plexus.components.io.resources.AbstractPlexusIoArchiveResourceCollection;
 import org.codehaus.plexus.components.io.resources.PlexusIoResource;
 
@@ -40,7 +42,7 @@ public boolean hasNext()
 
             public PlexusIoResource next()
             {
-                final TarEntry entry = (TarEntry) en.nextElement();
+                final TarArchiveEntry entry = (TarArchiveEntry) en.nextElement();
                 return new TarResource( tarFile, entry );
             }