costin 2003/03/07 07:57:31
Modified: catalina build.xml
Log:
Stop excluding the files - some loaders index by package name, and if catalina.jar
is used in embed/ it can't assume bootstrap will be around.
It is (relatively) fine to have the file in 2 jars - class loaders can deal with
that.
Revision Changes Path
1.42 +8 -1 jakarta-tomcat-catalina/catalina/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/build.xml,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- build.xml 16 Feb 2003 12:40:54 -0000 1.41
+++ build.xml 7 Mar 2003 15:57:31 -0000 1.42
@@ -920,6 +920,9 @@
</jar>
<!-- Catalina Main JAR File -->
+ <!-- Excluding files from here is worse than duplicating them - a loader that
uses the
+ package name as index and includes both bootstrap and catalina will be
confused -->
+
<jar jarfile="${catalina.deploy}/server/lib/catalina.jar">
<fileset dir="${classes.dir}">
<include name="org/apache/catalina/**" />
@@ -927,14 +930,16 @@
<exclude name="org/apache/catalina/launcher/**" />
<exclude name="org/apache/naming/**" />
<exclude name="org/apache/catalina/startup/Bootstrap.class" />
+<!--
<exclude name="org/apache/catalina/startup/catalina.properties" />
<exclude name="org/apache/catalina/startup/CatalinaProperties.class" />
<exclude name="org/apache/catalina/startup/ClassLoaderFactory.class" />
<exclude name="org/apache/catalina/startup/Tool.class" />
+ <exclude name="org/apache/catalina/startup/SecurityClassLoad.class" />
<exclude name="org/apache/catalina/loader/StandardClassLoader*.class" />
<exclude name="org/apache/catalina/loader/Extension.class" />
<exclude name="org/apache/catalina/loader/Reloader.class" />
- <exclude name="org/apache/catalina/startup/SecurityClassLoad.class" />
+-->
<exclude name="org/apache/catalina/servlets/**" />
<exclude name="org/apache/catalina/ssi/**" />
</fileset>
@@ -955,7 +960,9 @@
<include name="org/apache/naming/factory/Constants.class" />
<include name="org/apache/naming/factory/ResourceLinkFactory.class" />
<exclude name="org/apache/naming/java/*" />
+<!--
<exclude name="org/apache/naming/JndiPermission.class" />
+-->
</fileset>
</jar>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
