cmlenz 01/09/30 05:49:57
Modified: . build.xml
Log:
Make the JAXP workarounds in the build file for the catalina-dist target
depend on whether crimson.jar and jaxp.jar actually exist in the catalina
distribution.
This should fix the build against current versions of Tomcat 4, where
Crimson has been replaced by Xerces.
Revision Changes Path
1.126 +24 -10 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- build.xml 2001/09/27 14:26:00 1.125
+++ build.xml 2001/09/30 12:49:57 1.126
@@ -306,6 +306,12 @@
<available property="catalina.present"
classname="org.apache.catalina.Container"
classpath="${catalina.jar}" />
+ <available property="catalina.crimson.present"
+ file="crimson.jar"
+ filepath="${catalina.dist}/server/lib" />
+ <available property="catalina.jaxp.present"
+ file="jaxp.jar"
+ filepath="${catalina.dist}/server/lib" />
<available property="xsl.present"
classname="org.apache.tools.ant.taskdefs.optional.TraXLiaison" />
<available property="jdom.present" classname="org.jdom.Element"
@@ -1243,16 +1249,24 @@
<mkdir dir="${slide.dist}/server/blank" />
<!-- Sepcial handling for JAXP to avoid sealing violations with Jasper -->
- <copy file="${catalina.dist}/jasper/crimson.jar"
- tofile="${slide.dist}/server/common/lib/crimson.jar"
- overwrite="true" />
- <copy file="${catalina.dist}/jasper/jaxp.jar"
- tofile="${slide.dist}/server/common/lib/jaxp.jar"
- overwrite="true" />
- <delete file="${slide.dist}/server/jasper/crimson.jar" />
- <delete file="${slide.dist}/server/jasper/jaxp.jar" />
- <delete file="${slide.dist}/server/server/lib/crimson.jar" />
- <delete file="${slide.dist}/server/server/lib/jaxp.jar" />
+ <copy todir="${slide.dist}/server/common/lib">
+ <fileset dir="${catalina.dist}/server/lib">
+ <include name="crimson.jar" if="catalina.crimson.present" />
+ <include name="jaxp.jar" if="catalina.jaxp.present" />
+ </fileset>
+ </copy>
+ <delete failonerror="false">
+ <fileset dir="${slide.dist}/server/jasper">
+ <include name="crimson.jar" />
+ <include name="jaxp.jar" />
+ </fileset>
+ </delete>
+ <delete failonerror="false">
+ <fileset dir="${slide.dist}/server/server/lib">
+ <include name="crimson.jar" />
+ <include name="jaxp.jar" />
+ </fileset>
+ </delete>
<!-- Welcome web application -->
<war warfile="${slide.dist}/server/webapps/ROOT.war"
