Manifest improvements

- automate copyright year
- add manifests for el & annotations
- improve default NOTICE
- add info to bootstrap manifest

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@910604 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.xml b/build.xml
index 38710a7..6ab175f 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -52,6 +52,7 @@
   <!-- Exact spec versions (for the manifests) -->
   <property name="servlet.revision" value="FR" />
   <property name="jsp.revision" value="FR" />
+  <property name="el.revision" value="FR" />
 
   <!-- Release artifact base names -->
   <property name="final.name"            value="${project}-${version}" />
@@ -401,12 +402,17 @@
     <filter token="target.jdk" value="${compile.target}"/>
     <filter token="servlet.revision" value="${servlet.revision}"/>
     <filter token="jsp.revision" value="${jsp.revision}"/>
+    <filter token="el.revision" value="${el.revision}"/>
 
     <mkdir dir="${tomcat.manifests}" />
     <copy todir="${tomcat.manifests}" overwrite="yes" filtering="yes"
       encoding="ISO-8859-1">
       <filterset refid="version.filters"/>
-      <fileset dir="${tomcat.home}/res/META-INF" includes="*.manifest" />
+      <fileset dir="${tomcat.home}/res/META-INF" >
+        <include name="*.manifest" />
+        <include name="*.license" />
+        <include name="*.notice" />
+      </fileset>
     </copy>
 
   </target>
@@ -415,28 +421,30 @@
     <!-- Common Annotations 1.0 JAR File -->
     <jarIt jarfile="${annotations-api.jar}"
       filesDir="${tomcat.classes}"
-      filesId="files.annotations-api" />
+      filesId="files.annotations-api"
+      manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
 
     <!-- Servlet 3.0 Implementation JAR File -->
     <jarIt jarfile="${servlet-api.jar}"
       filesDir="${tomcat.classes}"
       filesId="files.servlet-api"
       manifest="${tomcat.manifests}/servlet-api.jar.manifest"
-      notice="res/META-INF/servlet-api.jar.notice"
-      license="res/META-INF/servlet-api.jar.license" />
+      notice="${tomcat.manifests}/servlet-api.jar.notice"
+      license="${tomcat.manifests}/servlet-api.jar.license" />
 
     <!-- JSP 2.1 Implementation JAR File -->
     <jarIt jarfile="${jsp-api.jar}"
       filesDir="${tomcat.classes}"
       filesId="files.jsp-api"
       manifest="${tomcat.manifests}/jsp-api.jar.manifest"
-      notice="res/META-INF/jsp-api.jar.notice"
-      license="res/META-INF/jsp-api.jar.license" />
+      notice="${tomcat.manifests}/jsp-api.jar.notice"
+      license="${tomcat.manifests}/jsp-api.jar.license" />
 
     <!-- JSP 2.1 EL Implementation JAR File -->
     <jarIt jarfile="${el-api.jar}"
       filesDir="${tomcat.classes}"
-      filesId="files.el-api" />
+      filesId="files.el-api"
+      manifest="${tomcat.manifests}/el-api.jar.manifest" />
 
     <!-- Bootstrap JAR File -->
     <jarIt jarfile="${bootstrap.jar}"
@@ -500,9 +508,9 @@
       <fileset dir="${tomcat.classes}">
         <include name="**/LocalStrings_es.properties" />
       </fileset>
-      <zipfileset file="res/META-INF/default.notice"
+      <zipfileset file="${tomcat.manifests}/default.notice"
         fullpath="META-INF/NOTICE" />
-      <zipfileset file="res/META-INF/default.license"
+      <zipfileset file="${tomcat.manifests}/default.license"
         fullpath="META-INF/LICENSE" />
     </jar>
     <jar jarfile="${tomcat.build}/lib/tomcat-i18n-fr.jar"
@@ -510,9 +518,9 @@
       <fileset dir="${tomcat.classes}">
         <include name="**/LocalStrings_fr.properties" />
       </fileset>
-      <zipfileset file="res/META-INF/default.notice"
+      <zipfileset file="${tomcat.manifests}/default.notice"
         fullpath="META-INF/NOTICE" />
-      <zipfileset file="res/META-INF/default.license"
+      <zipfileset file="${tomcat.manifests}/default.license"
         fullpath="META-INF/LICENSE" />
     </jar>
     <jar jarfile="${tomcat.build}/lib/tomcat-i18n-ja.jar"
@@ -520,9 +528,9 @@
       <fileset dir="${tomcat.classes}">
         <include name="**/LocalStrings_ja.properties" />
       </fileset>
-      <zipfileset file="res/META-INF/default.notice"
+      <zipfileset file="${tomcat.manifests}/default.notice"
         fullpath="META-INF/NOTICE" />
-      <zipfileset file="res/META-INF/default.license"
+      <zipfileset file="${tomcat.manifests}/default.license"
         fullpath="META-INF/LICENSE" />
     </jar>
 
@@ -1872,9 +1880,9 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
     <attribute name="manifest" description="the manifest file use"
                default="${tomcat.manifests}/default.manifest" />
     <attribute name="notice" description="the LICENSE file to use"
-               default="${tomcat.home}/res/META-INF/default.notice" />
+               default="${tomcat.manifests}/default.notice" />
     <attribute name="license" description="the NOTICE file to use"
-               default="${tomcat.home}/res/META-INF/default.license" />
+               default="${tomcat.manifests}/default.license" />
     <sequential>
       <jar jarfile="@{jarfile}" manifest="@{manifest}" index="yes">
         <fileset dir="@{filesDir}">

diff --git a/res/META-INF/annotations-api.jar.manifest b/res/META-INF/annotations-api.jar.manifest
new file mode 100644 (file)
index 0000000..ea72268
--- /dev/null
+++ b/res/META-INF/annotations-api.jar.manifest
@@ -0,0 +1,11 @@
+Manifest-version: 1.0
+
+Name: javax/servlet/
+Specification-Title: Java API for Servlets (Annotations)
+Specification-Version: 3.0
+Specification-Vendor: Sun Microsystems, Inc.
+Implementation-Title: javax.servlet
+Implementation-Version: 3.0.@servlet.revision@
+Implementation-Vendor: Apache Software Foundation
+X-Compile-Source-JDK: @source.jdk@
+X-Compile-Target-JDK: @target.jdk@

diff --git a/res/META-INF/bootstrap.jar.manifest b/res/META-INF/bootstrap.jar.manifest
index 7489eeb..74d5425 100644 (file)
--- a/res/META-INF/bootstrap.jar.manifest
+++ b/res/META-INF/bootstrap.jar.manifest
@@ -1,5 +1,11 @@
 Manifest-Version: 1.0
 Main-Class: org.apache.catalina.startup.Bootstrap
 Class-Path: commons-daemon.jar
-Specification-Title: Catalina
-Specification-Version: @VERSION_MAJOR_MINOR@
\ No newline at end of file
+Specification-Title: Apache Tomcat Bootstrap
+Specification-Version: @VERSION_MAJOR_MINOR@
+Specification-Vendor: Apache Software Foundation
+Implementation-Title: Apache Tomcat Bootstrap
+Implementation-Version: @VERSION@
+Implementation-Vendor: Apache Software Foundation
+X-Compile-Source-JDK: @source.jdk@
+X-Compile-Target-JDK: @target.jdk@
\ No newline at end of file

diff --git a/res/META-INF/default.notice b/res/META-INF/default.notice
index 3f59805..79c89d8 100644 (file)
--- a/res/META-INF/default.notice
+++ b/res/META-INF/default.notice
@@ -1,2 +1,5 @@
+Apache Tomcat
+Copyright 1999-@YEAR@ The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).

diff --git a/res/META-INF/el-api.jar.manifest b/res/META-INF/el-api.jar.manifest
new file mode 100644 (file)
index 0000000..880f5b1
--- /dev/null
+++ b/res/META-INF/el-api.jar.manifest
@@ -0,0 +1,11 @@
+Manifest-version: 1.0
+
+Name: javax/el/
+Specification-Title: Expression Language
+Specification-Version: 2.2
+Specification-Vendor: Sun Microsystems, Inc.
+Implementation-Title: javax.el
+Implementation-Version: 2.2.@el.revision@
+Implementation-Vendor: Apache Software Foundation
+X-Compile-Source-JDK: @source.jdk@
+X-Compile-Target-JDK: @target.jdk@