You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2010/05/14 08:31:16 UTC
svn commit: r944134 - in /tomcat/tc5.5.x/trunk: ./ build/ connectors/
connectors/coyote/ connectors/http11/ connectors/jk/ connectors/juli/
connectors/util/ container/catalina/ container/webapps/docs/
Author: kkolinko
Date: Fri May 14 06:31:15 2010
New Revision: 944134
URL: http://svn.apache.org/viewvc?rev=944134&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49236
Do not use indexing when packing Tomcat JARs.
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/build/build.xml
tomcat/tc5.5.x/trunk/connectors/build.xml
tomcat/tc5.5.x/trunk/connectors/coyote/build.xml
tomcat/tc5.5.x/trunk/connectors/http11/build.xml
tomcat/tc5.5.x/trunk/connectors/jk/build.xml
tomcat/tc5.5.x/trunk/connectors/juli/build.xml
tomcat/tc5.5.x/trunk/connectors/util/build.xml
tomcat/tc5.5.x/trunk/container/catalina/build.xml
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=944134&r1=944133&r2=944134&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Fri May 14 06:31:15 2010
@@ -116,12 +116,6 @@ PATCHES PROPOSED TO BACKPORT:
http://svn.apache.org/viewvc?view=revision&revision=749019
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49236
- Do not use indexing when packing Tomcat JARs.
- https://issues.apache.org/bugzilla/attachment.cgi?id=25382
- +1: kkolinko, markt, kfujino
- -1:
-
* Update to DBCP 1.3
http://people.apache.org/~markt/patches/2010-05-06-dbcp13-tc5.patch
+1: markt, kkolinko, kfujino
Modified: tomcat/tc5.5.x/trunk/build/build.xml
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/build.xml?rev=944134&r1=944133&r2=944134&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/build/build.xml (original)
+++ tomcat/tc5.5.x/trunk/build/build.xml Fri May 14 06:31:15 2010
@@ -294,7 +294,7 @@
-->
<!-- Protocol handlers - AJP -->
- <jar jarfile="${tomcat.build}/server/lib/tomcat-ajp.jar" index="true">
+ <jar jarfile="${tomcat.build}/server/lib/tomcat-ajp.jar">
<fileset dir="${tomcat.build}/classes">
<include name="org/apache/coyote/ajp/**" />
<include name="org/apache/jk/**" />
@@ -323,7 +323,7 @@
<!-- Coyote API -->
<delete file="${tomcat.build}/server/lib/tomcat-coyote.jar" />
- <jar jarfile="${tomcat.build}/server/lib/tomcat-coyote.jar" index="true">
+ <jar jarfile="${tomcat.build}/server/lib/tomcat-coyote.jar">
<fileset dir="${tomcat.build}/classes">
<include name="org/apache/coyote/*" />
<include name="org/apache/coyote/memory/*" />
@@ -350,7 +350,7 @@
</ant>
<!-- Protocol handlers - HTTP -->
- <jar jarfile="${tomcat.build}/server/lib/tomcat-http.jar" index="true">
+ <jar jarfile="${tomcat.build}/server/lib/tomcat-http.jar">
<fileset dir="${tomcat.build}/classes">
<include name="org/apache/coyote/http11/**" />
<!-- Javadoc and i18n exclusions -->
@@ -376,7 +376,7 @@
</ant>
<!-- APR -->
- <jar jarfile="${tomcat.build}/server/lib/tomcat-apr.jar" index="true">
+ <jar jarfile="${tomcat.build}/server/lib/tomcat-apr.jar">
<fileset dir="${tomcat.build}/classes">
<include name="org/apache/tomcat/jni/**" />
<!-- Javadoc and i18n exclusions -->
@@ -397,7 +397,7 @@
</ant>
<!-- Java.util.logging Implementation -->
- <jar jarfile="${tomcat.build}/bin/tomcat-juli.jar" index="true">
+ <jar jarfile="${tomcat.build}/bin/tomcat-juli.jar">
<fileset dir="${tomcat.build}/classes">
<include name="org/apache/juli/**" />
<!-- Javadoc and i18n exclusions -->
@@ -783,8 +783,7 @@
encoding="ISO-8859-1">
<include name="**" />
</javac>
- <jar jarfile="${tomcat-dbcp.jar}"
- index="true">
+ <jar jarfile="${tomcat-dbcp.jar}">
<fileset dir="${tomcat-dbcp.home}/classes">
<include name="**/*.class" />
<include name="**/*.properties" />
@@ -801,7 +800,7 @@
<target name="-build-jasper-compiler-jdt">
<unjar src="${jdt.jar}" dest="${jasper-compiler-jdt.home}" />
- <jar destfile="${jasper-compiler-jdt.jar}" index="true">
+ <jar destfile="${jasper-compiler-jdt.jar}">
<fileset dir="${jasper-compiler-jdt.home}">
<include name="org/eclipse/jdt/core/compiler/**"/>
<include name="org/eclipse/jdt/internal/compiler/**"/>
@@ -907,40 +906,35 @@
<!-- Build JARs for webapps classes -->
<mkdir dir="${tomcat.build}/server/webapps/admin/WEB-INF/lib" />
- <jar jarfile="${tomcat.build}/server/webapps/admin/WEB-INF/lib/catalina-admin.jar"
- index="true">
+ <jar jarfile="${tomcat.build}/server/webapps/admin/WEB-INF/lib/catalina-admin.jar">
<fileset dir="${tomcat.build}/server/webapps/admin/WEB-INF/classes">
<include name="**/*.class" />
<include name="**/*.properties" />
</fileset>
</jar>
<mkdir dir="${tomcat.build}/server/webapps/manager/WEB-INF/lib" />
- <jar jarfile="${tomcat.build}/server/webapps/manager/WEB-INF/lib/catalina-manager.jar"
- index="true">
+ <jar jarfile="${tomcat.build}/server/webapps/manager/WEB-INF/lib/catalina-manager.jar">
<fileset dir="${tomcat.build}/server/webapps/manager/WEB-INF/classes">
<include name="**/*.class" />
<include name="**/*.properties" />
</fileset>
</jar>
<mkdir dir="${tomcat.build}/server/webapps/host-manager/WEB-INF/lib" />
- <jar jarfile="${tomcat.build}/server/webapps/host-manager/WEB-INF/lib/catalina-host-manager.jar"
- index="true">
+ <jar jarfile="${tomcat.build}/server/webapps/host-manager/WEB-INF/lib/catalina-host-manager.jar">
<fileset dir="${tomcat.build}/server/webapps/host-manager/WEB-INF/classes">
<include name="**/*.class" />
<include name="**/*.properties" />
</fileset>
</jar>
<mkdir dir="${tomcat.build}/webapps/balancer/WEB-INF/lib" />
- <jar jarfile="${tomcat.build}/webapps/balancer/WEB-INF/lib/catalina-balancer.jar"
- index="true">
+ <jar jarfile="${tomcat.build}/webapps/balancer/WEB-INF/lib/catalina-balancer.jar">
<fileset dir="${tomcat.build}/webapps/balancer/WEB-INF/classes">
<include name="**/*.class" />
<include name="**/*.properties" />
</fileset>
</jar>
<mkdir dir="${tomcat.build}/webapps/ROOT/WEB-INF/lib" />
- <jar jarfile="${tomcat.build}/webapps/ROOT/WEB-INF/lib/catalina-root.jar"
- index="true">
+ <jar jarfile="${tomcat.build}/webapps/ROOT/WEB-INF/lib/catalina-root.jar">
<fileset dir="${tomcat.build}/webapps/ROOT/WEB-INF/classes">
<include name="**/*.class" />
<include name="**/*.properties" />
Modified: tomcat/tc5.5.x/trunk/connectors/build.xml
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/build.xml?rev=944134&r1=944133&r2=944134&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/connectors/build.xml (original)
+++ tomcat/tc5.5.x/trunk/connectors/build.xml Fri May 14 06:31:15 2010
@@ -111,7 +111,7 @@
</fileset>
</jar>
- <jar file="${dist.dir}/tomcat-connectors.jar" index="true" >
+ <jar file="${dist.dir}/tomcat-connectors.jar">
<fileset dir="${build.dir}/classes" >
<include name="**" />
<exclude name="org/apache/ajp/**" />
Modified: tomcat/tc5.5.x/trunk/connectors/coyote/build.xml
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/coyote/build.xml?rev=944134&r1=944133&r2=944134&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/connectors/coyote/build.xml (original)
+++ tomcat/tc5.5.x/trunk/connectors/coyote/build.xml Fri May 14 06:31:15 2010
@@ -247,7 +247,6 @@
<target name="jar.tomcat5" depends="compile.tomcat5" >
<jar jarfile="${tomcat-coyote.jar}"
- index="true"
basedir="${build.home}/classes"
manifest="${build.home}/conf/MANIFEST.MF"
excludes="**/tomcat3/*" >
@@ -294,7 +293,6 @@
description="Build shared Coyote jar">
<property name="tomcat-coyote.jar" value="${build.home}/lib/tomcat-${component.name}.jar" />
<jar jarfile="${tomcat-coyote.jar}"
- index="true"
manifest="${build.home}/conf/MANIFEST.MF">
<fileset dir="${build.home}/classes" >
<exclude name="**/tomcat3/*"/>
@@ -309,7 +307,6 @@
description="Build Tomcat 4 Adapter jar" if="tomcat4.detect">
<property name="tomcat4-coyote.jar" value="${build.home}/lib/tomcat4-${component.name}.jar" />
<jar jarfile="${tomcat4-coyote.jar}"
- index="true"
basedir="${build.home}/classes"
manifest="${build.home}/conf/MANIFEST.MF"
includes="org/apache/coyote/tomcat4/**" />
@@ -319,7 +316,6 @@
description="Build Tomcat 3.3 Adapter jar" if="tomcat33.detect">
<property name="tomcat33-coyote.jar" value="${build.home}/lib/tomcat33-${component.name}.jar" />
<jar jarfile="${tomcat33-coyote.jar}"
- index="true"
basedir="${build.home}/classes"
manifest="${build.home}/conf/MANIFEST.MF"
includes="org/apache/coyote/tomcat3/**" />
Modified: tomcat/tc5.5.x/trunk/connectors/http11/build.xml
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/http11/build.xml?rev=944134&r1=944133&r2=944134&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/connectors/http11/build.xml (original)
+++ tomcat/tc5.5.x/trunk/connectors/http11/build.xml Fri May 14 06:31:15 2010
@@ -194,7 +194,6 @@
</copy>
<property name="tomcat-http11.jar" value="${build.home}/lib/tomcat-${component.name}.jar"/>
<jar jarfile="${tomcat-http11.jar}"
- index="true"
basedir="${build.home}/classes"
manifest="${build.home}/conf/MANIFEST.MF">
<include name="org/apache/coyote/http11/**"/>
@@ -204,7 +203,6 @@
<target name="compile" depends="static,compile-only"
description="Compile shareable components">
<jar jarfile="${build.home}/lib/tomcat33-resource.jar"
- index="true"
basedir="${build.home}/classes"
includes="**/*.properties" />
</target>
Modified: tomcat/tc5.5.x/trunk/connectors/jk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/jk/build.xml?rev=944134&r1=944133&r2=944134&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/connectors/jk/build.xml (original)
+++ tomcat/tc5.5.x/trunk/connectors/jk/build.xml Fri May 14 06:31:15 2010
@@ -236,13 +236,11 @@
</classpath>
</javac>
<jar jarfile="${tomcat-jkconfig.jar}"
- index="true"
basedir="${jk.build}/classes"
manifest="conf/jkconfig.manifest">
<include name="org/apache/jk/config/**" />
</jar>
<jar jarfile="${tomcat-jk2.jar}"
- index="true"
manifest="conf/tomcat-jk2.manifest"
basedir="${jk.build}/classes" >
<include name="org/apache/jk/**" />
@@ -251,7 +249,6 @@
</jar>
<jar jarfile="${tomcat-jni.jar}"
- index="true"
basedir="${jk.build}/classes"
manifest="conf/jk2.manifest" >
<include name="org/apache/jk/apr/**" />
@@ -277,7 +274,6 @@
</classpath>
</javac>
<jar jarfile="${tomcat-jkconfig.jar}"
- index="true"
basedir="${jk.build}/classes"
manifest="conf/jkconfig.manifest">
<include name="org/apache/jk/config/**" />
@@ -303,13 +299,11 @@
</javac>
<jar jarfile="${tomcat-jk.jar}"
- index="true"
basedir="${jk.build}/classes">
<include name="org/apache/ajp/**" />
</jar>
<jar jarfile="${tomcat-jkshm.jar}"
- index="true"
basedir="${jk.build}/classes"
manifest="conf/shm.manifest">
<include name="org/apache/ajp/common/Shm.class" />
@@ -335,7 +329,6 @@
</javac>
<jar jarfile="${tomcat-jk.jar}"
- index="true"
basedir="${jk.build}/classes">
<include name="org/apache/ajp/**" />
</jar>
@@ -360,7 +353,6 @@
<copy todir="${jk.build}/classes/META-INF"
file="jkant/ant.tasks"/>
<jar jarfile="${jk.build}/lib/jkant.jar"
- index="true"
basedir="${jk.build}/classes" >
<include name="org/apache/jk/ant/**" />
<include name="META-INF/ant.tasks" />
Modified: tomcat/tc5.5.x/trunk/connectors/juli/build.xml
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/juli/build.xml?rev=944134&r1=944133&r2=944134&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/connectors/juli/build.xml (original)
+++ tomcat/tc5.5.x/trunk/connectors/juli/build.xml Fri May 14 06:31:15 2010
@@ -168,7 +168,6 @@
</copy>
<property name="tomcat-juli.jar" value="${build.home}/lib/tomcat-${component.name}.jar"/>
<jar jarfile="${tomcat-juli.jar}"
- index="true"
basedir="${build.home}/classes"
manifest="${build.home}/conf/MANIFEST.MF">
<include name="org/apache/juli/**"/>
Modified: tomcat/tc5.5.x/trunk/connectors/util/build.xml
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/util/build.xml?rev=944134&r1=944133&r2=944134&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/connectors/util/build.xml (original)
+++ tomcat/tc5.5.x/trunk/connectors/util/build.xml Fri May 14 06:31:15 2010
@@ -120,7 +120,6 @@
</copy>
<jar jarfile="${tomcat-util.jar}"
- index="true"
basedir="${tomcat-util.build}/classes"
manifest="java/tomcat-util.manifest" >
<include name="org/apache/tomcat/util/**"/>
@@ -141,7 +140,6 @@
<classpath refid="compile.classpath"/>
</javac>
<jar jarfile="${tomcat-loader.jar}"
- index="true"
basedir="${tomcat-util.build}/loader"
manifest="loader/tomcat-loader.manifest" >
<include name="org/apache/tomcat/util/loader/**"/>
Modified: tomcat/tc5.5.x/trunk/container/catalina/build.xml
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/build.xml?rev=944134&r1=944133&r2=944134&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/catalina/build.xml (original)
+++ tomcat/tc5.5.x/trunk/container/catalina/build.xml Fri May 14 06:31:15 2010
@@ -535,8 +535,7 @@
<!--
<copy todir="${catalina.build}/server/lib" file="${tomcat-util.jar}"/>
-->
- <jar jarfile="${tomcat-util.jar}"
- index="true">
+ <jar jarfile="${tomcat-util.jar}">
<fileset dir="${catalina.build}/classes">
<include name="org/apache/tomcat/util/**"/>
<!-- Javadoc and i18n exclusions -->
@@ -1119,7 +1118,7 @@
</jar>
<!-- Naming - Factory JAR File -->
- <jar jarfile="${catalina.deploy}/common/lib/naming-factory.jar" index="true">
+ <jar jarfile="${catalina.deploy}/common/lib/naming-factory.jar">
<fileset dir="${classes.dir}">
<include name="org/apache/naming/**" />
<exclude name="org/apache/naming/resources/**" />
@@ -1136,7 +1135,7 @@
</jar>
<!-- Naming - Resources JAR File -->
- <jar jarfile="${catalina.deploy}/common/lib/naming-resources.jar" index="true">
+ <jar jarfile="${catalina.deploy}/common/lib/naming-resources.jar">
<fileset dir="${classes.dir}">
<include name="org/apache/naming/JndiPermission.class" />
<include name="org/apache/naming/NameParserImpl.class" />
@@ -1152,14 +1151,14 @@
</jar>
<!-- Servlets - CGI Servlet -->
- <jar jarfile="${catalina.deploy}/server/lib/servlets-cgi.renametojar" index="true">
+ <jar jarfile="${catalina.deploy}/server/lib/servlets-cgi.renametojar">
<fileset dir="${classes.dir}">
<include name="org/apache/catalina/servlets/CGI*" />
</fileset>
</jar>
<!-- Servlets - Default File-Serving Servlet -->
- <jar jarfile="${catalina.deploy}/server/lib/servlets-default.jar" index="true">
+ <jar jarfile="${catalina.deploy}/server/lib/servlets-default.jar">
<fileset dir="${classes.dir}">
<include name="org/apache/catalina/servlets/Default*" />
<include name="org/apache/catalina/servlets/Constants.class" />
@@ -1168,14 +1167,14 @@
</jar>
<!-- Servlets - Invoker Servlet -->
- <jar jarfile="${catalina.deploy}/server/lib/servlets-invoker.jar" index="true">
+ <jar jarfile="${catalina.deploy}/server/lib/servlets-invoker.jar">
<fileset dir="${classes.dir}">
<include name="org/apache/catalina/servlets/Invoker*" />
</fileset>
</jar>
<!-- Servlets - SSI Servlet -->
- <jar jarfile="${catalina.deploy}/server/lib/servlets-ssi.renametojar" index="true">
+ <jar jarfile="${catalina.deploy}/server/lib/servlets-ssi.renametojar">
<fileset dir="${classes.dir}">
<include name="org/apache/catalina/ssi/**" />
<!-- Javadoc and i18n exclusions -->
@@ -1185,7 +1184,7 @@
</jar>
<!-- Servlets - Webdav Servlet -->
- <jar jarfile="${catalina.deploy}/server/lib/servlets-webdav.jar" index="true">
+ <jar jarfile="${catalina.deploy}/server/lib/servlets-webdav.jar">
<fileset dir="${classes.dir}">
<include name="org/apache/catalina/servlets/Webdav*" />
</fileset>
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=944134&r1=944133&r2=944134&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Fri May 14 06:31:15 2010
@@ -46,6 +46,9 @@
<update>
Update to NSIS 2.46. (kkolinko)
</update>
+ <fix>
+ <bug>49236</bug> Do not use indexing when packing Tomcat JARs. (kkolinko)
+ </fix>
</changelog>
</subsection>
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org