Moved zip collection here from p-io

Author: krosenvold

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

@@ -17,24 +17,6 @@
  *  limitations under the License.
  */
 
-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.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Set;
-
-import javax.annotation.Nonnull;
-
 import org.codehaus.plexus.PlexusConstants;
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.archiver.manager.ArchiverManager;
@@ -60,6 +42,23 @@
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.Os;
 
+import javax.annotation.Nonnull;
+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.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
 import static org.codehaus.plexus.archiver.util.DefaultArchivedFileSet.archivedFileSet;
 import static org.codehaus.plexus.archiver.util.DefaultFileSet.fileSet;
 

src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoZipFileResourceCollection.java

@@ -0,0 +1,28 @@
+package org.codehaus.plexus.components.io.resources;
+
+/*
+ * Copyright 2007 The Codehaus Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Wrapper to retain compatibility with old-style plexus-io. Can be removed "some day".
+ * Make sure maven-assembly-plugin IT's work when you do :)
+ */
+public class PlexusIoZipFileResourceCollection
+    extends  org.codehaus.plexus.archiver.zip.PlexusIoZipFileResourceCollection
+
+{
+
+}

src/main/resources/META-INF/plexus/components.xml

@@ -249,7 +249,7 @@
     <component>
       <role>org.codehaus.plexus.components.io.resources.PlexusIoResourceCollection</role>
       <role-hint>zip</role-hint>
-      <implementation>org.codehaus.plexus.components.io.resources.PlexusIoZipFileResourceCollection</implementation>
+      <implementation>org.codehaus.plexus.archiver.zip.PlexusIoZipFileResourceCollection</implementation>
       <instantiation-strategy>per-lookup</instantiation-strategy>
     </component>
     --><component>

src/test/java/org/codehaus/plexus/archiver/zip/PlexusIoZipFileResourceCollectionTest.java

@@ -2,8 +2,7 @@
 
 import org.apache.commons.io.IOUtils;
 import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.components.io.resources.PlexusIoResource;
-import org.codehaus.plexus.components.io.resources.PlexusIoURLResource;
+import org.codehaus.plexus.components.io.resources.*;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -47,7 +46,8 @@ public void testFilesWithIllegalHtmlChars()
         throws Exception
     {
         File testZip = new File( getBasedir(), "src/test/resources/bogusManifest.zip" );
-        PlexusIoZipFileResourceCollection prc = new PlexusIoZipFileResourceCollection();
+       PlexusIoZipFileResourceCollection
+            prc = new PlexusIoZipFileResourceCollection();
         prc.setFile( testZip );
         final Iterator<PlexusIoResource> entries = prc.getEntries();
         while ( entries.hasNext() )
@@ -73,7 +73,8 @@ public void testFilesThatAreNotThere()
         seen.add( "Afile&lt;Yo&gt;.txt" );
         seen.add( "File With Space.txt" );
         seen.add( "FileWith%.txt" );
-        PlexusIoZipFileResourceCollection prc = new PlexusIoZipFileResourceCollection();
+        PlexusIoZipFileResourceCollection
+            prc = new PlexusIoZipFileResourceCollection();
         prc.setFile( testZip );
         final Iterator<PlexusIoResource> entries = prc.getEntries();
         while ( entries.hasNext() )