From c1319de7f88c8743879353919e2825e520615917 Mon Sep 17 00:00:00 2001 From: Jan Materne Date: Thu, 4 Jan 2007 12:46:08 +0000 Subject: [PATCH] and inherit attributes and elements from . git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@492549 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/CoreTasks/ear.html | 44 ++++++++++++++++++++++++++++++++++ docs/manual/CoreTasks/war.html | 21 ++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/docs/manual/CoreTasks/ear.html b/docs/manual/CoreTasks/ear.html index c1af1196e..571e711ec 100644 --- a/docs/manual/CoreTasks/ear.html +++ b/docs/manual/CoreTasks/ear.html @@ -126,6 +126,44 @@ to a value other than its default, "add".

the manifest file to use. No + + filesetmanifest + 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". + + No + + + whenmanifestonly + behavior when no files match. Valid values are "fail", "skip", and "create". Default is "create". + No + + + manifestencoding + The encoding used to read the JAR manifest, when a manifest file is specified. + No, defaults to the platform encoding. + + + index + whether to create an index + list to speed up classloading. This is a JDK 1.3+ specific + feature. Unless you specify additional jars with nested indexjars elements, only the + contents of this jar will be included in the index. Defaults to + false. + No + + + index + whether to create an index + list to speed up classloading. This is a JDK 1.3+ specific + feature. Unless you specify additional jars with nested indexjars elements, only the + contents of this jar will be included in the index. Defaults to + false. + No + update indicates whether to update or overwrite @@ -159,13 +197,19 @@ to a value other than its default, "add".

No +

Nested elements

+

metainf

The nested metainf element specifies a FileSet. All files included in this fileset will end up in the META-INF directory of the ear file. If this fileset includes a file named MANIFEST.MF, the file is ignored and you will get a warning.

+ +

manifest, indexjars, service

+These are inherited from <jar> +

Example

     <ear destfile="${build.dir}/myapp.ear" appxml="${src.dir}/metadata/application.xml">
diff --git a/docs/manual/CoreTasks/war.html b/docs/manual/CoreTasks/war.html
index 3f3926011..bd2b5a731 100644
--- a/docs/manual/CoreTasks/war.html
+++ b/docs/manual/CoreTasks/war.html
@@ -159,6 +159,17 @@ to a value other than its default, "add".

     the manifest file to use.
     No
   
+  
+    filesetmanifest
+    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".
+    
+    No
+  
+  
+    whenmanifestonly
+    behavior when no files match.  Valid values are "fail", "skip", and "create".  Default is "create".
+    No
+  
   
     update
     indicates whether to update or overwrite
@@ -192,28 +203,38 @@ to a value other than its default, "add".

     No
   
 
+
 
Nested elements

+
 
lib

 
The nested lib element specifies a FileSet. All files included in this fileset will
 end up in the WEB-INF/lib directory of the war file.

+
 
classes

 
The nested classes element specifies a FileSet. All files included in this fileset will
 end up in the WEB-INF/classes directory of the war file.

+
 
webinf

 
The nested webinf element specifies a FileSet. All files included in this fileset will
 end up in the WEB-INF directory of the war file. If this
 fileset includes a file named web.xml, the file is
 ignored and you will get a warning.

+
 
metainf

 
The nested metainf element specifies a FileSet. All files included in this fileset will
 end up in the META-INF directory of the war file. If this
 fileset includes a file named MANIFEST.MF, the file is
 ignored and you will get a warning.

+
+
manifest, indexjars, service

+These are inherited from <jar>
+
 
Examples

+
 
Assume the following structure in the project's base directory:

 
 thirdparty/libs/jdbc1.jar