Author: kkolinko
Date: Fri May 14 06:38:11 2010
New Revision: 944137
URL: http://svn.apache.org/viewvc?rev=944137&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49236
Do not use indexing when packing Tomcat JARs.
In TC6 it affects the DBCP and JDT jars.
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=944137&r1=944136&r2=944137&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri May 14 06:38:11 2010
@@ -268,13 +268,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko, markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49236
- Do not use indexing when packing Tomcat JARs.
- In TC6 it affects the DBCP and JDT jars.
- https://issues.apache.org/bugzilla/attachment.cgi?id=25381
- +1: kkolinko, markt, kfujino
- -1:
-
* If any error happens in shutdown hook, do not forget to shutdown the
logging subsystem.
Modified: tomcat/tc6.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=944137&r1=944136&r2=944137&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Fri May 14 06:38:11 2010
@@ -811,7 +811,6 @@
<include name="**" />
</javac>
<jar jarfile="${tomcat-dbcp.jar}"
- index="true"
manifest="${tomcat.manifests}/default.manifest">
<fileset dir="${tomcat-dbcp.home}/classes">
<include name="**/*.class" />
@@ -826,7 +825,7 @@
<target name="build-jasper-jdt" depends="build-manifests">
<unjar src="${jdt.jar}" dest="${jasper-jdt.home}" />
- <jar destfile="${jasper-jdt.jar}" index="true"
+ <jar destfile="${jasper-jdt.jar}"
manifest="${tomcat.manifests}/default.manifest">
<fileset dir="${jasper-jdt.home}">
<include name="org/eclipse/jdt/core/compiler/**"/>
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=944137&r1=944136&r2=944137&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri May 14 06:38:11 2010
@@ -167,6 +167,10 @@
<update>
Update to NSIS 2.46. (kkolinko)
</update>
+ <fix>
+ <bug>49236</bug>: Do not use indexing when packing Tomcat JARs.
+ (kkolinko)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
