It looks like I forgot to attach the patch file in my original posting.
Patrick
------------------- Original Message ------------------------------------
Hello,
I found the following 2 problems when building using
"ant clean ; ant dist" against the HEAD of the cvs tree this morning:
1. xerces.jar is not copied to the distribution if you are building with
JDK 1.3 or JDK 1.4. As a result, catalina will not start.
2. tomcat-util.jar became a required dependency. As a result, the build
will fail if you don't download and build tomcat-util.jar beforehand.
The following patch to jakarta-tomcat-4.0/catalina/build.xml corrected
both problems by doing the following changes:
1. If you have xerces.jar, it is now copied regardless of which JDK
you are building with.
2. tomcat-util.jar is now an optional jar.
Does anyone see any problems with my patch? If so, let me know.
Thanks,
Patrick
Index: build.xml
===================================================================
RCS file: /home/cvspublic/jakarta-tomcat-4.0/catalina/build.xml,v
retrieving revision 1.70
diff -u -r1.70 build.xml
--- build.xml 2001/10/02 04:44:54 1.70
+++ build.xml 2001/10/02 16:20:11
@@ -272,6 +272,12 @@
</and>
</or>
</condition>
+ <condition property="copy.tomcat-util.jar">
+ <or>
+ <equals arg1="${full.dist}" arg2="on" />
+ <equals arg1="${tomcat-util.jar.present}" arg2="true" />
+ </or>
+ </condition>
<condition property="copy.tyrex.jar">
<or>
<equals arg1="${full.dist}" arg2="on" />
@@ -281,15 +287,7 @@
<condition property="copy.xerces.jar">
<or>
<equals arg1="${full.dist}" arg2="on" />
- <and>
- <equals arg1="${xerces.jar.present}" arg2="true" />
- <not>
- <or>
- <equals arg1="${jdk.1.3.present}" arg2="true" />
- <equals arg1="${jdk.1.4.present}" arg2="true" />
- </or>
- </not>
- </and>
+ <equals arg1="${xerces.jar.present}" arg2="true" />
</or>
</condition>
@@ -339,7 +337,6 @@
<echo message="jndi.jar.present(except JDK 1.3+)=${jndi.jar.present}" />
<echo message="regexp.jar.present=${regexp.jar.present}" />
<echo message="servlet.jar.present=${servlet.jar.present}" />
- <echo message="tomcat-util.jar.present=${tomcat-util.jar.present}" />
<echo message="--- Optional JARs ---" />
<echo message="tomcat-ajp.jar.present=${tomcat-ajp.jar.present}" />
@@ -348,6 +345,7 @@
<echo message="jta.jar.present=${jta.jar.present}" />
<echo message="junit.jar.present=${junit.jar.present}" />
<echo message="ldap.jar.present=${ldap.jar.present}" />
+ <echo message="tomcat-util.jar.present=${tomcat-util.jar.present}" />
<echo message="tyrex.jar.present=${tyrex.jar.present}" />
<echo message="xerces.jar.present=${xerces.jar.present}" />
@@ -368,6 +366,7 @@
<echo message="copy.javamail.jar=${copy.javamail.jar}" />
<echo message="copy.jta.jar=${copy.jta.jar}" />
<echo message="copy.ldap.jar=${copy.ldap.jar}" />
+ <echo message="copy.tomcat-util.jar=${copy.tomcat-util.jar}" />
<echo message="copy.tyrex.jar=${copy.tyrex.jar}" />
<echo message="copy.xerces.jar=${copy.xerces.jar}" />
@@ -420,7 +419,7 @@
<copy todir="${catalina.build}/common/lib" file="${jsse.jar}"/>
-->
</target>
- <target name="copy-tomcat-util.jar">
+ <target name="copy-tomcat-util.jar" if="copy.tomcat-util.jar">
<copy todir="${catalina.build}/server/lib" file="${tomcat-util.jar}"/>
</target>
<target name="copy-tyrex.jar" if="copy.tyrex.jar">
