Author: kylem
Date: Wed Jan 19 13:17:02 2005
New Revision: 125665

URL: http://svn.apache.org/viewcvs?view=rev&rev=125665
Log:
Tweaked ordering of classpath jars in controls/test/build.xml, because wrong 
version of Xerces
(from ant-all.dependency) was being referenced from httpunit-based tests, 
resulting in some
NoSuchMethodException errors due to versioning mismatch.

Modified:
   incubator/beehive/trunk/controls/test/build.xml

Modified: incubator/beehive/trunk/controls/test/build.xml
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/build.xml?view=diff&rev=125665&p1=incubator/beehive/trunk/controls/test/build.xml&r1=125664&p2=incubator/beehive/trunk/controls/test/build.xml&r2=125665
==============================================================================
--- incubator/beehive/trunk/controls/test/build.xml     (original)
+++ incubator/beehive/trunk/controls/test/build.xml     Wed Jan 19 13:17:02 2005
@@ -72,35 +72,35 @@
     </path>
 
     <path id="tch.run.classpath">
-        <!-- todo: there should be a common milton.dependency.path -->
+    <!-- todo: there should be a common milton.dependency.path -->
        <pathelement location="${tch.jar}"/>
        <pathelement location="${tch.schema.jar}"/>
        <pathelement location="${tch.xbean.jar}"/>
        <pathelement location="${milton.jar}"/>
 
-        <path refid="ant-all.dependency.path"/>
-        <path refid="controls.dependency.path"/>
-        <path refid="velocity.dependency.path"/>
-        <path refid="servlet.dependency.path"/>
-        <path refid="junit.dependency.path"/>
-        <path refid="tools.dependency.path"/>
-        <path refid="derby.dependency.path"/>
-
-        <pathelement location="${db.control.jar}"/>
-        <pathelement path="${build.beans}"/>
-       
-        <pathelement path="${build.drivers}"/>
-       <pathelement location="${build.tests}" />
-
-        <!-- todo: these JARs live in trunk/external and should be moved into 
controls/test/external
-             they are used only under that sub-directory.  there should also 
be a common path defined
-             for them
-          -->
+    <!-- todo: these JARs live in trunk/external and should be moved into 
controls/test/external
+         they are used only under that sub-directory.  there should also be a 
common path defined
+         for them
+      -->
        <pathelement location="${jakarta.jar}"/>
        <pathelement location="${httpunit.jar}"/>
        <pathelement location="${httpunit-xerces.jar}"/>
        <pathelement location="${nekohtml.jar}"/>
 
+    <path refid="ant-all.dependency.path"/>
+    <path refid="controls.dependency.path"/>
+    <path refid="velocity.dependency.path"/>
+    <path refid="servlet.dependency.path"/>
+    <path refid="junit.dependency.path"/>
+    <path refid="tools.dependency.path"/>
+    <path refid="derby.dependency.path"/>
+
+    <pathelement location="${db.control.jar}"/>
+    <pathelement path="${build.beans}"/>
+       
+    <pathelement path="${build.drivers}"/>
+       <pathelement location="${build.tests}" />
+
        <!-- the following are needed for axis clients -->
         <path refid="webservice.classpath"/>
     </path>
@@ -281,6 +281,7 @@
                <pathelement location="${milton.jar}"/>
                <pathelement location="${mantis.jar}"/>
                <pathelement location="${httpunit.jar}"/>
+                   <pathelement location="${httpunit-xerces.jar}"/>
                <pathelement path="${build.drivers}"/>
             </classpath>
         </apt>

Reply via email to