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

diff --git a/build.xml b/build.xml
index bffd13b..1b930ec 100755
--- a/build.xml
+++ b/build.xml
@@ -3,15 +3,14 @@
 <project name="Shibboleth" default="dist-all" basedir=".">
 
 	<!-- Set global properties for this build -->
-    <property name="opensaml" value="${root}/../../../opensaml/java/lib" />
 	<property name="distname" value="shibboleth" />
 	<property name="root" value="." />
 	<property name="src" value="${root}/src" />
-    <property name="bld" value="${root}/build" />
 	<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="lib" value="${root}/lib" />
+	<property name="buildlibs" value="${root}/lib" />
 	<property name="dist" value="${root}/dist" />
 
 
@@ -19,75 +18,72 @@
 	<path id="build.path">
 		<pathelement path="${classpath}" />
 		<pathelement location="${build}" />
-        <pathelement location="${bld}" />
 		<fileset dir="${libdir}">
 			<include name="**/*.jar" />
 		</fileset>
-		<fileset dir="${lib}">
+		<fileset dir="${buildlibs}">
 			<include name="**/*.jar" />
 		</fileset>
-		<fileset dir="${opensaml}">
-			<include name="opensaml.jar" />
-		</fileset>
 	</path>
 
 
 	<!-- Prepare directory structure for project build-->
 	<target name="init">
-        <mkdir dir="${bld}" />
-	    <mkdir dir="${build}" />
-        <mkdir dir="${dist}" />
+	<mkdir dir="${build}" />
+	<mkdir dir="${dist}" />
 	</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="compile-common">
+	<target name="compile-all" depends="init">
 		<javac srcdir="${src}" destdir="${build}" includes="**/*.java" debug="on">
-            <exclude name="edu/internet2/middleware/shibboleth/aaLocal/**" />
-            <exclude name="edu/internet2/middleware/shibboleth/common/**" />
-            <exclude name="edu/internet2/middleware/shibboleth/eduPerson/**" />
-           <classpath refid="build.path" />
-		</javac>
-	</target>
-
-	<target name="compile-common" depends="init">
-		<javac srcdir="${src}" destdir="${bld}" debug="on">
-			<include name="edu/internet2/middleware/eduPerson/*.java" />
-			<include name="edu/internet2/middleware/shibboleth/common/*.java" />
+			<exclude name="edu/internet2/middleware/shibboleth/hs-cmu/**" />
 			<classpath refid="build.path" />
 		</javac>
-		<copy todir="${bld}/schemas">
-            <fileset dir="${src}/schemas"/>
-        </copy>
+		<copy todir="${build}/schemas">
+                        <fileset dir="${src}/schemas"/>
+                </copy>
 	</target>
 
 
+
 	<!-- 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="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-common" depends="clean-common, compile-common, package-common" />
+	<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="package">
-		<war warfile="${dist}/${distname}.war" webxml="${approot}/WEB-INF/web.xml" basedir="${approot}" update="no" />
+	<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="package-common">
-		<jar jarfile="${dist}/${distname}.jar" basedir="${bld}">
-			<include name="schemas/**" />
-			<include name="edu/internet2/middleware/shibboleth/common/**" />
-			<include name="edu/internet2/middleware/eduPerson/**" />
-		</jar>
+	<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}" />
-        <delete dir="${bld}" />
 	</target>
 	<target name="clean-test">
 		<delete>
@@ -100,19 +96,17 @@
 		<delete dir="${dist}" />
 	</target>
 
-	<target name="clean-common">
-		<delete dir="${bld}/schemas" />
-		<delete dir="${bld}/edu/internet2/middleware/shibboleth/common" />
-		<delete dir="${bld}/edu/internet2/middleware/eduPerson" />
-	</target>
 	
 	<!-- 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>