Generate keystore with generated, self-signed, X.509 credential
[java-idp.git] / build.xml
index 18417f3..af39285 100755 (executable)
--- a/build.xml
+++ b/build.xml
-<!-- Main build configutaion for Shibboleth java components - Walter Hoehn 06/04/2002 -->
-
-<project name="Shibboleth" default="install" 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."/>
-       
-    <!-- antcontrib tasks -->
-    <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${buildlibs}/ant-contrib.jar"/>
-       
-    <!-- Construct the CLASSPATH -->
-    <path id="build.path">
-        <pathelement path="${classpath}" />
-        <pathelement location="${build}" />
-        <fileset dir="${endorsed}">
-            <include name="**/*.jar" />
-        </fileset>
-        <fileset dir="${libdir}">
-            <include name="**/*.jar" />
-        </fileset>
-        <fileset dir="${buildlibs}">
-            <include name="**/*.jar" />
-        </fileset>
-    </path>
+<project name="Shibboleth Identity Provider" basedir="." default="install">
 
-   <path id="test.path">
-      <path refid="build.path"/>
-      <pathelement location="${tests}"/>
-    </path>
+    <!-- User based property file that overrides any property below -->
+    <property file="${user.name}-build.properties" />
 
+    <!-- Project based property file -->
+    <property file="build.properties" />
 
-    <!-- Prepare directory structure for project build-->
-    <target name="init">
-        <mkdir dir="${build}" />
-        <mkdir dir="${dist}" />
-        <var file="build.properties" />
-    </target>
+    <!-- Installation specific property file -->
+    <property file="install.properties" />
 
-    <target name="install.init">
-       <taskdef name="xinput" classname="edu.internet2.middleware.shibboleth.utils.ant.XInput" classpath="${build}"/>
-       <typedef name="xoption" classname="edu.internet2.middleware.shibboleth.utils.ant.XInputOption" classpath="${build}"/>
-    </target>
+    <!-- Load ant-contrib tasks -->
+    <taskdef resource="net/sf/antcontrib/antlib.xml" />
 
+    <!-- Load Internet2 ant extensions -->
+    <taskdef resource="edu/internet2/middleware/ant/antlib.xml" />
 
-    <!-- This target should be run before checking code into the repository -->
-    <target name="pre-checkin" depends="compile, test-all, clean-all" />
+    <!-- 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>
 
-    <!-- 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.4" source="1.4">
-            <classpath refid="build.path" />
-        </javac>
-        <copy todir="${build}/schemas">
-            <fileset dir="${src}/schemas"/>
-        </copy>
-        <!-- configuration is now stored outside of shibboleth.war
-        <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" target="1.4" source="1.4">
-            <classpath refid="build.path" />
-        </javac>
+    <!-- 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-prep-source.dir}" />
+        <mkdir dir="${core-classes.dir}" />
+
+        <copy todir="${core-prep-source.dir}" preservelastmodified="true">
+            <fileset dir="${core-src.dir}" />
+            <filterset begintoken="$" endtoken="$">
+                <filter token="IDP_HOME" value="${idp.home}" />
+                <filter token="IDP_VERSION" value="${version}" />
+            </filterset>
+        </copy>
 
-       <!-- 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>
+        <javac srcdir="${core-prep-source.dir}"
+               destdir="${core-classes.dir}"
+               includes="**/*.java"
+               debug="on"
+               source="1.5">
+            <classpath refid="build-path" />
+        </javac>
 
-    <!-- Create various product distributions and move them to ${dist} -->
+        <delete dir="${core-prep-source.dir}" />
 
-    <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-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>
+    <!-- Compile unit test classes -->
+    <target name="compile-test" depends="compile-core">
+        <mkdir dir="${test-classes.dir}" />
 
-    <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>
+        <javac srcdir="${test-src.dir}" destdir="${test-classes.dir}" includes="**/*.java" debug="on" source="1.5">
+            <classpath refid="test-path" />
+        </javac>
 
-    <!-- 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-util">
-        <delete>
-            <fileset dir="${buildlibs}">
-                <include name="shib-util.jar" />
+    <!-- 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>
-        </delete>
-    </target>
+            <report format="frames" todir="${test-report.dir}" />
+        </junitreport>
 
-    <!-- Run automated tests on compiled code -->
-    <target name="test-all" depends="test-IdP, test-SP" />
-    <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="test.path" />
-            <formatter type="plain" />
-            <test name="edu.internet2.middleware.shibboleth.aa.arp.ArpTests" />
-                       <test name="edu.internet2.middleware.shibboleth.aa.attrresolv.ResolverTests" />
-                       <test name="edu.internet2.middleware.shibboleth.common.CredentialsTests" />
-                       <test name="edu.internet2.middleware.shibboleth.common.provider.NameMapperTests" />
-                       <test name="edu.internet2.middleware.shibboleth.common.TrustTests" />
-                       <test name="edu.internet2.middleware.shibboleth.idp.provider.DNHostNameExtractionTests" />
-                       <test name="edu.internet2.middleware.shibboleth.metadata.MetadataTests" />
-        </junit>
-    </target>
-    <target name="test-SP" depends="compile-tests">
-        <junit printsummary="no" fork="yes" haltonfailure="yes" haltonerror="yes" dir="${root}">
-                       <jvmarg value="-Djava.endorsed.dirs=${endorsed}" />
-            <classpath refid="test.path" />
-            <formatter type="plain" />
-            <test name="edu.internet2.middleware.shibboleth.aap.AAPTests" />
-        </junit>
-    </target>
-    
-    <!-- Tomcat Management -->
-    <target name="setupTomcatTasks">
-       <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"/>
-       </target>
-    
-    <target name="tomcat.start" depends="setupTomcatTasks" description="Start a deployed webapp using Tomcat manager">
-        <tomcatStart url="${tomcat.url}" username="${tomcat.username}" password="${tomcat.password}" path="/${distname}"/>
+        <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>
 
-    <target name="tomcat.stop" depends="setupTomcatTasks" description="Stop a deployed webapp using Tomcat manager">
-        <tomcatStop url="${tomcat.url}" username="${tomcat.username}" password="${tomcat.password}" path="/${distname}"/>
+    <!-- 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>
 
-    <target name="tomcat.deploy" depends="setupTomcatTasks" description="Upload and deploy using Tomcat manager">
-        <tomcatDeploy url="${tomcat.url}" username="${tomcat.username}" password="${tomcat.password}" path="/${distname}"
-               war="file:${basedir}/${dist}/${distname}.war"/>
+    <!-- Removes previously compiled files -->
+    <target name="clean-compile">
+        <delete dir="${build.dir}" />
+        <delete dir="${dist.dir}" />
     </target>
 
-    <target name="tomcat.undeploy" depends="setupTomcatTasks" description="Undeploy using Tomcat manager">
-        <tomcatUndeploy url="${tomcat.url}" username="${tomcat.username}" password="${tomcat.password}" path="/${distname}"/>
-    </target>
-       
-    
-    <!-- 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" />
+    <!-- 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>
-       
-       <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>
-       
-       
-    <!-- Install Shibboleth -->
-    <target name="install" depends="init, install.init" description="Install Shibboleth">
 
-        <if>
-            <xinput type="confirm" defaultvalue="y">Do you want to install the Shibboleth Identity Provider?</xinput>
-            <then>
-                <antcall target="install.idp" />
-            </then>
-        </if>
-    </target>
+    <!-- Create JAR file -->
+    <target name="package" depends="compile-core" description="Creates the project library jar file.">
+        <mkdir dir="${dist.dir}" />
+
+        <jar destfile="${dist.dir}/${jar.name}" whenempty="fail">
+            <fileset dir="${classpathres.dir}" />
+            <zipfileset dir="${metainf.dir}" prefix="META-INF/" />
+            <zipfileset dir="${core-classes.dir}" />
+        </jar>
 
-       <target name="install.idp" depends="init, install.init">
-        <xinput message="Deploying java web application.  Do you want to install it directly onto the filesystem or use the tomcat manager application?" 
-            addproperty="idp.install-type" type="menu" casesensitive="no">
-            <xoption>filesystem</xoption>
-            <xoption>manager</xoption>
-        </xinput>
-        
-        <antcall target="install.idp.${idp.install-type}" />
     </target>
 
-    <target name="install.idp.filesystem" depends="init, install.init">
-        
-        <input message="Enter Shibboleth install directory [default: ${shib.home}]"
-            addproperty="shib.home.input" defaultvalue="${shib.home}" />
-        <var name="shib.home" value="${shib.home.input}" />
-
-        <input message="Enter tomcat home directory [default: ${tomcat.home}]"
-            addproperty="tomcat.home.input" defaultvalue="${tomcat.home}" />
-        <var name="tomcat.home" value="${tomcat.home.input}" />
-        
-        <copy file="${configroot}/idp.xml.dist" tofile="${configroot}/idp.xml" overwrite="true" />
-        <replace file="${configroot}/idp.xml" token="$SHIB_HOME$" value="${shib.home}" />
-        <war warfile="${dist}/${distname}.war" webxml="${configroot}/idp.xml" basedir="${approot}" update="no" />
-        <copy file="${dist}/${distname}.war" tofile="${tomcat.home}/webapps/${distname}.war" />
+    <target name="install" description="Installs the identity provider software.">
+        <input message="Is this a new installation? Answering yes will overwrite your current configuration. [yes|no]"
+               addproperty="new.install"
+               defaultvalue="no" />
 
         <if>
-            <available file="${shib.home}" />
+            <equals arg1="${new.install}" arg2="yes" />
             <then>
-                <if>
-                    <xinput type="confirm">The directory `${shib.home}` already exists.  Do you want to overwrite the existing configuration?</xinput>
-                    <then>
-                        <delete dir="${shib.home}/etc" />
-                        <antcall target="install.idp.filesystem.config" />
-                    </then>
-                </if>
+                <input message="Where should the Shibboleth Identity Provider software be installed? [default: ${idp.home}]"
+                       addproperty="idp.home.input"
+                       defaultvalue="${idp.home}" />
+                <var name="idp.home" value="${idp.home.input}" />
+
+                <input message="What is the hostname of the Shibboleth Identity Provider server? [default: ${idp.hostname}]"
+                       addproperty="idp.hostname.input"
+                       defaultvalue="${idp.hostname}" />
+                <var name="idp.hostname" value="${idp.hostname.input}" />
+                
+                <input message="A keystore is about to be generated for you. Please enter a password that will be used to protect it."
+                       addproperty="idp.keystore.pass" />
+
+                <propertyfile file="install.properties">
+                    <entry key="idp.home" value="${idp.home.input}" />
+                    <entry key="idp.hostname" value="${idp.hostname.input}" />
+                </propertyfile>
+
+                <mkdir dir="${idp.home}" />
+                <mkdir dir="${idp.home}/bin" />
+                <mkdir dir="${idp.home}/conf" />
+                <mkdir dir="${idp.home}/credentials" />
+                <mkdir dir="${idp.home}/lib" />
+                <mkdir dir="${idp.home}/logs" />
+                <mkdir dir="${idp.home}/metadata" />
+                <mkdir dir="${idp.home}/war" />
+
+                <var name="idp.entity.id" value="https://${idp.hostname}/idp/shibboleth" />
+
+                <regexSplit input="${idp.hostname}" regex="^.*\.(.*\..*$)" addproperty="idp.scope" />
+
+                <echo message="Generating signing and encryption key, certificate, and keystore. " />
+                <selfSignedCert hostname="${idp.hostname}"
+                                privateKeyFile="${idp.home}/credentials/idp.key"
+                                certificateFile="${idp.home}/credentials/idp.crt"
+                                keystoreFile="${idp.home}/credentials/idp.crt"
+                                keystorePassword="${idp.keystore.pass}" />
+
+                <copy todir="${idp.home}/bin" preservelastmodified="true">
+                    <fileset dir="${tools.dir}" />
+                    <filterset begintoken="$" endtoken="$">
+                        <filter token="IDP_HOME" value="${idp.home}" />
+                        <filter token="IDP_VERSION" value="${version}" />
+                    </filterset>
+                </copy>
+                <chmod file="${idp.home}/bin/*.sh" perm="+x" />
+
+                <copy todir="${idp.home}/conf" preservelastmodified="true" overwrite="true">
+                    <fileset dir="${conf.dir}" />
+                    <filterset begintoken="$" endtoken="$">
+                        <filter token="IDP_HOME" value="${idp.home}" />
+                        <filter token="IDP_VERSION" value="${version}" />
+                        <filter token="IDP_ENTITY_ID" value="${idp.entity.id}" />
+                        <filter token="IDP_SCOPE" value="${idp.scope}" />
+                        <filter token="IDP_CERTIFICATE" value="${idp.cert}" />
+                        <filter token="IDP_HOSTNAME" value="${idp.hostname}" />
+                    </filterset>
+                </copy>
+
+                <stringFromFile input="${idp.home}/credentials/idp.crt" addProperty="idp.cert" />
+                <regexSplit input="${idp.cert}"
+                            regex="\A.*-----\s((?:.*\s)*)-----END.*\Z"
+                            addproperty="idp.metadata.cert" />
+                <copy todir="${idp.home}/metadata" preservelastmodified="true" overwrite="true">
+                    <fileset dir="${metadata.dir}" />
+                    <filterset begintoken="$" endtoken="$">
+                        <filter token="IDP_ENTITY_ID" value="${idp.entity.id}" />
+                        <filter token="IDP_SCOPE" value="${idp.scope}" />
+                        <filter token="IDP_CERTIFICATE" value="${idp.metadata.cert}" />
+                        <filter token="IDP_HOSTNAME" value="${idp.hostname}" />
+                    </filterset>
+                </copy>
             </then>
-            <else>
-                <antcall target="install.idp.filesystem.config" />
-            </else>
         </if>
 
-        <antcall target="savePropertyFile" />
-    </target>
+        <copy todir="${idp.home}/lib" preservelastmodified="true">
+            <fileset dir="${lib.dir}" />
+            <fileset file="${dist.dir}/${jar.name}" />
+            <fileset file="${build-lib.dir}/servlet-2.4.jar" />
+        </copy>
 
-       <target name="install.idp.filesystem.config" depends="init, install.init">
-        <mkdir dir="${shib.home}/etc" />
-        <copy todir="${shib.home}/etc" overwrite="true">
-            <fileset dir="${src}/conf" />
+        <copy todir="${webinf-temp.dir}">
+            <fileset dir="${webinf.dir}" />
+            <filterset begintoken="$" endtoken="$">
+                <filter token="IDP_HOME" value="${idp.home}" />
+                <filter token="IDP_VERSION" value="${version}" />
+            </filterset>
         </copy>
-        <replace file="${shib.home}/etc/idp.xml" token="$SHIB_HOME$" value="${shib.home}" />
-    </target>
 
-       <target name="install.idp.manager" depends="init, install.init">
-        <antcall target="setupTomcatTasks" />
-        
-        <input message="Enter local tomcat directory [default: ${tomcat.home}]" addproperty="tomcat.home.input" defaultValue="${tomcat.home}" />
-        <var name="tomcat.home" value="${tomcat.home.input}" />
-        
-        <input message="Enter tomcat url [default: ${tomcat.url}]" addproperty="tomcat.url.input" defaultValue="${tomcat.url}" />
-        <var name="tomcat.url" value="${tomcat.url.input}" />
-        
-        <input message="Enter tomcat username [default: ${tomcat.username}]" addproperty="tomcat.username.input" defaultValue="${tomcat.username}" />
-        <var name="tomcat.username" value="${tomcat.username.input}" />
-        
-        <input message="Enter tomcat password [default: ${tomcat.password}]" addproperty="tomcat.password.input" defaultValue="${tomcat.password}" />
-        <var name="tomcat.password" value="${tomcat.password.input}" />
-        
-        <antcall target="tomcat.deploy" />
-        <antcall target="savePropertyFile" />
+        <jar destfile="${idp.home}/war/${war.name}" whenempty="fail">
+            <zipfileset dir="${webinf-temp.dir}" prefix="WEB-INF/" />
+            <zipfileset dir="${webpages.dir}" prefix="" />
+            <zipfileset dir="${lib.dir}" prefix="WEB-INF/lib/" />
+            <zipfileset file="${dist.dir}/${jar.name}" prefix="WEB-INF/lib/" />
+        </jar>
     </target>
 
-    <target name="savePropertyFile">
-        <propertyfile file="build.properties">
-            <entry key="shib.home" value="${shib.home}" />
-            <entry key="tomcat.home" value="${tomcat.home}" />
-            <entry key="tomcat.url" value="${tomcat.url}" />
-            <entry key="tomcat.username" value="${tomcat.username}" />
-            <entry key="tomcat.password" value="${tomcat.password}" />
-        </propertyfile>
+
+    <!-- **************************************************************** -->
+    <!-- ***                                                          *** -->
+    <!-- ***                     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>