You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gump.apache.org by bi...@apache.org on 2004/10/10 08:01:05 UTC
cvs commit: gump/project jakarta-tomcat-40.xml jakarta-tomcat-connectors.xml
billbarker 2004/10/09 23:01:05
Modified: project jakarta-tomcat-40.xml jakarta-tomcat-connectors.xml
Log:
Splitting the connectors projects.
This is a cleanup, to shorten some of the dependancy trees.
Revision Changes Path
1.53 +3 -2 gump/project/jakarta-tomcat-40.xml
Index: jakarta-tomcat-40.xml
===================================================================
RCS file: /home/cvs/gump/project/jakarta-tomcat-40.xml,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- jakarta-tomcat-40.xml 8 Oct 2004 17:07:50 -0000 1.52
+++ jakarta-tomcat-40.xml 10 Oct 2004 06:01:05 -0000 1.53
@@ -73,8 +73,10 @@
<property name="regexp.jar"
reference="jarpath" id="regexp" project="jakarta-regexp"/>
<property name="mail.home" reference="home" project="javamail"/>
- <property name="tomcat-coyote.home" reference="home"
+ <depend name="tomcat-coyote.jar"
project="jakarta-tomcat-coyote"/>
+ <property name="tomcat-coyote.home" reference="home"
+ project="jakarta-tomcat-coyote-tomcat4" />
<property name="jasper.home" reference="home"
project="jakarta-tomcat-jasper_tc4"/>
<depend property="mail.jar" project="javamail"/>
@@ -113,7 +115,6 @@
<depend project="xml-xalan2"/>
<option project="avalon-framework-api"/>
<option project="avalon-phoenix"/>
- <depend project="jakarta-tomcat-coyote"/>
<depend project="jakarta-tomcat-util" runtime="true"/>
<depend project="jakarta-servletapi-4"/>
<depend project="jakarta-regexp"/>
1.28 +51 -19 gump/project/jakarta-tomcat-connectors.xml
Index: jakarta-tomcat-connectors.xml
===================================================================
RCS file: /home/cvs/gump/project/jakarta-tomcat-connectors.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- jakarta-tomcat-connectors.xml 20 Sep 2004 08:42:12 -0000 1.27
+++ jakarta-tomcat-connectors.xml 10 Oct 2004 06:01:05 -0000 1.28
@@ -31,47 +31,79 @@
<package>org.apache.tomcat.util</package>
<ant basedir="util">
<property name="jmx.home" reference="home" project="jmx"/>
- <property name="jmx.jar" project="jmx" path="jmx/lib/jmxri.jar" />
+ <depend property="jmx.jar" project="jmx" id="jmxri" />
<property name="jsse.home" reference="home" project="jsse"/>
- <property name="commons-logging.jar" reference="jarpath" id="commons-logging" project="commons-logging"/>
+ <depend property="commons-logging.jar" id="commons-logging" project="commons-logging"/>
</ant>
- <depend project="ant"/>
+ <depend project="ant" inherit="runtime"/>
<depend project="xml-xerces"/>
- <depend project="jmx"/>
- <depend project="commons-logging"/>
<depend project="jsse"/>
<home nested="util/build"/>
<jar name="lib/tomcat-util.jar"/>
<nag to="tomcat-dev@jakarta.apache.org"
- from="Bill Barker <billbarker@jakarta.apache.org>"/>
+ from="Bill Barker <billbarker@apache.org>"/>
</project>
<project name="jakarta-tomcat-coyote">
<package>org.apache.coyote</package>
- <ant basedir="coyote">
+ <ant basedir="coyote" target="shared.jar">
<property name="jmx.home" reference="home" project="jmx"/>
<property name="jmx.jar" project="jmx" path="jmx/lib/jmxri.jar" />
- <property name="catalina.home" reference="home"
- project="tomcat-catalina"/>
<depend property="commons-modeler.jar" project="commons-modeler"/>
+ <depend property="tomcat-util.jar" project="jakarta-tomcat-util" />
+ <depend property="commons-logging.jar" project="commons-logging" id="commons-logging" />
+ <property name="util.home" reference="home" project="jakarta-tomcat-util" />
</ant>
- <depend project="ant"/>
- <depend project="commons-logging"/>
- <depend project="xml-xerces"/>
- <depend project="jmx"/>
- <depend project="jakarta-tomcat-util"/>
- <depend project="jakarta-servletapi-4"/>
- <depend project="tomcat-catalina"/>
- <depend project="jakarta-tomcat"/>
+ <depend project="ant" inherit="runtime" />
<home nested="coyote"/>
<jar name="build/lib/tomcat-coyote.jar"/>
<nag to="tomcat-dev@jakarta.apache.org"
- from="Bill Barker <billbarker@jakarta.apache.org>"/>
+ from="Bill Barker <billbarker@apache.org>"/>
+ </project>
+
+ <project name="jakarta-tomcat-coyote-tomcat4">
+ <package>org.apache.coyote.tomcat4</package>
+ <ant basedir="coyote" target="tomcat4.jar">
+ <depend property="jmx.jar" project="jmx" id="jmxri" />
+ <depend property="commons-modeler.jar" project="commons-modeler"/>
+ <depend property="commons-logging.jar" project="commons-logging"
+ id="commons-logging" />
+ <property name="catalina.home" reference="home" project="tomcat-catalina" />
+ <depend property="tomcat-util.jar" project="jakarta-tomcat-util" />
+ <depend property="servlet.jar" project="jakarta-servletapi-4" id="servletapi" />
+ </ant>
+ <depend project="ant" inherit="runtime" />
+ <depend project="tomcat-catalina" />
+ <home nested="coyote"/>
+ <jar name="build/lib/tomcat4-coyote.jar" />
+
+ <nag to="tomcat-dev@jakarta.apache.org"
+ from="Bill Barker <billbarker@apache.org>"/>
+ </project>
+
+ <project name="jakarta-tomcat-coyote-tomcat3">
+ <package>org.apache.coyote.tomcat3</package>
+ <ant basedir="coyote" target="tomcat33.jar">
+ <depend property="jmx.jar" project="jmx" id="jmxri" />
+ <depend property="commons-modeler.jar" project="commons-modeler"/>
+ <depend property="commons-logging.jar" project="commons-logging"
+ id="commons-logging" />
+ <property name="tomcat33.home" reference="home" project="jakarta-tomcat" />
+ <depend property="tomcat-util.jar" project="jakarta-tomcat-util" />
+ </ant>
+ <depend project="ant" inherit="runtime" />
+ <depend project="jakarta-tomcat" />
+
+ <home nested="coyote"/>
+ <jar name="build/lib/tomcat33-coyote.jar" />
+
+ <nag to="tomcat-dev@jakarta.apache.org"
+ from="Bill Barker <billbarker@apache.org>"/>
</project>
<project name="jakarta-tomcat-jk">
@@ -81,7 +113,7 @@
<property name="jmx.home" reference="home" project="jmx"/>
<property name="jmx.jar" project="jmx" path="jmx/lib/jmxri.jar" />
<property name="jsse.home" reference="home" project="jsse"/>
- <property name="tomcat40.home" reference="home" project="jakarta-tomcat-4.0" />
+ <property name="tomcat40.home" reference="home" project="tomcat-catalina" />
<property name="tomcat5.home" reference="home" project="jakarta-tomcat-catalina" />
<depend property="commons-modeler.jar" project="commons-modeler"/>
</ant>