remm 01/07/18 15:47:29
Modified: catalina build.xml
Log:
- Bundle the BootstrapService class in bootstrap.jar.
Revision Changes Path
1.49 +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.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- build.xml 2001/07/16 06:57:18 1.48
+++ build.xml 2001/07/18 22:47:29 1.49
@@ -159,7 +159,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/StandardClassLoader*.class,org/apache/catalina/loader/Extension.class,org/apache/catalina/loader/Reloader.class,org/apache/catalina/startup/SecurityManagerDebug.class,org/apache/naming/JndiPermission.class"
+
includes="org/apache/catalina/startup/Bootstrap.class,org/apache/catalina/startup/BootstrapService.class,org/apache/catalina/loader/StandardClassLoader*.class,org/apache/catalina/loader/Extension.class,org/apache/catalina/loader/Reloader.class,org/apache/catalina/startup/SecurityManagerDebug.class,org/apache/naming/JndiPermission.class"
manifest="etc/bootstrap.MF"
/>
<jar jarfile="${catalina.build}/common/lib/naming.jar"
@@ -334,7 +334,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/**,org/apache/catalina/startup/Bootstrap.class,org/apache/catalina/loader/StandardClassLoader*.class,org/apache/catalina/loader/Extension.class,org/apache/catalina/loader/Reloader.class,org/apache/catalina/startup/SecurityManagerDebug.class"
/>
+
excludes="**/org/apache/naming/**,**/connector/warp/**,org/apache/catalina/startup/Bootstrap.class,org/apache/catalina/startup/BootstrapService.class,org/apache/catalina/loader/StandardClassLoader*.class,org/apache/catalina/loader/Extension.class,org/apache/catalina/loader/Reloader.class,org/apache/catalina/startup/SecurityManagerDebug.class"
/>
<jar jarfile="${catalina.deploy}/server/lib/warp.jar"
basedir="${catalina.build}/classes"
includes="**/connector/warp/**" />