Removed lots of unused code

Author: krosenvold

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

@@ -19,9 +19,7 @@
 
 import java.io.Closeable;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.lang.reflect.UndeclaredThrowableException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,7 +36,6 @@
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.archiver.manager.ArchiverManager;
 import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
-import org.codehaus.plexus.archiver.util.FilterSupport;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 import org.codehaus.plexus.components.io.attributes.Java7Reflector;
 import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes;
@@ -55,7 +52,6 @@
 import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.logging.console.ConsoleLogger;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
-import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.Os;
 
 import static org.codehaus.plexus.archiver.util.DefaultArchivedFileSet.archivedFileSet;
@@ -66,7 +62,7 @@
  */
 public abstract class AbstractArchiver
     extends AbstractLogEnabled
-    implements Archiver, Contextualizable, FilterEnabled, FinalizerEnabled
+    implements Archiver, Contextualizable, FinalizerEnabled
 {
 
     private Logger logger;
@@ -95,8 +91,6 @@ public abstract class AbstractArchiver
 
     private boolean forced = true;
 
-    private FilterSupport filterSupport;
-
     private List<ArchiveFinalizer> finalizers;
 
     private File dotFileDirectory;
@@ -237,14 +231,6 @@ public final int getDefaultDirectoryMode()
         }
     }
 
-    /**
-     * @deprecated Use {@link Archiver#getDefaultDirectoryMode()}.
-     */
-    public final int getRawDefaultDirectoryMode()
-    {
-        return getDefaultDirectoryMode();
-    }
-
     public boolean getIncludeEmptyDirs()
     {
         return includeEmptyDirs;
@@ -408,8 +394,6 @@ public void addFile( @Nonnull final File inputFile, @Nonnull String destFileName
             throw new ArchiverException( inputFile.getAbsolutePath() + " isn't a file." );
         }
 
-        InputStream in = null;
-
         if ( replacePathSlashesToJavaPaths )
         {
             destFileName = destFileName.replace( '\\', '/' );
@@ -423,34 +407,13 @@ public void addFile( @Nonnull final File inputFile, @Nonnull String destFileName
         try
         {
             // do a null check here, to avoid creating a file stream if there are no filters...
-            if ( filterSupport != null )
-            {
-                in = new FileInputStream( inputFile );
-
-                if ( include( in, destFileName ) )
-                {
-                    doAddResource(
-                        ArchiveEntry.createFileEntry( destFileName, inputFile, permissions, getDirectoryMode() ) );
-                }
-            }
-            else
-            {
                 doAddResource(
                     ArchiveEntry.createFileEntry( destFileName, inputFile, permissions, getDirectoryMode() ) );
-            }
         }
         catch ( final IOException e )
         {
             throw new ArchiverException( "Failed to determine inclusion status for: " + inputFile, e );
         }
-        catch ( final ArchiveFilterException e )
-        {
-            throw new ArchiverException( "Failed to determine inclusion status for: " + inputFile, e );
-        }
-        finally
-        {
-            IOUtil.close( in );
-        }
     }
 
     @Nonnull
@@ -640,27 +603,6 @@ protected Logger getLogger()
         return logger;
     }
 
-    public Map getDirs()
-    {
-        try
-        {
-            final Map map = new HashMap();
-            for ( final ResourceIterator iter = getResources(); iter.hasNext(); )
-            {
-                final ArchiveEntry entry = iter.next();
-                if ( entry.getType() == ArchiveEntry.DIRECTORY )
-                {
-                    map.put( entry.getName(), entry );
-                }
-            }
-            return map;
-        }
-        catch ( final ArchiverException e )
-        {
-            throw new UndeclaredThrowableException( e );
-        }
-    }
-
     protected PlexusIoResourceCollection asResourceCollection( final ArchivedFileSet fileSet )
         throws ArchiverException
     {
@@ -804,11 +746,6 @@ public void setForced( final boolean forced )
         this.forced = forced;
     }
 
-    public void setArchiveFilters( final List filters )
-    {
-        filterSupport = new FilterSupport( filters, getLogger() );
-    }
-
     public void addArchiveFinalizer( final ArchiveFinalizer finalizer )
     {
         if ( finalizers == null )
@@ -903,11 +840,6 @@ public boolean isSupportingForced()
         return false;
     }
 
-    protected List getArchiveFinalizers()
-    {
-        return finalizers;
-    }
-
     protected void runArchiveFinalizers()
         throws ArchiverException
     {
@@ -920,12 +852,6 @@ protected void runArchiveFinalizers()
         }
     }
 
-    private boolean include( final InputStream in, final String path )
-        throws ArchiveFilterException
-    {
-        return ( filterSupport == null ) || filterSupport.include( in, path );
-    }
-
     public final void createArchive()
         throws ArchiverException, IOException
     {

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

@@ -18,7 +18,6 @@
  */
 
 import org.codehaus.plexus.archiver.util.ArchiveEntryUtils;
-import org.codehaus.plexus.archiver.util.FilterSupport;
 import org.codehaus.plexus.components.io.attributes.SymlinkUtils;
 import org.codehaus.plexus.components.io.fileselectors.FileSelector;
 import org.codehaus.plexus.components.io.resources.PlexusIoResource;
@@ -27,12 +26,7 @@
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.StringUtils;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -44,7 +38,7 @@
  */
 public abstract class AbstractUnArchiver
     extends AbstractLogEnabled
-    implements UnArchiver, FinalizerEnabled, FilterEnabled
+    implements UnArchiver, FinalizerEnabled
 {
     private File destDirectory;
 
@@ -54,8 +48,6 @@ public abstract class AbstractUnArchiver
 
     private boolean overwrite = true;
 
-    private FilterSupport filterSupport;
-
     private List finalizers;
 
     private FileSelector[] fileSelectors;
@@ -137,11 +129,6 @@ public final void extract( final String path, final File outputDirectory )
         runArchiveFinalizers();
     }
 
-    public void setArchiveFilters(final List filters)
-    {
-        filterSupport = new FilterSupport( filters, getLogger() );
-    }
-
     public void addArchiveFinalizer( final ArchiveFinalizer finalizer )
     {
         if ( finalizers == null )
@@ -157,7 +144,7 @@ public void setArchiveFinalizers( final List archiveFinalizers )
         finalizers = archiveFinalizers;
     }
 
-    private final void runArchiveFinalizers()
+    private void runArchiveFinalizers()
         throws ArchiverException
     {
         if ( finalizers != null )
@@ -170,12 +157,6 @@ private final void runArchiveFinalizers()
         }
     }
 
-    protected boolean include( final InputStream inputStream, final String name )
-        throws ArchiveFilterException
-    {
-        return filterSupport == null || filterSupport.include( inputStream, name );
-    }
-
     protected void validate( final String path, final File outputDirectory )
     {
     }

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

@@ -10,34 +10,6 @@
  */
 public interface ArchiveFile
 {
-    /**
-     * Interfave of a archive file entry. An entry may be a file,
-     * or directory.
-     */
-    public interface Entry
-    {
-        /**
-         * Returns the entries name.
-         */
-        String getName();
-
-        /**
-         * Returns, whether the entry is a directory.
-         */
-        boolean isDirectory();
-
-        /**
-         * Returns the time of the entries last modification.
-         * @return Modification time, or -1, if unknown.
-         */
-        long getLastModificationTime();
-
-        /**
-         * Returns the entries size.
-         * @return File size; undefined for directories.
-         */
-        long getSize();
-    }
 
     /**
      * Returns an enumeration with the archive files entries.

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

@@ -7,8 +7,6 @@
  */
 public interface ArchiveFileFilter
 {
-    
-    boolean include( InputStream dataStream, String entryName )
-        throws ArchiveFilterException;
+    boolean include( InputStream dataStream, String entryName );
 
 }

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

@@ -16,7 +16,6 @@ public class JarSecurityFileFilter
     public static final String[] SECURITY_FILE_PATTERNS = JarSecurityFileSelector.SECURITY_FILE_PATTERNS;
 
     public boolean include( InputStream dataStream, String entryName )
-        throws ArchiveFilterException
     {
 		for (String pattern : SECURITY_FILE_PATTERNS) {
 			if (SelectorUtils.match(pattern, entryName)) {

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

@@ -36,15 +36,7 @@ public class PlexusIoVirtualFileResource
 {
     private final File file;
 
-    /**
-     * Creates a new instance. This constructor is usually used with a directory
-     */
-    protected PlexusIoVirtualFileResource(File file)
-    {
-        this( file, getName( file ));
-    }
-
-	protected PlexusIoVirtualFileResource(File file, String name)
+    protected PlexusIoVirtualFileResource(File file, String name)
     {
 		super( name, file.lastModified(), file.length(), file.isFile(), file.isDirectory(), file.exists() );
 		this.file = file;

src/main/java/org/codehaus/plexus/archiver/filters/JarSecurityFileFilter.java

@@ -36,12 +36,6 @@ public PlexusIoVirtualSymlinkResource(File symlinkFile, String symnlinkDestinati
 			this.symnlinkDestination = symnlinkDestination;
 		}
 
-		public PlexusIoVirtualSymlinkResource(File symlinkfile, String name, String symnlinkDestination)
-		{
-			super( symlinkfile, name );
-			this.symnlinkDestination = symnlinkDestination;
-		}
-
 	public String getSymlinkDestination()
 			throws IOException
 	{