Index: /greenstone3/branches/3.03/build.xml
===================================================================
--- /greenstone3/branches/3.03/build.xml	(revision 14721)
+++ /greenstone3/branches/3.03/build.xml	(revision 14722)
@@ -1,4 +1,3 @@
-<?xml version="1.0"?>
-
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- ====================================================================== 
      March 2005                                                    
@@ -11,4 +10,5 @@
 
 	<!-- ============ classpath =================== -->
+
 	<path id="project.classpath">
 	   <fileset dir="lib/java">
@@ -19,4 +19,5 @@
 	<!-- ============ self defined tasks =================== -->
 
+
 	<taskdef name="mysetproxy" classname="org.greenstone.anttasks.MySetProxy" classpath="${basedir}/lib/java/anttasks.jar"/>
 	<taskdef name="getuserandpassword" classname="org.greenstone.anttasks.MyGetUserAndPassword" classpath="${basedir}/lib/java/anttasks.jar"/>
@@ -26,4 +27,5 @@
 
 <!-- ===================== Property Definitions =========================== -->
+
 
 <!--
@@ -51,8 +53,10 @@
 -->
 
+
   <property file="build.properties"/>
   <property file="${user.home}/build.properties"/>
 
   <!-- get properties from the environment -->
+
   <property environment="env"/>
   <property name="build.home" value="${basedir}/build"/>
@@ -62,23 +66,30 @@
   <!-- this may be set in build.properties, eg if you move the web dir to 
   tomcats webapps directory -->
+
   <property name="web.home" value="${basedir}/web"/>
   <!-- jar files needed by applets go here -->
+
   <property name="web.applet" value="${web.home}/applet"/>
   <!-- jar files needed by the servlet (and extra ones) go here -->
+
   <property name="web.lib" value="${web.home}/WEB-INF/lib"/>
   <!-- other files needed by the servlet go here -->
+
   <property name="web.classes" value="${web.home}/WEB-INF/classes"/>
   <!-- jni libraries and java wrappers go here -->
+
   <property name="lib.jni" value="${basedir}/lib/jni"/>
     
   <property name="javadocs" value="${basedir}/docs/javadoc"/>
 
-  <property name="app.name"      value="greenstone3"/>
-  <property name="app.path"      value="/${app.name}"/>
+  <property name="app.name" value="greenstone3"/>
+  <property name="app.path" value="/${app.name}"/>
 
 
   <!-- version number stuff -->
 
+
   <!-- app.version defaults to trunk -->
+
   <condition property="app.version" value="trunk">
     <not><isset property="app.version"/></not>
@@ -86,9 +97,10 @@
 
 	<!-- determine the 'branch path' -->
+
   <condition property="branch.path" value="trunk">
-    <equals arg1="${app.version}" arg2="trunk" />
+    <equals arg1="${app.version}" arg2="trunk"/>
   </condition>
   <condition property="branch.path" value="branches/${app.version}">
-    <not><equals arg1="${app.version}" arg2="trunk" /></not>
+    <not><equals arg1="${app.version}" arg2="trunk"/></not>
   </condition>
 
@@ -98,6 +110,8 @@
   <property name="svn.root" value="http://svn.greenstone.org"/>
 <!--  <property name="cvs.root" value=":pserver:cvs_anon@cvs.scms.waikato.ac.nz:2402/usr/local/global-cvs/gsdl-src"/> -->
+
   <!-- catalina home is set to tomcat basedir is already installed, otherwise
   use greenstone's tomcat -->
+
   <condition property="catalina.home" value="${tomcat.installed.path}"> 
     <and>
@@ -116,5 +130,7 @@
   <property name="os.windows" value="Windows 95,Windows 98,Windows 2000,Windows XP,Windows NT,Windows ME"/> <!-- check this!!!-->
 
+
   <!-- this is true for linux and macs -->
+
   <condition property="current.os.isunix">
     <os family="unix"/>
@@ -162,4 +178,5 @@
     
   <!-- ============= Base dirs for each package and component ============ -->
+
   <property name="src.applet.home" value="${src.home}/org/greenstone/applet"/>
   <property name="src.gsdl3.home" value="${src.home}/org/greenstone/gsdl3"/>
@@ -170,4 +187,5 @@
 
   <!--<property name="indexers.home" value="${basedir}/src/packages/indexers">-->
+
   <condition property="indexers.home" value="${basedir}/src/packages/indexers">
     <isset property="disable.collection.building"/>
@@ -186,4 +204,5 @@
 <!--  ==================== Compilation Control Options ==================== -->
 
+
 <!--
 
@@ -199,7 +218,8 @@
 -->
 
-  <property name="compile.debug"       value="true"/>
+
+  <property name="compile.debug" value="true"/>
   <property name="compile.deprecation" value="true"/>
-  <property name="compile.optimize"    value="true"/>
+  <property name="compile.optimize" value="true"/>
 
 <!--
@@ -213,4 +233,5 @@
 
 -->
+
 
   <path id="compile.classpath">
@@ -277,51 +298,36 @@
 <!-- ==================== Primary and Global Targets ============================= -->
 
+
   <!-- add comments about using xxx-core, xxx-packages if only want certain parts?? -->
 
-  <target name="prepare" depends="accept-properties,init,prepare-core,prepare-packages,prepare-gs2building,prepare-tomcat,prepare-axis,prepare-web,prepare-collections"
-    description="Use this when you first checkout the code: 'ant prepare install'. This will do some additional subversion checkouts and downloads, so you need to be online to run this.">
-<!--  <target name="prepare" depends="accept-properties,init,prepare-core,prepare-packages,prepare-gs2building,prepare-tomcat,prepare-axis,prepare-web,prepare-collections"
-    description="Use this when you first checkout the code: 'ant prepare install'. This will do some additional cvs checkouts and downloads, so you need to be online to run this.">-->
-
-    <!-- make sure .sh files are executable -->
-    <chmod dir="${basedir}" perm="ugo+rx" 
-      includes="*.sh"/>
-    <chmod dir="${basedir}/bin/script" perm="ugo+rx" 
-      includes="*.sh,*.pl"/>
-  </target>
-  <target name="install" depends="init,install-indexer-files,configure,configure-c++,compile" 
-    description="Install Greenstone 3. Use this when you first checkout the code: 'ant prepare install'."/>
+
+  
+  
   
 <!--  <target name="cvsupdate" depends="init,cvsupdate-packages,cvsupdate-core,cvsupdate-gs2building,cvsupdate-web"
     description="Do a cvs update for all sources. Doesn't recompile the code. You need to be online to run this."/>-->
-  <target name="svnupdate" depends="init,svnupdate-packages,svnupdate-core,svnupdate-gs2building,svnupdate-web"
-    description="Do a `svn update` for all sources. Doesn't recompile the code. You need to be online to run this."/>
-
-
-  <target name="configure-c++" depends="init,configure-packages,configure-core,configure-gs2building"
-    description="Configure any C/C+/+ package code and gs2building code if necessary"/>
-  
-  <target name="configure" depends="init,configure-tomcat,configure-web"
-    description="Configure the installation. Includes setting up config files. Should be re-run if you change the build.properties file."/>
-
-  <target name="clean" depends="init,clean-packages,clean-core,clean-gs2building"
-    description="Remove all old compiled code. Includes core, packages and gs2building if necessary"/>
-  
-  <target name="compile" depends="init,compile-web,compile-packages,compile-core,compile-gs2building"
-    description="Compile all the source code, includes core, packages and gs2building if necessary. Copy jar files and executables to their correct places."/>
+
+  <target name="svnupdate" depends="init,svnupdate-packages,svnupdate-core,svnupdate-gs2building,svnupdate-web" description="Do a `svn update` for all sources. Doesn't recompile the code. You need to be online to run this."/>
+
+
+  <target name="configure-c++" depends="init,configure-packages,configure-core,configure-gs2building" description="Configure any C/C+/+ package code and gs2building code if necessary"/>
+  
+  <target name="configure" depends="init,configure-tomcat,configure-web" description="Configure the installation. Includes setting up config files. Should be re-run if you change the build.properties file."/>
+
+  <target name="clean" depends="init,clean-packages,clean-core,clean-gs2building" description="Remove all old compiled code. Includes core, packages and gs2building if necessary"/>
+  
+  <target name="compile" depends="init,compile-web,compile-packages,compile-core,compile-gs2building" description="Compile all the source code, includes core, packages and gs2building if necessary. Copy jar files and executables to their correct places."/>
     
-  <target name="update" depends="init,svnupdate,clean,configure,configure-c++,compile" 
-    description="Update (thru Subversion) all the source (including core, packages and gs2building), then clean, configure and recompile."/>
-
-  <target name="start" depends="init,start-tomcat"
-    description="Startup the Tomcat server." />
-
-  <target name="stop" depends="init,stop-tomcat" 
-    description="Shutdown the Tomcat server."/>
-  
-  <target name="restart" description="Shutdown and restart Tomcat"  depends="init,stop,start"/>
+  
+
+  <target name="start" depends="init,start-tomcat" description="Startup the Tomcat server."/>
+
+  <target name="stop" depends="init,stop-tomcat" description="Shutdown the Tomcat server."/>
+  
+  <target name="restart" description="Shutdown and restart Tomcat" depends="init,stop,start"/>
 
 
 <!-- =========== Help targets ===================================  -->
+
   
   <property name="install-command" value="ant [options] prepare install"/>
@@ -330,9 +336,4 @@
     <echo message="  Execute 'ant -projecthelp' for a list of targets."/>
     <echo message="  Execute 'ant -help' for Ant help."/>
-    <echo>To install Greenstone3, run '${install-command}'. 
-There are properties defined in build.properties. The install process will ask you if these properties are set correctly. To avoid this prompt, use the '-Dproperties.accepted=yes' option.
-To log the output, use the '-logfile build.log' option.
-The README.txt file has more information about the ant targets and install process.
-    </echo>
   </target>
   
@@ -344,4 +345,5 @@
 
 <!-- ====== initialization and setup targets ================== -->
+
 
   <target name="accept-properties" unless="properties.accepted">
@@ -352,5 +354,5 @@
 proxy.host=${proxy.host}
 proxy.port=${proxy.port}
-If these are not acceptable, please change them and rerun this target. Continue [y/n]? />
+If these are not acceptable, please change them and rerun this target. Continue [y/n]? /&gt;
     </input>
     <condition property="do.abort"> 
@@ -372,5 +374,7 @@
   </target> -->
 
+
   <!-- this sets up some initial properties -->
+
   <target name="init">
 
@@ -429,13 +433,11 @@
      
  <!-- ========== Web app Targets ================================ -->
-  
-  <target name="prepare-web" depends="init,configure-java-version">
-    <mkdir dir="${web.home}/applet"/>
-    <mkdir dir="${web.home}/logs"/>
-  </target>
+
+  
+  
   
   <!-- if we are using java 1.5, we need the xalan.jar file in web/WEB-INF/lib,  but if we are using java 1.4, we can't have it there -->
-  <target name="configure-java-version" depends="init"
-    description="Run this target if you have changed the default version of java since installing greenstone3">
+
+  <target name="configure-java-version" depends="init" description="Run this target if you have changed the default version of java since installing greenstone3">
     <condition property="need.xalan.jar">
       <equals arg1="1.5" arg2="${ant.java.version}"/>
@@ -453,35 +455,8 @@
   </target>
 
-  <target name="prepare-collections" depends="init">
-    <property name="collect.dir" value="${web.home}/sites/localsite/collect"/>
-    <!-- gs2mgdemo -->
-    <unzip src="${collect.dir}/gs2mgdemo/import.zip" 
-      dest="${collect.dir}/gs2mgdemo"/>
-    <unzip src="${collect.dir}/gs2mgdemo/metadata.zip" 
-      dest="${collect.dir}/gs2mgdemo"/>
-    <unzip src="${collect.dir}/gs2mgdemo/index/index.zip" 
-      dest="${collect.dir}/gs2mgdemo/index"/>
-    <delete file="${collect.dir}/gs2mgdemo/import.zip"/>
-    <delete file="${collect.dir}/gs2mgdemo/metadata.zip"/>
-    <delete file="${collect.dir}/gs2mgdemo/index/index.zip"/>
-    <!-- gs2mgppdemo -->
-    <unzip src="${collect.dir}/gs2mgppdemo/import.zip" 
-      dest="${collect.dir}/gs2mgppdemo"/>
-    <unzip src="${collect.dir}/gs2mgppdemo/metadata.zip" 
-      dest="${collect.dir}/gs2mgppdemo"/>
-    <unzip src="${collect.dir}/gs2mgppdemo/index/index.zip" 
-      dest="${collect.dir}/gs2mgppdemo/index"/>
-    <delete file="${collect.dir}/gs2mgppdemo/import.zip"/>
-    <delete file="${collect.dir}/gs2mgppdemo/metadata.zip"/>
-    <delete file="${collect.dir}/gs2mgppdemo/index/index.zip"/>
-    <!-- gberg -->
-    <unzip src="${collect.dir}/gberg/index/index.zip" 
-      dest="${collect.dir}/gberg/index"/>
-    <delete file="${collect.dir}/gberg/index/index.zip"/>
-  </target>
-
-  
-  <target name="configure-web" depends="init"
-    description="Configure only the web app config files">
+  
+
+  
+  <target name="configure-web" depends="init" description="Configure only the web app config files">
     <!-- we want a unix path in the global.properties file -->
     <pathconvert targetos="unix" property="src.gsdl3.home.unix">
@@ -499,9 +474,5 @@
 
   <target name="compile-web" depends="init">
-    <javac srcdir="${web.classes}"
-      destdir="${web.classes}"
-      debug="${compile.debug}"
-      deprecation="${compile.deprecation}"
-      optimize="${compile.optimize}">
+    <javac srcdir="${web.classes}" destdir="${web.classes}" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}">
       <classpath>
 	<path refid="compile.classpath"/>
@@ -516,41 +487,15 @@
 	</target>
 
-  <target name="update-web" depends="init,svnupdate-web,configure-web"
-    description="update only the web stuff (config files)"/>
+  
 
 
 <!-- ======================= Tomcat Targets ========================== -->
+
   
   <!-- this target downloads and installs Tomcat -->
+
   <!-- we download tomcat and the compat module - its needed for 1.4, and doesn't seem to harm 1.5 -->
-  <target name="prepare-tomcat" depends="init,setup-proxy" if="tomcat.islocal">
-
-    <!-- check that packages dir is there -->
-    <mkdir dir="${packages.home}"/>
-    <get src="http://www.greenstone.org/gs3files/apache-tomcat-5.5.25.zip"
-      dest="${packages.home}/apache-tomcat-5.5.25.zip"
-      usetimestamp="true"/>
-    <unzip src="${packages.home}/apache-tomcat-5.5.25.zip" 
-      dest="${packages.home}"/>
-    <get src="http://www.greenstone.org/gs3files/apache-tomcat-5.5.25-compat.zip"
-      dest="${packages.home}/apache-tomcat-5.5.25-compat.zip"
-      usetimestamp="true"/>
-    <unzip src="${packages.home}/apache-tomcat-5.5.25-compat.zip" 
-      dest="${packages.home}"/>
-    <!-- delete any existing tomcat -->
-    <delete dir="${packages.home}/tomcat"/>
-    <move todir="${packages.home}/tomcat">
-      <fileset dir="${packages.home}/apache-tomcat-5.5.25"/>
-    </move>
-    <copy file="${basedir}/resources/tomcat/setclasspath.bat"
-      tofile="${packages.home}/tomcat/bin/setclasspath.bat"
-      overwrite="true"/>
-    <copy file="${basedir}/resources/tomcat/setclasspath.sh"
-      tofile="${packages.home}/tomcat/bin/setclasspath.sh"
-      overwrite="true"/>
-    <!-- make sure we have execute permission for the .sh files -->
-    <chmod dir="${packages.home}/tomcat/bin" perm="ugo+rx" 
-      includes="*.sh"/>   
-  </target>
+
+  
   
   <target name="configure-tomcat" depends="init,configure-tomcat-local,configure-tomcat-external"/>
@@ -608,4 +553,5 @@
   </target>
   <!-- windows: do we want to launch a webrowser?? -->
+
   <target name="stop-tomcat" description="Shutdown only Tomcat" depends="init" if="tomcat.islocal">
     <exec executable="${catalina.home}/bin/shutdown.sh" os="${os.unix}" dir="${catalina.home}/bin" spawn="false">
@@ -619,72 +565,29 @@
   <target name="setup-catalina-ant-tasks">
     <!-- Configure the custom Ant tasks for the Tomcat Manager application -->
-    <taskdef name="deploy"    classname="org.apache.catalina.ant.DeployTask"
-      classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
-    <taskdef name="list"      classname="org.apache.catalina.ant.ListTask"
-      classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
-    <taskdef name="reload"    classname="org.apache.catalina.ant.ReloadTask"
-      classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
-    <taskdef name="resources" classname="org.apache.catalina.ant.ResourcesTask"
-      classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
-    <taskdef name="roles"     classname="org.apache.catalina.ant.RolesTask"
-      classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
-    <taskdef name="start"     classname="org.apache.catalina.ant.StartTask"
-      classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
-    <taskdef name="stop"      classname="org.apache.catalina.ant.StopTask"
-      classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
-    <taskdef name="undeploy"  classname="org.apache.catalina.ant.UndeployTask"
-      classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
-  </target>
-
-
-
-
-
-
-<!-- ======================= ant Targets ============================ --> 
-  <target name="prepare-ant" depends="init">
-    <get src="http://www.greenstone.org/gs3files/apache-ant-1.7.0-bin.zip"
-      dest="${packages.home}/apache-ant-1.7.0-bin.zip"
-      usetimestamp="true"/>
-    <unzip src="${packages.home}/apache-ant-1.7.0-bin.zip"
-      dest="${packages.home}"/>
-    <move todir="${packages.home}/ant">
-      <fileset dir="${packages.home}/apache-ant-1.7.0"/>
-    </move>
-  </target>
-
-<!-- ======================= Axis Targets ============================ --> 
-
-  <target name="prepare-axis" depends="init">
-    <get src="http://www.greenstone.org/gs3files/axis-bin-1_2_1.zip"
-      dest="${packages.home}/axis-bin-1_2_1.zip"
-      usetimestamp="true"/>
-    <unzip src="${packages.home}/axis-bin-1_2_1.zip"
-      dest="${packages.home}"/>
-    <move todir="${packages.home}/axis">
-      <fileset dir="${packages.home}/axis-1_2_1"/>
-    </move>
-    <!-- install axis into greenstone web app -->
-    <copy todir="${web.lib}">
-      <fileset dir="${packages.home}/axis/webapps/axis/WEB-INF/lib">
-	<include name="*.jar"/>
-      </fileset>
-    </copy>
-    <copy todir="${web.home}">
-      <fileset dir="${packages.home}/axis/webapps/axis/">
-	<include name="*.jsp"/>
-	<include name="*.jws"/>
-      </fileset>
-    </copy>
-    <copy tofile="${web.home}/axis.html" file="${packages.home}/axis/webapps/axis/index.html"/>
-    <copy todir="${web.classes}">
-      <fileset dir="${packages.home}/axis/webapps/axis/WEB-INF/classes">
-	<include name="*.properties"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <target name="soap-deploy-site" depends="init,get-sitename,get-siteuri,create-deployment-files,deploy-site"
-    description="Deploy a SOAP web service for a local Greenstone site. Tomcat must be running for this to work."/>
+    <taskdef name="deploy" classname="org.apache.catalina.ant.DeployTask" classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
+    <taskdef name="list" classname="org.apache.catalina.ant.ListTask" classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
+    <taskdef name="reload" classname="org.apache.catalina.ant.ReloadTask" classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
+    <taskdef name="resources" classname="org.apache.catalina.ant.ResourcesTask" classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
+    <taskdef name="roles" classname="org.apache.catalina.ant.RolesTask" classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
+    <taskdef name="start" classname="org.apache.catalina.ant.StartTask" classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
+    <taskdef name="stop" classname="org.apache.catalina.ant.StopTask" classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
+    <taskdef name="undeploy" classname="org.apache.catalina.ant.UndeployTask" classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
+  </target>
+
+
+
+
+
+
+<!-- ======================= ant Targets ============================ -->
+ 
+  
+
+<!-- ======================= Axis Targets ============================ -->
+ 
+
+  
+
+  <target name="soap-deploy-site" depends="init,get-sitename,get-siteuri,create-deployment-files,deploy-site" description="Deploy a SOAP web service for a local Greenstone site. Tomcat must be running for this to work."/>
   
   <target name="deploy-site">
@@ -697,6 +600,5 @@
   </target>
   
-  <target name="soap-undeploy-site" depends="get-sitename"
-    description="Undeploy a SOAP web service for a local Greenstone site. Tomcat must be running for this to work.">
+  <target name="soap-undeploy-site" depends="get-sitename" description="Undeploy a SOAP web service for a local Greenstone site. Tomcat must be running for this to work.">
     <java classname="org.apache.axis.client.AdminClient">
       <classpath refid="compile.classpath"/>
@@ -708,6 +610,6 @@
 
   <!-- this target used to deploy the preprepared localsite server  -->
-  <target name="deploy-localsite" depends="init" 
-    description="Deploy the SOAP server for localsite. Will start and stop Tomcat.">
+
+  <target name="deploy-localsite" depends="init" description="Deploy the SOAP server for localsite. Will start and stop Tomcat.">
     <antcall target="start-tomcat"/>
     <antcall target="deploy-site">
@@ -736,46 +638,31 @@
    </target> 
 
-  <target name="create-deployment-files" depends="get-sitename,get-siteuri,check-deployment-files" 
-    if="axis.sitename" unless="deploy.exists">
+  <target name="create-deployment-files" depends="get-sitename,get-siteuri,check-deployment-files" if="axis.sitename" unless="deploy.exists">
     <filter token="sitename" value="${axis.sitename}"/>
     <filter token="siteuri" value="${axis.siteuri}"/>
-    <copy file="${basedir}/resources/soap/site.wsdd.template"
-      tofile="${basedir}/resources/soap/${axis.sitename}.wsdd"
-      filtering="true"/>
-     <copy file="${basedir}/resources/soap/undeploy-site.wsdd.template"
-      tofile="${basedir}/resources/soap/undeploy-${axis.sitename}.wsdd"
-      filtering="true"/>
+    <copy file="${basedir}/resources/soap/site.wsdd.template" tofile="${basedir}/resources/soap/${axis.sitename}.wsdd" filtering="true"/>
+     <copy file="${basedir}/resources/soap/undeploy-site.wsdd.template" tofile="${basedir}/resources/soap/undeploy-${axis.sitename}.wsdd" filtering="true"/>
     <!-- create the java files and compile them -->
-    <copy file="${basedir}/resources/java/SOAPServer.java.in"
-      tofile="${src.gsdl3.home}/SOAPServer${axis.sitename}.java"
-      filtering="true"/>
+    <copy file="${basedir}/resources/java/SOAPServer.java.in" tofile="${src.gsdl3.home}/SOAPServer${axis.sitename}.java" filtering="true"/>
     <mkdir dir="${build.home}"/>
-    <javac srcdir="${src.home}"
-      destdir="${build.home}" 
-      debug="${compile.debug}"
-      deprecation="${compile.deprecation}"
-      optimize="${compile.optimize}">
+    <javac srcdir="${src.home}" destdir="${build.home}" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}">
       <classpath refid="compile.classpath"/>
-      <include name="org/greenstone/gsdl3/SOAPServer${axis.sitename}.java" />
+      <include name="org/greenstone/gsdl3/SOAPServer${axis.sitename}.java"/>
     </javac>
     <mkdir dir="${web.classes}/org/greenstone/gsdl3"/>
-    <copy file="${build.home}/org/greenstone/gsdl3/SOAPServer${axis.sitename}.class" tofile="${web.classes}/org/greenstone/gsdl3/SOAPServer${axis.sitename}.class" />
+    <copy file="${build.home}/org/greenstone/gsdl3/SOAPServer${axis.sitename}.class" tofile="${web.classes}/org/greenstone/gsdl3/SOAPServer${axis.sitename}.class"/>
   </target>
     
 
 <!-- ====================== Core targets ============================== -->
+
 <!-- core targets refer to the core gsdl3 java src -->
-  
-  <target name="prepare-core" unless="nocvs.mode">
-    <!-- just get rid of empty directories-->
-    <svn>
-		<update dir="."/>
-	</svn>
-  </target>
+
+  
+  
   
   <target name="configure-core"/>
 
-  <target name="update-core" depends="init,svnupdate-core,clean-core,compile-core"
-    description="Update only the Greenstone core" />
+  
   
   <target name="svnupdate-core" unless="nocvs.mode">
@@ -798,17 +685,11 @@
   </target>
 
-  <target name="clean-core"
-    description="Clean only the Greenstone core">
+  <target name="clean-core" description="Clean only the Greenstone core">
     <delete dir="${build.home}"/>
   </target>
 
-   <target name="compile-core" depends="init" 
-    description="Compile only the Greenstone core">
+   <target name="compile-core" depends="init" description="Compile only the Greenstone core">
     <mkdir dir="${build.home}"/>
-    <javac srcdir="${src.home}"
-      destdir="${build.home}"
-      debug="${compile.debug}"
-      deprecation="${compile.deprecation}"
-      optimize="${compile.optimize}">
+    <javac srcdir="${src.home}" destdir="${build.home}" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}">
       <classpath>
 	<path refid="compile.classpath"/>
@@ -822,10 +703,10 @@
       </fileset>
       <manifest>
-	<attribute name="Built-By" value="${user.name}" />
+	<attribute name="Built-By" value="${user.name}"/>
       </manifest>
     </jar>
     <copy file="${build.home}/gsdl3.jar" todir="${web.lib}"/>
     <!-- copy the localsite server in case we need it -->
-    <copy file="${build.home}/org/greenstone/gsdl3/SOAPServerlocalsite.class" tofile="${web.classes}/org/greenstone/gsdl3/SOAPServerlocalsite.class" />
+    <copy file="${build.home}/org/greenstone/gsdl3/SOAPServerlocalsite.class" tofile="${web.classes}/org/greenstone/gsdl3/SOAPServerlocalsite.class"/>
 
     <jar destfile="${build.home}/GAI.jar">
@@ -834,5 +715,5 @@
       </fileset>
       <manifest>
-	<attribute name="Built-By" value="${user.name}" />
+	<attribute name="Built-By" value="${user.name}"/>
       </manifest>
     </jar>
@@ -843,5 +724,5 @@
       </fileset>
       <manifest>
-	<attribute name="Built-By" value="${user.name}" />
+	<attribute name="Built-By" value="${user.name}"/>
       </manifest>
     </jar>
@@ -856,5 +737,5 @@
       </fileset>
       <manifest>
-	<attribute name="Built-By" value="${user.name}" />
+	<attribute name="Built-By" value="${user.name}"/>
       </manifest>
     </jar>
@@ -866,5 +747,5 @@
       </fileset>
       <manifest>
-	<attribute name="Built-By" value="${user.name}" />
+	<attribute name="Built-By" value="${user.name}"/>
       </manifest>
     </jar>
@@ -882,21 +763,15 @@
  
 <!-- ================== Packages targets ================================ -->
+
   <!-- these targets refer to the greenstone source packages - these need 
   updating less often, so are in  separate targets to the core -->
-  <target name="prepare-packages" depends="init,prepare-indexers"/>
-  
-  <target name="checkout-indexers" depends="init" if="independent-indexers" unless="nocvs.mode">
-<!--  <target name="checkout-indexers" depends="check-svnroot,init" if="independent-indexers" unless="nocvs.mode"> -->
-    <svn>
-		<checkout url="${svn.root}/indexers/${branch.path}" dest="${src.packages.home}/indexers"/>
-	</svn>
-  </target>
-  
-  <target name="prepare-indexers" depends="init" if="independent-indexers" unless="indexers.present">
-    <antcall target="checkout-indexers"/>
-  </target>
-
-  <target name="update-packages" depends="init,svnupdate-packages,configure-packages,clean-packages,compile-packages"
-    description="Update only the source packages"/>
+
+  
+  
+  
+  
+  
+
+  
 
   <target name="svnupdate-packages" unless="nocvs.mode"> 
@@ -906,6 +781,5 @@
   </target>
   
-  <target name="configure-packages" depends="init,configure-javagdbm,configure-indexers" 
-    description="Configure only the packages."/>
+  <target name="configure-packages" depends="init,configure-javagdbm,configure-indexers" description="Configure only the packages."/>
   
   <target name="configure-javagdbm">
@@ -913,11 +787,9 @@
       Configuring JavaGDBM
     </echo>
-    <exec executable="${javagdbm.home}/configure" os="${os.linux},${os.solaris}"
-      dir="${javagdbm.home}">
+    <exec executable="${javagdbm.home}/configure" os="${os.linux},${os.solaris}" dir="${javagdbm.home}">
       <arg value="--prefix=${basedir}"/>
       <arg value="--libdir=${lib.jni}"/>
     </exec>    
-    <exec executable="${javagdbm.home}/configure" os="${os.mac}"
-      dir="${javagdbm.home}">
+    <exec executable="${javagdbm.home}/configure" os="${os.mac}" dir="${javagdbm.home}">
       <arg value="--prefix=${basedir}"/>
       <arg value="--libdir=${lib.jni}"/>
@@ -930,5 +802,7 @@
 	Shouldn't they be configured when collection building is ENabled? -->
 
+
 <!--	<target name="configure-indexers" depends="init" if="independent-indexers"> -->
+
 <target name="configure-indexers" depends="init">
 		<echo>Configuring Indexers</echo>
@@ -942,6 +816,5 @@
 
   <target name="clean-javagdbm" depends="init">
-    <exec executable="make" os="${os.unix}"
-      dir="${javagdbm.home}">
+    <exec executable="make" os="${os.unix}" dir="${javagdbm.home}">
       <arg value="clean"/>
     </exec>
@@ -949,10 +822,8 @@
   
   <target name="clean-indexers" depends="init" if="independent-indexers">
-    <exec executable="make" os="${os.unix}"
-      dir="${indexers.home}">
+    <exec executable="make" os="${os.unix}" dir="${indexers.home}">
       <arg value="clean"/>
     </exec>
-    <exec executable="${indexers.home}/winMake.bat" os="${os.windows}"
-       dir="${indexers.home}">
+    <exec executable="${indexers.home}/winMake.bat" os="${os.windows}" dir="${indexers.home}">
        <arg value="clean"/>
     </exec>
@@ -1037,7 +908,6 @@
 
 
-  <target name="update-gs2building" if="collection.building.enabled" 
-    depends="init,svnupdate-gs2building,rename-gs2build-files,configure-gs2building,clean-gs2building,compile-gs2building"
-    description="Update only the Greenstone 2 building components"/>
+
+  
 
   <target name="svnupdate-gs2building" if="collection.building.enabled" depends="init,svnupdate-gs2build,svnupdate-gli" unless="nocvs.mode">
@@ -1055,110 +925,15 @@
   </target>
 
-  <target name="prepare-gs2building" depends="init,prepare-gs2build,prepare-gli" if="collection.building.enabled">
-  </target>
-
-  <target name="checkout-gs2build" depends="init" if="collection.building.enabled" unless="nocvs.mode">
-    <echo>checking out gs2build</echo>
-		<!-- svn checkouts -->
-		<svn>
-			<!-- perllib -->
-			<checkout url="${svn.root}/gsdl/${branch.path}/perllib" destPath="gs2build/perllib"/>
-
-			<!-- selected packages -->
-			<checkout url="${svn.root}/gsdl/${branch.path}/packages/cpan" destPath="gs2build/packages/cpan"/>
-			<checkout url="${svn.root}/gsdl/${branch.path}/packages/expat" destPath="gs2build/packages/expat"/>
-			<checkout url="${svn.root}/gsdl/${branch.path}/packages/html-tidy" destPath="gs2build/packages/html-tidy"/>
-			<checkout url="${svn.root}/gsdl/${branch.path}/packages/isis-gdl" destPath="gs2build/packages/isis-gdl"/>
-			<checkout url="${svn.root}/gsdl/${branch.path}/packages/kea" destPath="gs2build/packages/kea"/>
-			<checkout url="${svn.root}/gsdl/${branch.path}/packages/pdftohtml" destPath="gs2build/packages/pdftohtml"/>
-			<checkout url="${svn.root}/gsdl/${branch.path}/packages/rtftohtml" destPath="gs2build/packages/rtftohtml"/>
-			<checkout url="${svn.root}/gsdl/${branch.path}/packages/w3mir" destPath="gs2build/packages/w3mir"/>
-			<checkout url="${svn.root}/gsdl/${branch.path}/packages/wget" destPath="gs2build/packages/wget"/>
-			<checkout url="${svn.root}/gsdl/${branch.path}/packages/windows" destPath="gs2build/packages/windows"/>
-			<checkout url="${svn.root}/gsdl/${branch.path}/packages/wv" destPath="gs2build/packages/wv"/>
-			<checkout url="${svn.root}/gsdl/${branch.path}/packages/xlhtml" destPath="gs2build/packages/xlhtml"/>
-			<checkout url="${svn.root}/gsdl/${branch.path}/packages/yaz" destPath="gs2build/packages/yaz"/>
-			
-			<!-- some of src (db2txt hashfile phind txt2db) -->
-			<checkout url="${svn.root}/gsdl/${branch.path}/src/db2txt" destPath="gs2build/src/db2txt"/>
-			<checkout url="${svn.root}/gsdl/${branch.path}/src/hashfile" destPath="gs2build/src/hashfile"/>
-			<checkout url="${svn.root}/gsdl/${branch.path}/src/phind" destPath="gs2build/src/phind"/>
-			<checkout url="${svn.root}/gsdl/${branch.path}/src/txt2db" destPath="gs2build/src/txt2db"/>
-
-			<!-- bin -->
-			<checkout url="${svn.root}/gsdl/${branch.path}/bin/script" destPath="gs2build/bin/script"/>
-
-			<!-- mappings -->
-			<checkout url="${svn.root}/gsdl/${branch.path}/mappings" destPath="gs2build/mappings"/>
-
-			<!-- etc/packages -->
-			<checkout url="${svn.root}/gsdl/${branch.path}/etc/packages" destPath="gs2build/etc/packages"/>
-	
-			<!-- collect -->
-			<checkout url="${svn.root}/gsdl/${branch.path}/collect/modelcol" destPath="gs2build/collect/modelcol"/>
-
-			<!-- gs2build-extra -->
-			<checkout url="${svn.root}/other-projects/trunk/gs2build-extra" destPath="gs2build/gs2build-extra"/>
-
-			<!-- indexers -->
-			<checkout url="${svn.root}/indexers/${branch.path}" destPath="gs2build/indexers"/>
-
-
-		</svn>
-		<!-- regular downloads -->
-
-		<!-- some files from lib -->
-		<mkdir dir="gs2build/lib"/>
-		<get src="${svn.root}/gsdl/${branch.path}/lib/text_t.h" dest="gs2build/lib/text_t.h"/>
-		<get src="${svn.root}/gsdl/${branch.path}/lib/text_t.cpp" dest="gs2build/lib/text_t.cpp"/>
-		<get src="${svn.root}/gsdl/${branch.path}/lib/gsdlconf.h" dest="gs2build/lib/gsdlconf.h"/>
-
-		<!-- some files from etc -->
-		<get src="${svn.root}/gsdl/${branch.path}/etc/marctodc.txt" dest="gs2build/etc/marctodc.txt"/>
-		<get src="${svn.root}/gsdl/${branch.path}/etc/dc2marc-mapping.xml" dest="gs2build/etc/dc2marc-mapping.xml"/>
-		<get src="${svn.root}/gsdl/${branch.path}/etc/dc2marc.xsl" dest="gs2build/etc/dc2marc.xsl"/>
-		<get src="${svn.root}/gsdl/${branch.path}/etc/qdc2marc-mapping.xml" dest="gs2build/etc/qdc2marc-mapping.xml"/>
-
-		<!-- some files from the gsdl root directory -->
-		<get src="${svn.root}/gsdl/${branch.path}/setup.bash" dest="gs2build/setup.bash"/>
-		<get src="${svn.root}/gsdl/${branch.path}/config.sub" dest="gs2build/config.sub"/>
-		<get src="${svn.root}/gsdl/${branch.path}/config.guess" dest="gs2build/config.guess"/>
-		<get src="${svn.root}/gsdl/${branch.path}/config.h.in" dest="gs2build/config.h.in"/>
-		<get src="${svn.root}/gsdl/${branch.path}/configtest.pl" dest="gs2build/configtest.pl"/>
-		<get src="${svn.root}/gsdl/${branch.path}/install-sh" dest="gs2build/install-sh"/>
-		<get src="${svn.root}/gsdl/${branch.path}/acconfig.h" dest="gs2build/acconfig.h"/>
-		<get src="${svn.root}/gsdl/${branch.path}/aclocal.m4" dest="gs2build/aclocal.m4"/>
-		<get src="${svn.root}/gsdl/${branch.path}/WIN32cfg.h" dest="gs2build/WIN32cfg.h"/>
-
-	</target>
-
-  <target name="prepare-gs2build" depends="init" if="collection.building.enabled" unless="gs2build.present">
-    <antcall target="checkout-gs2build"/>
-    <antcall target="rename-gs2build-files"/>
-    <antcall target="unzip-windows-packages"/>
-    <antcall target="checkout-winbin"/>
-    <antcall target="get-windows-binaries"/>
-    <antcall target="delete-winbin"/>
-    <antcall target="get-macos-extra"/>
-  </target>
-
-  <target name="checkout-winbin" depends="init" if="current.os.iswindows" 
-    unless="nocvs.mode">
-    <svn>
-		<checkout url="${svn.root}/other-projects/trunk/winbin" destPath="${basedir}/winbin"/>
-	</svn>	
-  </target>
-
-  <target name="update-winbin" depends="init" if="current.os.iswindows" unless="nocvs.mode">
-		<svn>
-			<update dir="${svn.root}/other-projects/trunk/winbin"/>
-		</svn>	
-	</target>
-  
-  <target name="get-windows-binaries" depends="init" if="collection.building.enabled.windows">
-    <move todir="${gs2build.home}/bin/windows" failonerror="false">
-      <fileset dir="${basedir}/winbin/bin"/>
-    </move>
-  </target>
+  
+
+  
+
+  
+
+  
+
+  
+  
+  
   <target name="delete-winbin" depends="init" if="collection.building.enabled.windows">
     <delete dir="${basedir}/winbin"/>
@@ -1166,20 +941,17 @@
   
   <target name="unzip-windows-packages" depends="init" if="collection.building.enabled.windows">  
-    <unzip src="${gs2build.home}/packages/windows/gdbm/gdbm.zip"
-    dest="${gs2build.home}/packages/windows/gdbm"/>
-   <unzip src="${gs2build.home}/packages/windows/crypt/crypt.zip"
-    dest="${gs2build.home}/packages/windows/crypt"/>
-       <unzip src="${gs2build.home}/packages/windows/expat/expat.zip"
-    dest="${gs2build.home}/packages/windows/expat"/>
+    <unzip src="${gs2build.home}/packages/windows/gdbm/gdbm.zip" dest="${gs2build.home}/packages/windows/gdbm"/>
+   <unzip src="${gs2build.home}/packages/windows/crypt/crypt.zip" dest="${gs2build.home}/packages/windows/crypt"/>
+       <unzip src="${gs2build.home}/packages/windows/expat/expat.zip" dest="${gs2build.home}/packages/windows/expat"/>
    </target>
   
   <!-- downloads a good XML-Parser -->
+
   <target name="get-macos-extra" depends="init" if="need.macos.extra">	
-      <get src="http://www.greenstone.org/gs3files/XML-Parser.tar.gz"
-      dest="${gs2build.home}/perllib/cpan/XML-Parser.tar.gz"
-      usetimestamp="true"/>
+      <get src="http://www.greenstone.org/gs3files/XML-Parser.tar.gz" dest="${gs2build.home}/perllib/cpan/XML-Parser.tar.gz" usetimestamp="true"/>
   </target>  
 
   <!-- untars the XML-Parser. need to do this after compiling in gs2build-->
+
   <target name="install-macos-extra" depends="init,get-macos-extra" if="need.macos.extra">
     <!-- make sure these directories are present, otherwise chmod craps out 
@@ -1189,17 +961,15 @@
     <chmod dir="${gs2build.home}/perllib/cpan/perl-5.8" perm="ug+w" includes="**"/>
     <chmod dir="${gs2build.home}/perllib/cpan/perl-5.6" perm="ug+w" includes="**"/>
-    <untar src="${gs2build.home}/perllib/cpan/XML-Parser.tar.gz"
-      dest="${gs2build.home}/perllib/cpan/"
-      compression="gzip"/>
+    <untar src="${gs2build.home}/perllib/cpan/XML-Parser.tar.gz" dest="${gs2build.home}/perllib/cpan/" compression="gzip"/>
   </target>
 
   <target name="install-indexer-files" depends="init" unless="indexers.present">
     <copy todir="${indexers.home}">
-      <fileset dir="${gs2build.home}/indexers" />
+      <fileset dir="${gs2build.home}/indexers"/>
     </copy>
     <chmod file="${indexers.home}/configure" perm="a+x"/>
   </target>
 
-  <target name="rename-gs2build-files" depends="rename-gs2build-files-unix,rename-gs2build-files-windows,gs2build-edit-setup-bat" if="collection.building.enabled"/>
+  
   
   <target name="gs2build-edit-setup-bat" if="collection.building.enabled.windows">
@@ -1213,46 +983,22 @@
      </filterset>
     </move>  
-    <move file="${gs2build.home}/setup-tmp.bat" tofile="${gs2build.home}/setup.bat" />
-  </target>
-  
-  <target name="rename-gs2build-files-windows" if="collection.building.enabled.windows">
-    <property name="gs2build-extra.home" value="${gs2build.home}/gs2build-extra"/>
-    <copy file="${gs2build-extra.home}/lib.win32.mak" tofile="${gs2build.home}/lib/win32.mak"/>
-    <copy file="${gs2build-extra.home}/win32.mak" tofile="${gs2build.home}/win32.mak"/>
-    <copy file="${gs2build-extra.home}/setup.bat" tofile="${gs2build.home}/setup.bat"/>
-  </target> 
-  
-  <target name="rename-gs2build-files-unix" if="collection.building.enabled.unix">
-    <property name="gs2build-extra.home" value="${gs2build.home}/gs2build-extra"/>
-    <copy file="${gs2build-extra.home}/configure" tofile="${gs2build.home}/configure"/>    
-    <chmod file="${gs2build.home}/configure" perm="a+x"/>
-    <copy file="${gs2build-extra.home}/configure.in" tofile="${gs2build.home}/configure.in"/>
-    <copy file="${gs2build-extra.home}/Makefile.in" tofile="${gs2build.home}/Makefile.in"/>  
-    <copy file="${gs2build-extra.home}/packages.configure" tofile="${gs2build.home}/packages/configure"/>
-    <chmod file="${gs2build.home}/packages/configure" perm="a+x"/>
-    <copy file="${gs2build-extra.home}/packages.Makefile.in" tofile="${gs2build.home}/packages/Makefile.in"/>
-    <copy file="${gs2build-extra.home}/lib.Makefile.in" tofile="${gs2build.home}/lib/Makefile.in"/>  
-  </target>
-  
-  <target name="prepare-gli" depends="init" if="collection.building.enabled" unless="gli.present">
-    <antcall target="checkout-gli"/>
-  </target>
+    <move file="${gs2build.home}/setup-tmp.bat" tofile="${gs2build.home}/setup.bat"/>
+  </target>
+  
+   
+  
+  
+  
+  
   
 <!--  <target name="checkout-gli" depends="check-cvsroot,init" if="collection.building.enabled" unless="nocvs.mode"> -->
-  <target name="checkout-gli" depends="init" if="collection.building.enabled" unless="nocvs.mode">
-    <echo>checking out gli</echo>
-    <svn>
-		<checkout url="${svn.root}/gli/${branch.path}" destPath="gli"/>
-	</svn>
-  </target>
+
+  
     
-  <target name="configure-gs2building" depends="init" if="collection.building.enabled"
-    description="Configure only the Greenstone 2 building components">
-    <exec executable="${gs2build.home}/configure" os="${os.linux},${os.solaris}"
-      dir="${gs2build.home}">
+  <target name="configure-gs2building" depends="init" if="collection.building.enabled" description="Configure only the Greenstone 2 building components">
+    <exec executable="${gs2build.home}/configure" os="${os.linux},${os.solaris}" dir="${gs2build.home}">
       <arg value="--prefix=${gs2build.home}"/>
     </exec>
-    <exec executable="${gs2build.home}/configure" os="${os.mac}"
-      dir="${gs2build.home}">
+    <exec executable="${gs2build.home}/configure" os="${os.mac}" dir="${gs2build.home}">
       <arg value="--prefix=${gs2build.home}"/>
       <arg value="--with-gdbm=${gdbm.installed.path}"/>
@@ -1260,7 +1006,5 @@
   </target>
 
-  <target name="clean-gs2building" depends="init,clean-gli,clean-gs2build" 
-    description="Clean only the Greenstone 2 building components" 
-    if="collection.building.enabled"/>
+  <target name="clean-gs2building" depends="init,clean-gli,clean-gs2build" description="Clean only the Greenstone 2 building components" if="collection.building.enabled"/>
   
   <target name="clean-gli" depends="init" if="collection.building.enabled">
@@ -1268,9 +1012,7 @@
     <property name="gli.home" value="${basedir}/gli"/>
     <!-- linux -->
-    <exec executable="clean.sh" os="${os.unix}" dir="${gli.home}"
-      resolveExecutable="true"/>
+    <exec executable="clean.sh" os="${os.unix}" dir="${gli.home}" resolveExecutable="true"/>
     <!-- windows -->
-    <exec executable="clean.bat" os="${os.windows}" dir="${gli.home}"
-      resolveExecutable="true"/>
+    <exec executable="clean.bat" os="${os.windows}" dir="${gli.home}" resolveExecutable="true"/>
   </target>
   
@@ -1300,6 +1042,5 @@
   </target>
   
-  <target name="compile-gs2building" depends="init,compile-gs2build,compile-gli" if="collection.building.enabled"
-    description="Compile only the Greenstone 2 building components">
+  <target name="compile-gs2building" depends="init,compile-gs2build,compile-gli" if="collection.building.enabled" description="Compile only the Greenstone 2 building components">
   </target>
   
@@ -1313,12 +1054,10 @@
     <exec executable="makegli.sh" os="${os.unix}" dir="${gli.home}" resolveExecutable="true"/>
      <!--remote gli-->
-     <exec executable="makejar.sh" os="${os.unix}" dir="${gli.home}"
-      resolveExecutable="true"/>
+     <exec executable="makejar.sh" os="${os.unix}" dir="${gli.home}" resolveExecutable="true"/>
     <!-- windows -->
     <exec executable="makegli.bat" os="${os.windows}" dir="${gli.home}" resolveExecutable="true"/>
     <!--remote gli-->
-     <exec executable="makejar.bat" os="${os.windows}" dir="${gli.home}"
-      resolveExecutable="true"/> 
-     <copy file="${gli.home}/GLIServer.jar" todir="${gs2build.home}/bin/java" />
+     <exec executable="makejar.bat" os="${os.windows}" dir="${gli.home}" resolveExecutable="true"/> 
+     <copy file="${gli.home}/GLIServer.jar" todir="${gs2build.home}/bin/java"/>
   </target>
   
@@ -1377,69 +1116,8 @@
 
 <!-- ======================== TESTING Targets ========================= -->
-  
-  <target name="test" description="Run the (incomplete) JUnit test suite "
-    depends="init">
-    <mkdir dir="${basedir}/test"/>
-    <junit printsummary="withOutAndErr"
-      errorproperty="test.failed"
-      failureproperty="test.failed"
-      fork="${junit.fork}">
-      <formatter type="plain"/>
-      <classpath>
-	<pathelement location="${build.home}/gsdl3test.jar"/>
-	<path refid="compile.classpath"/>
-      </classpath>
-      <test name="${testcase}" if="testcase"/>
-      <batchtest todir="${basedir}/test" unless="testcase">
-	<fileset dir="${build.home}"
-	  includes="**/*Test.class"
-	  />
-      </batchtest>
-    </junit>
-    <echo>
-      *********************************************
-       Test output can be found in directory 'test'
-      *********************************************
-    </echo>
-  </target>
-  <target name="checkout-flax" description="check out flax source code from another repository">
-    <echo>checking out flax ...</echo>
-    <mkdir dir="${basedir}/src/java/org/flax"/>
-    <mkdir dir="${basedir}/src/java/org/greenstone/gsdl3/flax"/>
-    <mkdir dir="${basedir}/web/WEB-INF/classes/flax"/>
-    <mkdir dir="${basedir}/web/interfaces/flax"/>
-    <mkdir dir="${basedir}/web/sites/flax"/>
-    <svn>
-      <checkout url="${flax.svn.root}/flax1.0/trunk/src/java/org/flax/"  
-                destPath="${basedir}/src/java/org/flax"/>
-      <checkout url="${flax.svn.root}/flax1.0/trunk/src/java/org/greenstone/gsdl3/flax/" 
-                destPath="${basedir}/src/java/org/greenstone/gsdl3/flax"/>
-      <checkout url="${flax.svn.root}/flax1.0/trunk/web/WEB-INF/classes/flax/" 
-                destPath="${basedir}/web/WEB-INF/classes/flax"/>
-      <checkout url="${flax.svn.root}/flax1.0/trunk/web/interfaces/flax/" 
-                destPath="${basedir}/web/interfaces/flax"/>
-      <checkout url="${flax.svn.root}/flax1.0/trunk/web/sites/flax/" 
-                destPath="${basedir}/web/sites/flax"/>
-    </svn>
-    <move file="${basedir}/web/WEB-INF/web.xml" tofile="${basedir}/web/WEB-INF/web.xml.greenstone3backup"/>
-    <copy file="${basedir}/web/WEB-INF/classes/flax/web.xml" todir="${basedir}/web/WEB-INF" />
-
-    <property name="coll.dir" value="${basedir}/web/sites/flax/collect"/>
-    <!-- betterfa -->
-    <unzip src="${coll.dir}/betterfa/archives/archives.zip" dest="${coll.dir}/betterfa/archives"/>
-    <unzip src="${coll.dir}/betterfa/import/import.zip" dest="${coll.dir}/betterfa/import"/>
-    <unzip src="${coll.dir}/betterfa/index/index.zip" dest="${coll.dir}/betterfa/index"/>
-    <!-- imagegue -->
-    <unzip src="${coll.dir}/imagegue/archives/archives.zip" dest="${coll.dir}/imagegue/archives"/>
-    <unzip src="${coll.dir}/imagegue/import/import.zip" dest="${coll.dir}/imagegue/import"/>
-    <unzip src="${coll.dir}/imagegue/index/index.zip" dest="${coll.dir}/imagegue/index"/>
-    <!-- wikill -->
-    <unzip src="${coll.dir}/wikill/archives/archives.zip" dest="${coll.dir}/wikill/archives"/>
-    <unzip src="${coll.dir}/wikill/import/import.zip" dest="${coll.dir}/wikill/import"/>
-    <unzip src="${coll.dir}/wikill/index/index.zip" dest="${coll.dir}/wikill/index"/>
-
-  </target>
+
+  
+  
+  
 
 </project>
-
-
