glenn 01/03/31 06:05:11
Modified: catalina build.xml
Log:
Make sure bootstrap.jar only has the classes it needs and there are not duplicates
in catalina.jar
Revision Changes Path
1.35 +2 -2 jakarta-tomcat-4.0/catalina/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/build.xml,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- build.xml 2001/03/24 20:52:07 1.34
+++ build.xml 2001/03/31 14:05:11 1.35
@@ -130,7 +130,7 @@
<!-- Construct bootstrap JAR file -->
<jar jarfile="${catalina.build}/bin/bootstrap.jar"
basedir="${catalina.build}/classes"
-
includes="org/apache/catalina/startup/Bootstrap.class,org/apache/catalina/loader/**"
+
includes="org/apache/catalina/startup/Bootstrap.class,org/apache/catalina/loader/StandardClassLoader*.class,org/apache/catalina/loader/Extension.class,org/apache/catalina/loader/Reloader.class"
/>
<jar jarfile="${catalina.build}/common/lib/naming.jar"
basedir="${catalina.build}/classes"
@@ -227,7 +227,7 @@
<target name="deploy-main" depends="deploy-static">
<jar jarfile="${catalina.deploy}/server/lib/catalina.jar"
basedir="${catalina.build}/classes"
- excludes="**/org/apache/naming/**,**/connector/warp/**" />
+
excludes="**/org/apache/naming/**,**/connector/warp/**,org/apache/catalina/startup/Bootstrap.class,org/apache/catalina/loader/StandardClassLoader*.class,org/apache/catalina/loader/Extension.class,org/apache/catalina/loader/Reloader.class"
/>
<jar jarfile="${catalina.deploy}/server/lib/warp.jar"
basedir="${catalina.build}/classes"
includes="**/connector/warp/**" />
