Author: jhm
Date: Thu Jan 4 04:46:08 2007
New Revision: 492549
URL: http://svn.apache.org/viewvc?view=rev&rev=492549
Log:
<ear> and <war> inherit attributes and elements from <jar>.
Modified:
ant/core/trunk/docs/manual/CoreTasks/ear.html
ant/core/trunk/docs/manual/CoreTasks/war.html
Modified: ant/core/trunk/docs/manual/CoreTasks/ear.html
URL:
http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/CoreTasks/ear.html?view=diff&rev=492549&r1=492548&r2=492549
==============================================================================
--- ant/core/trunk/docs/manual/CoreTasks/ear.html (original)
+++ ant/core/trunk/docs/manual/CoreTasks/ear.html Thu Jan 4 04:46:08 2007
@@ -127,6 +127,44 @@
<td valign="top" align="center">No</td>
</tr>
<tr>
+ <td valign="top">filesetmanifest</td>
+ <td valign="top">behavior when a Manifest is found in a zipfileset or
zipgroupfileset file is found. Valid values are "skip",
"merge", and "mergewithoutmain". "merge" will
merge all of the manifests together, and merge this into any other specified
manifests. "mergewithoutmain" merges everything but the Main section
of the manifests. Default value is "skip".
+ </td>
+ <td valign="top" align="center">No</td>
+ </tr>
+ <tr>
+ <td valign="top">whenmanifestonly</td>
+ <td valign="top">behavior when no files match. Valid values are
"fail", "skip", and "create". Default is
"create".</td>
+ <td valign="top" align="center">No</td>
+ </tr>
+ <tr>
+ <td valign="top">manifestencoding</td>
+ <td valign="top">The encoding used to read the JAR manifest, when a
manifest file is specified.</td>
+ <td valign="top" align="center">No, defaults to the platform encoding.</td>
+ </tr>
+ <tr>
+ <td valign="top">index</td>
+ <td valign="top">whether to create an <A
+
HREF="http://java.sun.com/j2se/1.3/docs/guide/jar/jar.html#JAR%20Index";>index
+ list</A> to speed up classloading. This is a JDK 1.3+ specific
+ feature. Unless you specify additional jars with nested <a
+ href="#indexjars"><code>indexjars</code></a> elements, only the
+ contents of this jar will be included in the index. Defaults to
+ false.</td>
+ <td valign="top" align="center">No</td>
+ </tr>
+ <tr>
+ <td valign="top">index</td>
+ <td valign="top">whether to create an <A
+
HREF="http://java.sun.com/j2se/1.3/docs/guide/jar/jar.html#JAR%20Index";>index
+ list</A> to speed up classloading. This is a JDK 1.3+ specific
+ feature. Unless you specify additional jars with nested <a
+ href="#indexjars"><code>indexjars</code></a> elements, only the
+ contents of this jar will be included in the index. Defaults to
+ false.</td>
+ <td valign="top" align="center">No</td>
+ </tr>
+ <tr>
<td valign="top">update</td>
<td valign="top">indicates whether to update or overwrite
the destination file if it already exists. Default is
"false".</td>
@@ -159,13 +197,19 @@
<td valign="top" align="center">No</td>
</tr>
</table>
+
<h3>Nested elements</h3>
+
<h4>metainf</h4>
<p>The nested <code>metainf</code> element specifies a <a
href="../CoreTypes/fileset.html">FileSet</a>. All files included in this
fileset will
end up in the <code>META-INF</code> directory of the ear file. If this
fileset includes a file named <code>MANIFEST.MF</code>, the file is
ignored and you will get a warning.</p>
+
+<h4>manifest, indexjars, service</h4>
+These are inherited from <a href="jar.html"><jar></a>
+
<h2>Example</h2>
<pre>
<ear destfile="${build.dir}/myapp.ear"
appxml="${src.dir}/metadata/application.xml">
Modified: ant/core/trunk/docs/manual/CoreTasks/war.html
URL:
http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/CoreTasks/war.html?view=diff&rev=492549&r1=492548&r2=492549
==============================================================================
--- ant/core/trunk/docs/manual/CoreTasks/war.html (original)
+++ ant/core/trunk/docs/manual/CoreTasks/war.html Thu Jan 4 04:46:08 2007
@@ -160,6 +160,17 @@
<td valign="top" align="center">No</td>
</tr>
<tr>
+ <td valign="top">filesetmanifest</td>
+ <td valign="top">behavior when a Manifest is found in a zipfileset or
zipgroupfileset file is found. Valid values are "skip",
"merge", and "mergewithoutmain". "merge" will
merge all of the manifests together, and merge this into any other specified
manifests. "mergewithoutmain" merges everything but the Main section
of the manifests. Default value is "skip".
+ </td>
+ <td valign="top" align="center">No</td>
+ </tr>
+ <tr>
+ <td valign="top">whenmanifestonly</td>
+ <td valign="top">behavior when no files match. Valid values are
"fail", "skip", and "create". Default is
"create".</td>
+ <td valign="top" align="center">No</td>
+ </tr>
+ <tr>
<td valign="top">update</td>
<td valign="top">indicates whether to update or overwrite
the destination file if it already exists. Default is
"false".</td>
@@ -192,28 +203,38 @@
<td valign="top" align="center">No</td>
</tr>
</table>
+
<h3>Nested elements</h3>
+
<h4>lib</h4>
<p>The nested <code>lib</code> element specifies a <a
href="../CoreTypes/fileset.html">FileSet</a>. All files included in this
fileset will
end up in the <code>WEB-INF/lib</code> directory of the war file.</p>
+
<h4>classes</h4>
<p>The nested <code>classes</code> element specifies a <a
href="../CoreTypes/fileset.html">FileSet</a>. All files included in this
fileset will
end up in the <code>WEB-INF/classes</code> directory of the war file.</p>
+
<h4>webinf</h4>
<p>The nested <code>webinf</code> element specifies a <a
href="../CoreTypes/fileset.html">FileSet</a>. All files included in this
fileset will
end up in the <code>WEB-INF</code> directory of the war file. If this
fileset includes a file named <code>web.xml</code>, the file is
ignored and you will get a warning.</p>
+
<h4>metainf</h4>
<p>The nested <code>metainf</code> element specifies a <a
href="../CoreTypes/fileset.html">FileSet</a>. All files included in this
fileset will
end up in the <code>META-INF</code> directory of the war file. If this
fileset includes a file named <code>MANIFEST.MF</code>, the file is
ignored and you will get a warning.</p>
+
+<h4>manifest, indexjars, service</h4>
+These are inherited from <a href="jar.html"><jar></a>
+
<h3>Examples</h3>
+
<p>Assume the following structure in the project's base directory:</p>
<pre>
thirdparty/libs/jdbc1.jar
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
