You are viewing a plain text version of this content. The canonical link for it is here.
Posted to general@gump.apache.org by bo...@apache.org on 2003/05/23 09:51:54 UTC
cvs commit: jakarta-gump/project avalon-excalibur.xml jakarta-commons.xml jakarta-jmeter.xml jakarta-taglibs.xml
bodewig 2003/05/23 00:51:54
Modified: java Project.java
project avalon-excalibur.xml jakarta-commons.xml
jakarta-jmeter.xml jakarta-taglibs.xml
Log:
Make inherit="jars" work as expected for <depend> within <ant>.
Should bring jetspeed back into the builds.
Adapt the projects that depend on Xalan as they now suddenly see the
jar inherited from xml-apis as well.
Revision Changes Path
1.58 +16 -3 jakarta-gump/java/Project.java
Index: Project.java
===================================================================
RCS file: /home/cvs/jakarta-gump/java/Project.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- Project.java 30 Apr 2003 13:06:25 -0000 1.57
+++ Project.java 23 May 2003 07:51:53 -0000 1.58
@@ -378,6 +378,19 @@
}
if (target == null) continue;
+ String inheritAttr = depend.getAttribute("inherit");
+ if ("jars".equals(inheritAttr)) {
+ jars.putAll(target.jars);
+ numberOfJars += target.numberOfJars;
+
+ if (numberOfJars != 1) {
+ // need to remove the "" id from hashtable that may exist
+ // because either this or the project this depends on
+ // had only one jar - and now we have more than one
+ jars.remove("");
+ }
+ }
+
target.referencedBy.put(this, depend);
depend.setAttribute("home",target.get("home"));
depend.setAttribute("defined-in",target.get("defined-in"));
1.51 +1 -1 jakarta-gump/project/avalon-excalibur.xml
Index: avalon-excalibur.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/project/avalon-excalibur.xml,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- avalon-excalibur.xml 8 May 2003 17:18:42 -0000 1.50
+++ avalon-excalibur.xml 23 May 2003 07:51:53 -0000 1.51
@@ -431,7 +431,7 @@
<depend property="excalibur-testcase.jar" project="excalibur-component" id="testcase"/>
<depend property="excalibur-xmlutil.jar" project="excalibur-xmlutil"/>
<depend property="jaxen-full.jar" project="jaxen"/>
- <depend property="xalan.jar" project="xml-xalan2"/>
+ <depend property="xalan.jar" project="xml-xalan2" id="transformer"/>
<!-- optional dependencies -->
<property name="bcel.jar" project="jakarta-bcel" reference="jarpath"/>
1.112 +1 -1 jakarta-gump/project/jakarta-commons.xml
Index: jakarta-commons.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/project/jakarta-commons.xml,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- jakarta-commons.xml 25 Apr 2003 22:41:42 -0000 1.111
+++ jakarta-commons.xml 23 May 2003 07:51:53 -0000 1.112
@@ -296,7 +296,7 @@
<depend property="junit.jar" project="junit"/>
<depend property="j2ee.jar" project="jakarta-servletapi"/>
<depend property="jaxp.jaxp.jar" project="xml-xerces" id="apis"/>
- <depend property="jaxp.xslt.jar" project="xml-xalan2"/>
+ <depend property="jaxp.xslt.jar" project="xml-xalan2" id="transformer"/>
</ant>
<depend project="ant" inherit="runtime"/>
<depend project="jakarta-site2" inherit="all"/>
1.28 +1 -1 jakarta-gump/project/jakarta-jmeter.xml
Index: jakarta-jmeter.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/project/jakarta-jmeter.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- jakarta-jmeter.xml 23 May 2003 07:14:52 -0000 1.27
+++ jakarta-jmeter.xml 23 May 2003 07:51:54 -0000 1.28
@@ -17,7 +17,7 @@
<depend property="jakarta-oro.jar" project="jakarta-oro"/>
<depend property="junit.jar" project="junit"/>
<depend property="logkit.jar" project="avalon-logkit"/>
- <depend property="xalan.jar" project="xml-xalan2"/>
+ <depend property="xalan.jar" project="xml-xalan2" id="transformer"/>
<depend property="xerces.jar" project="xml-xerces" id="parser"/>
<depend property="xml-apis.jar" project="xml-apis"/>
</ant>
1.58 +2 -2 jakarta-gump/project/jakarta-taglibs.xml
Index: jakarta-taglibs.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/project/jakarta-taglibs.xml,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- jakarta-taglibs.xml 21 May 2003 11:47:39 -0000 1.57
+++ jakarta-taglibs.xml 23 May 2003 07:51:54 -0000 1.58
@@ -369,7 +369,7 @@
<depend property="sax.jar" project="jaxp" id="sax"/>
<depend property="jsp20.jar" project="jakarta-servletapi-5-jsp"/>
<depend property="servlet24.jar" project="jakarta-servletapi-5-servlet"/>
- <depend property="xalan.jar" project="xml-xalan2"/>
+ <depend property="xalan.jar" project="xml-xalan2" id="transformer"/>
<depend property="xercesImpl.jar" project="xml-xerces" id="parser"/>
<property name="build.dir" path="build"/>
<property name="dist.dir" path="dist"/>
@@ -430,7 +430,7 @@
<depend property="dom4j.jar" project="dom4j"/>
<depend property="jaxp.jar" project="xml-xerces" id="apis"/>
<depend property="servlet.jar" project="jakarta-servletapi-4"/>
- <depend property="xalan.jar" project="xml-xalan2"/>
+ <depend property="xalan.jar" project="xml-xalan2" id="transformer"/>
<property name="build.dir" path="build"/>
<property name="dist.dir" path="dist"/>
</ant>