Fixed a bug caused by recent class moves.

[java-idp.git] / build.xml

diff --git a/build.xml b/build.xml
index ae05261..e3629d0 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -19,7 +19,7 @@
     <property name="docs" value="${root}/doc/" />
     <property name="javadocs" value="${docs}/api/" />
 
-    <property name="year" value="2002"/>
+    <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 -->
@@ -64,8 +64,10 @@
 
 
     <!-- Compile classes and move them to ${build} -->
-    <target name="compile" depends="init">
-        <javac srcdir="${src}" destdir="${build}" includes="**/*.java" debug="on">
+    <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">
@@ -109,8 +111,10 @@
         <war warfile="${dist}/${distname}.war" webxml="${configroot}/origin.xml" basedir="${approot}" update="no" />
     </target>
        
-    <target name="dist-IdP-SP" depends="compile, test-IdP, package-IdP-SP, clean-build" />
-    <target name="package-IdP-SP">
+    <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>
 
@@ -181,6 +185,16 @@
     <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>
+       
     
     <!-- Automated key generation -->
        <target name="genSecret" depends="compile">
@@ -192,4 +206,12 @@
         <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>