Author: markt
Date: Tue Nov 4 19:07:56 2008
New Revision: 711498
URL: http://svn.apache.org/viewvc?rev=711498&view=rev
Log:
Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=45878
Add proper manifests (regression from 5.5.x) and LICENSE & NOTICE files
Added:
tomcat/tc6.0.x/trunk/res/META-INF/
tomcat/tc6.0.x/trunk/res/META-INF/LICENSE
tomcat/tc6.0.x/trunk/res/META-INF/NOTICE
tomcat/tc6.0.x/trunk/res/jsp-api.jar.manifest
tomcat/tc6.0.x/trunk/res/servlet-api.jar.manifest
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.xml
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=711498&r1=711497&r2=711498&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Nov 4 19:07:56 2008
@@ -127,13 +127,6 @@
+1: rjung, mturk, markt, pero
0: remm (also affects to the two other AJP connectors)
-* Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=45878
- Add proper manifests (regression from 5.5.x) and LICENSE & NOTICE files
- Lots of ways to do this. Alternative/better suggestions welcome
- http://svn.apache.org/viewvc?rev=699128&view=rev
- +1: markt, fhanik, rjung
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45851
Fix NPE and out of order message processing issues
http://svn.apache.org/viewvc?rev=699427&view=rev
Modified: tomcat/tc6.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=711498&r1=711497&r2=711498&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Tue Nov 4 19:07:56 2008
@@ -50,6 +50,12 @@
<!-- Can't be lower - jsp uses templates -->
<property name="compile.source" value="1.5"/>
+ <!-- Can't be higher - must run on 1.5 -->
+ <property name="compile.target" value="1.5"/>
+
+ <!-- Exact spec versions (for the manifests) -->
+ <property name="servlet.revision" value="MR2" />
+ <property name="jsp.revision" value="FR" />
<!-- JAR artifacts -->
<property name="bootstrap.jar" value="${tomcat.build}/bin/bootstrap.jar"/>
@@ -105,6 +111,7 @@
debug="${compile.debug}"
deprecation="${compile.deprecation}"
source="${compile.source}"
+ target="${compile.target}"
optimize="${compile.optimize}"
excludes="**/CVS/**,**/.svn/**">
<!-- Comment this in to show unchecked warnings: <compilerarg
value="-Xlint:unchecked"/> -->
@@ -134,6 +141,9 @@
<target name="build-only" depends="build-prepare,compile,package" />
<target name="package" >
+ <!-- Common filtering tokens for JAR manifests-->
+ <filter token="source.jdk" value="${compile.source}"/>
+ <filter token="target.jdk" value="${compile.target}"/>
<!-- Common Annotations 1.0 JAR File -->
<jar jarfile="${annotations-api.jar}">
@@ -150,7 +160,17 @@
</jar>
<!-- Servlet 2.5 Implementation JAR File -->
- <jar jarfile="${servlet-api.jar}">
+ <filter token="implementation.revision"
+ value="${servlet.revision}"/>
+ <copy tofile="res/manifest.tmp"
+ file="res/servlet-api.jar.manifest"
+ overwrite="yes"
+ filtering="true" />
+ <jar jarfile="${servlet-api.jar}"
+ manifest="res/manifest.tmp">
+ <fileset dir="res">
+ <include name="META-INF/**" />
+ </fileset>
<fileset dir="${tomcat.classes}">
<include name="javax/servlet/*" />
<include name="javax/servlet/http/*" />
@@ -162,7 +182,17 @@
</jar>
<!-- JSP 2.1 Implementation JAR File -->
- <jar jarfile="${jsp-api.jar}">
+ <filter token="implementation.revision"
+ value="${jsp.revision}"/>
+ <copy tofile="res/manifest.tmp"
+ file="res/jsp-api.jar.manifest"
+ overwrite="yes"
+ filtering="true" />
+ <jar jarfile="${jsp-api.jar}"
+ manifest="res/manifest.tmp">
+ <fileset dir="res">
+ <include name="META-INF/**" />
+ </fileset>
<fileset dir="${tomcat.classes}">
<include name="javax/servlet/jsp/**" />
<!-- Javadoc and i18n exclusions -->
@@ -506,6 +536,8 @@
<javac srcdir="webapps/examples/WEB-INF/classes"
destdir="${tomcat.build}/webapps/examples/WEB-INF/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
+ source="${compile.source}"
+ target="${compile.target}"
optimize="${compile.optimize}"
classpath="${tomcat.classes}"
excludes="**/CVS/**,**/.svn/**">
@@ -514,6 +546,8 @@
<javac srcdir="webapps/examples/jsp/plugin/applet"
destdir="${tomcat.build}/webapps/examples/jsp/plugin/applet"
debug="${compile.debug}" deprecation="${compile.deprecation}"
+ source="${compile.source}"
+ target="${compile.target}"
optimize="${compile.optimize}"
classpath="$tomcat.lcasses}"
excludes="**/CVS/**,**/.svn/**">
@@ -766,6 +800,7 @@
debug="${compile.debug}"
deprecation="${compile.deprecation}"
source="${compile.source}"
+ target="${compile.target}"
sourcepath="${tomcat-dbcp.home}/src/java"
srcdir="${tomcat-dbcp.home}/src/java" >
<include name="**" />
Added: tomcat/tc6.0.x/trunk/res/META-INF/LICENSE
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/META-INF/LICENSE?rev=711498&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/res/META-INF/LICENSE (added)
+++ tomcat/tc6.0.x/trunk/res/META-INF/LICENSE Tue Nov 4 19:07:56 2008
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
Added: tomcat/tc6.0.x/trunk/res/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/META-INF/NOTICE?rev=711498&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/res/META-INF/NOTICE (added)
+++ tomcat/tc6.0.x/trunk/res/META-INF/NOTICE Tue Nov 4 19:07:56 2008
@@ -0,0 +1,2 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
Added: tomcat/tc6.0.x/trunk/res/jsp-api.jar.manifest
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/jsp-api.jar.manifest?rev=711498&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/res/jsp-api.jar.manifest (added)
+++ tomcat/tc6.0.x/trunk/res/jsp-api.jar.manifest Tue Nov 4 19:07:56 2008
@@ -0,0 +1,11 @@
+Manifest-version: 1.0
+
+Name: javax/servlet/jsp/
+Specification-Title: Java API for JavaServer Pages
+Specification-Version: 2.1
+Specification-Vendor: Sun Microsystems, Inc.
+Implementation-Title: javax.servlet.jsp
+Implementation-Version: [EMAIL PROTECTED]@
+Implementation-Vendor: Apache Software Foundation
+X-Compile-Source-JDK: @source.jdk@
+X-Compile-Target-JDK: @target.jdk@
Added: tomcat/tc6.0.x/trunk/res/servlet-api.jar.manifest
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/servlet-api.jar.manifest?rev=711498&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/res/servlet-api.jar.manifest (added)
+++ tomcat/tc6.0.x/trunk/res/servlet-api.jar.manifest Tue Nov 4 19:07:56 2008
@@ -0,0 +1,11 @@
+Manifest-version: 1.0
+
+Name: javax/servlet/
+Specification-Title: Java API for Servlets
+Specification-Version: 2.5
+Specification-Vendor: Sun Microsystems, Inc.
+Implementation-Title: javax.servlet
+Implementation-Version: [EMAIL PROTECTED]@
+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=711498&r1=711497&r2=711498&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Nov 4 19:07:56 2008
@@ -245,6 +245,10 @@
creating tomcat-users.xml with Windows installer. (markt)
</fix>
<fix>
+ <bug>45878</bug>: Restore manifest, licence and notice files to the jsp
+ and servlet jars. (markt)
+ </fix>
+ <fix>
<bug>45879</bug>: Move NOTICE file from documentation webapp to the
installation directory. (markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
