Index: docs/manual/CoreTasks/unzip.html
===================================================================
RCS file: /home/cvspublic/ant/docs/manual/CoreTasks/unzip.html,v
retrieving revision 1.11
diff -b -u -r1.11 unzip.html
--- docs/manual/CoreTasks/unzip.html	4 Sep 2002 11:05:16 -0000	1.11
+++ docs/manual/CoreTasks/unzip.html	18 May 2003 01:27:48 -0000
@@ -9,15 +9,9 @@
 
 <h2><a name="unzip">Unjar/Untar/Unwar/Unzip</a></h2>
 <h3>Description</h3>
-<p>Unzips a zip-, war-, tar- or jarfile.</p>
+<p>Unzips zip-, war-, tar- or jarfile(s).</p>
 <p>For JDK 1.1 &quot;last modified time&quot; field is set to current time instead of being
 carried from the archive file.</p>
-<p><a href="../CoreTypes/patternset.html">PatternSet</a>s are used to select files to extract
-<I>from</I> the archive.  If no patternset is used, all files are extracted.
-</p>
-<p><a href="../CoreTypes/fileset.html">FileSet</a>s may be used used to select archived files
-to perform unarchival upon.
-</p>
 <p>File permissions will not be restored on extracted files.</p>
 <p>The untar task recognizes the long pathname entries used by GNU tar.<p>
 <h3>Parameters</h3>
@@ -53,16 +47,40 @@
   </tr>
 
 </table>
+<h3>Parameters specified as nested elements</h3>
+
+<h4>fileset</h4>
+ <p><a href="../CoreTypes/fileset.html">FileSet</a>s may be used used to select archived files
+ to perform unarchival upon.
+ </p>
+
+<h4>patternset</h4>
+ <p><a href="../CoreTypes/patternset.html">PatternSet</a>s are used to select files to extract
+ <I>from</I> the archive.  If no patternset is used, all files are extracted.
+ </p>
+
+<h4>mapper</h4>
+ <p>A nested <a href="../CoreTypes/mapper.html">mapper</a> element can be used
+ to map archive file names to extraction directories. The mapper will map the
+ src or fileset file names to a directory name that is appended to dest to
+ create the final destination directory. New directories will be created if they
+ don't already exist. Unmatched archives will not be extracted. If no mapper is
+ specified all of the archive files will be extracted into the single dest
+ directory.</p>
+
 <h3>Examples</h3>
 <blockquote>
   <p><code>&lt;unzip src=&quot;${tomcat_src}/tools-src.zip&quot; dest=&quot;${tools.home}&quot;/&gt;</code></p>
 </blockquote>
+<p>Unzips ${tomcat_src}/tools-src.zip into the ${tools.home} directory</p>
 <blockquote>
   <p><code>
 &lt;gunzip src=&quot;tools.tar.gz&quot;/&gt;<br>
 &lt;untar src=&quot;tools.tar&quot; dest=&quot;${tools.home}&quot;/&gt;
 </code></p>
 </blockquote>
+<p>Gunzips the tools.tar.gz file into tools.tar and untars that into the
+${tools.home} directory</p>
 <blockquote>
 <p><pre>
 &lt;unzip src=&quot;${tomcat_src}/tools-src.zip&quot;
@@ -74,6 +92,9 @@
 &lt;/unzip&gt;
 </pre></p>
 </blockquote>
+<p>Unzips any file in the ${tomcat_src}/tools-src.zip archive that ends with
+".java", unless the file name starts with "Test", into the ${tools.home}
+directory</p>
 <blockquote>
 <p><pre>
 &lt;unzip dest=&quot;${tools.home}&quot;&gt;
@@ -88,8 +109,31 @@
 &lt;/unzip&gt;
 </pre></p>
 </blockquote>
+<p>Unzips any file that ends with ".java", unless the file name starts with
+"Test", into the ${tools.home} directory from any archive in the current
+directory or subdirectories that ends in ".zip", but doesn't start with
+"tmp".</p>
+<blockquote>
+<p><pre>&lt;unjar dest=&quot;${dir.preverified}&quot;&gt;
+  &lt;fileset dir=&quot;${dir.src}&quot;&gt;
+    &lt;include name=&quot;*.jar&quot; /&gt;
+    &lt;include name=&quot;*.zip&quot; /&gt;
+  &lt;/fileset&gt;
+  &lt;mapper type=&quot;regexp&quot; from=&quot;^(.*)\.(jar|zip)$$&quot; to=&quot;\1/&quot; /&gt;
+&lt;/unjar&gt;
+</pre></p>
+</blockquote>
+
+<p>Unpacks all files ending in .jar or .zip in the ${dir.src} directory and puts
+the contents of <em>each</em> into a subdirectory of the ${dir.preverified}
+directory. Each subdirectory is named the same name as the original archive file
+that its' contents came from, but without the trailing .jar or .zip. For
+example, the contents of <code>src/purifier.zip</code> and
+<code>src/ant.jar</code> will be extracted to <code>preverified/purifier/</code>
+and <code>preverified/ant/</code> directories respectively.</p>
+
 <hr>
-<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2003 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>