rubys 02/03/10 09:41:50
Modified: proposal/gump naglist
proposal/gump/java Project.java
proposal/gump/project jakarta-tomcat-40.xml
jakarta-tomcat-connectors.xml jakarta-tomcat.xml
Log:
Attempt to resolve circular dependencies with coyote w.r.t. tomcat 4 and
add new dependencies on tomcat 3
Note: I don't expect that I am done yet... but this is enough to enable me
to see what the next problem is...
Revision Changes Path
1.109 +6 -0 jakarta-alexandria/proposal/gump/naglist
Index: naglist
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/naglist,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- naglist 5 Mar 2002 20:33:47 -0000 1.108
+++ naglist 10 Mar 2002 17:41:49 -0000 1.109
@@ -341,6 +341,12 @@
Subject: [GUMP] Build Failure - Tomcat 3.x
Regex: /BUILD FAILED/
------
+Project: jakarta-tomcat-coyote
+To: [EMAIL PROTECTED]
+From: Craig McClanahan <[EMAIL PROTECTED]>
+Subject: [GUMP] Build Failure - Coyote
+Regex: /BUILD FAILED/
+------
Project: jakarta-tomcat-4.0
To: [EMAIL PROTECTED]
From: Craig McClanahan <[EMAIL PROTECTED]>
1.34 +1 -1 jakarta-alexandria/proposal/gump/java/Project.java
Index: Project.java
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/java/Project.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- Project.java 4 Mar 2002 10:13:55 -0000 1.33
+++ Project.java 10 Mar 2002 17:41:50 -0000 1.34
@@ -571,7 +571,7 @@
throw new Exception(
"Project \"" + projectName + "\" referenced by project " +
- name + "defines no jars as output.");
+ name + " defines no jars as output.");
}
1.34 +27 -3 jakarta-alexandria/proposal/gump/project/jakarta-tomcat-40.xml
Index: jakarta-tomcat-40.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-tomcat-40.xml,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- jakarta-tomcat-40.xml 3 Mar 2002 12:23:41 -0000 1.33
+++ jakarta-tomcat-40.xml 10 Mar 2002 17:41:50 -0000 1.34
@@ -7,6 +7,32 @@
<cvs repository="jakarta"/>
+ <project name="tomcat-catalina">
+ <ant basedir="catalina" target="deploy-catalina">
+ <depend property="servlet.jar" project="jakarta-servletapi-4"/>
+ <depend property="commons-collections.jar" project="commons-collections"
+ runtime="true"/>
+ <depend property="commons-beanutils.jar" project="commons-beanutils"
+ runtime="true"/>
+ <depend property="commons-digester.jar" project="commons-digester"
+ runtime="true"/>
+ <depend property="commons-logging.jar" project="commons-logging"
+ runtime="true"/>
+ <property name="regexp.jar"
+ reference="jarpath" id="regexp" project="jakarta-regexp"/>
+ <property name="jtc.home" reference="srcdir"
+ project="jakarta-tomcat-connectors"/>
+ </ant>
+ <depend project="jakarta-ant"/>
+ <depend project="xml-xerces"/>
+ <depend project="jakarta-tomcat-util"/>
+ <depend project="jakarta-servletapi-4"/>
+ <depend project="jakarta-regexp"/>
+
+ <home nested="build"/>
+ <jar name="server/lib/catalina.jar"/>
+ </project>
+
<project name="jakarta-tomcat-4.0">
<package>org.apache.catalina</package>
@@ -52,9 +78,6 @@
</ant>
<depend project="jaf"/>
- <depend project="jakarta-ant"/>
- <depend project="jakarta-regexp"/>
- <depend project="jakarta-servletapi-4"/>
<depend project="javamail"/>
<depend project="jmx"/>
<depend project="jsse"/>
@@ -62,6 +85,7 @@
<option project="jakarta-avalon"/>
<option project="jakarta-avalon-phoenix"/>
<depend project="jakarta-tomcat-coyote"/>
+ <depend project="tomcat-catalina" inherit="all"/>
<work nested="catalina/build/server/classes"/>
<home nested="dist"/>
1.7 +4 -2
jakarta-alexandria/proposal/gump/project/jakarta-tomcat-connectors.xml
Index: jakarta-tomcat-connectors.xml
===================================================================
RCS file:
/home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-tomcat-connectors.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jakarta-tomcat-connectors.xml 3 Mar 2002 12:23:41 -0000 1.6
+++ jakarta-tomcat-connectors.xml 10 Mar 2002 17:41:50 -0000 1.7
@@ -23,14 +23,16 @@
<project name="jakarta-tomcat-coyote">
<package>org.apache.coyote</package>
<ant basedir="coyote">
- <!-- Force catalina NOT to be detected -->
- <property name="catalina.home" value="."/>
+ <property name="catalina.home" reference="home"
+ project="tomcat-catalina"/>
</ant>
<depend project="jakarta-ant"/>
<depend project="xml-xerces"/>
<depend project="jakarta-tomcat-util"/>
<depend project="jakarta-servletapi-4"/>
+ <depend project="tomcat-catalina"/>
+ <depend project="jakarta-tomcat"/>
<home nested="coyote"/>
<jar name="build/lib/tomcat-coyote.jar"/>
1.20 +2 -0 jakarta-alexandria/proposal/gump/project/jakarta-tomcat.xml
Index: jakarta-tomcat.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-tomcat.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- jakarta-tomcat.xml 3 Mar 2002 12:23:41 -0000 1.19
+++ jakarta-tomcat.xml 10 Mar 2002 17:41:50 -0000 1.20
@@ -29,6 +29,8 @@
<work nested="build/tomcat/classes"/>
<home nested="dist/tomcat"/>
<jar name="lib/common/etomcat.jar"/>
+ <jar name="lib/common/tomcat-core.jar"/>
+ <jar name="lib/container/tomcat-util.jar"/>
<javadoc nested="build/tomcat/webapps/ROOT/javadoc"/>
</project>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
