Included black-box IdP tests in standared test suite.
[java-idp.git] / build.xml
index 2c6509a..8c5e1f9 100755 (executable)
--- a/build.xml
+++ b/build.xml
                        <test name="edu.internet2.middleware.shibboleth.common.TrustTests" />
                        <test name="edu.internet2.middleware.shibboleth.idp.provider.DNHostNameExtractionTests" />
                        <test name="edu.internet2.middleware.shibboleth.metadata.MetadataTests" />
+                       <test name="edu.internet2.middleware.shibboleth.idp.SSOTest" />      
+                       <test name="edu.internet2.middleware.shibboleth.idp.AATest" />    
                </junit>
        </target>
 
        </target>
 
        <target name="package-wayf" depends="compile" description="Creates the WAYF war and moves it to ${dist}">
-               <war warfile="${dist}/${distnameWayf}.war" webxml="${configroot}/wayf.xml" basedir="${approot}" update="no" />
+        <copy file="${appconfig}/schemas.properties" todir="${approot}/WEB-INF/classes/conf"/>
+        <copy file="${appconfig}/wayfconfig.xml" todir="${approot}/WEB-INF/classes/conf"/>
+            
+               <war warfile="${dist}/${distnameWayf}.war" webxml="${configroot}/wayf.xml" basedir="${approot}" update="no"/>
        </target>
 
        <target name="package-sp" depends="compile, install.url" description="Creates the Java SP war and moves it to ${dist}">
                <copy todir="${sp.home}/etc" overwrite="true">
                        <fileset dir="${src}/conf" includesfile="conf/sp-conf.include"/>
                </copy>
-               <move file="${sp.home}/etc/dist.sp.xml" tofile="${sp.home}/etc/sp.xml" overwrite="true" />
+               <move file="${sp.home}/etc/dist.sp-iqidp.xml" tofile="${sp.home}/etc/sp.xml" overwrite="true" />
                <replace file="${sp.home}/etc/sp.xml" token="$SP_HOME$" value="${sp.home.url}" />
        </target>