diff --git a/docs/index.html b/docs/index.html
index 6e389fcc8..7eeea1662 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -2943,6 +2943,8 @@ supports all attributes of <fileset>
<patternset> elements.
You can also use nested file sets for more flexibility, and specify multiple ones to merge together different trees of files into one JAR. +The extended fileset attributes from the zip task are also available +in the jar task. See the Zip task for more details and examples.
If the manifest is omitted, a simple one will be supplied by Ant.
You should not include META-INF/MANIFEST.MF in your set of files.
@@ -2952,7 +2954,7 @@ If skip, the JAR is not created and a warning is issued.
If fail, the JAR is not created and the build is halted with an error.
(The Jar task is a shortcut for specifying the manifest file of a JAR file. The same thing can be accomplished by using the fullpath -attribute of a prefixedfileset in a Zip task. The one difference is that if the +attribute of a fileset in a Zip task. The one difference is that if the manifest attribute is not specified, the Jar task will include an empty one for you.)
@@ -5138,7 +5140,9 @@ treatment for files that should end up in theWEB-INF directories of the Web Application Archive.
(The War task is a shortcut for specifying the particular layout of a WAR file. The same thing can be accomplished by using the prefix and fullpath -attributes of the prefixedfilesets in a Zip or Jar task.)
+attributes of filesets in a Zip or Jar task.) +The extended fileset attributes from the zip task (prefix, fullpath, and src) are available for all filesets used in the War task.
+| No |
<fileset> elements to specify the files to be included in the archive. A <fileset> has three additional attributes when
+used in the context of the <zip> task: prefix, fullpath, and src. The
+prefix and fullpath attributes modify the location of the files when they are placed
+inside the archive. If the prefix attribute is set, all files in the fileset are prefixed
+with that path in the archive. If the fullpath attribute is set, the file described by the fileset is placed at that
+exact location in the archive. (The fullpath attribute can only be set for filesets that represent a single file. The prefix and fullpath attributes cannot both be set on the same fileset.) The src attribute
+may be used in place of the dir attribute to specify a zip file whose
+contents will be extracted and included in the archive. As with directories, include and exclude patterns may be used to specify a subset of the zip file
+for inclusion in the archive.
+
<zip zipfile="${dist}/manual.zip"
basedir="htdocs/manual"
@@ -5387,13 +5394,18 @@ are zipped, and files with the name todo.html are excluded.
current directory. ChangeLog.txt will be added to the top of the ZIP file, just as if
it had been located at htdocs/manual/ChangeLog.txt.
<zip zipfile="${dist}/manual.zip">
- <prefixedfileset dir="htdocs/manual" prefix="docs/user-guide"/>
- <prefixedfileset dir="." includes="ChangeLog27.txt" fullpath="docs/ChangeLog.txt"/>
+ <fileset dir="htdocs/manual" prefix="docs/user-guide"/>
+ <fileset dir="." includes="ChangeLog27.txt" fullpath="docs/ChangeLog.txt"/>
+ <fileset src="examples.zip" includes="**/*.html" prefix="docs/examples"/>
</zip>
zips all files in the htdocs/manual directory into the docs/user-guide directory
-in the archive, and also adds the file ChangeLog27.txt in the
-current directory as docs/ChangeLog.txt. For example, the archive might end up containing two files:
-docs/user-guide/html/index.html and docs/ChangeLog.txt
+in the archive, adds the file ChangeLog27.txt in the
+current directory as docs/ChangeLog.txt, and includes all the html files in examples.zip under docs/examples. The archive might end up containing the files:
+ docs/user-guide/html/index.html
+ docs/ChangeLog.txt
+ docs/examples/index.html
+
+
Optional tasks