Metacat

<?xml version="1.0"?>

<!--

	*   '$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: berkley $'

	*    '$Date: 2010-05-11 10:58:02 -0700 (Tue, 11 May 2010) $'

	*    '$Revision: 5347 $'

	*

	* 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

-->

<project name="metacat" default="jar" basedir="."

         xmlns:artifact="antlib:org.apache.maven.artifact.ant">

	<property environment="env" />

	<property file="build.properties" /><!-- USER SPECIFIC PROPS -->

    <!-- 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" />

	<!-- Determine if ecogrid should be installed-->

	<condition property="enable.ecogrid">

		<equals arg1="${install.ecogrid}" arg2="true" />

	</condition>

	<!-- Determine if perl should be built-->

	<condition property="build.perl">

		<equals arg1="${make.perl.code}" arg2="true" />

	</condition>

	<!-- Determine if dataone-service should be built-->

	<condition property="d1.available">

        <and>

	        <available file="${d1.dir}"/>

	        <available file="${maven.home}"/>

        </and>

	</condition>

	<available file="${build.tomcat.dir}/common/lib/servlet-api.jar" 

			property="tomcat.common.exists" />

	<target name="config" depends="setTomcatCommon, setTomcatNoCommon">

		<!-- 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" />

		<property name="debug" value="on" />

		<property name="morphosourcedir" value="../morpho" />

		<property name="utilitiesdir" value="../utilities" />

		<property name="installdir"

			value="${app.deploy.dir}/${metacat.context}" />

		<echo>*********** set jsdk to ${jsdk}</echo>

	</target>

	<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>

	<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>

			<!-- Include geoserver, geotools, et. al. -->

			<fileset dir="lib/spatial/geoserver/WEB-INF/lib">

				<include name="*.jar" />

			</fileset>

			<pathelement

				location="lib/spatial/geoserver/WEB-INF/classes" />

			<!-- Include OAI-PMH -->

			<fileset dir="lib/oaipmh">

				<include name="*.jar" />

			</fileset>

		</path>

		<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>

			<!-- Include geoserver, geotools, et. al. -->

			<fileset dir="lib/spatial/geoserver/WEB-INF/lib">

				<include name="*.jar" />

			</fileset>

			<pathelement

				location="lib/spatial/geoserver/WEB-INF/classes" />

			<!-- Include OAI-PMH -->

			<fileset dir="lib/oaipmh">

				<include name="*.jar" />

			</fileset>

		</path>

		<!-- 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" />

		<!-- property name="utilities-tag" value="/tags/UTILITIES_1_0_1_RC2" / -->

		<property name="utilities-tag" value="trunk" />

		<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" />

		<property name="dataone-0.1-schema-tag" value="D1_SCHEMA_0_1" />

		<property name="eml2-style-tag" value="RELEASE_EML_UTILS_0_9_0" />

		<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" />

		<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="" />

		<!-- 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" />

		<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}" />

		<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" />

		<property name="testtorun" value="BuildIndexTest" />

		<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"

			value="https://code.ecoinformatics.org/code/utilities/${utilities-tag}" />

		<property name="svn.ecogridUrl"

			value="https://code.ecoinformatics.org/code/seek/trunk/projects/ecogrid/" />

		<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}" />

		<property name="svn.dataone-0.1-schema-url"

			value="https://repository.dataone.org/software/cicore/tags/${dataone-0.1-schema-tag}" />

		<property name="svn.eml2StyleUrl"

			value="https://code.ecoinformatics.org/code/eml/tags/${eml2-style-tag}" />

		<!-- 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/httpclient.jar" />

				</not>

				<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="**/.#*" />

				<exclude name="edu/ucsb/nceas/workflowscheduler/**" />

			</fileset>

		</copy>

		<available file="lib/style/common/emlb6toeml2" type="dir"

			property="styles.not.needed" />

	</target>

	<taskdef resource="axis-tasks.properties"

		classpathref="compile.classpath" />

	<target name="generateStubs" depends="prepare">

		<echo

			message=" Generating stubs for execution service from ${/tmp/KeplerWebService.wsdl}" />

		<axis-wsdl2java verbose="true" output="${srcdir}"

			url="/tmp/KeplerWebService.wsdl" />

	</target>

	<target name="compile" depends="dataone-service,prepare,utilities"

		description="Compiles java code to build dir, and copies metacat props files there">

		<javac srcdir="${build.src}" destdir="${build.dest}"

			debug="${debug}"

			excludes="**/*.sql **/stringclient/** **/client/*.java **/harvesterClient/*.java">

			<classpath>

				<path refid="compile.classpath" />

			</classpath>

		</javac>

	</target>

	<target name="jar" depends="compile,geteml,getd1schemas"

		description="Compiles and jars metacat java code to metacat.jar in build dir ">

		<delete file="${build.dir}/${name}.jar" />

		<jar jarfile="${build.dir}/${name}.jar" basedir="${build.dest}"

			excludes="**/protocols/ **/harvesterClient/" />

	</target>

	<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>

	<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}/lib/httpclient.jar" todir="lib" />

		<copy file="${utilitiesdir}/build/utilities.jar" todir="lib" />

	</target>

	<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">

		<echo message="Exporting utilities files from svn repository:" />

		<svn>

			<export srcUrl="${svn.utilitiesUrl}"

				destPath="${utilitiesdir}" />

		</svn>

		<!--  ant dir="${utilitiesdir}" inheritAll="false"  target="dist" / -->

	</target>

	<target name="getutilities" depends="prepare"

		description="Checks utility out of svn and copies it to your metacat sandbox">

		<svn>

			<export srcUrl="${svn.utilitiesUrl}"

				destPath="${utilitiesdir}" />

		</svn>

	</target>

	<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>

	<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>

	<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>

	<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>

	<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>

	<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>

	<target name="geteml" depends="getemlpre2,geteml2+,getConversionXSL"

		if="eml.required" description="Calls getemlpre2 and geteml2+ targets" />

	<target name="getemlpre2" depends="prepare" if="eml.required"

		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>

		<mkdir dir="lib/dtd" />

		<copy todir="lib/dtd" filtering="yes">

			<fileset

				dir="${build.tmp}/eml_${eml-beta-tag}">

				<include name="*.dtd" />

			</fileset>

			<mapper type="glob" from="eml-*.dtd"

				to="eml-*-${eml-version}.dtd" />

		</copy>

		<copy todir="${style-common-cvsrelpath}" filtering="yes">

			<fileset

				dir="${build.tmp}/eml_${eml-beta-tag}/style">

				<include name="**/*.xsl" />

			</fileset>

		</copy>

	</target>

	<target name="geteml2+" depends="prepare" if="eml.required"

		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>

		<mkdir dir="lib/schema/eml-2.0.0" />

		<copy todir="lib/schema/eml-2.0.0" filtering="yes">

			<fileset

				dir="${build.tmp}/eml_${eml2_0_0-schema-tag}">

				<include name="*.xsd" />

			</fileset>

			<!-- 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 -->

		</copy>

		<!-- <antcall target="copyxsl">

			<param name="cvs.tagname" value="${eml2_0_0-schema-tag}" />

			<param name="dirname" value="eml-2.0.0" />

			</antcall> -->

		<!-- Checkout eml201 for given schema tag-->

		<svn>

			<export srcUrl="${svn.eml201SchemaUrl}"

				destPath="${build.tmp}/eml_${eml2_0_1-schema-tag}" />

		</svn>

		<mkdir dir="lib/schema/eml-2.0.1" />

		<copy todir="lib/schema/eml-2.0.1" filtering="yes">

			<fileset

				dir="${build.tmp}/eml_${eml2_0_1-schema-tag}">

				<include name="*.xsd" />

			</fileset>

		</copy>

		<!-- 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 -->

		<!-- Checkout eml210 for given schema tag-->

		<svn>

			<export srcUrl="${svn.eml210SchemaUrl}"

				destPath="${build.tmp}/eml_${eml2_1_0-schema-tag}" />

		</svn>

		<mkdir dir="lib/schema/eml-2.1.0" />

		<copy todir="lib/schema/eml-2.1.0" filtering="yes">

			<fileset

				dir="${build.tmp}/eml_${eml2_1_0-schema-tag}">

				<include name="*.xsd" />

			</fileset>

		</copy>

		<!-- Checkout eml210 for given style sheet tag-->

		<svn>

			<export srcUrl="${svn.eml2StyleUrl}"

				destPath="${build.tmp}/eml_${eml2-style-tag}" />

		</svn>

		<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>

	</target>

	<!-- 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"/>

	  <property name="install-dataone-schema-dir" value="${installdir}/schema/D1_SCHEMA_0_1"/>

	  <mkdir dir="${install-dataone-schema-dir}"/>

	  <copy todir="${install-dataone-schema-dir}">

	    <fileset dir="${dataone-shema-dir}">

	      <include name="**/*.xsd"/>

	    </fileset>

	  </copy>

	</target>

	<!-- get the dataone schemas from svn -->

	<target name="getd1schemas" depends="prepare" 

		description="Checkout dataone schemas from svn and copy to metacat sandbox">

		<delete dir="${build.tmp}/${dataone-0.1-schema-tag}"/>

        <svn>

            <export srcUrl="${svn.dataone-0.1-schema-url}"

                destPath="${build.tmp}/${dataone-0.1-schema-tag}" />

        </svn>

        <mkdir dir="lib/schema/${dataone-0.1-schema-tag}" />

        <copy todir="lib/schema/${dataone-0.1-schema-tag}" filtering="yes">

            <fileset dir="${build.tmp}/${dataone-0.1-schema-tag}">

                <include name="*.xsd" />

            </fileset>

        </copy>

    </target>

	<target name="copyxsl"

		description="Copies xsl stylesheets from checkout in build/tmp to your metacat sandbox">

		<delete file="${style-common-cvsrelpath}/${eml-css}" />

		<copy todir="${style-common-cvsrelpath}/${dirname}"

			filtering="yes">

			<fileset

				dir="${build.tmp}/eml_${cvs.tagname}/style/eml">

				<include name="**/*.xsl" />

			</fileset>

		</copy>

		<!-- 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

			file="${build.tmp}/eml_${cvs.tagname}/${eml-module.default.css}"

			tofile="${style-common-cvsrelpath}/${eml-css}" />

	</target>

	<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>

	<target name="install-spatial" depends="jar,clientjar,harvesterjar"

		description="Installs spatial option for metacat">

		<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" />

		<!-- Copy geoserver libs into ${war.lib} -->

		<copy todir="${war.lib}" filtering="no">

			<fileset dir="${spatial.geoserver.dir}/WEB-INF/lib">

				<include name="**" />

			</fileset>

		</copy>

		<!-- Copy everything in geoservers WEB-INF (except the libs) into ${war.webinf} -->

		<copy todir="${war.webinf}" filtering="no">

			<fileset dir="${spatial.geoserver.dir}/WEB-INF">

				<exclude name="lib/**" />

				<exclude name="web.xml" />

			</fileset>

		</copy>

		<!-- Copy the rest of the geoserver codebase into ${war.context} -->

		<copy todir="${war.context}" filtering="no">

			<fileset dir="${spatial.geoserver.dir}">

				<exclude name="WEB-INF/**" />

				<exclude name="index.jsp" />

			</fileset>

		</copy>

		<!-- Copy the geoserver index.jsp but rename it to avoid conflicting w/metcat   -->

		<copy file="${spatial.geoserver.dir}/WEB-INF/pages/index.jsp"

			tofile="${war.context}/geoserver.jsp" overwrite="true"

			filtering="no" />

		<!-- Copy the rest of the modified geoserver web-inf files

			<copy todir="${war.webinf}" filtering="no">

			<fileset dir="${spatial.webinf-mods}">

			<exclude name="web.xml.combined"/>

			</fileset>

			</copy> -->

	</target>

	<target name="install" depends="build-metacat"

		description="* Full Install For Development *">

		<copy file="${dist.dir}/${metacat.context}.war"

			todir="${app.deploy.dir}" />

               <!-- <copy file="${dist.dir}/${metacat.context}.war"

                        todir="${app.deploy.dir2}" />-->

		<delete dir="${app.deploy.dir}/${metacat.context}" />

		<!--<delete dir="${app.deploy.dir2}/${metacat.context}" />-->

		<tstamp>

			<format property="NOW" pattern="MM/dd/yyyy hh:mm:ss aa" />

		</tstamp>

		<echo>Dev install completed at ${NOW}</echo>

	</target>

	<target name="build-metacat" depends="install-ecogrid"

		description="Build Metacat">

	</target>

	<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}" />

			<!-- property name="metacat.dir" value="."/ -->

		</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}" />

			<!-- property name="metacat.dir" value="."/ -->

		</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" />

	</target>

	<target name="get-ecogrid" depends="init"

		description="Check out ecogrid module" if="ecogrid.required">

		<svn>

			<export srcUrl="${svn.ecogridUrl}"

				destPath="${ecogrid-dir}" />

		</svn>

	</target>

	<!-- 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 -->

	<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" />

				<exclude name="maven-ant-tasks*.jar" />

			</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/**" />

				<exclude name="spatial/geoserver/**" />

				<exclude name="spatial/WEB-INF/**" />

			</fileset>

		</copy>

		<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}"