Added custom extension libraries into main shib test case classpath

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@1708 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/build.xml b/build.xml
index b928d6b..3b116dc 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -173,7 +173,12 @@
        <target name="test-IdP" depends="compile-tests">
                <junit printsummary="no" fork="yes" haltonfailure="yes" haltonerror="yes" dir="${root}">
                        <jvmarg value="-Djava.endorsed.dirs=${endorsed}" />
-                       <classpath refid="test.path" />
+                       <classpath>
+                           <fileset dir="${custom.libs}">
+                               <include name="*.jar"/>
+                           </fileset>
+                           <filelist refid="test.path"/>
+                       </classpath>
                        <formatter type="plain" />
                        <test name="edu.internet2.middleware.shibboleth.aa.arp.ArpTests" />
                        <test name="edu.internet2.middleware.shibboleth.aa.attrresolv.ResolverTests" />
@@ -188,7 +193,12 @@
        <target name="test-SP" depends="compile-tests">
                <junit printsummary="no" fork="yes" haltonfailure="yes" haltonerror="yes" dir="${root}">
                        <jvmarg value="-Djava.endorsed.dirs=${endorsed}" />
-                       <classpath refid="test.path" />
+                   <classpath>
+                               <fileset dir="${custom.libs}">
+                                       <include name="*.jar"/>
+                               </fileset>
+                               <filelist refid="test.path"/>
+                       </classpath>
                        <formatter type="plain" />
                        <test name="edu.internet2.middleware.shibboleth.aap.AAPTests" />
                </junit>
@@ -268,7 +278,7 @@
                <replace file="${configroot}/idp.xml" token="$IDP_HOME$" value="${idp.home.url}" />
 
                <!-- create the war -->
-               <war warfile="${dist}/${idp.webapp.name}.war" webxml="${configroot}/idp.xml" basedir="${approot}" update="no">
+               <war warfile="${dist}/${idp.webapp.name}.war" webxml="${configroot}/idp.xml" basedir="${approot}" update="no" duplicate="preserve">
                        <!-- Grab any custom extension libraries -->
                        <lib dir="${custom.libs}"/>