You are viewing a plain text version of this content. The canonical link for it is here.
Posted to alexandria-dev@jakarta.apache.org by ru...@apache.org on 2002/02/03 03:25:55 UTC
cvs commit: jakarta-alexandria/proposal/gump/project jakarta-regexp.xml jakarta-velocity.xml
rubys 02/02/02 18:25:55
Modified: proposal/gump/java Project.java
proposal/gump/project jakarta-regexp.xml
jakarta-velocity.xml
Log:
Fix circular dependency loop
Revision Changes Path
1.31 +3 -2 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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- Project.java 22 Jan 2002 17:36:32 -0000 1.30
+++ Project.java 3 Feb 2002 02:25:55 -0000 1.31
@@ -312,7 +312,8 @@
*/
private boolean isPrereq(Set todo) {
for (Enumeration e=referencedBy.keys(); e.hasMoreElements();) {
- if (todo.contains(e.nextElement())) return true;
+ Project p = (Project)e.nextElement();
+ if (todo.contains(p.name)) return true;
}
return false;
}
@@ -457,7 +458,7 @@
// Construct a list of the rest, and throw an exception
String message="Circular dependency loop involving:";
for (Iterator i=todo.iterator(); i.hasNext();) {
- Project p = ((Project)(i.next()));
+ Project p = (Project) projects.get(i.next());
message += "\n " + p.name;
}
throw new Exception(message);
1.7 +8 -2 jakarta-alexandria/proposal/gump/project/jakarta-regexp.xml
Index: jakarta-regexp.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-regexp.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jakarta-regexp.xml 27 Oct 2001 14:57:17 -0000 1.6
+++ jakarta-regexp.xml 3 Feb 2002 02:25:55 -0000 1.7
@@ -8,12 +8,18 @@
<cvs repository="jakarta"/>
<project name="jakarta-regexp">
- <ant basedir="build" buildfile="build-regexp.xml" target="package"/>
+ <ant basedir="build" buildfile="build-regexp.xml" target="jar"/>
<depend project="jakarta-ant"/>
- <depend project="jakarta-site2"/>
<depend project="xml-xerces"/>
<home nested="jakarta-regexp-1.3-dev"/>
<jar name="jakarta-regexp-1.3-dev.jar" id="regexp"/>
+ </project>
+
+ <project name="jakarta-regexp-package">
+ <ant basedir="build" buildfile="build-regexp.xml" target="package"/>
+ <depend project="jakarta-ant"/>
+ <depend project="jakarta-site2"/>
+ <depend project="xml-xerces"/>
<javadoc nested="jakarta-regexp-1.3-dev/docs/api"/>
</project>
1.36 +1 -0 jakarta-alexandria/proposal/gump/project/jakarta-velocity.xml
Index: jakarta-velocity.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-velocity.xml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- jakarta-velocity.xml 2 Feb 2002 21:57:26 -0000 1.35
+++ jakarta-velocity.xml 3 Feb 2002 02:25:55 -0000 1.36
@@ -20,6 +20,7 @@
<depend project="werken.xpath"/>
<depend project="junit"/>
<depend project="jakarta-log4j"/>
+ <depend project="jakarta-bcel"/>
<depend project="commons-collections" runtime="true"/>
<home nested="bin"/>
<jar name="velocity-@@DATE@@.jar"/>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>