rubys 02/01/12 05:07:05
Modified: proposal/gump/java Project.java
proposal/gump/project xml-commons.xml xml-xalan.xml
proposal/gump/site/xdocs project.xml
Log:
Add the ability to inherit the jars...
Revision Changes Path
1.24 +16 -0 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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Project.java 2 Jan 2002 19:12:58 -0000 1.23
+++ Project.java 12 Jan 2002 13:07:05 -0000 1.24
@@ -361,6 +361,22 @@
element.appendChild(clone);
}
}
+ } else {
+ // if this project depends on any project which in turn has
+ // a dependency which specifies inherit="jars", then inherit
+ // that dependency.
+ for (Enumeration d=p.dependsOn.keys(); d.hasMoreElements(); ) {
+ String name = (String) d.nextElement();
+ if (dependsOn.get(name) != null) continue;
+ Element source = (Element) p.dependsOn.get(name);
+ if (source.getAttribute("inherit").equals("jars")) {
+ Element clone = (Element) source.cloneNode(true);
+ clone.setAttribute("inherited", "true");
+ clone.removeAttribute("inherit");
+ dependsOn.put(name,clone);
+ element.appendChild(clone);
+ }
+ }
}
}
}
1.7 +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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xml-commons.xml 12 Jan 2002 03:15:19 -0000 1.6
+++ xml-commons.xml 12 Jan 2002 13:07:05 -0000 1.7
@@ -1,7 +1,7 @@
<module name="xml-commons">
<description>
- XML commons($Revision: 1.6 $) externally defined standards - DOM,SAX,JAXP; plus
xml utilities
+ XML commons($Revision: 1.7 $) externally defined standards - DOM,SAX,JAXP; plus
xml utilities
</description>
<cvs repository="xml"/>
@@ -11,7 +11,7 @@
<depend project="bootstrap-ant"/>
<depend project="xml-xerces"/>
<home nested="java/external/build"/>
- <jar name="xml-apis.jar" runtime="true" type="boot"/>
+ <jar name="xml-apis.jar" type="boot"/>
</project>
<project name="xml-commons-which">
1.31 +1 -1 jakarta-alexandria/proposal/gump/project/xml-xalan.xml
Index: xml-xalan.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/xml-xalan.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- xml-xalan.xml 12 Jan 2002 03:15:19 -0000 1.30
+++ xml-xalan.xml 12 Jan 2002 13:07:05 -0000 1.31
@@ -12,7 +12,7 @@
<depend project="bootstrap-ant"/>
<depend project="xml-xerces"/>
- <depend project="xml-apis" inherit="runtime"/>
+ <depend project="xml-apis" inherit="jars"/>
<home nested="java/build"/>
<jar name="xalan.jar" type="boot"/>
1.8 +2 -1 jakarta-alexandria/proposal/gump/site/xdocs/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/site/xdocs/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 8 Jan 2002 18:10:17 -0000 1.7
+++ project.xml 12 Jan 2002 13:07:05 -0000 1.8
@@ -118,7 +118,8 @@
copy all dependencies as, "runtime" which will only copy the runtime
dependencies, and "hard" which will not only copy all
dependencies, but will also convert option elements into depend
- elements in the process.</td>
+ elements in the process, and "jars" which will actually copy the
+ dependent jars into the list of jars exported by this project.</td>
<td>No</td>
</tr>
<tr>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
