These patches will allow phoenix to build again, and excalibur to make
significant progress towards compilation.  Note: the various <mkdir>
additions in the various excalibur build.xml's are clearly workarounds
to a more underlying problem - the build.xml's expect there to be test
cases present when they are not.

- Sam Ruby

? Announcement.txt
? jakarta-news.xml
Index: gump.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/gump.xml,v
retrieving revision 1.3
diff -u -r1.3 gump.xml
--- gump.xml    16 Jul 2002 23:32:38 -0000      1.3
+++ gump.xml    22 Jul 2002 00:27:12 -0000
@@ -17,10 +17,6 @@
       <depend property="xerces.jar" project="xml-xerces" id="parser"/>
       <depend property="logkit.jar" project="jakarta-avalon-logkit"/>
       <depend property="framework.jar" project="jakarta-avalon"/>
-      <depend property="excalibur.jar"
-        project="jakarta-avalon-excalibur" id="excalibur-core"/>
-      <depend property="scratchpad.jar"
-        project="jakarta-avalon-excalibur" id="excalibur-scratchpad"/>
     </ant>
 
     <depend project="bsf"/>

? build.log
? velocity.log
? instrument/src/test
? sourceresolve/src/test
? store/src/test
? xmlbundle/src/test
Index: gump.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/gump.xml,v
retrieving revision 1.73
diff -u -r1.73 gump.xml
--- gump.xml    15 Jul 2002 15:14:40 -0000      1.73
+++ gump.xml    22 Jul 2002 00:30:43 -0000
@@ -10,7 +10,7 @@
     <project name="jakarta-avalon-excalibur">
         <package>org.apache.avalon.excalibur</package>
 
-        <ant basedir="all" target="dist">
+        <ant target="dist">
             <depend property="logkit.jar" project="jakarta-avalon-logkit" 
runtime="true"/>
             <property name="skip.dependencies" value="true"/>
         </ant>
@@ -29,6 +29,10 @@
         <depend project="excalibur-xmlutil"/>
         <depend project="excalibur-testcase"/>
         <depend project="excalibur-io"/>
+        <depend project="excalibur-thread"/>
+        <depend project="excalibur-concurrent"/>
+        <depend project="excalibur-threadcontext"/>
+        <depend project="excalibur-util"/>
         <depend project="xml-xalan2"/>
         <depend project="jdom"/>
         <depend project="junit"/>
@@ -36,7 +40,7 @@
         <depend project="dist-bsf"/>
         <depend project="rhino"/>
         <depend project="junitperf"/>
-
+        <depend project="jakarta-velocity" inherit="runtime"/>
 
         <option project="jdbc"/>
         <option project="jaxen"/>
@@ -44,6 +48,8 @@
 
         <work nested="all/build/classes"/>
         <work nested="all/build/scratchpad"/>
+        <work nested="collections/build/testclasses"/>
+        <work nested="monitor/build/classes"/>
 
         <home nested="all/build/lib"/>
         <jar name="excalibur-core.jar" id="excalibur-core"/>
Index: sourceresolve/build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/sourceresolve/build.xml,v
retrieving revision 1.19
diff -u -r1.19 build.xml
--- sourceresolve/build.xml     6 Jul 2002 05:44:26 -0000       1.19
+++ sourceresolve/build.xml     22 Jul 2002 00:30:45 -0000
@@ -78,6 +78,7 @@
     <!-- Compiles the unit test source code -->
     <target name="compile-test" depends="compile, dependencies-test" 
description="Compiles the source code">
         <mkdir dir="${build.testsrc}"/>
+        <mkdir dir="${test.dir}"/>
 
         <!-- Copy over all of the tests applying test filters -->
         <copy todir="${build.testsrc}">
Index: store/build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/store/build.xml,v
retrieving revision 1.6
diff -u -r1.6 build.xml
--- store/build.xml     6 Jul 2002 05:44:26 -0000       1.6
+++ store/build.xml     22 Jul 2002 00:30:45 -0000
@@ -77,6 +77,7 @@
     <!-- Compiles the unit test source code -->
     <target name="compile-test" depends="compile, dependencies-test" 
description="Compiles the source code">
         <mkdir dir="${build.testsrc}"/>
+        <mkdir dir="${test.dir}"/>
 
         <!-- Copy over all of the tests applying test filters -->
         <copy todir="${build.testsrc}">
Index: xmlbundle/build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/xmlbundle/build.xml,v
retrieving revision 1.26
diff -u -r1.26 build.xml
--- xmlbundle/build.xml 8 Jul 2002 11:49:09 -0000       1.26
+++ xmlbundle/build.xml 22 Jul 2002 00:30:46 -0000
@@ -115,6 +115,7 @@
     <!-- Compiles the unit test source code -->
     <target name="compile-test" depends="compile, dependencies-test" 
description="Compiles the source code">
         <mkdir dir="${build.testsrc}"/>
+        <mkdir dir="${test.dir}"/>
 
         <!-- Copy over all of the tests applying test filters -->
         <copy todir="${build.testsrc}">


--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to