rubys 01/11/23 15:08:58
Modified: proposal/gump/java Project.java
proposal/gump/project dom4j.xml
proposal/gump/site/xdocs ant.xml
Log:
Resolve circular dependencies between dom4j and jaxen
Revision Changes Path
1.18 +3 -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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Project.java 2001/11/02 16:16:27 1.17
+++ Project.java 2001/11/23 23:08:58 1.18
@@ -402,9 +402,9 @@
value = module.getSrcDir();
property.setAttribute("type", "path");
} else if (property.getAttributeNode("path") != null) {
- Module module = Module.find(this.get("module"));
- require (module, "module", this.get("module"));
- value = module.getSrcDir();
+ Project project = (Project) projects.get(projectName);
+ if (project == null) project=this;
+ value = project.get("srcdir");
value += "/" + property.getAttribute("path");
property.setAttribute("type", "path");
}
1.16 +4 -1 jakarta-alexandria/proposal/gump/project/dom4j.xml
Index: dom4j.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/dom4j.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- dom4j.xml 2001/10/31 01:03:22 1.15
+++ dom4j.xml 2001/11/23 23:08:58 1.16
@@ -8,7 +8,9 @@
<cvs repository="sourceforge" host-prefix="cvs.dom4j" dir="dom4j"/>
<project name="dom4j">
- <ant/>
+ <ant target="gump">
+ <property name="jaxen.src" project="jaxen" path="src/java/main"/>
+ </ant>
<depend project="jakarta-ant"/>
<depend project="xml-xerces"/>
<depend project="junit"/>
@@ -25,6 +27,7 @@
<project name="xpp">
<url href="http://www.extreme.indiana.edu/soap/xpp/"/>
<jar name="lib/PullParser11.jar"/>
+ <jar name="lib/PullParser2.jar"/>
</project>
<project name="msv">
1.3 +2 -2 jakarta-alexandria/proposal/gump/site/xdocs/ant.xml
Index: ant.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/site/xdocs/ant.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ant.xml 2001/10/20 11:53:25 1.2
+++ ant.xml 2001/11/23 23:08:58 1.3
@@ -76,8 +76,8 @@
<tr>
<td>path</td>
<td>a path which is to be interpreted relative to the srcdir for the
- module containing this project. This option is ignored if
- reference is specified.</td>
+ project if specified, or this project otherwise. This option is
+ ignored if reference is specified.</td>
<td>No</td>
</tr>
<tr>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
