larryi 2003/10/01 19:50:59
Modified: . build.xml
Log:
Update to build using MAIN branch of JTC coyote and http11. The jars are
a little different from coyote_10 version.
Sync log4j detection property name.
Revision Changes Path
1.197 +10 -4 jakarta-tomcat/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- build.xml 4 Aug 2003 23:30:44 -0000 1.196
+++ build.xml 2 Oct 2003 02:50:59 -0000 1.197
@@ -71,6 +71,7 @@
location="${jtc.util.build}/lib/tomcat-util.jar"/>
<property name="jtc.coyote.home" location="${jakarta-tomcat-connectors}/coyote"/>
+ <property name="jtc.coyote.lib" location="${jtc.coyote.home}/build/lib"/>
<property name="jtc.http11.home" location="${jakarta-tomcat-connectors}/http11"/>
<property name="jtc.http11.lib" location="${jtc.http11.home}/build/lib"/>
@@ -259,7 +260,7 @@
<echo message="tomcat-util.jar is up to date"/>
</target>
- <target name="msg.log4j" if="log4j.present">
+ <target name="msg.log4j" if="log4j-present">
<echo message="Detected Log4j" />
</target>
@@ -405,7 +406,9 @@
<ant dir="${jtc.http11.home}" inheritAll="false">
<property name="util.home" value="${jtc.util.home}"/>
+ <property name="commons-logging.jar" value="${commons-logging.jar}"/>
<property name="commons-modeler.jar" value="${commons-modeler.jar}"/>
+ <property name="jmx.jar" value="${jmx.jar}"/>
</ant>
<ant dir="${jtc.jk.home}" target="build-jk">
@@ -689,11 +692,14 @@
<copy tofile="${tomcat.build}/lib/common/tomcat33-resource.jar"
file="${jtc.http11.lib}/tomcat33-resource.jar"/>
- <copy tofile="${tomcat.build}/lib/container/tomcat-http11.jar"
- file="${jtc.http11.lib}/tomcat-http11.jar"/>
+ <copy tofile="${tomcat.build}/lib/container/tomcat-coyote.jar"
+ file="${jtc.coyote.lib}/tomcat-coyote.jar"/>
<copy tofile="${tomcat.build}/lib/container/tomcat33-coyote.jar"
- file="${jtc.http11.lib}/tomcat33-coyote.jar"/>
+ file="${jtc.coyote.lib}/tomcat33-coyote.jar"/>
+
+ <copy tofile="${tomcat.build}/lib/container/tomcat-http11.jar"
+ file="${jtc.http11.lib}/tomcat-http11.jar"/>
<copy todir="${tomcat.build}/lib/container"
file="${jtc.jk.home}/build/lib/tomcat-jk2.jar"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
