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 bo...@apache.org on 2002/05/29 11:42:33 UTC
cvs commit: jakarta-alexandria/proposal/gump/java Project.java
bodewig 02/05/29 02:42:33
Modified: proposal/gump/project jaxp.xml xml-commons.xml
xml-xerces.xml xml-xerces2.xml
proposal/gump/java Project.java
Log:
Add a new ids attribute to <depend> to allow a project to depend only
on a subset of jars of a different project.
Use that in projects depending on JAXP and export xalan.jar in JAXP as well
(will be needed by Ant RS).
Revision Changes Path
1.6 +3 -2 jakarta-alexandria/proposal/gump/project/jaxp.xml
Index: jaxp.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/jaxp.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jaxp.xml 3 Mar 2002 12:23:41 -0000 1.5
+++ jaxp.xml 29 May 2002 09:42:33 -0000 1.6
@@ -8,8 +8,9 @@
<project name="jaxp">
<package>javax.xml</package>
- <jar name="jaxp.jar"/>
- <jar name="crimson.jar" id="parser"/>
+ <jar name="jaxp.jar" id="apis" />
+ <jar name="crimson.jar" id="parser" />
+ <jar name="xalan.jar" id="transformer" />
</project>
</module>
1.11 +3 -3 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xml-commons.xml 22 Mar 2002 14:00:45 -0000 1.10
+++ xml-commons.xml 29 May 2002 09:42:33 -0000 1.11
@@ -1,7 +1,7 @@
<module name="xml-commons">
<description>
- XML commons($Revision: 1.10 $) externally defined standards - DOM,SAX,JAXP; plus xml utilities
+ XML commons($Revision: 1.11 $) externally defined standards - DOM,SAX,JAXP; plus xml utilities
</description>
<cvs repository="xml"/>
@@ -21,8 +21,8 @@
<project name="xml-commons-which">
<package>org.apache.env</package>
- <ant basedir="java" buildfile="which.xml" target="jar"/>
- <depend project="jaxp"/>
+ <ant basedir="java" buildfile="which.xml" target="jar" />
+ <depend project="jaxp" ids="apis,parser" />
<depend project="bootstrap-ant"/>
<home nested="java/build"/>
<jar name="which.jar"/>
1.16 +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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xml-xerces.xml 26 Mar 2002 13:48:32 -0000 1.15
+++ xml-xerces.xml 29 May 2002 09:42:33 -0000 1.16
@@ -11,7 +11,7 @@
<project name="xml-xerces1">
<ant basedir="java" target="jar"/>
- <depend project="jaxp"/>
+ <depend project="jaxp" ids="apis,parser" />
<depend project="bootstrap-ant"/>
<home nested="java/build"/>
1.19 +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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xml-xerces2.xml 30 Apr 2002 11:34:42 -0000 1.18
+++ xml-xerces2.xml 29 May 2002 09:42:33 -0000 1.19
@@ -13,7 +13,7 @@
<package>org.apache.xerces</package>
<ant basedir="java" target="jars"/>
- <depend project="jaxp"/>
+ <depend project="jaxp" ids="apis,parser" />
<depend project="bootstrap-ant"/>
<home nested="java/build"/>
<jar name="xercesImpl.jar" id="parser"/>
1.42 +6 -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.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- Project.java 30 Apr 2002 11:34:42 -0000 1.41
+++ Project.java 29 May 2002 09:42:33 -0000 1.42
@@ -276,6 +276,7 @@
String name = (String)e.nextElement();
Element depend = (Element) dependsOn.get(name);
Project target = (Project)projects.get(name);
+ String jarIds = depend.getAttribute("ids");
boolean buildable = false;
if (!depend.getNodeName().equals("option")) {
@@ -290,7 +291,11 @@
Node child=target.element.getFirstChild();
for (; child != null; child=child.getNextSibling()) {
if (child.getNodeName().equals("jar")) {
- depend.appendChild(child.cloneNode(false));
+ String id = ((Element) child).getAttribute("id");
+ if (jarIds.equals("")
+ || (!id.equals("") && jarIds.indexOf(id) > -1)) {
+ depend.appendChild(child.cloneNode(false));
+ }
} else if (child.getNodeName().equals("ant")) {
depend.appendChild(document.createElement("ant"));
buildable = true;
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>