Bumped to 2.8-SNAPSHOT

Author: krosenvold

pom.xml

@@ -10,7 +10,7 @@
   </parent>
 
   <artifactId>plexus-archiver</artifactId>
-  <version>2.7.2-SNAPSHOT</version>
+  <version>2.8-SNAPSHOT</version>
 
   <name>Plexus Archiver Component</name>
 
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-io</artifactId>
-      <version>2.2</version>
+      <version>2.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>

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

@@ -307,6 +307,7 @@ public void addFileSet( final FileSet fileSet )
         collection.setPrefix( fileSet.getPrefix() );
         collection.setCaseSensitive( fileSet.isCaseSensitive() );
         collection.setUsingDefaultExcludes( fileSet.isUsingDefaultExcludes() );
+        collection.setStreamTransformers( fileSet.getStreamTransformers() );
 
         if ( getOverrideDirectoryMode() > -1 || getOverrideFileMode() > -1 )
         {
@@ -688,6 +689,7 @@ protected PlexusIoResourceCollection asResourceCollection( final ArchivedFileSet
         proxy.setPrefix( fileSet.getPrefix() );
         proxy.setUsingDefaultExcludes( fileSet.isUsingDefaultExcludes() );
         proxy.setFileSelectors( fileSet.getFileSelectors() );
+        proxy.setStreamTransformers( fileSet.getStreamTransformers() );
 
         if ( getOverrideDirectoryMode() > -1 || getOverrideFileMode() > -1 )
         {

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

@@ -168,6 +168,8 @@ void addArchivedFileSet( File archiveFile, String prefix, String[] includes, Str
      * {@link #addArchivedFileSet(File)}, {@link #addArchivedFileSet(File, String[], String[])}, and
      * {@link #addArchivedFileSet(File, String, String[], String[])}. However, as these methods are in widespread use,
      * they cannot easily be made deprecated.
+     *
+     * Stream transformers are supported on this method
      * 
      * @since 1.0-alpha-9
      */
@@ -176,15 +178,19 @@ void addArchivedFileSet( ArchivedFileSet fileSet )
 
     /**
      * Adds the given resource collection to the archive.
-     * 
+     *
+     * Stream transformers are *not* supported on this method
+     *
      * @since 1.0-alpha-10
      */
     void addResource( PlexusIoResource resource, String destFileName, int permissions )
         throws ArchiverException;
 
     /**
      * Adds the given resource collection to the archive.
-     * 
+     *
+     * Stream transformers are supported om this method
+     *
      * @since 1.0-alpha-10
      */
     void addResources( PlexusIoResourceCollection resources )

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

@@ -1,6 +1,9 @@
 package org.codehaus.plexus.archiver;
 
 import org.codehaus.plexus.components.io.fileselectors.FileSelector;
+import org.codehaus.plexus.components.io.functions.InputStreamTransformer;
+
+import java.util.Arrays;
 
 
 /**
@@ -50,4 +53,13 @@ public interface BaseFileSet
      * to select the included files.
      */
     FileSelector[] getFileSelectors();
+
+    /**
+     * Returns the InputStreamTransformers that can be applied to this fileset
+     * @return The transformers.
+     */
+
+    InputStreamTransformer[] getStreamTransformers();
+
+
 }

src/main/java/org/codehaus/plexus/archiver/util/AbstractFileSet.java

@@ -17,6 +17,9 @@
  */
 import org.codehaus.plexus.archiver.BaseFileSet;
 import org.codehaus.plexus.components.io.fileselectors.FileSelector;
+import org.codehaus.plexus.components.io.functions.InputStreamTransformer;
+
+import java.util.Arrays;
 
 
 /**
@@ -26,6 +29,8 @@
 public abstract class AbstractFileSet<T extends AbstractFileSet>
     implements BaseFileSet
 {
+    private static final InputStreamTransformer[] empty = new InputStreamTransformer[0];
+
     private String prefix;
 
     private String[] includes;
@@ -40,6 +45,9 @@ public abstract class AbstractFileSet<T extends AbstractFileSet>
 
     private boolean includingEmptyDirectories = true;
 
+    private InputStreamTransformer[] streamTransformers = empty;
+
+
     /**
      * Sets a string of patterns, which excluded files
      * should match.
@@ -161,4 +169,15 @@ public T includeEmptyDirs( boolean includeEmptyDirectories  ){
         setIncludingEmptyDirectories(  includeEmptyDirectories );
         return (T) this;
     }
+
+    public void addStreamTransformer( InputStreamTransformer streamTransformer )
+    {
+        streamTransformers = Arrays.copyOf( this.streamTransformers, this.streamTransformers.length + 1 );
+        streamTransformers[streamTransformers.length -1] = streamTransformer;
+    }
+
+    public InputStreamTransformer[] getStreamTransformers()
+    {
+        return streamTransformers;
+    }
 }