You are viewing a plain text version of this content. The canonical link for it is here.
Posted to general@gump.apache.org by ru...@apache.org on 2003/02/21 20:55:54 UTC
cvs commit: jakarta-gump/project avalon-cornerstone.xml
rubys 2003/02/21 11:55:54
Modified: java Project.java
project avalon-cornerstone.xml
Log:
Better error checking on ids attribute
Revision Changes Path
1.51 +14 -5 jakarta-gump/java/Project.java
Index: Project.java
===================================================================
RCS file: /home/cvs/jakarta-gump/java/Project.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- Project.java 11 Feb 2003 09:12:12 -0000 1.50
+++ Project.java 21 Feb 2003 19:55:53 -0000 1.51
@@ -373,9 +373,11 @@
for (; child != null; child=child.getNextSibling()) {
if (child.getNodeName().equals("jar")) {
String id = ((Element) child).getAttribute("id");
- if (idsAttr.equals("")
- || (!id.equals("") && jarIds.contains(id))) {
+ if (idsAttr.equals("")) {
depend.appendChild(child.cloneNode(false));
+ } else if (!id.equals("") && jarIds.contains(id)) {
+ depend.appendChild(child.cloneNode(false));
+ jarIds.remove(id);
}
} else if (child.getNodeName().equals("ant")) {
depend.appendChild(document.createElement("ant"));
@@ -385,6 +387,13 @@
buildable = true;
}
}
+
+ if (jarIds.size()>0) {
+ throw new Exception(
+ "A jar with id \"" + jarIds.firstElement() +
+ "\" was not found in project \"" +
+ this.name + "\" referenced by project " + name);
+ }
if (buildable && !jardir.equals("") && target.isRedistributable()) {
String module = target.get("module");
1.3 +1 -1 jakarta-gump/project/avalon-cornerstone.xml
Index: avalon-cornerstone.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/project/avalon-cornerstone.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- avalon-cornerstone.xml 19 Feb 2003 13:50:13 -0000 1.2
+++ avalon-cornerstone.xml 21 Feb 2003 19:55:53 -0000 1.3
@@ -26,7 +26,7 @@
<depend project="excalibur-i18n"/>
<depend project="excalibur-thread"/>
<depend project="excalibur-threadcontext"/>
- <depend project="avalon-phoenix" ids="client,metagenerate"/>
+ <depend project="avalon-phoenix" ids="client metagenerate"/>
<depend project="ant" inherit="runtime"/>
<depend project="jakarta-velocity" inherit="runtime"/>