Moved test libs into dedicated folder. Preparing the way for better t…

…esting hopefully, need this for JSR-225 stuff

svn path=/trunk/eXist/; revision=10897

.classpath

@@ -68,7 +68,7 @@
 	<classpathentry kind="lib" path="thirdparty/tomcat5/bin/jmx.jar"/>
 	<classpathentry kind="lib" path="thirdparty/tomcat5/server/lib/catalina-5.0.28.jar"/>
 	<classpathentry kind="lib" path="tools/ant/lib/ant.jar"/>
-	<classpathentry kind="lib" path="tools/ant/lib/junit-4.6.jar"/>
+	<classpathentry kind="lib" path="lib/test/junit-4.6.jar"/>
 	<classpathentry kind="lib" path="tools/ant/lib/xmlunit-1.2.jar"/>
 	<classpathentry kind="lib" path="tools/ircbot/lib/pircbot.jar"/>
 	<classpathentry kind="lib" path="tools/wrapper/lib/wrapper.jar"/>

build.properties

@@ -35,6 +35,7 @@ lib.optional = ./lib/optional
 lib.endorsed = ./lib/endorsed
 lib.user = ./lib/user
 lib.extensions = ./lib/extensions
+lib.test = ./lib/test
 
 # antlr is only needed if you change the XPath/XQuery parser
 # set these properties to true to get a lot of debugging output

build/scripts/junit.xml

@@ -9,13 +9,19 @@
 
     <description>jUnit tests for eXist</description>
 
-	<!-- import common targets -->
-	<import file="../../build.xml"/>
+    <!-- import common targets -->
+    <import file="../../build.xml"/>
 
-	<path id="classpath.junit">
+    <path id="classpath.junit">
         <pathelement path="${junit.reports}/classes"/>
     </path>
 
+     <path id="classpath.test-libs">
+         <fileset dir="${lib.test}">
+            <include name="*.jar"/>
+        </fileset>
+    </path>
+
 
     <target name="test"
             depends="test-prepare, test-local,  test-fluent, test-indexing, test-xqdoc, test-jetty, test-concurrent, test-remote, test-recovery, test-wrapup, test-ant"
@@ -39,6 +45,7 @@
             <classpath>
                 <path refid="classpath.core"/>
                 <path refid="classpath.jetty"/>
+                <path refid="classpath.test-libs"/>
             </classpath>
         </javac>
         <copy todir="${junit.reports}/classes/org/exist/performance/ant"
@@ -89,6 +96,7 @@
             <classpath refid="classpath.core"/>
             <classpath refid="classpath.jetty"/>
             <classpath refid="classpath.junit"/>
+            <classpath refid="classpath.test-libs"/>
 
             <formatter type="plain"/>
             <formatter type="xml"/>
@@ -142,6 +150,7 @@
             <classpath refid="classpath.core"/>
             <classpath refid="classpath.jetty"/>
             <classpath refid="classpath.junit"/>
+            <classpath refid="classpath.test-libs"/>
 
             <formatter type="plain"/>
             <formatter type="xml"/>
@@ -168,6 +177,7 @@
             <classpath refid="classpath.core"/>
             <classpath refid="classpath.jetty"/>
             <classpath refid="classpath.junit"/>
+            <classpath refid="classpath.test-libs"/>
 
             <formatter type="plain"/>
             <formatter type="xml"/>
@@ -184,6 +194,7 @@
             <sysproperty key="exist.home" value="${basedir}" />
             <classpath refid="classpath.core"/>
             <classpath refid="classpath.junit"/>
+            <classpath refid="classpath.test-libs"/>
             <formatter type="plain"/>
             <formatter type="xml"/>
             <test name="org.exist.storage.AllStorageTests" todir="${junit.reports.dat}"/>
@@ -232,6 +243,7 @@
             <classpath refid="classpath.core"/>
             <classpath refid="classpath.jetty"/>
             <classpath refid="classpath.junit"/>
+            <classpath refid="classpath.test-libs"/>
             <formatter type="plain"/>
             <formatter type="xml"/>
 
@@ -256,6 +268,7 @@
             <classpath refid="classpath.core"/>
             <classpath refid="classpath.jetty"/>
             <classpath refid="classpath.junit"/>
+            <classpath refid="classpath.test-libs"/>
             <formatter type="plain"/>
             <formatter type="xml"/>
 
@@ -273,7 +286,8 @@
             <classpath refid="classpath.core"/>
             <classpath refid="classpath.jetty"/>
             <classpath refid="classpath.junit"/>
-
+            <classpath refid="classpath.test-libs"/>
+
             <formatter type="plain"/>
             <formatter type="xml"/>
             <test fork="yes" name="org.exist.xquery.XQueryUpdateTest" todir="${junit.reports.dat}"/>
@@ -394,6 +408,7 @@
             <classpath refid="classpath.jetty"/>
             <classpath refid="classpath.ant_launcher"/>
             <classpath refid="classpath.junit"/>
+            <classpath refid="classpath.test-libs"/>
             <formatter type="plain"/>
             <formatter type="xml"/>
             <test name="org.exist.xquery.xqts.XQTS_1_0_2.AllTests" todir="${junit.reports.dat}"/>
@@ -411,6 +426,7 @@
             <classpath refid="classpath.jetty"/>
             <classpath refid="classpath.ant_launcher"/>
             <classpath refid="classpath.junit"/>
+            <classpath refid="classpath.test-libs"/>
             <formatter type="plain"/>
             <formatter type="xml"/>
             <test name="org.exist.xslt.xslts.AllTests" todir="${junit.reports.dat}"/>

extensions/fluent/build.xml

@@ -44,6 +44,11 @@
     <path id="classpath.jar">
         <pathelement path="${top.dir}/exist-fluent.jar"/>
     </path>
+    <path id="classpath.test-libs">
+         <fileset dir="${top.dir}/${lib.test}">
+            <include name="*.jar"/>
+        </fileset>
+    </path>
     <path id="classpath.test">
         <pathelement path="${test}/classes"/>
     </path>
@@ -82,6 +87,7 @@
                source="${build.compiler.source}" target="${build.compiler.target}">
             <classpath>
                 <path refid="classpath.core"/>
+                <path refid="classpath.test-libs"/>
                 <pathelement path="${classes}"  />
             </classpath>
         </javac>
@@ -130,6 +136,7 @@
                 <path refid="classpath.core"/>
                 <path refid="classpath.jar"/>
                 <path refid="classpath.test"/>
+                <path refid="classpath.test-libs"/>
                 <pathelement path="${classes}"  />
             </classpath>
 

extensions/xqdoc/build.xml

@@ -56,6 +56,12 @@
     	<pathelement path="${test.classes}"/>
     </path>
 
+    <path id="classpath.test-libs">
+         <fileset dir="${top.dir}/${lib.test}">
+            <include name="*.jar"/>
+        </fileset>
+    </path>
+
     <target name="prepare">
 		<mkdir dir="${xqdoc.classes}"/>
     </target>
@@ -108,6 +114,7 @@
         	source="${build.compiler.source}" target="${build.compiler.target}">
             <classpath>
             	<path refid="classpath.core"/>
+                <path refid="classpath.test-libs"/>
             </classpath>
 		</javac>
 	</target>
@@ -117,6 +124,7 @@
 
             <classpath refid="classpath.core"/>
             <classpath refid="classpath.junit"/>
+            <classpath refid="classpath.test-libs"/>
 
             <formatter type="plain"/>
             <formatter type="xml"/>

nbproject/project.properties

@@ -10,6 +10,8 @@ file.reference.commons-jexl-1.0.jar=extensions/cocoon/lib/commons-jexl-1.0.jar
 file.reference.commons-jxpath-1.2.jar=extensions/cocoon/lib/commons-jxpath-1.2.jar
 file.reference.commons-lang-2.0-20041007T2305.jar=extensions/cocoon/lib/commons-lang-2.0-20041007T2305.jar
 file.reference.commons-pool-1.5.4.jar=lib/core/commons-pool-1.5.4.jar
+file.reference.easymock-2.5.2.jar=lib/test/easymock-2.5.2.jar
+file.reference.easymockclassextension-2.5.2.jar=lib/test/easymockclassextension-2.5.2.jar
 file.reference.ehcache-1.1.jar=extensions/cocoon/lib/ehcache-1.1.jar
 file.reference.excalibur-component-1.2.jar=extensions/cocoon/lib/excalibur-component-1.2.jar
 file.reference.excalibur-datasource-1.1.1.jar=extensions/cocoon/lib/excalibur-datasource-1.1.1.jar
@@ -26,9 +28,12 @@ file.reference.excalibur-store-1.0.jar=extensions/cocoon/lib/excalibur-store-1.0
 file.reference.excalibur-xmlutil-1.0.jar=extensions/cocoon/lib/excalibur-xmlutil-1.0.jar
 file.reference.javacApi-0.9.jar=extensions/cocoon/lib/javacApi-0.9.jar
 file.reference.javacImpl-0.9.jar=extensions/cocoon/lib/javacImpl-0.9.jar
+file.reference.junit-4.6.jar=lib/test/junit-4.6.jar
 file.reference.logkit-1.2.2.jar=extensions/cocoon/lib/logkit-1.2.2.jar
 file.reference.util.concurrent-1.3.4.jar=extensions/cocoon/lib/util.concurrent-1.3.4.jar
 file.reference.xml-apis-1.4.01.jar=lib/endorsed/xml-apis-1.4.01.jar
+file.reference.xmlunit-1.2.jar=lib/test/xmlunit-1.2.jar
+file.reference.xmlunit-1.2.jar-1=tools/ant/lib/xmlunit-1.2.jar
 jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api"
 #Fri Dec 11 13:25:47 CET 2009
 jmx.jconsole.enabled=true
@@ -72,7 +77,6 @@ file.reference.xmlrpc-client-3.1.2.jar=lib/core/xmlrpc-client-3.1.2.jar
 javac.compilerargs=
 file.reference.xmlrpc-common-3.1.2.jar=lib/core/xmlrpc-common-3.1.2.jar
 file.reference.excalibur-naming-1.0.jar=lib/cocoon/excalibur-naming-1.0.jar
-file.reference.junit-4.6.jar=tools/ant/lib/junit-4.6.jar
 jar.compress=false
 file.reference.wrapper.jar=tools/wrapper/lib/wrapper.jar
 file.reference.jetty-6.1.21.jar=tools/jetty/lib/jetty-6.1.21.jar
@@ -105,7 +109,10 @@ file.reference.jetty-util-6.1.21.jar=tools/jetty/lib/jetty-util-6.1.21.jar
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\
-    ${libs.junit_4.classpath}
+    ${file.reference.easymock-2.5.2.jar}:\
+    ${file.reference.easymockclassextension-2.5.2.jar}:\
+    ${file.reference.junit-4.6.jar}:\
+    ${file.reference.xmlunit-1.2.jar}
 file.reference.wsdl4j-1.5.1.jar=lib/optional/wsdl4j-1.5.1.jar
 javadoc.splitindex=true
 file.reference.commons-codec-1.4.jar=lib/optional/commons-codec-1.4.jar
@@ -141,7 +148,6 @@ file.reference.commons-collections-3.2.1.jar=lib/core/commons-collections-3.2.1.
 jnlp.offline-allowed=false
 src.src6.dir=tools/wrapper/src
 javac.deprecation=false
-file.reference.xmlunit-1.2.jar=tools/ant/lib/xmlunit-1.2.jar
 build.classes.excludes=**/*.java,**/*.form
 dist.dir=nbproject/dist
 debug.classpath=${run.classpath}
@@ -203,8 +209,6 @@ javac.classpath=\
     ${file.reference.mail-1.4.2.jar}:\
     ${file.reference.nekohtml-1.9.11.jar}:\
     ${file.reference.ant.jar}:\
-    ${file.reference.junit-4.6.jar}:\
-    ${file.reference.xmlunit-1.2.jar}:\
     ${file.reference.catalina-5.0.28.jar}:\
     ${file.reference.jasper-compiler.jar}:\
     ${file.reference.jasper-runtime.jar}:\
@@ -244,7 +248,8 @@ javac.classpath=\
     ${file.reference.javacApi-0.9.jar}:\
     ${file.reference.javacImpl-0.9.jar}:\
     ${file.reference.logkit-1.2.2.jar}:\
-    ${file.reference.util.concurrent-1.3.4.jar}
+    ${file.reference.util.concurrent-1.3.4.jar}:\
+    ${file.reference.xmlunit-1.2.jar-1}
 javadoc.additionalparam=-J-Xmx320m
 build.classes.dir=${build.dir}/classes
 file.reference.samples-src=samples/src