Fixed a bug caused by recent class moves.
[java-idp.git] / build.xml
index e9807d5..e3629d0 100755 (executable)
--- a/build.xml
+++ b/build.xml
 <!-- 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>
-
-
-       <!-- 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>
-
-
-       <!-- 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" />
+<project name="Shibboleth" default="dist-IdP" basedir=".">
+
+    <!-- Set global properties for this build -->
+    <property name="distname" value="shibboleth" />
+    <property name="root" value="." />
+    <property name="src" value="${root}/src/" />
+    <property name="tests" value="${root}/tests/" />
+    <property name="approot" value="${root}/webApplication/" />
+    <property name="appconfig" value="${src}/conf/" />
+    <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="endorsed" value="${root}/endorsed/" />
+    <property name="distlibs" value="${root}/lib/" />
+    <property name="dist" value="${root}/dist/" />
+    <property name="docs" value="${root}/doc/" />
+    <property name="javadocs" value="${docs}/api/" />
+
+    <property name="year" value="2002-2005"/>
+    <property name="copyright" value="Copyright &#169; ${year} UCAID. All Rights Reserved."/>
+
+       <!-- Configure properties to find Tomcat and access the Manager application -->
+       <property name="tomcat.home" value="/usr/local/tomcat"/>
+       <property name="url" value="http://localhost:8080/manager"/>
+       <property name="username" value="manager"/>
+       <property name="password" value="password"/>
+
+       <!-- Uncomment this for Tomcat Tasks
+       <path id="tomcat.classpath">
+       <fileset dir="${tomcat.home}/server/lib" includes="catalina-ant.jar"/>
+       </path>
+
+       <taskdef name="tomcatStart" classname="org.apache.catalina.ant.StartTask" classpathref="tomcat.classpath"/>
+       <taskdef name="tomcatStop" classname="org.apache.catalina.ant.StopTask" classpathref="tomcat.classpath"/>
+       <taskdef name="tomcatDeploy" classname="org.apache.catalina.ant.DeployTask" classpathref="tomcat.classpath"/>
+       <taskdef name="tomcatUndeploy" classname="org.apache.catalina.ant.UndeployTask" classpathref="tomcat.classpath"/>
+       -->
+       
+    <!-- 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>
+
+
+    <!-- This target should be run before checking code into the repository -->
+    <target name="pre-checkin" depends="compile, test-all, clean-all" />
+
+
+    <!-- Compile classes and move them to ${build} -->
+    <target name="compile" depends="init"
+       description="Compile source file, combine with schemas and conf directories">
+        <javac srcdir="${src}" destdir="${build}" includes="**/*.java" debug="on" 
+               target="1.3" source="1.3">
+            <classpath refid="build.path" />
+        </javac>
+        <copy todir="${build}/schemas">
+            <fileset dir="${src}/schemas"/>
+        </copy>
+        <copy todir="${build}/conf">
+            <fileset dir="${src}/conf"/>
+        </copy>
+    </target>
+    
+    <target name="compile-tests" depends="compile">
+        <javac srcdir="${tests}" destdir="${build}" includes="**/*.java" debug="on">
+            <classpath refid="build.path" />
+        </javac>
+    </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>
 
+    <!-- Create various product distributions and move them to ${dist} -->
 
-       <!-- 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 name="dist-all" depends="compile, test-all, package-all, clean-build" />
+       
+    <target name="package-all">
+        <war warfile="${dist}/${distname}.war" webxml="${configroot}/all.xml" basedir="${approot}" update="no" />
+    </target>
+
+    <target name="dist-IdP" depends="compile, test-IdP, package-IdP, clean-build" />
+    <target name="package-IdP">
+        <war warfile="${dist}/${distname}.war" webxml="${configroot}/origin.xml" basedir="${approot}" update="no" />
+    </target>
+       
+    <target name="dist-IdP-SP" depends="compile, package-IdP-SP, clean-build" 
+       description="Build application from source, create shibboleth.war file for IdP and SP"/>
+    <target name="package-IdP-SP" depends="compile"
+       description="Create shibboleth.war file from build output and IdP-SP deployment descriptor">
+        <war warfile="${dist}/${distname}.war" webxml="${configroot}/IdP-SP.xml" basedir="${approot}" update="no" />
+    </target>
+
+    <target name="dist-wayf" depends="compile, package-wayf, clean-build" />
+    <target name="package-wayf">
+        <war warfile="${dist}/${distname}-wayf.war" webxml="${configroot}/wayf.xml" basedir="${approot}" update="no" />
+    </target>
+
+    <!-- Build utilities -->
+    <target name="build-util" depends="compile">
+        <jar jarfile="${distlibs}/shib-util.jar" basedir="${build}" />
+    </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, clean-util" />
+    <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>
-       <target name="clean-dist">
-               <delete dir="${dist}" />
+    <target name="clean-util">
+        <delete>
+            <fileset dir="${buildlibs}">
+                <include name="shib-util.jar" />
+            </fileset>
+        </delete>
+    </target>
+
+    <!-- Run automated tests on compiled code -->
+    <target name="test-all" depends="test-IdP" />
+    <target name="test-IdP" depends="compile-tests">
+        <junit printsummary="no" fork="yes" haltonfailure="yes" haltonerror="yes" dir="${root}">
+                       <jvmarg value="-Djava.endorsed.dirs=${endorsed}" />
+            <classpath refid="build.path" />
+            <formatter type="plain" />
+            <test name="edu.internet2.middleware.shibboleth.aa.arp.ArpTests" />
+                       <test name="edu.internet2.middleware.shibboleth.aa.attrresolv.ResolverTests" />
+        </junit>
+    </target>
+    
+    <!-- Tomcat Management -->
+    <target name="start" description="Start a deployed webapp using Tomcat manager">
+        <tomcatStop url="${url}" username="${username}" password="${password}" path="/${distname}"/>
+    </target>
+
+    <target name="stop" description="Stop a deployed webapp using Tomcat manager">
+        <tomcatStop url="${url}" username="${username}" password="${password}" path="/${distname}"/>
+    </target>
+
+    <target name="deploy" description="Upload and deploy using Tomcat manager">
+        <tomcatDeploy url="${url}" username="${username}" password="${password}" path="/${distname}"
+               war="file:${basedir}/${dist}/${distname}.war"/>
+    </target>
+
+    <target name="undeploy" description="Undeploy using Tomcat manager">
+        <tomcatUndeploy url="${url}" username="${username}" password="${password}" path="/${distname}"/>
+    </target>
+       
+       <target name="distcopy" description="Copy shibboleth.war to {tomcat.home}/webapps (Tomcat must be stopped first)">
+               <!-- Deploy war file by copy and delete. Tomcat must not be
+                    running when this occurs. --> 
+               <copy file="${dist}/${distname}.war" 
+                       tofile="${tomcat.home}/webapps/${distname}.war" 
+               />
+               <delete dir="${tomcat.home}/webapps/${distname}" quiet="yes" />
        </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>
+    
+    <!-- Automated key generation -->
+       <target name="genSecret" depends="compile">
+       <taskdef name="genSecret" classname="edu.internet2.middleware.shibboleth.utils.HandleRepositorySecretGenerator" classpathref="build.path"/>
+               <genSecret keyStorePath="${appconfig}/handle.jks" keyStorePassword="shibhs" keyStoreKeyAlias="handleKey" keyStoreKeyPassword="shibhs" />
        </target>
 
+    <target name="genSalt" depends="compile">
+        <taskdef name="genSalt" classname="edu.internet2.middleware.shibboleth.utils.HandleRepositorySecretGenerator" classpathref="build.path"/>
+        <genSalt keyStorePath="${appconfig}/persistent.jks" keyStorePassword="shibhs" keyStoreKeyAlias="handleKey" keyStoreKeyPassword="shibhs" />
+    </target>
        
+       <target name="exampleCertificate">
+               <genkey alias="tomcat" storepass="exampleorg"
+                       keystore="${tomcat.home}/conf/example.jks"
+                       keyalg="RSA" validity="365"
+                       dname="cn=shibboleth.example.org, o=example.org, c=US"
+               />
+       </target>
 </project>
-