bodewig 2002/06/05 01:45:57
Modified: proposal/gump/project xml-commons.xml xml-xerces.xml
xml-xerces2.xml
proposal/gump/java Project.java
Log:
Rework ids attribute for <depend> to use a space separated list to
more closely match NAMES production of DTD.
Revision Changes Path
1.12 +2 -2 jakarta-alexandria/proposal/gump/project/xml-commons.xml
Index: xml-commons.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/xml-commons.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xml-commons.xml 29 May 2002 09:42:33 -0000 1.11
+++ xml-commons.xml 5 Jun 2002 08:45:57 -0000 1.12
@@ -1,7 +1,7 @@
<module name="xml-commons">
<description>
- XML commons($Revision: 1.11 $) externally defined standards - DOM,SAX,JAXP;
plus xml utilities
+ XML commons($Revision: 1.12 $) externally defined standards - DOM,SAX,JAXP;
plus xml utilities
</description>
<cvs repository="xml"/>
@@ -22,7 +22,7 @@
<project name="xml-commons-which">
<package>org.apache.env</package>
<ant basedir="java" buildfile="which.xml" target="jar" />
- <depend project="jaxp" ids="apis,parser" />
+ <depend project="jaxp" ids="apis parser" />
<depend project="bootstrap-ant"/>
<home nested="java/build"/>
<jar name="which.jar"/>
1.17 +1 -1 jakarta-alexandria/proposal/gump/project/xml-xerces.xml
Index: xml-xerces.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/xml-xerces.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xml-xerces.xml 29 May 2002 09:42:33 -0000 1.16
+++ xml-xerces.xml 5 Jun 2002 08:45:57 -0000 1.17
@@ -11,7 +11,7 @@
<project name="xml-xerces1">
<ant basedir="java" target="jar"/>
- <depend project="jaxp" ids="apis,parser" />
+ <depend project="jaxp" ids="apis parser" />
<depend project="bootstrap-ant"/>
<home nested="java/build"/>
1.20 +1 -1 jakarta-alexandria/proposal/gump/project/xml-xerces2.xml
Index: xml-xerces2.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/xml-xerces2.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xml-xerces2.xml 29 May 2002 09:42:33 -0000 1.19
+++ xml-xerces2.xml 5 Jun 2002 08:45:57 -0000 1.20
@@ -13,7 +13,7 @@
<package>org.apache.xerces</package>
<ant basedir="java" target="jars"/>
- <depend project="jaxp" ids="apis,parser" />
+ <depend project="jaxp" ids="apis parser" />
<depend project="bootstrap-ant"/>
<home nested="java/build"/>
<jar name="xercesImpl.jar" id="parser"/>
1.43 +11 -3 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.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- Project.java 29 May 2002 09:42:33 -0000 1.42
+++ Project.java 5 Jun 2002 08:45:57 -0000 1.43
@@ -10,6 +10,7 @@
import java.util.Hashtable;
import java.util.Iterator;
import java.util.Set;
+import java.util.StringTokenizer;
import java.util.TreeSet;
import java.util.Vector;
@@ -276,7 +277,14 @@
String name = (String)e.nextElement();
Element depend = (Element) dependsOn.get(name);
Project target = (Project)projects.get(name);
- String jarIds = depend.getAttribute("ids");
+
+ String idsAttr = depend.getAttribute("ids");
+ StringTokenizer tok = new StringTokenizer(idsAttr, " ", false);
+ Vector jarIds = new Vector();
+ while (tok.hasMoreTokens()) {
+ jarIds.add(tok.nextToken());
+ }
+
boolean buildable = false;
if (!depend.getNodeName().equals("option")) {
@@ -292,8 +300,8 @@
for (; child != null; child=child.getNextSibling()) {
if (child.getNodeName().equals("jar")) {
String id = ((Element) child).getAttribute("id");
- if (jarIds.equals("")
- || (!id.equals("") && jarIds.indexOf(id) > -1)) {
+ if (idsAttr.equals("")
+ || (!id.equals("") && jarIds.contains(id))) {
depend.appendChild(child.cloneNode(false));
}
} else if (child.getNodeName().equals("ant")) {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
