Added encoding

Author: krosenvold

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

@@ -714,8 +714,8 @@ protected PlexusIoResourceCollection asResourceCollection( final ArchivedFileSet
 
         if (resources instanceof EncodingSupported ) {
             ((EncodingSupported)resources).setEncoding( charset );
-
         }
+
         if ( resources instanceof PlexusIoArchivedResourceCollection )
         {
             ( (PlexusIoArchivedResourceCollection) resources ).setFile( fileSet.getArchive() );

src/main/java/org/codehaus/plexus/archiver/zip/PlexusIoZipFileResourceCollection.java

@@ -3,23 +3,27 @@
 import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
+import java.nio.charset.Charset;
 import java.util.Enumeration;
 import java.util.Iterator;
 
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
 import org.apache.commons.compress.archivers.zip.ZipFile;
 import org.codehaus.plexus.components.io.resources.AbstractPlexusIoArchiveResourceCollection;
+import org.codehaus.plexus.components.io.resources.EncodingSupported;
 import org.codehaus.plexus.components.io.resources.PlexusIoResource;
 
 public class PlexusIoZipFileResourceCollection
-    extends AbstractPlexusIoArchiveResourceCollection
+    extends AbstractPlexusIoArchiveResourceCollection implements EncodingSupported
 {
 
     /**
      * The zip file resource collections role hint.
      */
     public static final String ROLE_HINT = "zip";
 
+    private Charset charset = Charset.forName( "UTF-8" );
+
     protected Iterator<PlexusIoResource> getEntries()
         throws IOException
     {
@@ -28,7 +32,7 @@ protected Iterator<PlexusIoResource> getEntries()
         {
             throw new IOException( "The tar archive file has not been set." );
         }
-        final ZipFile zipFile = new ZipFile( f );
+        final ZipFile zipFile = new ZipFile( f, charset.name() );
         return new CloseableIterator( zipFile );
     }
 
@@ -68,5 +72,8 @@ public void close()
         }
     }
 
-    ;
+    public void setEncoding( Charset charset )
+    {
+       this.charset = charset;
+    }
 }