patrickl 2002/08/01 14:31:13
Modified: catalina build.xml
Log:
Remove conditional copying of Xerces 2 as Xerces 2.0.1 is always required (even with
JDK 1.4) to handle XML schemas
Revision Changes Path
1.10 +1 -17 jakarta-tomcat-catalina/catalina/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml 1 Aug 2002 20:29:20 -0000 1.9
+++ build.xml 1 Aug 2002 21:31:13 -0000 1.10
@@ -499,22 +499,6 @@
</or>
</and>
</condition>
- <condition property="copy.xerces2.jars">
- <and>
- <not>
- <equals arg1="${light.dist}" arg2="on" />
- </not>
- <and>
- <equals arg1="${xerces2.jars.present}" arg2="true" />
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <not>
- <equals arg1="${jdk.1.4.present}" arg2="true" />
- </not>
- </or>
- </and>
- </and>
- </condition>
</target>
@@ -690,7 +674,7 @@
<copy todir="${catalina.build}/common/lib" file="../lib/tyrex.license"/>
-->
</target>
- <target name="copy-xerces2.jars" if="copy.xerces2.jars">
+ <target name="copy-xerces2.jars">
<copy todir="${catalina.build}/common/endorsed" file="${xercesImpl.jar}"/>
<copy todir="${catalina.build}/common/endorsed" file="${xmlParserAPIs.jar}"/>
</target>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
