costin 2003/01/30 14:40:15
Modified: . build.xml
Log:
Fix the build target.
I think the right order is util->coyote base ->jk, http11 -> catalina -> coyote
connector.
Coyote base will be the container-independent portion.
Catalina will be able to use low-level coyote objects.
Probably the connector should be moved in the catalina repo to simplify this.
Revision Changes Path
1.73 +6 -1 jakarta-tomcat-5/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- build.xml 27 Jan 2003 18:05:10 -0000 1.72
+++ build.xml 30 Jan 2003 22:40:15 -0000 1.73
@@ -180,6 +180,8 @@
<property name="build.home" value="${tomcat.build}"/>
<property name="tomcat5.detect" value="true"/>
<property name="tomcat-coyote.jar"
value="${tomcat.build}/server/lib/tomcat-coyote.jar" />
+ <property name="tomcat-util.jar"
+ value="${tomcat.build}/server/lib/tomcat-util.jar"/>
<property name="servlet.jar"
value="${tomcat.build}/common/lib/servlet-api.jar"/>
</ant>
</target>
@@ -283,6 +285,9 @@
<ant dir="${catalina.home}/catalina" target="catalina-jars">
<!-- in-place building -->
<property name="catalina.build" value="${tomcat.build}" />
+ <property name="classes.dir" value="${tomcat.build}/classes" />
+ <property name="tomcat-util.jar"
+ value="${tomcat.build}/server/lib/tomcat-util.jar"/>
<property name="catalina.deploy" value="${tomcat.build}" />
<property name="flags.hide" value="true" />
</ant>
@@ -350,10 +355,10 @@
<echo>Target: Catalina - Deploy ...</echo>
<ant dir="${catalina.home}" target="deploy"/>
<!--
- <ant dir="${catalina.home}" target="deploy-catalina"/>
<antcall target="build-tomcat-coyote"/>
<antcall target="build-tomcat-jk"/>
<antcall target="build-tomcat-http11"/>
+ <ant dir="${catalina.home}" target="deploy-catalina"/>
-->
<copy todir="${tomcat.build}">
<fileset dir="${catalina.home}/build"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
