/build.xml - Annotate - Metacat - Ecoinformatics Redmine

metacat/build.xml @ 6184

-            jones
+<?xml version="1.0"?>
-            berkley
+<!--
-            daigle
+	*   '$RCSfile$'
 	*     Authors: Matt Jones, Chad Berkley, Jivka Bojilova
 	*   Copyright: 2000 Regents of the University of California and the
 	*              National Center for Ecological Analysis and Synthesis
 	* For Details: http://www.nceas.ucsb.edu/
+	*
 	*    '$Author$'
 	*    '$Date$'
 	*    '$Revision$'
+	*
 	* Build file for the Ant cross-platform build system for metacat
 	* See http://jakarta.apache.org for details on Ant
+	*
 	* usage: ant [compile|jar|install|jdoc]
+	*
 	* This program is free software; you can redistribute it and/or modify
 	* it under the terms of the GNU General Public License as published by
 	* the Free Software Foundation; either version 2 of the License, or
 	* (at your option) any later version.
+	*
 	* This program is distributed in the hope that it will be useful,
 	* but WITHOUT ANY WARRANTY; without even the implied warranty of
 	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	* GNU General Public License for more details.
+	*
 	* You should have received a copy of the GNU General Public License
 	* along with this program; if not, write to the Free Software
 	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-            berkley
+-->
-            jones
+<project name="metacat" default="jar" basedir="."
          xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-            daigle
+	<property environment="env" />
 	<property file="build.properties" /><!-- USER SPECIFIC PROPS -->
             perry
             tao
-            jones
+    <!-- Configure the maven2 ant tasks -->
     <path id="maven-ant-tasks.classpath" path="lib/maven-ant-tasks-2.1.0.jar" />
     <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
              uri="antlib:org.apache.maven.artifact.ant"
              classpathref="maven-ant-tasks.classpath" />
             tao
-            leinfelder
+	<!-- defining the axis tasks -->
 	<path id="axis.ant.classpath">
 		<fileset dir="lib/lsid_lib">
 			<include name="*.jar" />
 		</fileset>
 	</path>
             cjones
-            leinfelder
+	<taskdef resource="axis-tasks.properties"
 		classpathref="axis.ant.classpath" />
-            daigle
+	<!-- Determine if ecogrid should be installed-->
 	<condition property="enable.ecogrid">
 		<equals arg1="${install.ecogrid}" arg2="true" />
 	</condition>
             perry
-            daigle
+	<!-- Determine if perl should be built-->
 	<condition property="build.perl">
 		<equals arg1="${make.perl.code}" arg2="true" />
 	</condition>
             perry
-            jones
+	<!-- Determine if dataone-service should be built-->
 	<condition property="d1.available">
         <and>
 	        <available file="${d1.dir}"/>
 	        <available file="${maven.home}"/>
         </and>
 	</condition>
-            daigle
+	<available file="${build.tomcat.dir}/common/lib/servlet-api.jar"
 			property="tomcat.common.exists" />
             jones
-            daigle
+	<target name="config" depends="setTomcatCommon, setTomcatNoCommon">
-            daigle
+		<!-- usr for client testing, generally you don't need change-->
 		<property name="mcuser"
 			value="uid=kepler,o=unaffiliated,dc=ecoinformatics,dc=org" />
 		<property name="mcpassword" value="kepler" />
 		<property name="mcanotheruser"
 			value="uid=tao,o=NCEAS,dc=ecoinformatics,dc=org" />
 		<property name="mcanotherpassword" value="yourpass" />
 		<property name="piscouser"
 			value="uid=tao,o=PISCO,dc=ecoinformatics,dc=org" />
 		<property name="piscopassword" value="yourpass" />
 		<property name="lteruser"
 			value="uid=jtao,o=LTER,dc=ecoinformatics,dc=org" />
 		<property name="lterpassword" value="yourpass" />
             costa
-            daigle
+		<property name="debug" value="on" />
 		<property name="morphosourcedir" value="../morpho" />
 		<property name="utilitiesdir" value="../utilities" />
 		<property name="installdir"
 			value="${app.deploy.dir}/${metacat.context}" />
             brooke
-            daigle
+		<echo>*********** set jsdk to ${jsdk}</echo>
 	</target>
             daigle
 	<target name="setTomcatCommon" if="tomcat.common.exists" >
 		<property name="jsdk"
 			value="${build.tomcat.dir}/common/lib/servlet-api.jar" />
 	</target>
 	<target name="setTomcatNoCommon" unless="tomcat.common.exists" >
 		<property name="jsdk"
 			value="${build.tomcat.dir}/lib/servlet-api.jar" />
 	</target>
-            daigle
+	<target name="init" depends="config">
 		<path id="compile.classpath">
 			<pathelement location="${jsdk}" />
 			<pathelement location="lib" />
 			<fileset dir="lib">
 				<include name="*.jar" />
 			</fileset>
 			<fileset dir="lib">
 				<include name="xalan.jar" />
 			</fileset>
 			<fileset dir="lib/lsid_lib">
 				<include name="*.jar" />
 			</fileset>
             sgarg
-            daigle
+			<!-- Include geoserver, geotools, et. al. -->
 			<fileset dir="lib/spatial/geoserver/WEB-INF/lib">
 				<include name="*.jar" />
 			</fileset>
             tao
-            daigle
+			<!-- Include OAI-PMH -->
 			<fileset dir="lib/oaipmh">
 				<include name="*.jar" />
 			</fileset>
             jones
-            daigle
+		</path>
             daigle
 		<path id="test.classpath">
 			<pathelement location="${jsdk}" />
 			<pathelement location="lib" />
 			<fileset dir="lib">
 				<include name="*.jar" />
 				<exclude name="maven-ant-tasks-2.1.0.jar" />
 			</fileset>
 			<fileset dir="lib">
 				<include name="xalan.jar" />
 			</fileset>
 			<fileset dir="lib/lsid_lib">
 				<include name="*.jar" />
 			</fileset>
             jones
-            daigle
+			<!-- Include geoserver, geotools, et. al. -->
 			<fileset dir="lib/spatial/geoserver/WEB-INF/lib">
 				<include name="*.jar" />
 			</fileset>
             leinfelder
             daigle
 			<!-- Include OAI-PMH -->
 			<fileset dir="lib/oaipmh">
 				<include name="*.jar" />
 			</fileset>
 		</path>
-            daigle
+		<!-- It is less likely you'll need to make any changes from here down,
 			but customization is possible -->
 		<property name="name" value="metacat" />
 		<property name="Name" value="MetaCat" />
 		<property name="debugprefix" value="${Name}:" />
 		<property name="release" value="${metacat.version}" />
 		<property name="style-common-relpath" value="/style/common" />
 		<property name="style-shared-relpath" value="/style/shared" />
 		<property name="schema-relpath" value="/schema" />
 		<property name="style-common-cvsrelpath"
 			value="lib${style-common-relpath}" />
 		<property name="schema-cvsrelpath" value="lib${schema-relpath}" />
 		<property name="style-skins-relpath" value="/style/skins" />
 		<property name="util-module" value="utilities" />
-            leinfelder
+		<!-- property name="utilities-tag" value="trunk" / -->
-            jones
+		<property name="utilities-tag" value="tags/UTILITIES_1_1_0_RC2" />
-            leinfelder
+		<property name="seek-tag" value="tags/ECOGRID_1_2_2_RC3" />
-            daigle
+		<property name="eml-module" value="eml" />
 		<property name="eml-version" value="2.0.0beta6" />
 		<property name="eml-beta-tag"
 			value="BRANCH_EML_2_0_0_BETA_6_FOR_METACAT" />
 		<property name="eml2_0_0-schema-tag"
 			value="RELEASE_EML_2_0_0_UPDATE_1" />
 		<property name="eml2_0_1-schema-tag" value="RELEASE_EML_2_0_1" />
 		<property name="eml2_1_0-schema-tag" value="RELEASE_EML_2_1_0" />
-            leinfelder
+		<property name="eml2_1_1-schema-tag" value="RELEASE_EML_2_1_1_RC_2" />
-            cjones
+		<property name="dataone-schema-tag" value="D1_SCHEMA_0_6_2" />
-            leinfelder
+		<property name="eml2-style-tag" value="RELEASE_EML_UTILS_1_0_0_RC12" />
-            daigle
+		<property name="eml2_0_0namespace"
 			value="eml://ecoinformatics.org/eml-2.0.0" />
 		<property name="eml2_0_1namespace"
 			value="eml://ecoinformatics.org/eml-2.0.1" />
 		<property name="eml2_1_0namespace"
 			value="eml://ecoinformatics.org/eml-2.1.0" />
-            leinfelder
+		<property name="eml2_1_1namespace"
 			value="eml://ecoinformatics.org/eml-2.1.1" />
-            daigle
+		<property name="stmmlnamespace"
 			value="http://www.xml-cml.org/schema/stmml" />
 		<property name="eml-css" value="eml_xsl.css" />
 		<property name="eml-module.default.css" value="default.css" />
 		<property name="systemidserver" value="" />
 		<property name="html-path" value="" />
-            tao
+		<property name ="metacat-properties-file" value="build/war/WEB-INF/metacat.properties"/>
             berkley
             jones
-            daigle
+		<!-- Config for registry variables -->
 		<!-- TODO: SCW remove these, covered in metacat.properties or in skin.properties -->
 		<property name="scope" value="obfs" />
 		<property name="responseForm" value="genericResponse.tmpl" />
 		<property name="entryForm" value="entryForm.tmpl" />
 		<property name="guide" value="genericGuide.tmpl" />
 		<property name="loginForm" value="loginForm.tmpl" />
 		<property name="confirmData" value="confirmData.tmpl" />
 		<property name="deleteData" value="deleteData.tmpl" />
 		<property name="genericHeader" value="genericHeader.tmpl" />
 		<property name="genericFooter" value="genericFooter.tmpl" />
             jones
-            daigle
+		<filter token="scope" value="${scope}" />
 		<filter token="responseForm" value="${responseForm}" />
 		<filter token="entryForm" value="${entryForm}" />
 		<filter token="guide" value="${guide}" />
 		<filter token="loginForm" value="${loginForm}" />
 		<filter token="confirmData" value="${confirmData}" />
 		<filter token="deleteData" value="${deleteData}" />
 		<filter token="genericHeader" value="${genericHeader}" />
 		<filter token="genericFooter" value="${genericFooter}" />
 		<filter token="adminname" value="${adminname}" />
 		<filter token="recipient" value="${recipient}" />
 		<filter token="metacatVersion" value="${metacat.version}" />
 		<filter token="metacatRC" value="${metacat.releaseCandidate}" />
 		<filter token="build.context" value="${metacat.context}" />
 		<filter token="docrooturl" value="./" />
 		<filter token="mcuser" value="${mcuser}" />
 		<filter token="mcpassword" value="${mcpassword}" />
 		<filter token="mcanotheruser" value="${mcanotheruser}" />
 		<filter token="mcanotherpassword" value="${mcanotherpassword}" />
 		<filter token="eml-css" value="${eml-css}" />
 		<filter token="style-skins-relpath"
 			value="${style-skins-relpath}" />
 		<filter token="style-common-relpath"
 			value="${style-common-relpath}" />
 		<filter token="eml-version" value="${eml-version}" />
 		<filter token="eml2_0_0namespace" value="${eml2_0_0namespace}" />
 		<filter token="eml2_0_1namespace" value="${eml2_0_1namespace}" />
 		<filter token="eml2_1_0namespace" value="${eml2_1_0namespace}" />
-            leinfelder
+		<filter token="eml2_1_1namespace" value="${eml2_1_1namespace}" />
-            daigle
+		<filter token="stmmlnamespace" value="${stmmlnamespace}" />
 		<filter token="debugprefix" value="${debugprefix}" />
 		<filter token="defaultStage" value="${defaultStage}" />
 		<filter token="defaultHeader" value="${defaultHeader}" />
 		<filter token="defaultFooter" value="${defaultFooter}" />
 		<filter token="defaultChangePass" value="${defaultChangePass}" />
 		<filter token="defaultResetPass" value="${defaultResetPass}" />
 		<filter token="changePassSuccess" value="${changePassSuccess}" />
 		<filter token="resetPassSuccess" value="${resetPassSuccess}" />
 		<filter token="registerFailed" value="${registerFailed}" />
 		<filter token="registerLter" value="${registerLter}" />
 		<filter token="registerMatch" value="${registerMatch}" />
 		<filter token="registerSuccess" value="${registerSuccess}" />
 		<filter token="register" value="${register}" />
 		<filter token="searchResults" value="${searchResults}" />
 		<filter token="ldapMainServerFailure"
 			value="${ldapMainServerFailure}" />
 		<filter token="lter-user" value="${lteruser}" />
 		<filter token="lter-pass" value="${lterpassword}" />
 		<filter token="pisco-user" value="${piscouser}" />
 		<filter token="pisco-pass" value="${piscopassword}" />
 		<!-- MCD BYE filter token="timedreplication"     value="${timedreplication}" / -->
 		<!-- MCD BYE filter token="firsttimedreplication" value="${firsttimedreplication}" / -->
 		<!-- MCD BYE filter token="timedreplicationinterval" value="${timedreplicationinterval}" / -->
 		<property name="srcdir" value="./src" />
 		<property name="lib.dir" value="./lib" />
 		<property name="docdir" value="./docs" />
 		<property name="cgidir" value="./cgi-bin" />
 		<property name="testdir" value="./test" />
-            leinfelder
+		<property name="testtorun" value="CrudServiceTest" />
-            daigle
+		<property name="junittestsdir"
 			value="./test/edu/ucsb/nceas/metacattest" />
 		<property name="junitnettestsdir"
 			value="./test/edu/ucsb/nceas/metacatnettest" />
 		<property name="build.dir" value="./build" />
 		<property name="build.src" value="${build.dir}/src" />
 		<property name="build.dest" value="${build.dir}/classes" />
 		<property name="build.samples" value="${build.dir}/samples" />
 		<property name="build.tests" value="${build.dir}/tests" />
 		<property name="build.tmp" value="${build.dir}/tmp" />
 		<property name="build.metacattest"
 			value="${build.tests}/metacattest" />
 		<property name="build.metacatnettest"
 			value="${build.tests}/metacatnettest" />
 		<property name="build.data" value="${build.dir}/data" />
 		<property name="build.javadocs" value="${build.dir}/docs/api" />
 		<property name="build.war" value="${build.dir}/war" />
 		<property name="dist.dir" value="dist" />
 		<property name="ver.dir" value="${dist.dir}/${name}-${release}" />
 		<property name="ver.src" value="${ver.dir}/src" />
 		<property name="util.dir" value="${dist.dir}/${util-module}" />
 		<property name="test.dir" value="${dist.dir}/test" />
 		<!-- directories for creating a Harvest List Editor distribution -->
 		<property name="dist.dir.hle" value="disthle" />
 		<property name="ver.dir.hle"
 			value="${dist.dir.hle}/harvest-list-editor-${release}" />
 		<property name="pkg.dir" value="./package" />
 		<property name="deb.pkg.dir" value="${pkg.dir}/debian" />
 		<property name="ecogrid-target-name" value="metacatImpl" />
 		<property name="ecogrid-module-dest-dir" value=".." />
 		<property name="ecogrid-module" value="seek/projects/ecogrid" />
 		<property name="ecogrid-dist-dir"
 			value="${dist.dir}/${ecogrid-module}" />
 		<property name="ecogrid-dir"
 			value="${ecogrid-module-dest-dir}/${ecogrid-module}" />
 		<property name="package.home" value="edu/ucsb/nceas/metacat" />
 		<!-- set up svn -->
 		<property name="svnant.lib" value="lib" />
 		<property name="svnant.jar" value="${svnant.lib}/svnant.jar" />
 		<property name="svnClientAdapter.jar"
 			value="${svnant.lib}/svnClientAdapter.jar" />
 		<property name="svnjavahl.jar"
 			value="${svnant.lib}/svnjavahl.jar" />
 		<property name="svn.utilitiesUrl"
-            daigle
+			value="https://code.ecoinformatics.org/code/utilities/${utilities-tag}" />
-            daigle
+		<property name="svn.ecogridUrl"
-            leinfelder
+			value="https://code.ecoinformatics.org/code/seek/${seek-tag}/projects/ecogrid/" />
-            daigle
+		<property name="svn.emlBetaUrl"
 			value="https://code.ecoinformatics.org/code/eml/branches/${eml-beta-tag}" />
 		<property name="svn.eml200SchemaUrl"
 			value="https://code.ecoinformatics.org/code/eml/tags/${eml2_0_0-schema-tag}" />
 		<property name="svn.eml201SchemaUrl"
 			value="https://code.ecoinformatics.org/code/eml/tags/${eml2_0_1-schema-tag}" />
 		<property name="svn.eml210SchemaUrl"
 			value="https://code.ecoinformatics.org/code/eml/tags/${eml2_1_0-schema-tag}" />
-            leinfelder
+		<property name="svn.eml211SchemaUrl"
 			value="https://code.ecoinformatics.org/code/eml/tags/${eml2_1_1-schema-tag}" />
-            jones
+		<property name="svn.dataone-0.1-schema-url"
-            jones
+			value="https://repository.dataone.org/software/cicore/branches/${dataone-schema-tag}" />
-            daigle
+		<property name="svn.eml2StyleUrl"
 			value="https://code.ecoinformatics.org/code/eml/tags/${eml2-style-tag}" />
             daigle
 		<!-- load the svn task -->
 		<path id="svn.classpath">
 			<pathelement location="${svnjavahl.jar}" />
 			<pathelement location="${svnant.jar}" />
 			<pathelement location="${svnClientAdapter.jar}" />
 		</path>
 		<taskdef resource="svntask.properties"
 			classpathref="svn.classpath" />
 		<condition property="utilities.required">
 			<or>
 				<not>
 					<available file="lib/utilities.jar" />
 				</not>
 				<not>
 					<available file="${utilitiesdir}" type="dir" />
 				</not>
 			</or>
 		</condition>
 		<!-- peer.utilities.required is used when there is no utilities
 			directory at ${utilitiesdir} -->
 		<condition property="peer.utilities.required">
 			<or>
 				<not>
 					<available file="${utilitiesdir}" type="dir" />
 				</not>
 			</or>
 		</condition>
 		<condition property="eml.required">
 			<or>
 				<not>
 					<available file="lib/schema/eml-2.0.1/eml.xsd" />
 				</not>
 				<not>
 					<available file="lib/schema/eml-2.0.0/eml.xsd" />
 				</not>
 				<not>
 					<available file="lib/schema/eml-2.1.0/eml.xsd" />
 				</not>
 				<not>
 					<available
 						file="lib/dtd/eml-dataset-2.0.0beta6.dtd" />
 				</not>
 			</or>
 		</condition>
 		<condition property="ecogrid.required">
 			<or>
 				<not>
 					<available file="${ecogrid-dir}/build.properties" />
 				</not>
 				<not>
 					<available
 						file="${ecogrid-dir}/buildfiles/metacatImpl.xml" />
 				</not>
 			</or>
 		</condition>
 	</target>
 	<target name="prepare" depends="init">
 		<mkdir dir="${build.dir}" />
 		<mkdir dir="${build.src}" />
 		<mkdir dir="${build.dest}" />
 		<mkdir dir="${build.javadocs}" />
 		<mkdir dir="${build.tmp}" />
 		<copy todir="${build.src}" filtering="yes">
 			<fileset dir="${srcdir}">
 				<include name="edu/**" />
 				<include name="com/**" />
 				<include name="org/**" />
 				<!-- include name="java/**" / -->
 				<include name="**/*.sql" />
 				<exclude name="**/CVS*" />
 				<exclude name="**/.#*" />
-            daigle
+				<exclude name="edu/ucsb/nceas/workflowscheduler/**" />
-            daigle
+			</fileset>
 		</copy>
 		<available file="lib/style/common/emlb6toeml2" type="dir"
 			property="styles.not.needed" />
 	</target>
-            leinfelder
+	<target name="generateStubs" depends="prepare">
-            daigle
+		<echo
 			message=" Generating stubs for execution service from ${/tmp/KeplerWebService.wsdl}" />
 		<axis-wsdl2java verbose="true" output="${srcdir}"
 			url="/tmp/KeplerWebService.wsdl" />
-            leinfelder
+	</target>
             brooke
-            jones
+	<target name="compile" depends="dataone-service,prepare,utilities"
-            daigle
+		description="Compiles java code to build dir, and copies metacat props files there">
             jones
-            daigle
+		<javac srcdir="${build.src}" destdir="${build.dest}"
 			debug="${debug}"
-            leinfelder
+			excludes="**/*.sql **/client/*.java **/harvesterClient/*.java">
-            daigle
+			<classpath>
 				<path refid="compile.classpath" />
 			</classpath>
 		</javac>
 	</target>
             brooke
-            jones
+	<target name="jar" depends="compile,geteml,getd1schemas"
-            daigle
+		description="Compiles and jars metacat java code to metacat.jar in build dir ">
             berkley
-            daigle
+		<delete file="${build.dir}/${name}.jar" />
 		<jar jarfile="${build.dir}/${name}.jar" basedir="${build.dest}"
 			excludes="**/protocols/ **/harvesterClient/" />
 	</target>
             jones
-            daigle
+	<target name="protocol" depends="compile"
 		description="Compiles and jars protocol java code to protocol.jar in build dir">
 		<delete file="${build.dir}/protocol.jar" />
 		<jar jarfile="${build.dir}/protocol.jar" basedir="${build.dest}"
 			includes="**/protocols/" />
 	</target>
             daigle
-            daigle
+	<target name="utilities" depends="config,getpeerutilities"
 		if="utilities.required">
 		<ant dir="${utilitiesdir}" target="clean" inheritAll="false" />
 		<ant dir="${utilitiesdir}" target="jar" inheritAll="false" />
 		<copy file="${utilitiesdir}/build/utilities.jar" todir="lib" />
 	</target>
             jones
-            daigle
+	<target name="getpeerutilities" depends="prepare"
 		if="peer.utilities.required"
 		description="Checks utilities out of svn and copies it to your utilitiesdir if it does not already exist">
-            daigle
+		<echo message="Exporting utilities files from svn repository:" />
-            daigle
+		<svn>
 			<export srcUrl="${svn.utilitiesUrl}"
 				destPath="${utilitiesdir}" />
 		</svn>
             sgarg
-            daigle
+		<!--  ant dir="${utilitiesdir}" inheritAll="false"  target="dist" / -->
 	</target>
             jones
-            daigle
+	<target name="getutilities" depends="prepare"
-            daigle
+		description="Checks utility out of svn and copies it to your metacat sandbox">
-            daigle
+		<svn>
 			<export srcUrl="${svn.utilitiesUrl}"
-            leinfelder
+				destPath="${utilitiesdir}" force="true" />
-            daigle
+		</svn>
-            daigle
+	</target>
             jones
-            daigle
+	<target name="client" depends="utilities, prepare"
 		description="Compiles metacat-client java code to build dir">
 		<javac srcdir="${build.src}" destdir="${build.dest}"
 			includes="edu/ucsb/nceas/metacat/client/*">
 			<classpath>
 				<path refid="compile.classpath" />
 			</classpath>
 		</javac>
 	</target>
             costa
-            daigle
+	<target name="clientjar" depends="client"
 		description="Compiles and jars metacat-client java code to metacat-client.jar in build dir">
 		<delete file="${build.dir}/${name}-client.jar" />
 		<jar jarfile="${build.dir}/${name}-client.jar"
 			basedir="${build.dest}" includes="**/metacat/client/" />
 	</target>
             costa
-            daigle
+	<target name="advancedsearchjar" depends="compile"
 		description="Compiles and jars advanced search Java code to advancedsearch.jar in build dir">
 		<delete file="${build.dir}/advancedsearch.jar" />
 		<jar jarfile="${build.dir}/advancedsearch.jar"
 			basedir="${build.dest}" includes="**/metacat/advancedsearch/" />
 	</target>
             costa
-            daigle
+	<target name="harvester" depends="client"
 		description="Compiles harvester java code to build dir">
 		<javac srcdir="${build.src}" destdir="${build.dest}"
 			includes="edu/ucsb/nceas/metacat/harvesterClient/*">
 			<classpath>
 				<path refid="compile.classpath" />
 			</classpath>
 		</javac>
 	</target>
             cjones
-            daigle
+	<target name="harvesterjar" depends="harvester"
 		description="Compiles and jars harvester java code to harvester.jar in build dir">
 		<delete file="${build.dir}/harvester.jar" />
 		<jar jarfile="${build.dir}/harvester.jar"
 			basedir="${build.dest}" includes="**/metacat/harvesterClient/" />
 	</target>
             sgarg
-            daigle
+	<target name="harvestListEditorDist" depends="harvesterjar"
 		description="Prepares a distribution of the Harvest List Editor tool">
 		<mkdir dir="${dist.dir.hle}" />
 		<delete dir="${ver.dir.hle}" />
 		<mkdir dir="${ver.dir.hle}" />
 		<copy todir="${ver.dir.hle}" file="${build.dir}/harvester.jar" />
 		<copy todir="${ver.dir.hle}" file="lib/xercesImpl.jar" />
 		<copy todir="${ver.dir.hle}"
 			file="lib/harvester/harvestList.xsd" />
 		<copy todir="${ver.dir.hle}"
 			file="lib/harvester/harvestListEditor.bat" />
 		<copy todir="${ver.dir.hle}"
 			file="lib/harvester/harvestListEditor.sh" />
 		<delete file="./harvest-list-editor-${release}.zip" />
 		<zip zipfile="./harvest-list-editor-${release}.zip"
 			basedir="${ver.dir.hle}" />
 		<delete file="./harvest-list-editor-${release}.tar.gz" />
 		<tar tarfile="./harvest-list-editor-${release}.tar"
 			basedir="${ver.dir.hle}" />
 		<gzip zipfile="./harvest-list-editor-${release}.tar.gz"
 			src="./harvest-list-editor-${release}.tar" />
 		<delete file="./harvest-list-editor-${release}.tar" />
 	</target>
             brooke
-            daigle
+	<target name="geteml" depends="getemlpre2,geteml2+,getConversionXSL"
 		if="eml.required" description="Calls getemlpre2 and geteml2+ targets" />
             tao
-            daigle
+	<target name="getemlpre2" depends="prepare" if="eml.required"
-            daigle
+		description="Checks EML-beta6 out of svn and copies dtds and xsl to your metacat sandbox">
 		<svn>
 			<export srcUrl="${svn.emlBetaUrl}"
 				destPath="${build.tmp}/eml_${eml-beta-tag}" />
 		</svn>
-            daigle
+		<mkdir dir="lib/dtd" />
 		<copy todir="lib/dtd" filtering="yes">
 			<fileset
-            daigle
+				dir="${build.tmp}/eml_${eml-beta-tag}">
-            daigle
+				<include name="*.dtd" />
 			</fileset>
 			<mapper type="glob" from="eml-*.dtd"
 				to="eml-*-${eml-version}.dtd" />
 		</copy>
             tao
-            daigle
+		<copy todir="${style-common-cvsrelpath}" filtering="yes">
 			<fileset
-            daigle
+				dir="${build.tmp}/eml_${eml-beta-tag}/style">
-            daigle
+				<include name="**/*.xsl" />
 			</fileset>
 		</copy>
 	</target>
             tao
-            daigle
+	<target name="geteml2+" depends="prepare" if="eml.required"
-            daigle
+		description="Checks eml-2 out of svn and copies schema and xsl to your metacat sandbox">
 		<svn>
 			<export srcUrl="${svn.eml200SchemaUrl}"
 				destPath="${build.tmp}/eml_${eml2_0_0-schema-tag}" />
 		</svn>
-            daigle
+		<mkdir dir="lib/schema/eml-2.0.0" />
 		<copy todir="lib/schema/eml-2.0.0" filtering="yes">
 			<fileset
-            daigle
+				dir="${build.tmp}/eml_${eml2_0_0-schema-tag}">
-            daigle
+				<include name="*.xsd" />
 			</fileset>
             brooke
-            daigle
+			<!-- shouldn't we have a mapper here like this??
 				<mapper type="glob" from="eml-*.xsd" to="eml-*-${eml-version}.xsd" />
 				Jing's code didn't nave one - does it need to be added?
 				NOTE that eml-version is set to beta 6, so this would need changing -->
             daigle
-            daigle
+		</copy>
 		<!-- <antcall target="copyxsl">
 			<param name="cvs.tagname" value="${eml2_0_0-schema-tag}" />
 			<param name="dirname" value="eml-2.0.0" />
 			</antcall> -->
             tao
-            daigle
+		<!-- Checkout eml201 for given schema tag-->
-            daigle
+		<svn>
 			<export srcUrl="${svn.eml201SchemaUrl}"
 				destPath="${build.tmp}/eml_${eml2_0_1-schema-tag}" />
 		</svn>
-            daigle
+		<mkdir dir="lib/schema/eml-2.0.1" />
 		<copy todir="lib/schema/eml-2.0.1" filtering="yes">
 			<fileset
-            daigle
+				dir="${build.tmp}/eml_${eml2_0_1-schema-tag}">
-            daigle
+				<include name="*.xsd" />
 			</fileset>
 		</copy>
             brooke
-            daigle
+		<!-- Checkout eml201 again for given style sheet tag-->
 		<!-- echo>Enter CVS password: </echo>
 			<cvs cvsRoot="${cvsroot}"
 			package="${eml-module}"
 			tag="${eml2_0_1-style-tag}"
 			dest="${build.tmp}/eml_${eml2_0_1-style-tag}" />
 			<antcall target="copyxsl">
 			<param name="cvs.tagname" value="${eml2_0_1-style-tag}" />
 			<param name="dirname" value="eml-2.0.1" />
 			</antcall -->
             tao
-            daigle
+		<!-- Checkout eml210 for given schema tag-->
-            daigle
+		<svn>
 			<export srcUrl="${svn.eml210SchemaUrl}"
 				destPath="${build.tmp}/eml_${eml2_1_0-schema-tag}" />
 		</svn>
-            daigle
+		<mkdir dir="lib/schema/eml-2.1.0" />
 		<copy todir="lib/schema/eml-2.1.0" filtering="yes">
 			<fileset
-            daigle
+				dir="${build.tmp}/eml_${eml2_1_0-schema-tag}">
-            daigle
+				<include name="*.xsd" />
 			</fileset>
 		</copy>
             tao
-            daigle
+		<!-- Checkout eml210 for given style sheet tag-->
-            daigle
+		<svn>
 			<export srcUrl="${svn.eml2StyleUrl}"
 				destPath="${build.tmp}/eml_${eml2-style-tag}" />
 		</svn>
-            daigle
+		<antcall target="copyxsl">
 			<param name="cvs.tagname" value="${eml2-style-tag}" />
 			<!-- param name="dirname" value="eml-2.1.0" / -->
 			<param name="dirname" value="eml-2" />
 		</antcall>
             leinfelder
 		<!-- Checkout eml210 for given schema tag-->
 		<svn>
 			<export srcUrl="${svn.eml211SchemaUrl}"
 				destPath="${build.tmp}/eml_${eml2_1_1-schema-tag}" />
 		</svn>
 		<mkdir dir="lib/schema/eml-2.1.1" />
 		<copy todir="lib/schema/eml-2.1.1" filtering="yes">
 			<fileset
 				dir="${build.tmp}/eml_${eml2_1_1-schema-tag}">
 				<include name="*.xsd" />
 			</fileset>
 		</copy>
-            daigle
+	</target>
             berkley
 	<!-- copies the dataone schemas from a local source if you don't want
 	     to have to make a ton of svn calls when you're testing (see getd1schemas) -->
 	<target name="install-dataone" depends="init">
 	  <property name="dataone-shema-dir" value="../cicore/schemas"/>
-            berkley
+	  <property name="install-dataone-schema-dir" value="${installdir}/schema/${dataone-schema-tag}"/>
-            berkley
+	  <mkdir dir="${install-dataone-schema-dir}"/>
 	  <copy todir="${install-dataone-schema-dir}">
 	    <fileset dir="${dataone-shema-dir}">
 	      <include name="**/*.xsd"/>
 	    </fileset>
 	  </copy>
 	</target>
             sgarg
-            berkley
+	<!-- get the dataone schemas from svn -->
-            jones
+	<target name="getd1schemas" depends="prepare"
 		description="Checkout dataone schemas from svn and copy to metacat sandbox">
-            berkley
+		<delete dir="${build.tmp}/${dataone-schema-tag}"/>
-            jones
+        <svn>
             <export srcUrl="${svn.dataone-0.1-schema-url}"
-            berkley
+                destPath="${build.tmp}/${dataone-schema-tag}" />
-            jones
+        </svn>
-            berkley
+        <mkdir dir="lib/schema/${dataone-schema-tag}" />
         <copy todir="lib/schema/${dataone-schema-tag}" filtering="yes">
             <fileset dir="${build.tmp}/${dataone-schema-tag}">
-            jones
+                <include name="*.xsd" />
             </fileset>
         </copy>
     </target>
-            daigle
+	<target name="copyxsl"
-            daigle
+		description="Copies xsl stylesheets from checkout in build/tmp to your metacat sandbox">
             perry
-            daigle
+		<delete file="${style-common-cvsrelpath}/${eml-css}" />
             perry
-            daigle
+		<copy todir="${style-common-cvsrelpath}/${dirname}"
 			filtering="yes">
 			<fileset
-            daigle
+				dir="${build.tmp}/eml_${cvs.tagname}/style/eml">
-            daigle
+				<include name="**/*.xsl" />
 			</fileset>
 		</copy>
             perry
-            daigle
+		<!-- now copy default css from eml module and put it in style-common-path
 			dir with a new name, so other skin-specific css can import it if reqd -->
 		<copy
-            daigle
+			file="${build.tmp}/eml_${cvs.tagname}/${eml-module.default.css}"
-            daigle
+			tofile="${style-common-cvsrelpath}/${eml-css}" />
             perry
-            daigle
+	</target>
             perry
-            daigle
+	<target name="correctEML201Docs" depends="jar"
 		description="Uses the ant  task to run a JAVA patch class to correct invalide eml201 documents which were generated by wrong schema">
 		<copy todir="${build.dir}" file="lib/metacat.properties"
 			filtering="yes" />
 		<java
 			classname="edu.ucsb.nceas.metacat.EML201DocumentCorrector">
 			<classpath>
 				<path refid="compile.classpath" />
 				<fileset dir="${build.dir}">
 					<include name="${name}.jar" />
 				</fileset>
 			</classpath>
 		</java>
 	</target>
             perry
-            daigle
+	<target name="install-spatial" depends="jar,clientjar,harvesterjar"
 		description="Installs spatial option for metacat">
             perry
-            daigle
+		<property name="spatial.dir" value="./lib/spatial" />
 		<property name="spatial.geoserver.dir"
 			value="${spatial.dir}/geoserver" />
 		<property name="spatial.webinf-mods"
 			value="${spatial.dir}/WEB-INF" />
             perry
-            daigle
+		<!-- Copy geoserver libs into ${war.lib} -->
 		<copy todir="${war.lib}" filtering="no">
 			<fileset dir="${spatial.geoserver.dir}/WEB-INF/lib">
 				<include name="**" />
 			</fileset>
 		</copy>
             leinfelder
 		<copy todir="${dist.dir}">
 			<fileset dir="./lib/spatial/geoserver" includes="*.war" />
 		</copy>
             jones
-            daigle
+	</target>
             daigle
-            daigle
+	<target name="install" depends="build-metacat"
 		description="* Full Install For Development *">
 		<copy file="${dist.dir}/${metacat.context}.war"
 			todir="${app.deploy.dir}" />
-            berkley
+               <!-- <copy file="${dist.dir}/${metacat.context}.war"
                         todir="${app.deploy.dir2}" />-->
-            daigle
+		<delete dir="${app.deploy.dir}/${metacat.context}" />
-            berkley
+		<!--<delete dir="${app.deploy.dir2}/${metacat.context}" />-->
-            leinfelder
+		<copy file="${dist.dir}/geoserver.war"
 					todir="${app.deploy.dir}" />
-            daigle
+		<tstamp>
 			<format property="NOW" pattern="MM/dd/yyyy hh:mm:ss aa" />
 		</tstamp>
 		<echo>Dev install completed at ${NOW}</echo>
 	</target>
             sgarg
-            leinfelder
+	<target name="build-metacat" depends="install-ecogrid, install-spatial"
-            daigle
+		description="Build Metacat">
 	</target>
             sgarg
-            daigle
+	<target name="install-ecogrid" depends="warPrepare, get-ecogrid"
 		if="enable.ecogrid" description="Install Ecogrid Compentent">
 		<ant antfile="build.xml" dir="${ecogrid-dir}" target="clean"
 			inheritall="false">
 			<property name="context" value="${metacat.context}" />
 			<property name="target" value="${ecogrid-target-name}" />
 		</ant>
 		<ant antfile="build.xml" dir="${ecogrid-dir}" target="war"
 			inheritall="false">
 			<property name="context" value="${metacat.context}" />
 			<property name="target" value="${ecogrid-target-name}" />
-            berkley
+			<property name="metacat.dir" value="${basedir}"/>
-            daigle
+		</ant>
 		<!-- war destfile="${ecogrid-dir}/build/${metacat.context}.war" update="true">
 			<webinf dir="${ecogrid-dir}/lib">
 			<include name="server-config.wsdd"/>
 			</webinf>
 			</war -->
 		<copy file="${ecogrid-dir}/build/${metacat.context}.war"
 			todir="${dist.dir}" overwrite="true" />
             sgarg
-            daigle
+	</target>
             sgarg
-            daigle
+	<target name="get-ecogrid" depends="init"
 		description="Check out ecogrid module" if="ecogrid.required">
 		<svn>
-            leinfelder
+			<export srcUrl="${svn.ecogridUrl}" force="true"
-            daigle
+				destPath="${ecogrid-dir}" />
 		</svn>
 	</target>
             sgarg
-            daigle
+	<!-- target name="deploy-ecogrid" depends="clean-ecogrid-server-config-wsdd" if="enable.ecogrid" description="Automately generate wsdd for ecogrid service">
 		<ant antfile="build.xml" dir="${ecogrid-dir}" target ="deploy" inheritall="false">
 		<property name="context" value="${metacat.context}"/>
 		<property name="target" value="${ecogrid-target-name}"/>
 		<property name="metacat.dir" value="."/>
 		<property name="hostname" value="${ecogrid.hostname}"/>
 		<property name="port" value="${config.port}"/>
 		</ant>
 		</target -->
             jones
-            daigle
+	<target name="clean-ecogrid-server-config-wsdd" depends="init"
 		description="Automately generate wsdd for ecogrid service">
 		<delete
 			file="${app.deploy.dir}/${metacat.context}/WEB-INF/server-config.wsdd" />
 	</target>
 	<target name="install-skin" depends="init"
 		description="Install a Skin">
 		<input message="Please enter name of the skin"
 			addproperty="skin-name" />
 		<mkdir dir="${installdir}/style/skins/${skin-name}" />
 		<copy todir="${installdir}/style/skins/${skin-name}"
 			filtering="yes">
 			<fileset dir="lib/style/skins/${skin-name}">
 				<exclude name="**/*.png" />
 				<exclude name="**/*.gif" />
 				<exclude name="**/*.jpg" />
 				<exclude name="**/CVS*" />
 				<exclude name="**/.#*" />
 			</fileset>
 		</copy>
 		<copy todir="${installdir}/style/skins/${skin-name}"
 			filtering="no">
 			<fileset dir="lib/style/skins/${skin-name}">
 				<include name="**/*.png" />
 				<include name="**/*.gif" />
 				<include name="**/*.jpg" />
 				<exclude name="**/CVS*" />
 				<exclude name="**/.#*" />
 			</fileset>
 		</copy>
 		<copy todir="${installdir}/style/common" filtering="yes">
 			<fileset dir="lib/style/common">
 				<include name="*.js" />
 				<include name="*.jsp" />
 				<include name="*.css" />
 				<exclude name="*.png" />
 				<exclude name="*.gif" />
 				<exclude name="*.jpg" />
 				<exclude name="**/CVS*" />
 				<exclude name="**/.#*" />
 			</fileset>
 		</copy>
 		<!--
 			<mkdir dir="${installdir}/style/skins/${skin-name}/images" />
 			<copy todir="${installdir}/style/skins/${skin-name}/images" filtering="no">
 			<fileset dir="lib/style/skins/${skin-name}/images">
 			<include name="*.png"/>
 			<include name="*.gif"/>
 			<include name="*.jpg"/>
 			</fileset>
 			</copy>
 		-->
 		<echo message="Install Skin completed." />
 	</target>
 	<target name="war" depends="warPrepare,install-spatial"
 		description="Create a web archive (WAR) for servlet deployment">
 		<mkdir dir="${dist.dir}" />
 		<war destfile="${dist.dir}/${metacat.context}.war"
 			webxml="${build.war}/web.xml">
 			<fileset dir="${war.context}" />
 			<lib dir="${war.lib}" />
 			<webinf dir="${war.webinf}" />
 		</war>
 	</target>
 	<target name="warPrepare"
 		depends="cgiPrepare,jar,clientjar,harvesterjar,testPrepare"
 		description="Prepare files for creating a web archive (WAR)">
 		<property name="war.lib" value="${build.war}/lib" />
 		<property name="war.webinf" value="${build.war}/WEB-INF" />
 		<property name="war.context"
 			value="${build.war}/${metacat.context}" />
 		<property name="war.webinf.sql" value="${war.webinf}/sql" />
 		<property name="war.webinf.scripts"
 			value="${war.webinf}/scripts" />
 		<property name="war.context.cgi" value="${war.context}/cgi-bin" />
 		<property name="war.context.docs" value="${war.context}/docs" />
 		<property name="war.context.temp" value="${war.context}/temp" />
 		<property name="war.context.templates"
 			value="${war.context}${style-common-relpath}/templates" />
 		<mkdir dir="${war.lib}" />
 		<mkdir dir="${war.webinf}" />
 		<mkdir dir="${war.context}" />
 		<mkdir dir="${war.webinf.sql}" />
 		<mkdir dir="${war.context.cgi}" />
 		<mkdir dir="${war.context.docs}" />
 		<mkdir dir="${war.context.temp}" />
 		<mkdir dir="${war.context.templates}" />
 		<!--copy file="${lib.dir}/${jdbc.lib.postgres}" todir="${war.lib}" / -->
 		<!--copy file="${lib.dir}/${jdbc.lib.sqlserver1}" todir="${war.lib}" / -->
 		<!--copy file="${lib.dir}/${jdbc.lib.sqlserver2}" todir="${war.lib}" / -->
 		<!--copy file="${lib.dir}/${jdbc.lib.sqlserver3}" todir="${war.lib}" / -->
 		<copy file="${build.dir}/${name}.jar" todir="${war.lib}" />
 		<copy file="${build.dir}/${name}-client.jar" todir="${war.lib}" />
 		<copy file="${build.dir}/harvester.jar" todir="${war.lib}" />
 		<copy todir="${war.lib}" filtering="no">
 			<fileset dir="lib">
 				<!--
 					<not>
 					<filename name="${jdbc-jar-name}"/>
 					</not>
 				-->
 				<include name="*.jar" />
-            jones
+				<exclude name="maven-ant-tasks*.jar" />
-            daigle
+			</fileset>
 			<fileset dir="lib">
 				<include name="xalan.jar" />
 				<include name="gwt*.jar" />
 			</fileset>
 			<fileset dir="lib/oaipmh">
 				<include name="oaicat.jar" />
 			</fileset>
 		</copy>
 		<!-- MCD copy file="lib/web.xml.${tomcatversion}"
 			tofile="${build.war}/web.xml" / -->
 		<!-- MCD added next - Remove the tomcat5 reference-->
 		<copy file="lib/web.xml.tomcat5" tofile="${build.war}/web.xml" />
 		<copy file="lib/metacat.properties" todir="${war.webinf}"
 			filtering="yes" />
 		<copy file="lib/metacat.properties.metadata.xml"
 			todir="${war.webinf}" filtering="no" />
 		<copy file="lib/org.properties.metadata.xml"
 			todir="${war.webinf}" filtering="no" />
 		<copy file="lib/auth.properties.metadata.xml"
 			todir="${war.webinf}" filtering="no" />
 		<copy todir="${war.webinf}" filtering="yes">
 			<fileset dir="lib">
 				<include name="skin.configs/**" />
 			</fileset>
 		</copy>
 		<copy file="lib/log4j.properties" todir="${war.webinf}"
 			filtering="yes" />
 		<copy todir="${war.context}" filtering="no">
 			<fileset dir="lib">
 				<include name="**/*.jpg" />
 				<include name="**/*.png" />
 				<include name="**/*.gif" />
 				<include name="LiveMap_30/**" />
 				<include name="oaipmh/**" />
 			</fileset>
 		</copy>
 		<copy todir="${war.context}" filtering="yes">
 			<fileset dir="lib">
 				<exclude name="*.jar" />
 				<exclude name="*.properties" />
 				<exclude name="*.metadata.xml" />
 				<exclude name="web.xml" />
 				<exclude name="**/*.jpg" />
 				<exclude name="**/*.png" />
 				<exclude name="**/*.gif" />
 				<exclude name="lsid_lib/**" />
 				<exclude name="lsid_conf/**" />
 				<exclude name="LiveMap_30/**" />
 				<exclude name="oaipmh/**" />
 				<exclude name="skin.configs/**" />
-            leinfelder
+				<exclude name="spatial/geoserver/**" />
-            daigle
+			</fileset>
 		</copy>
-            leinfelder
+		<copy todir="${war.context}" filtering="no">
 			<fileset dir="lib">
 				<include name="spatial/geoserver/data/**" />
 			</fileset>
 		</copy>
-            daigle
+		<copy todir="${war.context.docs}" filtering="yes">
 			<fileset dir="docs" excludes="**/*gif **/*jpg **/*png" />
 		</copy>
 		<copy todir="${war.context.docs}" filtering="no">
 			<fileset dir="docs" includes="**/*gif **/*jpg **/*png" />
 		</copy>
 		<copy todir="${war.webinf.sql}" filtering="yes">
 			<fileset dir="src">
 				<include name="**/*.sql" />
 			</fileset>
 		</copy>
 		<copy todir="${war.webinf.scripts}" filtering="yes">
 			<fileset dir="src/scripts" />
 		</copy>
 		<copy todir="${war.webinf.scripts}"
 			file="src/perl/Metacat/blib/lib/auto/Metacat/autosplit.ix"
 			failonerror="false" />
 		<copy file="src/perl/register-dataset.cgi"
 			todir="${war.context.cgi}" />
 		<copy file="src/perl/ldapweb.cgi" todir="${war.context.cgi}" />
 		<copy file="src/perl/Metacat/Metacat.pm" todir="${war.lib}" />
 		<!-- registry cgi section -->
 		<!-- TODO SCW: use relative paths to grab these instead of copying to tmp,
 			used in readDocumentFromMetacat -->
 		<!-- TODO MCD copy temp files to actual location using config util?? -->
 		<copy todir="${war.context.temp}" filtering="yes">
 			<fileset dir="lib/style/common/emlb6toeml2">
 				<include name="*.xsl" />
 				<include name="*.xml" />
 			</fileset>
 		</copy>
 		<available file="lib/style/common/emlb6toeml2" type="dir"
 			property="styles.not.needed" />
 		<!-- ldap cgi section -->
 		<copy todir="${war.context.templates}">
 			<fileset dir="lib/style/common/templates">
 				<!-- SCW: Copy all files -->
 			</fileset>
 		</copy>
 	</target>
 	<target name="cgiPrepare" if="build.perl">
 		<exec dir="src/perl/Metacat/" executable="make">
-            daigle
+			<arg value="clean" />
-            daigle
+		</exec>
 		<exec dir="src/perl/Metacat/" executable="perl">
-            daigle
+			<arg value="Makefile.PL" />
 		</exec>
-            daigle
+		<exec dir="src/perl/Metacat/" executable="make" />
-            daigle
+	</target>
             daigle
-            daigle
+	<target name="testPrepare"
-            daigle
+		description="Copies test files into the war directories">
 		<echo>in testPrepare</echo>
-            daigle
+		<property name="war.context.test"
 			value="${build.war}/${metacat.context}/test" />
-            daigle
+		<mkdir dir="${war.context.test}" />
-            daigle
+		<copy todir="${war.context.test}" filtering="yes">
 			<fileset dir="test/servertestfiles">
 				<include name="*/**" />
 			</fileset>
-            daigle
+		</copy>
 	</target>
             brooke
-            daigle
+	<target name="getConversionXSL" depends="prepare"
 		unless="styles.not.needed"
 		description="Gets the conversion stylesheets for eml2 beta 6 to eml 2.0.0">
             sgarg
-            daigle
+		<svn>
 			<export srcUrl="${svn.eml2StyleUrl}"
 				destPath="${build.tmp}/conv_eml_${eml2-style-tag}" />
 		</svn>
             sgarg
-            daigle
+		<mkdir dir="lib/style/common/emlb6toeml2" />
 		<copy todir="lib/style/common/emlb6toeml2" filtering="yes">
 			<fileset
-            daigle
+				dir="${build.tmp}/conv_eml_${eml2-style-tag}/lib/beta6toeml2/xsl">
-            daigle
+				<include name="*.xsl" />
 				<include name="*.xml" />
 			</fileset>
 		</copy>
 	</target>
             brooke
-            daigle
+	<target name="testprep" depends="jar,clientjar,harvesterjar">
 		<mkdir dir="${build.tests}" />
-            leinfelder
+		<copy todir="${build.tests}" encoding="UTF-8">
-            daigle
+			<fileset dir="${testdir}">
 				<include name="edu/**" />
 			</fileset>
 		</copy>
-            leinfelder
+		<copy todir="${build.tests}" file="${testdir}/test.properties" />
             daigle
-            cjones
+		<path id="test.classpath">
 			<path refid="compile.classpath" />
 			<fileset dir="${build.dir}">
 				<include name="${name}.jar" />
 				<include name="${name}-client.jar" />
 				<include name="harvester.jar" />
 			</fileset>
 		</path>
 		<pathconvert pathsep="${line.separator}|  |--"
 		             property="echo.test.classpath"
 		             refid="test.classpath">
 		</pathconvert>
 		<echo message="|--test classpath" />
 		<echo message="|  |" />
 		<echo message="|  |-- ${echo.test.classpath}" />
-            daigle
+		<!-- copy and compile the tests into a jar file -->
 		<javac srcdir="${build.tests}" destdir="${build.tests}"
-            leinfelder
+			debug="on" includes="**/*.java" encoding="UTF-8">
-            cjones
+			<classpath refid="test.classpath" />
-            daigle
+		</javac>
             jones
-            daigle
+		<jar jarfile="${build.dir}/${name}-junittests.jar"
 			basedir="${build.tests}" includes="**/*.class" />
             cjones
-            daigle
+	</target>
             tao
-            daigle
+	<target name="test" depends="testprep"
 		description="Uses the ant junit task to run all JUnit tests">
             jones
-            daigle
+		<!-- use the ant "junit" task to run JUnit tests. -->
 		<junit printsummary="yes" haltonfailure="no" fork="yes"
 			haltonerror="no">
-            leinfelder
+			<jvmarg value="-Dfile.encoding=UTF-8"/>
-            daigle
+			<classpath>
-            daigle
+				<path refid="test.classpath" />
-            daigle
+				<fileset dir="${build.dir}">
 					<include name="${name}.jar" />
 					<include name="${name}-client.jar" />
 					<include name="harvester.jar" />
 					<include name="${name}-junittests.jar" />
 				</fileset>
 			</classpath>
             tao
-            daigle
+			<formatter type="plain" />
             tao
-            daigle
+			<batchtest fork="yes" todir="${build.dir}">
 				<fileset dir="${build.tests}">
-            daigle
+					<include name="**/*.class" />
-            daigle
+					<exclude name="**/MCTestCase.class" />
 					<exclude name="**/ClientViewHelperTest.class" />
 				</fileset>
 			</batchtest>
 		</junit>
 	</target>
             tao
-            daigle
+	<target name="runonetest" depends="testprep"
 		description="Uses the ant junit task to run a single JUnit test, defined by the ${testtorun} property">
             tao
-            daigle
+		<echo>testtorun: ${testtorun}</echo>
             brooke
-            daigle
+		<!-- use the ant "junit" task to run JUnit tests. -->
 		<junit printsummary="yes" haltonfailure="no" fork="yes"
 			haltonerror="no" showoutput="yes">
-            leinfelder
+			<jvmarg value="-Dfile.encoding=UTF-8"/>
-            daigle
+			<classpath>
-            daigle
+				<path refid="test.classpath" />
-            daigle
+				<fileset dir="${build.dir}">
 					<include name="${name}.jar" />
 					<include name="${name}-client.jar" />
 					<include name="harvester.jar" />
 					<include name="${name}-junittests.jar" />
 				</fileset>
 			</classpath>
             tao
-            daigle
+			<formatter type="plain" />
             tao
-            daigle
+			<batchtest fork="yes" todir="${build.dir}">
 				<fileset dir="${build.tests}">
 					<include name="**/${testtorun}.class" />
 				</fileset>
 			</batchtest>
 		</junit>
 	</target>
             tao
-            daigle
+	<target name="testharvester" depends="testprep"
 		description="Uses the ant junit task to test only the Harvester code">
 		<junit printsummary="yes" haltonfailure="off" fork="yes"
 			haltonerror="off">
 			<classpath>
 				<path refid="compile.classpath" />
 				<fileset dir="${build.dir}">
 					<include name="${name}.jar" />
 					<include name="${name}-client.jar" />
 					<include name="harvester.jar" />
 					<include name="${name}-junittests.jar" />
 				</fileset>
 			</classpath>
 			<formatter type="plain" />
 			<batchtest fork="yes" todir="${build.dir}">
 				<fileset dir="${build.tests}">
 					<include name="**/harvesterClient/*.class" />
 				</fileset>
 			</batchtest>
 		</junit>
 	</target>
             costa
-            daigle
+	<!-- run this target, we need to check out a another morpho souce dir was checked out. -->
 	<target name="nettest" depends="install"
 		description="compiles and runs the metacatnettest code">
             tao
-            daigle
+		<echo>
 			*********************************** Please run ant
 			gethttpclient first! ***********************************
 		</echo>
 		<!-- copy and compile the tests into a jar file -->
 		<mkdir dir="${build.metacatnettest}" />
 		<javac srcdir="${junitnettestsdir}"
 			destdir="${build.metacatnettest}" includes="**/*.java">
 			<classpath>
 				<path refid="compile.classpath" />
 				<fileset dir="${build.dir}">
 					<include name="${name}.jar" />
 				</fileset>
 			</classpath>
 		</javac>
             tao
-            daigle
+		<jar jarfile="${build.dir}/${name}-junitnettests.jar"
 			basedir="${build.metacatnettest}" includes="**/*.class" />
             tao
-            daigle
+		<!-- use the ant "junit" task to run JUnit tests. -->
 		<junit printsummary="yes" haltonfailure="no" fork="yes"
 			haltonerror="no">
 			<jvmarg value="-Djava.protocol.handler.pkgs=HTTPClient" />
 			<classpath>
 				<path refid="compile.classpath" />
 				<fileset dir="${build.dir}">
 					<include name="${name}.jar" />
 					<include name="${name}-junitnettests.jar" />
 				</fileset>
 			</classpath>
             tao
-            daigle
+			<formatter type="plain" />
             tao
-            daigle
+			<batchtest fork="yes" todir="${build.dir}">
 				<fileset dir="${build.metacatnettest}">
 					<include name="**/*.class" />
 				</fileset>
 			</batchtest>
 		</junit>
 	</target>
             tao
-            daigle
+	<target name="cleanweb" depends="clean"
 		description="deletes tomcat web context dir and all its contents">
 		<delete dir="${installdir}" />
 	</target>
             berkley
-            daigle
+	<target name="clean" depends="init"
 		description="deletes build dir and files that can be regenerated form the release">
 		<delete dir="${build.dir}" />
 		<delete dir="${dist.dir}" />
 	</target>
             jones
-            daigle
+	<target name="localclean" depends="clean"
-            daigle
+		description="deletes even jars that depend on external sources such as stylesheets and jars">
 		<delete file="lib/utilities.jar" />
 	</target>
             jones
-            daigle
+	<target name="fullclean" depends="localclean"
 		description="deletes code and eml">
 		<delete includeEmptyDirs="true" failonerror="false">
 			<fileset dir="${style-common-cvsrelpath}">
 				<include name="${eml-css}" />
 				<include name="eml-*/*.xsl" />
 				<include name="eml-*" />
 			</fileset>
 			<fileset dir="${schema-cvsrelpath}">
 				<include name="eml-*/*.xsd" />
 			</fileset>
-            tao
+			<fileset dir="${ecogrid-dir}"/>
-            leinfelder
+			<fileset dir="lib/style/common/emlb6toeml2"/>
 			<fileset dir="lib/dtd"/>
 			<fileset dir="lib/schema"/>
-            tao
+			<fileset dir="${utilitiesdir}"/>
-            daigle
+		</delete>
 	</target>
             jones
-            daigle
+	<target name="jdoc" depends="prepare"
 		description="generates javadoc documentation">
 		<javadoc packagenames="edu.ucsb.nceas.*"
 			sourcepath="${build.src}" destdir="${build.javadocs}" author="true"
 			version="true" use="true" windowtitle="${Name} API"
 			doctitle="&lt;h1&gt;${Name}&lt;/h1&gt;"
 			bottom="&lt;i&gt;Copyright &#169; 2000 National Center for Ecological Analysis and Synthesis. All Rights Reserved.&lt;/i&gt;">
 			<classpath>
 				<path refid="compile.classpath" />
 			</classpath>
 		</javadoc>
 	</target>
             jones
-            daigle
+	<target name="dist"
-            jones
+		depends="geteml,getd1schemas,get-ecogrid,jar,protocol,jdoc,getConversionXSL,getutilities"
-            daigle
+		description="prepares a full release distribution">
 		<mkdir dir="${dist.dir}" />
 		<delete dir="${ver.dir}" />
 		<mkdir dir="${ver.dir}" />
 		<copy todir="${ver.dir}">
 			<fileset dir="."
 				excludes="**/CVS* **/.#* src/** test/** build/** docs/** ${dist.dir}/** ${dist.dir.hle}/** metacat*.tar.gz metacat*.tar metacat*.zip" />
 		</copy>
 		<copy todir="${ver.dir}" file="build.xml" />
 		<copy todir="${ver.dir}" file="build.properties" />
             jones
-            daigle
+		<copy todir="${ver.dir}/docs" filtering="yes">
 			<fileset dir="docs" excludes="**/*gif **/*jpg **/*png" />
 		</copy>
 		<copy todir="${ver.dir}/docs" filtering="no">
 			<fileset dir="docs" includes="**/*gif **/*jpg **/*png" />
 		</copy>
 		<copy todir="${ver.dir}/docs/dev">
 			<fileset dir="${build.dir}/docs" />
 		</copy>
 		<copy todir="${ver.dir}/src">
 			<fileset dir="${build.dir}/src" />
 		</copy>
 		<mkdir dir="${ver.dir}/tests/servertestfiles" />
 		<copy todir="${ver.dir}/test/servertestfiles">
 			<fileset dir="./test/servertestfiles" />
 		</copy>
 	</target>
 	<target name="distbin" depends="build-metacat,war-lsid"
 		description="prepares a binary distribution">
-            daigle
+		<copy todir="${dist.dir}">
-            daigle
+			<fileset dir="./src/scripts" />
 		</copy>
-            daigle
+		<delete file="./${name}-bin-${release}.zip" />
-            daigle
+		<zip zipfile="./${name}-bin-${release}.zip"
 			basedir="${dist.dir}" excludes="metacat-*/**" />
-            daigle
+		<delete file="./${name}-bin-${release}.tar.gz" />
-            daigle
+		<tar tarfile="./${name}-bin-${release}.tar"
 			basedir="${dist.dir}" excludes="metacat-*/**" />
 		<gzip zipfile="./${name}-bin-${release}.tar.gz"
 			src="./${name}-bin-${release}.tar" />
-            daigle
+		<delete file="./${name}-bin-${release}.tar" />
 	</target>
             jones
-            daigle
+	<target name="distsrc" depends="dist"
 		description="prepares a source distribution">
 		<mkdir dir="${ver.src}" />
 		<copy todir="${ver.src}">
 			<fileset dir="./src" />
 		</copy>
 		<mkdir dir="${util.dir}" />
 		<copy todir="${util.dir}">
 			<fileset dir="${build.tmp}/utilities" excludes="**/CVS*" />
 		</copy>
             perry
-            daigle
+		<mkdir dir="${ecogrid-dist-dir}" />
 		<copy todir="${ecogrid-dist-dir}">
 			<fileset dir="${ecogrid-dir}" excludes="**/CVS*" />
 		</copy>
             jones
-            daigle
+		<delete file="${ver.dir}/lib/utilities.jar" />
             tao
-            daigle
+		<delete file="./${name}-src-${release}.zip" />
 		<zip zipfile="./${name}-src-${release}.zip"
 			basedir="${dist.dir}" excludes="metacat*.tar.gz,metacat*.zip" />
 		<delete file="./${name}-src-${release}.tar.gz" />
 		<tar tarfile="./${name}-src-${release}.tar"
 			basedir="${dist.dir}" excludes="metacat*.tar.gz,metacat*.zip" />
 		<gzip zipfile="./${name}-src-${release}.tar.gz"
 			src="./${name}-src-${release}.tar" />
 		<delete file="./${name}-src-${release}.tar" />
 		<!--delete dir="${dist.dir}"/ -->
 	</target>
             tao
-            daigle
+	<target name="deb-package" depends="distbin"
 		description="create a debian installation package">
 		<delete dir="${deb.pkg.dir}" />
 		<mkdir dir="${deb.pkg.dir}/DEBIAN" />
 		<copy todir="${deb.pkg.dir}/DEBIAN" filtering="yes">
 			<fileset dir="./src/scripts/debian"
 				includes="control postinst" />
 		</copy>
             harris
-            daigle
+		<mkdir
 			dir="${deb.pkg.dir}/usr/share/metacat-${metacat.version}" />
 		<copy
 			todir="${deb.pkg.dir}/usr/share/metacat-${metacat.version}"
 			filtering="yes">
 			<fileset dir="./src/scripts/debian"
 				excludes="control postinst" />
 		</copy>
 		<chmod file="${deb.pkg.dir}/DEBIAN/postinst" perm="755" />
             harris
-            daigle
+		<copy file="${dist.dir}/knb.war"
 			todir="${deb.pkg.dir}/usr/share/metacat-${metacat.version}" />
 		<copy file="./metacat-bin-${metacat.version}.tar.gz"
 			tofile="${deb.pkg.dir}/metacat_${metacat.version}.orig.tar.gz" />
             jones
-            daigle
+		<exec dir="${pkg.dir}" executable="dpkg" os="Linux, Unix"
 			failonerror="true">
 			<arg line="--build debian" />
 		</exec>
             jones
-            daigle
+		<move file="${pkg.dir}/debian.deb"
 			tofile="${pkg.dir}/metacat_${metacat.version}${metacat.releaseCandidate}_all.deb" />
 	</target>
 	<target name="stylesheettest">
 		<xslt in="${input}" out="eml.html"
 			style="${style-common-cvsrelpath}/eml-2.0.0/eml-2.0.0.xsl">
 			<param name="displaymodule" expression="${displaymodule}" />
 			<param name="docid" expression="${input}" />
 			<param name="entitytype" expression="${entitytype}" />
 			<param name="entityindex" expression="${entityindex}" />
 			<outputproperty name="method" value="html" />
 			<outputproperty name="standalone" value="yes" />
 			<outputproperty name="encoding" value="iso8859_1" />
 			<outputproperty name="indent" value="yes" />
 		</xslt>
 	</target>
 	<target name="spatial_option" depends="prepare"
 		description=" -- compiles code for the spatial option">
 		<echo message="Compiling the metatcat shapefile creator" />
 		<echo message="using the shapelib at: ${shapelib.dir}" />
 		<exec dir="." executable="g++" os="Linux, Unix"
 			failonerror="true">
 			<arg
 				line="./src/spatial/cpp/metacat_shapefile.cpp -I ${shapelib.dir} -c -o build/metacat_shapefile.o" />
 		</exec>
 		<exec dir="." executable="g++" os="Linux, Unix"
 			failonerror="true">
 			<arg
 				line="build/metacat_shapefile.o ${shapelib.dir}/.libs/libshp.a -o bin/metacat_shapefile" />
 		</exec>
 	</target>
 	<!-- LSID Authority support -->
 	<patternset id="lsid.jars">
 		<include name="axis.jar" />
 		<include name="commons-discovery-0.2.jar" />
 		<include name="jaxrpc.jar" />
 		<include name="lsid-client-1.1.1.jar" />
 		<include name="lsid-server-1.1.1.jar" />
 		<include name="saaj.jar" />
 		<include name="wsdl4j-1.5.1.jar" />
 		<include name="activation.jar" />
 		<include name="castor-0.9.5.jar" />
 		<include name="dnsjava-1.3.2.jar" />
 		<include name="mail.jar" />
 		<include name="commons-logging-1.0.4.jar" />
 		<!-- These jars may be needed but seem to not actually be,
 			so leaving them out for now
 			<include name="axis-ant.jar" />
 		-->
 		<!--<include name="GenCastor.class" />-->
 	</patternset>
 	<patternset id="lib.jars">
 		<include name="log4j-1.2.12.jar" />
 		<include name="utilities.jar" />
-            leinfelder
+		<include name="xerces*.jar" />
 		<include name="xalan*.jar" />
-            daigle
+		<include name="xml-apis.jar" />
 	</patternset>
 	<path id="lsid.classpath">
 		<fileset dir="${lsid.lib.dir}">
 			<patternset refid="lsid.jars" />
 		</fileset>
 		<fileset dir="${lib.dir}">
-            leinfelder
+			<patternset refid="lib.jars" />
-            daigle
+		</fileset>
 		<fileset dir="${build.dir}">
 			<include name="metacat-client.jar" />
-            leinfelder
+			<include name="metacat.jar" />
-            daigle
+		</fileset>
 	</path>
 	<filterset id="configFilters">
 		<!-- MCD BYE filter token="LSID_AUTHORITY_HOSTNAME"
 			value="${config.hostname}" / -->
 		<!-- MCD BYE filter token="LSID_AUTHORITY_PORT"
 			value="${config.port}" / -->
 		<!-- MCD BYE filter token="METADATA_LABELS"
 			value="${config.metadataLabelLsid}" / -->
 		<!-- MCD BYE filter token="METACAT_SERVER"
 			value="${config.metacatserver}" / -->
 		<!-- MCD BYE filter token="LSID_AUTHORITY_STRING"
 			value="${config.lsidauthority}" / -->
 	</filterset>
 	<target name="prepare-lsid" depends="prepare,utilities,clientjar"
 		description="Configure files prior to compilation">
 		<mkdir dir="${lsid.build.dir}" />
 		<!-- Copy the properties file into the build -->
 		<copy file="${conf.dir}/metacat-lsid.properties"
 			tofile="${lsid.build.dir}/WEB-INF/classes/metacat-lsid.properties"
 			overwrite="true">
 			<filterset refid="configFilters" />
 		</copy>
 		<copy file="${conf.dir}/log4j.properties"
 			tofile="${lsid.build.dir}/WEB-INF/classes/log4j.properties"
 			overwrite="true">
 			<filterset refid="configFilters" />
 		</copy>
 		<!-- Copy config files into the build -->
 		<copy todir="${lsid.build.dir}/WEB-INF">
 			<fileset dir="${webinf.dir}" includes="**/*.wsdd" />
 		</copy>
 		<!-- Copy the metadata configuration files into the build -->
 		<mkdir
 			dir="${lsid.build.dir}/WEB-INF/classes/${lsid.classes.dir}" />
 		<copy
 			todir="${lsid.build.dir}/WEB-INF/classes/${lsid.classes.dir}">
 			<fileset dir="${conf.dir}" includes="**/*.xml" />
 			<fileset dir="${conf.dir}" includes="**/*.xslt" />
 			<filterset refid="configFilters" />
 		</copy>
 		<!-- Copy services files into the build -->
 		<mkdir dir="${lsid.build.dir}/services" />
 		<copy todir="${lsid.build.dir}/services">
 			<fileset dir="${services.dir}" />
 			<filterset refid="configFilters" />
 		</copy>
 		<!-- Copy axis files into the build -->
 		<mkdir dir="${lsid.build.dir}" />
 		<copy todir="${lsid.build.dir}">
 			<fileset dir="${conf.dir}/axis" excludes="*.properties" />
 		</copy>
 		<mkdir dir="${lsid.build.dir}/WEB-INF/classes" />
 		<copy todir="${lsid.build.dir}/WEB-INF/classes">
 			<fileset dir="${conf.dir}/axis" includes="*.properties" />
 		</copy>
 	</target>
 	<target name="compile-lsid" depends="prepare-lsid"
 		description="Compile Java sources">
 		<mkdir dir="${lsid.build.dir}/WEB-INF/classes" />
 		<javac srcdir="src/edu/ucsb/nceas/metacat/lsid"
 			destdir="${lsid.build.dir}/WEB-INF/classes" debug="${compile.debug}"
 			deprecation="${compile.deprecation}"
 			optimize="${compile.optimize}">
 			<classpath refid="lsid.classpath" />
 		</javac>
 	</target>
 	<target name="war-lsid" depends="compile-lsid"
 		description="Create a war file for the application">
 		<mkdir dir="${dist.dir}" />
 		<war destfile="${dist.dir}/${authority.context}.war"
 			webxml="${webinf.dir}/web.xml">
 			<fileset dir="${lsid.build.dir}" />
 			<lib dir="${lsid.lib.dir}">
 				<patternset refid="lsid.jars" />
 			</lib>
 			<lib dir="${lib.dir}">
 				<patternset refid="lib.jars" />
 			</lib>
 			<lib dir="${lib.dir}">
 				<include name="xalan.jar" />
 				<include name="xml-apis.jar" />
 			</lib>
 			<lib dir="${build.dir}">
 				<include name="metacat-client.jar" />
 			</lib>
 		</war>
 	</target>
 	<target name="deploy-lsid" depends="war-lsid"
 		description="Deploy LSID war to servlet container">
 		<delete dir="${app.deploy.dir}/${authority.context}" />
 		<delete file="${app.deploy.dir}/${authority.context}.war" />
 		<mkdir dir="${app.deploy.dir}" />
 		<copy todir="${app.deploy.dir}">
 			<fileset dir="${dist.dir}" />
 		</copy>
 	</target>
             tao
 	<target name="change-metacat-properties" depends="warPrepare"
         description="Chage some default values of metacat.properties">
-            tao
+       <echo file="${metacat-properties-file}" append="true">
 		   configutil.propertiesConfigured=true
 		   configutil.authConfigured=true
            configutil.skinsConfigured=true
 		   configutil.databaseConfigured=true
 		   configutil.geoserverConfigured=true
 	   </echo>
-            cjones
+  </target>
             tao
-            tao
+	<!-- This target will use default values in svn metacat.properties to build a configured
 		metacat (except configuti.* properties, they will be set true). Those default settings
 		are for a test machine. It may not work on your system-->
-            tao
+	<target name="install-configured-metacat" depends="change-metacat-properties, install"
-            tao
+        description="Install a metacat by the default value in metacat.properties without additional configutaion">
     </target>
             jones
     <!-- Build the dataone service, but only if it is checked out as a
          sibling of the current build directory. Requires maven2 to
          be installed and on the path. -->
     <target name="dataone-service" if="d1.available">
-            cjones
+        <property name="d1.jar" value="d1_common_java-0.6.2-SNAPSHOT.jar"/>
-            jones
+        <artifact:mvn pom="${d1.dir}/pom.xml" fork="true"
                       mavenHome="${maven.home}">
             <arg value="install"/>
         </artifact:mvn>
 		<copy file="${d1.dir}/target/${d1.jar}" todir="${lib.dir}" />
-            cjones
+  </target>
-            jones
+</project>

Project

General

Profile

Metacat