From ec8fed4750569d7612c54683fb5349cfceaec536 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 16 Sep 2009 08:09:08 +0000
Subject: [PATCH] Use defaults where appropriate for jarIt macro A couple of
 minor packaging tweaks

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@815657 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml | 97 ++++++++++++++++-----------------------------------------------
 1 file changed, 24 insertions(+), 73 deletions(-)

diff --git a/build.xml b/build.xml
index 4f8014460..b56e7f3ca 100644
--- a/build.xml
+++ b/build.xml
@@ -217,7 +217,6 @@
     <include name="org/apache/catalina/loader/Reloader.*" />
     <include name="org/apache/catalina/security/SecurityClassLoad.*" />
     <include name="org/apache/naming/JndiPermission.*" />
-    <include name="org/apache/tomcat/util/compat/*" />
   </patternset>
 
   <patternset id="files.tomcat-juli">
@@ -225,7 +224,7 @@
   </patternset>
 
   <patternset id="files.tomcat-api">
-    <include name="org/apache/tomcat/*" />
+    <include name="org/apache/tomcat/*.class" />
   </patternset>
   	
   <patternset id="files.catalina">
@@ -299,9 +298,12 @@
     <attribute name="jarfile" description="the name of the JAR file to create"/>
     <attribute name="filesDir" description="the directory to obtain the files from"/>
     <attribute name="filesId" description="the patternset id of the files to use"/>
-    <attribute name="manifest" description="the manifest file use"/>
-    <attribute name="notice" description="the LICENSE file to use"/>
-    <attribute name="license" description="the NOTICE file to use"/>
+    <attribute name="manifest" description="the manifest file use"
+               default="${tomcat.tmp}/servlet-api.jar.manifest" />
+    <attribute name="notice" description="the LICENSE file to use"
+               default="res/META-INF/default.notice" />
+    <attribute name="license" description="the NOTICE file to use"
+               default="res/META-INF/default.license" />
     <sequential>
       <jar  jarfile="@{jarfile}" manifest="@{manifest}">
         <fileset dir="@{filesDir}">
@@ -336,10 +338,7 @@
     <!-- Common Annotations 1.0 JAR File -->
     <jarIt jarfile="${annotations-api.jar}"
       filesDir="${tomcat.classes}"
-      filesId="files.annotations-api"
-      manifest="${tomcat.tmp}/default.manifest"
-      notice="res/META-INF/default.notice"
-      license="res/META-INF/default.license" />
+      filesId="files.annotations-api" />
 
     <!-- Servlet 3.0 Implementation JAR File -->
     <jarIt jarfile="${servlet-api.jar}"
@@ -360,90 +359,58 @@
     <!-- JSP 2.1 EL Implementation JAR File -->
     <jarIt jarfile="${el-api.jar}"
       filesDir="${tomcat.classes}"
-      filesId="files.el-api"
-      manifest="${tomcat.tmp}/default.manifest"
-      notice="res/META-INF/default.notice"
-      license="res/META-INF/default.license" />
+      filesId="files.el-api" />
 
     <!-- Bootstrap JAR File -->
     <jarIt jarfile="${bootstrap.jar}"
       filesDir="${tomcat.classes}"
       filesId="files.bootstrap"
-      manifest="${tomcat.tmp}/bootstrap.jar.manifest"
-      notice="res/META-INF/default.notice"
-      license="res/META-INF/default.license" />
+      manifest="${tomcat.tmp}/bootstrap.jar.manifest" />
 
     <!-- Tomcat-juli JAR File -->
     <jarIt jarfile="${tomcat-juli.jar}"
       filesDir="${tomcat.classes}"
-      filesId="files.tomcat-juli"
-      manifest="${tomcat.tmp}/default.manifest"
-      notice="res/META-INF/default.notice"
-      license="res/META-INF/default.license" />
+      filesId="files.tomcat-juli" />
 
     <!-- Catalina Main JAR File -->
     <jarIt jarfile="${catalina.jar}"
       filesDir="${tomcat.classes}"
-      filesId="files.catalina"
-      manifest="${tomcat.tmp}/default.manifest"
-      notice="res/META-INF/default.notice"
-      license="res/META-INF/default.license" />
+      filesId="files.catalina" />
 
     <!-- Catalina GroupCom/Tribes JAR File -->
     <jarIt jarfile="${catalina-tribes.jar}"
       filesDir="${tomcat.classes}"
-      filesId="files.catalina-tribes"
-      manifest="${tomcat.tmp}/default.manifest"
-      notice="res/META-INF/default.notice"
-      license="res/META-INF/default.license" />
+      filesId="files.catalina-tribes" />
 
     <!-- Catalina Cluster/HA JAR File -->
     <jarIt jarfile="${catalina-ha.jar}"
       filesDir="${tomcat.classes}"
-      filesId="files.catalina-ha"
-      manifest="${tomcat.tmp}/default.manifest"
-      notice="res/META-INF/default.notice"
-      license="res/META-INF/default.license" />
+      filesId="files.catalina-ha" />
 
     <!-- Catalina Ant Tasks JAR File -->
     <jarIt jarfile="${catalina-ant.jar}"
       filesDir="${tomcat.classes}"
-      filesId="files.catalina-ant"
-      manifest="${tomcat.tmp}/default.manifest"
-      notice="res/META-INF/default.notice"
-      license="res/META-INF/default.license" />
+      filesId="files.catalina-ant" />
 
     <!-- Tomcat API JAR File -->
     <jarIt jarfile="${tomcat-api.jar}"
       filesDir="${tomcat.classes}"
-      filesId="files.tomcat-api"
-      manifest="${tomcat.tmp}/default.manifest"
-      notice="res/META-INF/default.notice"
-      license="res/META-INF/default.license" />
+      filesId="files.tomcat-api" />
 
     <!-- Protocol handlers - Coyote -->
     <jarIt jarfile="${tomcat-coyote.jar}"
       filesDir="${tomcat.classes}"
-      filesId="files.tomcat-coyote"
-      manifest="${tomcat.tmp}/default.manifest"
-      notice="res/META-INF/default.notice"
-      license="res/META-INF/default.license" />
+      filesId="files.tomcat-coyote" />
 
     <!-- Jasper Implementation JAR File -->
     <jarIt jarfile="${jasper.jar}"
       filesDir="${tomcat.classes}"
-      filesId="files.jasper"
-      manifest="${tomcat.tmp}/default.manifest"
-      notice="res/META-INF/default.notice"
-      license="res/META-INF/default.license" />
+      filesId="files.jasper" />
 
     <!-- Jasper EL Implementation JAR File -->
     <jarIt jarfile="${jasper-el.jar}"
       filesDir="${tomcat.classes}"
-      filesId="files.jasper-el"
-      manifest="${tomcat.tmp}/default.manifest"
-      notice="res/META-INF/default.notice"
-      license="res/META-INF/default.license" />
+      filesId="files.jasper-el" />
 
     <!-- i18n JARs -->
     <jar jarfile="${tomcat.build}/lib/tomcat-i18n-es.jar"
@@ -734,21 +701,14 @@
     <jarIt jarfile="${tomcat-embed-core.jar}"
            filesDir="${tomcat.classes}"
            filesId="files.tomcat-embed-core"
-    	   manifest="${tomcat.tmp}/default.manifest"
            notice="res/META-INF/servlet-api.jar.notice"
            license="res/META-INF/servlet-api.jar.license"/>
     <jarIt jarfile="${tomcat-embed-jasper.jar}"
            filesDir="${tomcat.classes}"
-           filesId="files.tomcat-embed-jasper"
-           manifest="${tomcat.tmp}/default.manifest"
-           notice="res/META-INF/default.notice"
-           license="res/META-INF/default.license"/>
+           filesId="files.tomcat-embed-jasper"/>
     <jarIt jarfile="${tomcat-embed-juli.jar}"
            filesDir="${tomcat.classes}"
-           filesId="files.tomcat-juli"
-           manifest="${tomcat.tmp}/default.manifest"
-           notice="res/META-INF/default.notice"
-           license="res/META-INF/default.license"/>
+           filesId="files.tomcat-juli"/>
 
   </target>
 
@@ -761,22 +721,13 @@
   	
     <jarIt jarfile="${tomcat-embed-core-sources.jar}"
     	   filesDir="java"
-           filesId="files.tomcat-embed-core"
-           manifest="${tomcat.tmp}/default.manifest"
-           notice="res/META-INF/default.notice"
-           license="res/META-INF/default.license"/>
+           filesId="files.tomcat-embed-core"/>
     <jarIt jarfile="${tomcat-embed-jasper-sources.jar}"
            filesDir="java"
-           filesId="files.tomcat-embed-jasper"
-           manifest="${tomcat.tmp}/default.manifest"
-           notice="res/META-INF/default.notice"
-           license="res/META-INF/default.license"/>
+           filesId="files.tomcat-embed-jasper"/>
     <jarIt jarfile="${tomcat-embed-juli-sources.jar}"
            filesDir="java"
-           filesId="files.tomcat-juli"
-           manifest="${tomcat.tmp}/default.manifest"
-           notice="res/META-INF/default.notice"
-           license="res/META-INF/default.license"/>
+           filesId="files.tomcat-juli"/>
 
   </target>
 
-- 
2.11.0