X-Git-Url: https://repo.niif.hu/gitweb/gitweb.cgi?p=java-idp.git;a=blobdiff_plain;f=build.xml;h=71f691b96cb3d677ea825182e8513ede61e2faf4;hp=a3c6c2a98dbed1125f67939c129c5b733fddcc47;hb=10fa62dd02b96fdfc5b8b5c345803a50ce60a7b6;hpb=9f8ff4e953ef5f7027a79a068249dee7f223d391

diff --git a/build.xml b/build.xml
index a3c6c2a..71f691b 100755
--- a/build.xml
+++ b/build.xml
@@ -1,86 +1,223 @@
-<!-- Main build configutaion for Shibboleth java components - Walter Hoehn 06/04/2002 -->
-
-<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}/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>
-
-
-	<!-- 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>
-		<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="package">
-		<war warfile="${dist}/${distname}.war" webxml="${approot}/WEB-INF/web.xml" basedir="${approot}" update="no" />
-	</target>
-
-
-	<!-- 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}" />
-	</target>
-
+<project name="Shibboleth Identity Provider" basedir="." default="package">
+	
+	<tstamp>
+		<format property="build-date" pattern="ddMMyyyy'T'kkmmss" timezone="GMT"/>
+	</tstamp>
+
+	<!-- User based property file that overrides any property below -->
+	<property file="${user.name}-build.properties"/>
+		
+	<!-- Project based property file -->
+    <property file="build.properties" />
+
+    <!-- Load ant-contrib tasks -->
+    <taskdef resource="net/sf/antcontrib/antlib.xml" />
 	
-	<!-- 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>
+	<!-- Load Checkstyle tasks -->
+	<taskdef resource="checkstyletask.properties" />
+
+    <!-- Classpath for building core classes-->
+    <path id="build-path">
+        <fileset dir="${build-lib.dir}" includes="**/*.jar" />
+        <fileset dir="${lib.dir}" includes="**/*.jar" />
+    </path>
+
+    <!-- Classpath for testing classes-->
+    <path id="test-path">
+        <path refid="build-path" />
+        <pathelement location="${core-classes.dir}" />
+        <pathelement location="${core-src.dir}" />
+        <pathelement location="${test-classes.dir}" />
+    	<pathelement location="${test-classes.dir}/data" />
+    	<pathelement location="${test-classes.dir}/log4j.xml" />
+        <pathelement location="${test-src.dir}" />
+        <pathelement location="${classpathres.dir}" />
+    </path>
+
+    <!-- Prepare directory structure for build -->
+    <target name="build-init">
+        <mkdir dir="${build.dir}" />
+    </target>
+
+    <!-- Compile core (non-test) classes -->
+    <target name="compile-core" depends="build-init, clean-compile">
+        <mkdir dir="${core-classes.dir}" />
+
+        <javac srcdir="${core-src.dir}" destdir="${core-classes.dir}" includes="**/*.java" debug="on" source="1.5">
+            <classpath refid="build-path" />
+        </javac>
+
+    </target>
+
+    <!-- Compile unit test classes -->
+    <target name="compile-test" depends="compile-core">
+        <mkdir dir="${test-classes.dir}" />
+
+        <javac srcdir="${test-src.dir}" destdir="${test-classes.dir}" includes="**/*.java" debug="on" source="1.5">
+            <classpath refid="test-path" />
+        </javac>
+
+    </target>
+
+    <!-- Compile and run unit tests -->
+    <target name="test" depends="compile-core, compile-test" description="Runs the unit tests for the project.">
+        <mkdir dir="${test-results.dir}" />
+
+    	<echo message="Excuting unit tests using endorsed directory ${java.endorsed.dirs}" />
+        <junit printsummary="off" fork="yes" forkmode="once" haltonerror="false" haltonfailure="false" dir="${basedir}" errorproperty="testFailed">
+        	<jvmarg value="-Djava.endorsed.dirs=${java.endorsed.dirs}" />
+            <classpath refid="test-path" />
+            <formatter type="xml" />
+            <batchtest todir="${test-results.dir}">
+                <fileset dir="${test-classes.dir}">
+                    <include name="**/*Test.class" />
+                </fileset>
+            </batchtest>
+        </junit>
+    	<junitreport todir="${test-results.dir}">
+    	  <fileset dir="${test-results.dir}">
+    	    <include name="TEST-*.xml"/>
+    	  </fileset>
+    	  <report format="frames" todir="${test-report.dir}"/>
+    	</junitreport>
+    	
+    	<echo message="Test report available at ${test-report.dir}/index.html" />
+    	<fail if="testFailed" message="Test failure; see ${test-report.dir}/index.html for more information."/>
+    </target>
+
+    <!-- Javadoc core (non-test) classes -->
+    <target name="javadoc" description="Creates the JavaDoc documentatin for the project.">
+        <mkdir dir="${javadoc.dir}" />
+        <javadoc packagenames="org.opensaml.*" 
+        	     sourcepath="${core-src.dir}" 
+        	     destdir="${javadoc.dir}" 
+        	     author="false" version="true" 
+        	     windowtitle="${ant.project.name} ${version} Java API" 
+        	     doctitle="${ant.project.name} ${version} Java API" 
+        	     bottom="${copyright}"
+        	     overview="${core-src.dir}/overview.html">
+            <classpath refid="build-path" />
+        </javadoc>
+    </target>
+
+    <!-- Removes previously compiled files -->
+    <target name="clean-compile">
+        <delete dir="${build.dir}" />
+    </target>
+
+    <!-- Removes all build generated content -->
+    <target name="clean" depends="clean-compile" description="Removes any artifact produced by the build process.">
+        <delete dir="${javadoc.dir}" />
+    	<delete dir="${reports.dir}" />
+        <delete dir="${dist.dir}" />
+    </target>
+
+    <!-- Create JAR file -->
+    <target name="package" depends="compile-core, test" description="Creates the project library jar file.">
+        <mkdir dir="${dist.dir}" />
+
+        <if>
+            <equals arg1="${jdk.target}" arg2="1.4" />
+            <then>
+                <java classname="com.rc.retroweaver.Weaver">
+                    <arg value="-source" />
+                    <arg value="${core-classes.dir}" />
+                    <classpath>
+                        <fileset dir="${thirdpaty-lib.dir}">
+                            <include name="**/*.jar" />
+                        </fileset>
+                    </classpath>
+                </java>
+
+                <echo message="**************************************************************" />
+                <echo message="    Remember, you must include the retroweaver-rt jar" />
+                <echo message="    file, located in the thirdparty-lib directory, along with the" />
+                <echo message="    ${jar.name} on your" />
+                <echo message="    classpath in order to use this with JDK 1.4" />
+                <echo message="**************************************************************" />
+
+            </then>
+        </if>
+
+        <jar destfile="${dist.dir}/${jar.name}" whenempty="fail">
+        	<fileset dir="${classpathres.dir}" />
+        	<fileset dir="${metainf.dir}" />
+    		<fileset dir="${webinf.dir}" />
+        	<fileset dir="${webpages.dir}" />
+        	<zipfileset dir="${core-classes.dir}" prefix="/WEB-INF/classes/" />
+        	<zipfileset dir="${lib.dir}" prefix="/WEB-INF/lib/" />
+    	</jar>
+
+    </target>
+
+    <!-- **************************************************************** -->
+    <!-- ***                                                          *** -->
+    <!-- ***                     Developer Tasks                      *** -->
+    <!-- ***                                                          *** -->
+    <!-- **************************************************************** -->
+	
+	<!-- Checks code against style guidelines -->
+	<target name="checkstyle" description="Developer task: Produces coding standard compliance report.">
+		<mkdir dir="${reports.dir}" />
+		
+		<checkstyle config="${basedir}/checkstyle.xml"
+					failOnViolation="false"
+	                classpathref="build-path">
+			<fileset dir="src" includes="**/*.java" />
+			<formatter type="plain" toFile="${reports.dir}/checkstyle-report.txt" />
+		</checkstyle>
 	</target>
-
-</project>
-
+	
+    <!-- Create TGZ source distribution -->
+    <target name="tgz-src-dist" depends="package, javadoc" description="Developer task: Creates the tar, gzipped source distribution.">
+        <tar tarfile="${dist.dir}/${src-dist.name}.tgz" compression="gzip">
+        	<tarfileset dir="${build-lib.dir}" prefix="/build-lib/" />
+        	<tarfileset dir="${lib.dir}" prefix="/lib/" />
+        	<tarfileset dir="${resources.dir}" prefix="/resources/" />
+        	<tarfileset dir="${core-src.dir}" prefix="/src/" />
+    		<tarfileset dir="${test-src.dir}" prefix="/test/" />
+        	<tarfileset dir="${doc.dir}" prefix="/doc/" />
+        	<tarfileset file="${dist.dir}/${jar.name}" prefix="/dist/" />
+        	<tarfileset file="${basedir}/*.*" prefix="/" />
+        </tar>
+    	<checksum file="${dist.dir}/${src-dist.name}.tgz" />
+    </target>
+
+    <!-- Create TGZ binary distribution -->
+    <target name="tgz-bin-dist" depends="package, javadoc" description="Developer task: Creates the tar, gzipped binary distribution.">
+        <tar tarfile="${dist.dir}/${bin-dist.name}.tgz" compression="gzip">
+        	<tarfileset dir="${lib.dir}" prefix="/lib/" />
+        	<tarfileset dir="${resources.dir}" prefix="/resources/" />
+        	<tarfileset dir="${doc.dir}" prefix="/doc/" />
+        	<tarfileset file="${dist.dir}/${jar.name}" prefix="/dist/" />
+        </tar>
+    	<checksum file="${dist.dir}/${bin-dist.name}.tgz" />
+    </target>
+
+    <!-- Create ZIP source distribution -->
+    <target name="zip-src-dist" depends="package, javadoc" description="Developer task: Creates the zipped source distribution.">
+        <zip zipfile="${dist.dir}/${src-dist.name}.zip" whenempty="fail">
+        	<zipfileset dir="${build-lib.dir}" prefix="build-lib/" />
+        	<zipfileset dir="${lib.dir}" prefix="lib/" />
+        	<zipfileset dir="${resources.dir}" prefix="/resources/" />
+        	<zipfileset dir="${core-src.dir}" prefix="src/" />
+    		<zipfileset dir="${test-src.dir}" prefix="test/" />
+        	<zipfileset dir="${doc.dir}" prefix="doc/" />
+        	<zipfileset file="${dist.dir}/${jar.name}" prefix="/dist/" />
+        	<zipfileset file="${basedir}/*.*" prefix="" />
+        </zip>
+    	<checksum file="${dist.dir}/${src-dist.name}.zip" />
+    </target>
+
+    <!-- Create ZIP binary distribution -->
+    <target name="zip-bin-dist" depends="package, javadoc"  description="Developer task: Creates the zipped binary distribution.">
+        <zip zipfile="${dist.dir}/${bin-dist.name}.zip" whenempty="fail">
+        	<zipfileset dir="${lib.dir}" prefix="lib/" />
+        	<zipfileset dir="${resources.dir}" prefix="/resources/" />
+        	<zipfileset dir="${doc.dir}" prefix="doc/" />
+        	<zipfileset file="${dist.dir}/${jar.name}" prefix="/dist/" />
+        </zip>
+    	<checksum file="${dist.dir}/${bin-dist.name}.zip" />
+    </target>
+
+</project>
\ No newline at end of file