X-Git-Url: https://repo.niif.hu/gitweb/gitweb.cgi?p=java-idp.git;a=blobdiff_plain;f=build.xml;h=1b930ec1d9209e22f3acc2a648b2b34face2e2e2;hp=98ebb44b819685a3f69d1cbe434ad9ffe0f34f90;hb=2365194bca2588b77fe57f34d17c76df1e24bcea;hpb=6fc2f57881ba85862605574f49a35314b3ec05fd

diff --git a/build.xml b/build.xml
index 98ebb44..1b930ec 100755
--- a/build.xml
+++ b/build.xml
@@ -5,11 +5,12 @@
 	<!-- Set global properties for this build -->
 	<property name="distname" value="shibboleth" />
 	<property name="root" value="." />
-	<property name="src" value="${root}/source" />
+	<property name="src" value="${root}/src" />
 	<property name="approot" value="${root}/webApplication" />
+	<property name="configroot" value="${root}/webAppConfig" />
 	<property name="build" value="${approot}/WEB-INF/classes" />
 	<property name="libdir" value="${approot}/WEB-INF/lib" />
-	<property name="buildlibs" value="${root}/buildlibs" />
+	<property name="buildlibs" value="${root}/lib" />
 	<property name="dist" value="${root}/dist" />
 
 
@@ -33,9 +34,14 @@
 	</target>
 
 
+	<!-- This target should be run before checking code into the repository -->
+	<target name="pre-checkin" depends="compile-all, test-all, clean-all" />
+
+
 	<!-- Compile classes and move them to ${build} -->
 	<target name="compile-all" depends="init">
-		<javac srcdir="${src}" destdir="${build}" includes="**/*.java" excludes="edu/internet2/middleware/shibboleth/aaLocal/**" debug="on">
+		<javac srcdir="${src}" destdir="${build}" includes="**/*.java" debug="on">
+			<exclude name="edu/internet2/middleware/shibboleth/hs-cmu/**" />
 			<classpath refid="build.path" />
 		</javac>
 		<copy todir="${build}/schemas">
@@ -46,16 +52,35 @@
 
 
 	<!-- Create various product distributions and move them to ${dist} -->
-	<target name="dist-all" depends="compile-all, package, clean-build" />
-	<target name="dist-origin" depends="compile-all, package, clean-build" />
-	<target name="dist-target" depends="compile-all, package, clean-build" />
-	<target name="dist-wayf" depends="compile-all, package, clean-build" />
-	<target name="package">
+	<target name="dist" depends="dist-all" />
+	<target name="dist-all" depends="compile-all, test-all, package-all, clean-build" />
+	<target name="package-all">
 		<war warfile="${dist}/${distname}.war" webxml="${approot}/WEB-INF/web.xml" basedir="${approot}" update="no" />
 	</target>
 
+	<target name="dist-origin" depends="compile-all, test-origin, package-origin, clean-build" />
+	<target name="package-origin">
+		<war warfile="${dist}/${distname}-origin.war" webxml="${configroot}/origin.xml" basedir="${approot}" update="no" />
+	</target>
+
+	<target name="dist-target" depends="compile-all, test-target, package-target, clean-build" />
+	<target name="package-target">
+		<war warfile="${dist}/${distname}-target.war" webxml="${configroot}/target.xml" basedir="${approot}" update="no" />
+	</target>
+
+	<target name="dist-target-includeswayf" depends="compile-all, test-target, test-wayf, package-target-includeswayf, clean-build" />
+	<target name="package-target-includeswayf">
+		<war warfile="${dist}/${distname}-target.war" webxml="${configroot}/target-includeswayf.xml" basedir="${approot}" update="no" />
+	</target>
+
+	<target name="dist-wayf" depends="compile-all, test-wayf, package-wayf, clean-build" />
+	<target name="package-wayf">
+		<war warfile="${dist}/${distname}-wayf.war" webxml="${configroot}/wayf.xml" basedir="${approot}" update="no" />
+	</target>
+
 
 	<!-- Cleanup after the build, test, and distribution processes -->
+	<target name="clean" depends="clean-all" />
 	<target name="clean-all" depends="clean-build, clean-dist, clean-test" />
 	<target name="clean-build">
 		<delete dir="${build}" />
@@ -73,12 +98,15 @@
 
 	
 	<!-- Run automated tests on compiled code -->
-	<target name="test-all" depends="test-common" />
+	<target name="test-all" depends="test-origin, test-target, test-wayf" />
+	<target name="test-origin" depends="test-common" />
+	<target name="test-target" depends="test-common" />
+	<target name="test-wayf" depends="test-common" />
 	<target name="test-common" depends="compile-all">
 		<junit printsummary="no" fork="no" haltonfailure="yes" haltonerror="no">
 			<classpath refid="build.path" />
 			<formatter type="plain" />
-			<test name="edu.internet2.middleware.shibboleth.common.AQHTest" />
+		<!--	<test name="edu.internet2.middleware.shibboleth.common.AQHTest" /> -->
 		</junit>
 	</target>