X-Git-Url: https://repo.niif.hu/gitweb/gitweb.cgi?p=java-idp.git;a=blobdiff_plain;f=build.xml;h=b8f180c27d1e85ed5bb94f3defcf2f2da8c9d667;hp=099e81974b24a9dece446ca9354d27022cdd3335;hb=ccec76f01a97a0f0686da3b56322e373b8561938;hpb=c5e7f5f42dce76d9e415e9d7976919b03bd91f49

diff --git a/build.xml b/build.xml
index 099e819..b8f180c 100755
--- a/build.xml
+++ b/build.xml
@@ -1,82 +1,135 @@
 <!-- Main build configutaion for Shibboleth java components - Walter Hoehn 06/04/2002 -->
 
-<project default="dist-all" basedir=".">
-
-	<!-- Set global properties for this build -->
-	<property name="distname" value="shibboleth" />
-	<property name="root" value="." />
-	<property name="src" value="${root}/source" />
-	<property name="approot" value="${root}/webApplication" />
-	<property name="build" value="${approot}/WEB-INF/classes" />
-	<property name="libdir" value="${approot}/WEB-INF/lib" />
-	<property name="buildlibs" value="${root}/buildlibs" />
-	<property name="dist" value="${root}/dist" />
-
-
-	<!-- Construct the CLASSPATH -->
-	<path id="build.path">
-		<pathelement path="${classpath}" />
-		<pathelement location="${build}" />
-		<fileset dir="${libdir}">
-			<include name="**/*.jar" />
-		</fileset>
-		<fileset dir="${buildlibs}">
-			<include name="**/*.jar" />
-		</fileset>
-	</path>
-
-
-	<!-- Prepare directory structure for project build-->
-	<target name="init">
-	<mkdir dir="${build}" />
-	<mkdir dir="${dist}" />
-	</target>
+<project name="Shibboleth" default="dist-all" basedir=".">
 
+    <!-- Set global properties for this build -->
+    <property name="distname" value="shibboleth" />
+    <property name="root" value="." />
+    <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}/lib" />
+    <property name="dist" value="${root}/dist" />
+    <property name="docs" value="${root}/docs" />
+    <property name="javadocs" value="${docs}/api" />
 
-	<!-- Compile classes and move them to ${build} -->
-	<target name="compile-all" depends="init">
-		<javac srcdir="${src}" destdir="${build}" includes="**/*.java" debug="on">
-			<classpath refid="build.path" />
-		</javac>
-	</target>
+    <property name="year" value="2002"/>
+    <property name="copyright" value="Copyright &#169; ${year} UCAID. All Rights Reserved."/>
 
 
-	<!-- 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">
-		<war warfile="${dist}/${distname}.war" webxml="${approot}/WEB-INF/web.xml" basedir="${approot}" update="no" />
-	</target>
+    <!-- Construct the CLASSPATH -->
+    <path id="build.path">
+        <pathelement path="${classpath}" />
+        <pathelement location="${build}" />
+        <fileset dir="${libdir}">
+            <include name="**/*.jar" />
+        </fileset>
+        <fileset dir="${buildlibs}">
+            <include name="**/*.jar" />
+        </fileset>
+    </path>
 
 
-	<!-- Cleanup after the build, test, and distribution processes -->
-	<target name="clean-all" depends="clean-build, clean-dist, clean-test" />
-	<target name="clean-build">
-		<delete dir="${build}" />
-	</target>
-	<target name="clean-test">
-		<delete>
-			<fileset dir="${root}">
-				<include name="**/TEST*.txt" />
-			</fileset>
-		</delete>
-	</target>
-	<target name="clean-dist">
-		<delete dir="${dist}" />
+    <!-- Prepare directory structure for project build-->
+    <target name="init">
+    <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="init">
+        <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">
+            <fileset dir="${src}/schemas"/>
+        </copy>
+    </target>
+
+
+	<!-- Generate API docs -->
+	<target name="javadocs">
+		<mkdir dir="${docs}" />
+		<mkdir dir="${javadocs}" />
+		<javadoc packagenames='edu.internet2.middleware.*'
+			sourcepath='${src}' destdir='${javadocs}'
+			author='true' version='true'
+			windowtitle='Shibboleth Java API' doctitle='Shibboleth Java API'
+			bottom='${copyright}'>
+                <classpath refid="build.path" />
+        </javadoc>
 	</target>
 
-	
-	<!-- Run automated tests on compiled code -->
-	<target name="test-all" 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" />
-		</junit>
+    <!-- Create various product distributions and move them to ${dist} -->
+    <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, clean-javadocs" />
+    <target name="clean-build">
+        <delete dir="${build}" />
+    </target>
+    <target name="clean-test">
+        <delete>
+            <fileset dir="${root}">
+                <include name="**/TEST*.txt" />
+            </fileset>
+        </delete>
+    </target>
+    <target name="clean-dist">
+        <delete dir="${dist}" />
+    </target>
+	<target name="clean-javadocs">
+		<delete dir="${javadocs}" />
 	</target>
 
+    
+    <!-- Run automated tests on compiled code -->
+    <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" /> -->
+        </junit>
+    </target>
+
 </project>
 
+