Author: markt
Date: Wed Feb 24 00:14:39 2010
New Revision: 915608
URL: http://svn.apache.org/viewvc?rev=915608&view=rev
Log:
Improve manifest information
Added:
tomcat/tc6.0.x/trunk/res/META-INF/annotations-api.jar.manifest
tomcat/tc6.0.x/trunk/res/META-INF/el-api.jar.manifest
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/extras.xml
tomcat/tc6.0.x/trunk/res/META-INF/bootstrap.jar.manifest
tomcat/tc6.0.x/trunk/res/META-INF/default.manifest
tomcat/tc6.0.x/trunk/res/META-INF/default.notice
tomcat/tc6.0.x/trunk/res/META-INF/jsp-api.jar.manifest
tomcat/tc6.0.x/trunk/res/META-INF/servlet-api.jar.manifest
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=915608&r1=915607&r2=915608&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Feb 24 00:14:39 2010
@@ -147,11 +147,6 @@
kkolinko: mark User constructor as protected, replace ArrayList argument
with a List, and maybe address sebb's comments to r910485 on dev@
-* Various manifest improvements
-
http://people.apache.org/~markt/patches/2010-02-16-manifest-improvements.patch
- +1: markt, fhanik, kkolinko
- -1:
-
* Update bundled TC-Native to 1.1.20
I think there is no need to update "recommended" version number here.
http://svn.apache.org/viewvc?rev=915226&view=rev
Modified: tomcat/tc6.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=915608&r1=915607&r2=915608&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Wed Feb 24 00:14:39 2010
@@ -58,7 +58,7 @@
<property name="tomcat.build" value="${basedir}/output/build"/>
<property name="tomcat.classes" value="${basedir}/output/classes"/>
<property name="tomcat.dist" value="${basedir}/output/dist"/>
- <property name="tomcat.tmp" value="${basedir}/output/tmp"/>
+ <property name="tomcat.manifests" value="${basedir}/output/manifests"/>
<property name="test.failonerror" value="true"/>
<property name="test.runner" value="junit.textui.TestRunner"/>
@@ -70,6 +70,7 @@
<!-- Exact spec versions (for the manifests) -->
<property name="servlet.revision" value="MR2" />
<property name="jsp.revision" value="FR" />
+ <property name="el.revision" value="FR" />
<!-- JAR artifacts -->
<property name="bootstrap.jar" value="${tomcat.build}/bin/bootstrap.jar"/>
@@ -258,9 +259,12 @@
<macrodef name="jarIt" description="utility macro for standard JAR
packaging">
<attribute name="jarfile" description="the name of the JAR file to
create"/>
<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.manifests}/default.manifest" />
+ <attribute name="notice" description="the LICENSE file to use"
+ default="${tomcat.manifests}/default.notice" />
+ <attribute name="license" description="the NOTICE file to use"
+ default="${tomcat.manifests}/default.license" />
<sequential>
<jar jarfile="@{jarfile}" manifest="@{manifest}">
<fileset dir="${tomcat.classes}">
@@ -281,12 +285,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.tmp}" />
- <copy todir="${tomcat.tmp}" overwrite="yes" filtering="yes"
+ <mkdir dir="${tomcat.manifests}" />
+ <copy todir="${tomcat.manifests}" overwrite="yes" filtering="yes"
encoding="ISO-8859-1">
<filterset refid="version.filters"/>
- <fileset dir="res/META-INF" includes="*.manifest" />
+ <fileset dir="${tomcat.home}/res/META-INF" >
+ <include name="*.manifest" />
+ <include name="*.license" />
+ <include name="*.notice" />
+ </fileset>
</copy>
</target>
@@ -294,112 +303,78 @@
<target name="package" depends="build-manifests" >
<!-- Common Annotations 1.0 JAR File -->
<jarIt jarfile="${annotations-api.jar}" filesId="files.annotations-api"
- manifest="${tomcat.tmp}/default.manifest"
- notice="res/META-INF/default.notice"
- license="res/META-INF/default.license" />
+ manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
<!-- Servlet 2.5 Implementation JAR File -->
<jarIt jarfile="${servlet-api.jar}" filesId="files.servlet-api"
- manifest="${tomcat.tmp}/servlet-api.jar.manifest"
- notice="res/META-INF/default.notice"
- license="res/META-INF/default.license" />
+ manifest="${tomcat.manifests}/servlet-api.jar.manifest" />
<!-- JSP 2.1 Implementation JAR File -->
<jarIt jarfile="${jsp-api.jar}" filesId="files.jsp-api"
- manifest="${tomcat.tmp}/jsp-api.jar.manifest"
- notice="res/META-INF/default.notice"
- license="res/META-INF/default.license" />
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
<!-- JSP 2.1 EL Implementation JAR File -->
<jarIt jarfile="${el-api.jar}" filesId="files.el-api"
- manifest="${tomcat.tmp}/default.manifest"
- notice="res/META-INF/default.notice"
- license="res/META-INF/default.license" />
+ manifest="${tomcat.manifests}/el-api.jar.manifest" />
<!-- Bootstrap JAR File -->
<jarIt jarfile="${bootstrap.jar}" filesId="files.bootstrap"
- manifest="${tomcat.tmp}/bootstrap.jar.manifest"
- notice="res/META-INF/default.notice"
- license="res/META-INF/default.license" />
+ manifest="${tomcat.manifests}/bootstrap.jar.manifest" />
<!-- Tomcat-juli JAR File -->
- <jarIt jarfile="${tomcat-juli.jar}" filesId="files.tomcat-juli"
- manifest="${tomcat.tmp}/default.manifest"
- notice="res/META-INF/default.notice"
- license="res/META-INF/default.license" />
+ <jarIt jarfile="${tomcat-juli.jar}" filesId="files.tomcat-juli" />
<!-- Catalina Main JAR File -->
- <jarIt jarfile="${catalina.jar}" filesId="files.catalina"
- manifest="${tomcat.tmp}/default.manifest"
- notice="res/META-INF/default.notice"
- license="res/META-INF/default.license" />
+ <jarIt jarfile="${catalina.jar}" filesId="files.catalina" />
<!-- Catalina GroupCom/Tribes JAR File -->
- <jarIt jarfile="${catalina-tribes.jar}" filesId="files.catalina-tribes"
- manifest="${tomcat.tmp}/default.manifest"
- notice="res/META-INF/default.notice"
- license="res/META-INF/default.license" />
+ <jarIt jarfile="${catalina-tribes.jar}" filesId="files.catalina-tribes" />
<!-- Catalina Cluster/HA JAR File -->
- <jarIt jarfile="${catalina-ha.jar}" filesId="files.catalina-ha"
- manifest="${tomcat.tmp}/default.manifest"
- notice="res/META-INF/default.notice"
- license="res/META-INF/default.license" />
+ <jarIt jarfile="${catalina-ha.jar}" filesId="files.catalina-ha" />
<!-- Catalina Ant Tasks JAR File -->
- <jarIt jarfile="${catalina-ant.jar}" filesId="files.catalina-ant"
- manifest="${tomcat.tmp}/default.manifest"
- notice="res/META-INF/default.notice"
- license="res/META-INF/default.license" />
+ <jarIt jarfile="${catalina-ant.jar}" filesId="files.catalina-ant" />
<!-- Protocol handlers - Coyote -->
- <jarIt jarfile="${tomcat-coyote.jar}" filesId="files.tomcat-coyote"
- manifest="${tomcat.tmp}/default.manifest"
- notice="res/META-INF/default.notice"
- license="res/META-INF/default.license" />
+ <jarIt jarfile="${tomcat-coyote.jar}" filesId="files.tomcat-coyote" />
<!-- Jasper Implementation JAR File -->
- <jarIt jarfile="${jasper.jar}" filesId="files.jasper"
- manifest="${tomcat.tmp}/default.manifest"
- notice="res/META-INF/default.notice"
- license="res/META-INF/default.license" />
+ <jarIt jarfile="${jasper.jar}" filesId="files.jasper" />
<!-- Jasper EL Implementation JAR File -->
- <jarIt jarfile="${jasper-el.jar}" filesId="files.jasper-el"
- manifest="${tomcat.tmp}/default.manifest"
- notice="res/META-INF/default.notice"
- license="res/META-INF/default.license" />
+ <jarIt jarfile="${jasper-el.jar}" filesId="files.jasper-el" />
<!-- i18n JARs -->
<jar jarfile="${tomcat.build}/lib/tomcat-i18n-es.jar"
- manifest="${tomcat.tmp}/default.manifest" >
+ manifest="${tomcat.manifests}/default.manifest" >
<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"
- manifest="${tomcat.tmp}/default.manifest" >
+ manifest="${tomcat.manifests}/default.manifest" >
<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"
- manifest="${tomcat.tmp}/default.manifest" >
+ manifest="${tomcat.manifests}/default.manifest" >
<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>
@@ -669,7 +644,7 @@
<target name="clean">
<delete dir="${tomcat.classes}" />
<delete dir="${tomcat.build}" />
- <delete dir="${tomcat.tmp}" />
+ <delete dir="${tomcat.manifests}" />
</target>
<!-- Download and dependency building -->
@@ -782,7 +757,8 @@
</target>
- <target name="build-tomcat-dbcp" unless="jdk16.present">
+ <target name="build-tomcat-dbcp" unless="jdk16.present"
+ depends="build-manifests">
<copy todir="${tomcat-dbcp.home}">
<fileset dir="${commons-pool.home}">
<include name="**/*.java" />
@@ -822,30 +798,30 @@
</javac>
<jar jarfile="${tomcat-dbcp.jar}"
index="true"
- manifest="${tomcat.tmp}/default.manifest">
+ manifest="${tomcat.manifests}/default.manifest">
<fileset dir="${tomcat-dbcp.home}/classes">
<include name="**/*.class" />
<include name="**/*.properties" />
</fileset>
- <zipfileset file="${tomcat.home}/res/META-INF/default.notice"
+ <zipfileset file="${tomcat.manifests}/default.notice"
fullpath="META-INF/NOTICE" />
- <zipfileset file="${tomcat.home}/res/META-INF/default.license"
+ <zipfileset file="${tomcat.manifests}/default.license"
fullpath="META-INF/LICENSE" />
</jar>
</target>
- <target name="build-jasper-jdt">
+ <target name="build-jasper-jdt" depends="build-manifests">
<unjar src="${jdt.jar}" dest="${jasper-jdt.home}" />
<jar destfile="${jasper-jdt.jar}" index="true"
- manifest="${tomcat.tmp}/default.manifest">
+ manifest="${tomcat.manifests}/default.manifest">
<fileset dir="${jasper-jdt.home}">
<include name="org/eclipse/jdt/core/compiler/**"/>
<include name="org/eclipse/jdt/internal/compiler/**"/>
<include name="org/eclipse/jdt/internal/core/util/CommentRecorder*"/>
</fileset>
- <zipfileset file="${tomcat.home}/res/META-INF/jasper-jdt.jar.notice"
+ <zipfileset file="${tomcat.manifests}/jasper-jdt.jar.notice"
fullpath="META-INF/NOTICE" />
- <zipfileset file="${tomcat.home}/res/META-INF/jasper-jdt.jar.license"
+ <zipfileset file="${tomcat.manifests}/jasper-jdt.jar.license"
fullpath="META-INF/LICENSE" />
</jar>
</target>
Modified: tomcat/tc6.0.x/trunk/extras.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/extras.xml?rev=915608&r1=915607&r2=915608&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/extras.xml (original)
+++ tomcat/tc6.0.x/trunk/extras.xml Wed Feb 24 00:14:39 2010
@@ -58,7 +58,7 @@
<property name="tomcat.classes" value="${basedir}/output/classes"/>
<property name="tomcat.dist" value="${basedir}/output/dist"/>
<property name="tomcat.extras" value="${basedir}/output/extras"/>
- <property name="tomcat.tmp" value="${basedir}/output/tmp"/>
+ <property name="tomcat.manifests" value="${basedir}/output/manifests"/>
<property name="tomcat.deployer" value="${basedir}/output/deployer"/>
<property name="tomcat.release" value="${basedir}/output/release"/>
<property name="test.failonerror" value="true"/>
@@ -151,7 +151,7 @@
target="compile" />
<jar jarfile="${tomcat-juli.jar}"
- manifest="${tomcat.tmp}/default.manifest" >
+ manifest="${tomcat.manifests}/default.manifest" >
<fileset
dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/target/classes">
<include name="org/apache/juli/logging/*.class" />
<include name="org/apache/juli/logging/impl/LogFactoryImpl*.class" />
@@ -169,9 +169,9 @@
<exclude name="**/package.html" />
<exclude name="**/LocalStrings_*" />
</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>
<antcall target="md5sum">
@@ -179,7 +179,7 @@
</antcall>
<jar jarfile="${tomcat-juli-adapters.jar}"
- manifest="${tomcat.tmp}/default.manifest" >
+ manifest="${tomcat.manifests}/default.manifest" >
<fileset
dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/target/classes">
<include name="org/apache/juli/logging/impl/**.class" />
<exclude name="org/apache/juli/logging/impl/WeakHashtable*.class" />
@@ -188,9 +188,9 @@
<exclude name="**/package.html" />
<exclude name="**/LocalStrings_*" />
</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>
<antcall target="md5sum">
@@ -236,16 +236,16 @@
<!-- Catalina Main JAR File -->
<jar jarfile="${catalina-ws.jar}"
- manifest="${tomcat.tmp}/default.manifest">
+ manifest="${tomcat.manifests}/default.manifest">
<fileset dir="${tomcat.classes}">
<include name="org/apache/naming/factory/webservices/**" />
<!-- Javadoc and i18n exclusions -->
<exclude name="**/package.html" />
<exclude name="**/LocalStrings_*" />
</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>
<antcall target="md5sum">
@@ -256,13 +256,13 @@
<target name="jmx-remote" >
<!-- Create the JAR file -->
<jar jarfile="${catalina-jmx-remote.jar}"
- manifest="${tomcat.tmp}/default.manifest" >
+ manifest="${tomcat.manifests}/default.manifest" >
<fileset dir="${tomcat.classes}">
<include name="org/apache/catalina/mbeans/JmxRemote*" />
</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>
<antcall target="md5sum">
Added: tomcat/tc6.0.x/trunk/res/META-INF/annotations-api.jar.manifest
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/META-INF/annotations-api.jar.manifest?rev=915608&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/res/META-INF/annotations-api.jar.manifest (added)
+++ tomcat/tc6.0.x/trunk/res/META-INF/annotations-api.jar.manifest Wed Feb 24
00:14:39 2010
@@ -0,0 +1,11 @@
+Manifest-version: 1.0
+
+Name: javax/servlet/
+Specification-Title: Java API for Servlets (Annotations)
+Specification-Version: 2.5
+Specification-Vendor: Sun Microsystems, Inc.
+Implementation-Title: javax.servlet
+Implementation-Version: 2...@servlet.revision@
+Implementation-Vendor: Apache Software Foundation
+X-Compile-Source-JDK: @source.jdk@
+X-Compile-Target-JDK: @target.jdk@
Modified: tomcat/tc6.0.x/trunk/res/META-INF/bootstrap.jar.manifest
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/META-INF/bootstrap.jar.manifest?rev=915608&r1=915607&r2=915608&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/META-INF/bootstrap.jar.manifest (original)
+++ tomcat/tc6.0.x/trunk/res/META-INF/bootstrap.jar.manifest Wed Feb 24
00:14:39 2010
@@ -1,5 +1,11 @@
Manifest-Version: 1.0
Main-Class: org.apache.catalina.startup.Bootstrap
Class-Path: commons-daemon.jar tomcat-juli.jar
-Specification-Title: Catalina
-Specification-Version: 6.0
\ 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
Modified: tomcat/tc6.0.x/trunk/res/META-INF/default.manifest
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/META-INF/default.manifest?rev=915608&r1=915607&r2=915608&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/META-INF/default.manifest (original)
+++ tomcat/tc6.0.x/trunk/res/META-INF/default.manifest Wed Feb 24 00:14:39 2010
@@ -1,5 +1,9 @@
Manifest-Version: 1.0
-Specification-Title: Catalina
+Specification-Title: Apache Tomcat
Specification-Version: @VERSION_MAJOR_MINOR@
+Specification-Vendor: Apache Software Foundation
+Implementation-Title: Apache Tomcat
+Implementation-Version: @VERSION@
+Implementation-Vendor: Apache Software Foundation
X-Compile-Source-JDK: @source.jdk@
X-Compile-Target-JDK: @target.jdk@
Modified: tomcat/tc6.0.x/trunk/res/META-INF/default.notice
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/META-INF/default.notice?rev=915608&r1=915607&r2=915608&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/META-INF/default.notice (original)
+++ tomcat/tc6.0.x/trunk/res/META-INF/default.notice Wed Feb 24 00:14:39 2010
@@ -1,2 +1,5 @@
+Apache Tomcat
+Copyright 19...@year@ The Apache Software Foundation
+
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Added: tomcat/tc6.0.x/trunk/res/META-INF/el-api.jar.manifest
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/META-INF/el-api.jar.manifest?rev=915608&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/res/META-INF/el-api.jar.manifest (added)
+++ tomcat/tc6.0.x/trunk/res/META-INF/el-api.jar.manifest Wed Feb 24 00:14:39
2010
@@ -0,0 +1,11 @@
+Manifest-version: 1.0
+
+Name: javax/el/
+Specification-Title: Expression Language
+Specification-Version: 2.1
+Specification-Vendor: Sun Microsystems, Inc.
+Implementation-Title: javax.el
+Implementation-Version: 2...@el.revision@
+Implementation-Vendor: Apache Software Foundation
+X-Compile-Source-JDK: @source.jdk@
+X-Compile-Target-JDK: @target.jdk@
Modified: tomcat/tc6.0.x/trunk/res/META-INF/jsp-api.jar.manifest
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/META-INF/jsp-api.jar.manifest?rev=915608&r1=915607&r2=915608&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/META-INF/jsp-api.jar.manifest (original)
+++ tomcat/tc6.0.x/trunk/res/META-INF/jsp-api.jar.manifest Wed Feb 24 00:14:39
2010
@@ -5,7 +5,7 @@
Specification-Version: 2.1
Specification-Vendor: Sun Microsystems, Inc.
Implementation-Title: javax.servlet.jsp
-Implementation-Version: 2...@implementation.revision@
+Implementation-Version: 2...@jsp.revision@
Implementation-Vendor: Apache Software Foundation
X-Compile-Source-JDK: @source.jdk@
X-Compile-Target-JDK: @target.jdk@
Modified: tomcat/tc6.0.x/trunk/res/META-INF/servlet-api.jar.manifest
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/META-INF/servlet-api.jar.manifest?rev=915608&r1=915607&r2=915608&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/META-INF/servlet-api.jar.manifest (original)
+++ tomcat/tc6.0.x/trunk/res/META-INF/servlet-api.jar.manifest Wed Feb 24
00:14:39 2010
@@ -5,7 +5,7 @@
Specification-Version: 2.5
Specification-Vendor: Sun Microsystems, Inc.
Implementation-Title: javax.servlet
-Implementation-Version: 2...@implementation.revision@
+Implementation-Version: 2...@servlet.revision@
Implementation-Vendor: Apache Software Foundation
X-Compile-Source-JDK: @source.jdk@
X-Compile-Target-JDK: @target.jdk@
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=915608&r1=915607&r2=915608&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Feb 24 00:14:39 2010
@@ -184,6 +184,9 @@
<code>javax.servlet.jsp.JspContext</code> since the specification does
not include them in the API definition. (markt)
</fix>
+ <add>
+ Improve the information in the JAR manifest files. (markt)
+ </add>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
