Zip changes

Fixes a bug in Zip so that its source zip files are closed after
it is done and adds tests to verify this.

* files
NONE

Index: src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java
===================================================================
RCS file: /home/cvspublic/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java,v
retrieving revision 1.3
diff -u -r1.3 ZipTest.java
--- src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java	2001/03/02 16:01:01	1.3
+++ src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java	2001/03/07 00:11:39
@@ -54,6 +54,8 @@
 
 package org.apache.tools.ant.taskdefs;
 
+import java.io.File;
+
 /**
  * @author Nico Seessle <nico@seessle.de> 
  */
@@ -87,4 +89,17 @@
         executeTarget("cleanup");
     }
     
+    public void test5() { 
+        executeTarget("test5");
+    }
+
+
+    public void test6() { 
+        executeTarget("test6");
+    }
+
+
+    public void test7() { 
+        executeTarget("test7");
+    }
 }


Index: src/etc/testcases/taskdefs/zip.xml
===================================================================
RCS file: /home/cvspublic/jakarta-ant/src/etc/testcases/taskdefs/zip.xml,v
retrieving revision 1.3
diff -u -r1.3 zip.xml
--- src/etc/testcases/taskdefs/zip.xml	2001/03/02 15:57:31	1.3
+++ src/etc/testcases/taskdefs/zip.xml	2001/03/06 20:08:24
@@ -25,9 +25,37 @@
          basedir="."/>
   </target>
 
+  <target name="test5">
+    <zip zipfile="test5.zip" basedir="." >
+      <exclude name="test5.zip" />
+    </zip>
+  </target>
 
+  <target name="test6">
+    <zip zipfile="test6.zip" basedir=".">
+      <include name="*.xml" />
+      <exclude name="zip.*" />
+    </zip>
+  </target>
+
+  <target name="test7">
+    <zip zipfile="inner7.zip" basedir="." >
+      <exclude name="inner7.zip" />
+    </zip>
+    <zip zipfile="test7.zip" basedir=".">
+      <exclude name="**/*.*" />
+      <zipfileset src="inner7.zip" />
+    </zip>
+  </target>
+
+
+
   <target name="cleanup">
     <delete file="test3.zip"/>
     <delete file="test4.zip"/>
+    <delete file="test5.zip"/>
+    <delete file="test6.zip"/>
+    <delete file="inner7.zip"/>
+    <delete file="test7.zip"/>
   </target>
 </project>

Index: src/main/org/apache/tools/ant/taskdefs/Zip.java
===================================================================
RCS file: /home/cvspublic/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Zip.java,v
retrieving revision 1.31
diff -u -r1.31 Zip.java
--- src/main/org/apache/tools/ant/taskdefs/Zip.java	2001/03/02 15:58:24	1.31
+++ src/main/org/apache/tools/ant/taskdefs/Zip.java	2001/03/06 20:08:29
@@ -280,6 +280,7 @@
                 }
             }
         }
+        in.close();
     }
 
     protected void initZipOutputStream(ZipOutputStream zOut)