Pete, the changes to index.html when you put back <prefixedfileset> didn't get
catch all the references. Here's a fix.

--Alex

Index: index.html
===================================================================
RCS file: /home/cvspublic/jakarta-ant/docs/index.html,v
retrieving revision 1.172
diff -u -r1.172 index.html
--- index.html  2000/12/13 09:56:11     1.172
+++ index.html  2000/12/13 20:58:24
@@ -2727,7 +2727,7 @@
 If <code>fail</code>, the JAR is not created and the build is halted with an 
error.
 <p>(The Jar task is a shortcut for specifying the manifest file of a JAR file. 
 The same thing can be accomplished by using the <i>fullpath</i>
-attribute of the filesets in a Zip task. The one difference is that if the
+attribute of a prefixedfileset in a Zip task. The one difference is that if the
 <i>manifest</i> attribute is not specified, the Jar task will 
 include an empty one for you.)</p>
 </p>
@@ -4787,7 +4787,7 @@
 <code>WEB-INF</code> directories of the Web Application Archive.
 <p>(The War task is a shortcut for specifying the particular layout of a WAR 
file. 
 The same thing can be accomplished by using the <i>prefix</i> and 
<i>fullpath</i>
-attributes of the filesets in a Zip or Jar task.)</p>
+attributes of the prefixedfilesets in a Zip or Jar task.)</p>
 <h3>Parameters</h3>
 <table border="1" cellpadding="2" cellspacing="0">
   <tr>
@@ -4892,7 +4892,7 @@
     &lt;exclude name=&quot;jdbc1.jar&quot; /&gt;
   &lt;/lib&gt;
   &lt;classes dir=&quot;build/main&quot; /&gt;
-  &lt;fileset dir=&quot;src/graphics/images/gifs&quot; 
+  &lt;prefixedfileset dir=&quot;src/graphics/images/gifs&quot; 
                    prefix="images"/&gt;
 &lt;/war&gt;
 </pre>
@@ -4937,13 +4937,15 @@
 and optional subelements like <code>&lt;include&gt;</code>); explicit nested
 <code>&lt;fileset&gt;</code> elements so long as at least one fileset total is 
specified. The ZIP file will
 only reflect the relative paths of files <em>within</em> each fileset.</p>
-<p>Inside of <code>&lt;zip&gt;</code> elements, 
<code>&lt;prefixedfileset&gt;</code>s (a extended form of filesets) may include 
one of two special attributes: 
+<p><code>&lt;zip&gt;</code> elements may contain both regular 
<code>&lt;fileset&gt;</code> elements
+and also <code>&lt;prefixedfileset&gt;</code> elements.  A 
<code>&lt;prefixedfileset&gt;</code> is an extended form of a fileset,
+which may include one of two special attributes: 
 <i>prefix</i> or <i>fullpath</i>. These attributes modify the location of the 
files when they are placed 
-inside the archive. If the <i>prefix</i> attribute is set, all the files in 
the fileset are prefixed
-with that path in the archive. If the <i>fullpath</i> attribute is set, the 
file described by the filset is placed at that 
-exact location in the archive. (The <i>fullpath</i> attribute can only be set 
for filesets that 
+inside the archive. If the <i>prefix</i> attribute is set, all the files in 
the prefixedfileset are prefixed
+with that path in the archive. If the <i>fullpath</i> attribute is set, the 
file described by the prefixedfileset is placed at that 
+exact location in the archive. (The <i>fullpath</i> attribute can only be set 
for prefixedfilesets that 
 represent a single file. The <i>prefix</i> and <i>fullpath</i> attributes 
cannot both be set on the
-same fileset.)</p>
+same prefixedfileset.)</p>
 <p>The <code>whenempty</code> parameter controls what happens when no files 
match.
 If <code>skip</code> (the default), the ZIP is not created and a warning is 
issued.
 If <code>fail</code>, the ZIP is not created and the build is halted with an 
error.
@@ -5034,8 +5036,8 @@
 current directory. <code>ChangeLog.txt</code> will be added to the top of the 
ZIP file, just as if
 it had been located at <code>htdocs/manual/ChangeLog.txt</code>.</p>
 <pre>  &lt;zip zipfile=&quot;${dist}/manual.zip&quot;&gt;
-    &lt;fileset dir=&quot;htdocs/manual&quot; 
prefix=&quot;docs/user-guide&quot;/&gt;
-    &lt;fileset dir=&quot;.&quot; includes=&quot;ChangeLog27.txt&quot; 
fullpath=&quot;docs/ChangeLog.txt&quot;/&gt;
+    &lt;prefixedfileset dir=&quot;htdocs/manual&quot; 
prefix=&quot;docs/user-guide&quot;/&gt;
+    &lt;prefixedfileset dir=&quot;.&quot; includes=&quot;ChangeLog27.txt&quot; 
fullpath=&quot;docs/ChangeLog.txt&quot;/&gt;
   &lt;/zip&gt;</pre>
 <p>zips all files in the <code>htdocs/manual</code> directory into the 
<code>docs/user-guide</code> directory
 in the archive, and also adds the file <code>ChangeLog27.txt</code> in the

Reply via email to