Index: trunk/bedework/build.xml
===================================================================
---  (revision )
+++ trunk/bedework/build.xml (revision 956)
@@ -1,0 +1,716 @@
+<?xml version="1.0"?>
+
+<!-- This is the ant build file for the bedework uber project.
+
+     Authors: Mike Douglass   douglm @ rpi.edu
+-->
+
+<project name="bedework.build" default="usage" basedir=".">
+  <property environment="env"/>
+
+  <!-- this project -->
+  <property name="org.bedework.project.bedework"
+            location="${basedir}" />
+
+  <!-- Wheer we put other projects -->
+  <property name="org.bedework.projects"
+            location="${org.bedework.project.bedework}/projects" />
+
+  <property name="org.bedework.project.access"
+            location="${org.bedework.projects}/access" />
+
+  <property name="org.bedework.project.bwtools"
+            location="${org.bedework.projects}/bwtools" />
+
+  <property name="org.bedework.project.caldav"
+            location="${org.bedework.projects}/caldav" />
+
+  <property name="org.bedework.project.caldavTest"
+            location="${org.bedework.projects}/caldavTest" />
+
+  <property name="org.bedework.project.calendarapi"
+            location="${org.bedework.projects}/calendarapi" />
+
+  <property name="org.bedework.project.davutil"
+            location="${org.bedework.projects}/davutil" />
+
+  <property name="org.bedework.project.dumprestore"
+            location="${org.bedework.projects}/dumprestore" />
+
+  <property name="org.bedework.project.freebusy"
+            location="${org.bedework.projects}/freebusy" />
+
+  <property name="org.bedework.project.rpiutil"
+            location="${org.bedework.projects}/rpiutil" />
+
+  <property name="org.bedework.project.synchml"
+            location="${org.bedework.projects}/synchml" />
+
+  <property name="org.bedework.project.webapps"
+            location="${org.bedework.projects}/webapps" />
+
+  <property name="org.bedework.project.webdav"
+            location="${org.bedework.projects}/webdav" />
+
+  <target name="README" depends="init"
+          description="Describe targets and their usage">
+    <loadfile property="org.bedework.README"
+              srcFile="${org.bedework.project.bedework}/docs/README"/>
+    <echo message="${org.bedework.README}" />
+  </target>
+
+  <target name="usage" depends="init"
+          description="Describe targets and their usage">
+    <echo message="As distributed the package should be ready to go."/>
+    <echo message="Ensure ant is on your path, (a version is in the" />
+    <echo message="package)"/>
+    <echo message=""/>
+    <echo message="First in one window do"/>
+    <echo message="    ant hsqldb"/>
+    <echo message="This will start the hsqldb server ready for the "/>
+    <echo message="application."/>
+    <echo message=""/>
+    <echo message="In another window do"/>
+    <echo message="    ant tomcatstart"/>
+    <echo message=""/>
+    <echo message="Once tomcat is running you should be able to go to a"/>
+    <echo message="browser and connect to"/>
+    <echo message="    http://localhost:8080/bedework"/>
+    <echo message="and follow the instructions."/>
+    <echo message=""/>
+    <echo message="To build the calendar do"/>
+    <echo message="    ant deploy    or "/>
+    <echo message="    ant deploy.debug "/>
+    <echo message="which does a build and deploy of all components"/>
+    <echo message=""/>
+    <echo message="To rebuild the calendar do"/>
+    <echo message="    ant clean.deploy    or "/>
+    <echo message="    ant clean.deploy.debug "/>
+    <echo message="which does a clean, build and deploy of all components"/>
+    <echo message=""/>
+    <echo message="See documentation in the docs directory or on bedework.org"/>
+    <echo message="for instructions on creating a locally configured calendar application"/>
+    <echo message=""/>
+  </target>
+
+  <target name="init" >
+    <property name="org.bedework.qs.build.synchml" value="yes" />
+
+    <!-- Overriding this when invoking ant allows different user property
+         files to be included e.g.
+            ant -Dorg.bedework.user.build.properties=/home/me/bedework.properties ...
+            -->
+    <property name="org.bedework.user.build.properties"
+              location="${user.home}/bedework.build.properties" />
+
+    <echo message="Load user properties from ${org.bedework.user.build.properties}" />
+
+    <!-- Load user property definition overrides -->
+    <property file="${org.bedework.user.build.properties}" />
+
+    <!-- ===============================================================
+              Default properties.
+         =============================================================== -->
+
+    <property name="project.home" location="${org.bedework.project.bedework}"/>
+
+    <property file="${project.home}/build.properties" />
+
+    <property name="project.name" value="${org.bedework.package.name}"/>
+    <property name="project.version" value="${org.bedework.version}"/>
+
+    <property name="dist.home" location="${project.home}/dist"/>
+    <property name="lib.dir" location="${project.home}/lib"/>
+    <property name="bin.home" location="${project.home}/bin"/>
+
+    <property name="build.dir" location="${project.home}/build"/>
+    <property name="buildjar" location="${build.dir}/buildjar.xml"/>
+    <property name="buildsh" location="${build.dir}/buildsh.xml"/>
+    <property name="buildwar" location="${build.dir}/buildwar.xml"/>
+
+    <property name="org.bedework.build.caldav" value="yes" />
+
+    <condition property="org.bedework.qs.build.caldav">
+      <equals arg1="yes" arg2="${org.bedework.build.caldav}"/>
+    </condition>
+
+    <property name="org.bedework.build.freebusy" value="no" />
+
+    <condition property="org.bedework.qs.build.freebusy">
+      <equals arg1="yes" arg2="${org.bedework.build.freebusy}"/>
+    </condition>
+
+    <mkdir dir="${dist.home}" />
+
+    <mkdir dir="${bin.home}" />
+
+    <property name="org.bedework.empty.dir"
+              location="${dist.home}/empty-dir" />
+    <mkdir dir="${org.bedework.empty.dir}" />
+
+    <fileset id="empty.fileset" dir="${org.bedework.empty.dir}"
+             excludes="*" />
+    <!-- default to empty -->
+    <fileset id="base.resource.files" refid="empty.fileset" />
+
+    <!-- ==================== Subcomponent Compilation Classpath ==================== -->
+
+    <path id="compile.classpath">
+      <fileset dir="${lib.dir}">
+         <include name="*.jar"/>
+      </fileset>
+      <fileset dir="${dist.home}">
+         <include name="*.jar"/>
+      </fileset>
+    </path>
+
+    <!-- ===============================================================
+              Locations and jar files built by this project.
+         =============================================================== -->
+
+    <property name="org.bedework.temp.dir"
+              location="${dist.home}/temp" />
+
+    <property name="org.bedework.temp.wars.home"
+              location="${org.bedework.temp.dir}/wars" />
+
+    <property name="org.bedework.temp.shellscr.home"
+              location="${org.bedework.temp.dir}/shellscr" />
+
+    <property name="org.bedework.config.base"
+              location="${org.bedework.project.bedework}/config" />
+
+    <property name="org.bedework.default.lib"
+              location="${org.bedework.project.bedework}/lib" />
+
+    <property name="org.bedework.deployment.base"
+              location="${org.bedework.project.bedework}/deployment" />
+
+    <property name="org.bedework.deployutil.jar"
+              location="${bin.home}/${org.bedework.deployutil.jar.name}-${project.version}.jar" />
+
+    <!-- ===============================================================
+              Default properties.
+         =============================================================== -->
+    <property file="${org.bedework.defaultdefs.properties}" />
+  </target>
+
+  <!-- =================================================================
+       "build" and "clean" targets for the project - does not build
+       subsidiary projects like rpiutil and access
+       ================================================================= -->
+
+  <target name="build" depends="build.rpiutil,build.access,build.davutil,
+                                build.calendarapi,build.dumprestore,build.synchml.if,
+                                build.webdav.if,build.caldav.if,build.caldavTest.if,
+                                build.freebusy.if,build.bwtools,build.webapps,
+                                build.deployutil"
+          description="builds the project"/>
+
+  <target name="clean" depends="clean.rpiutil,clean.access,clean.davutil,
+                                clean.calendarapi,clean.dumprestore,clean.synchml.if,
+                                clean.webdav.if,clean.caldav.if,clean.caldavTest.if,
+                                clean.freebusy.if,clean.bwtools,clean.webapps"
+          description="Remove all generated files.">
+    <delete dir="${dist.home}" />
+    <delete dir="${bin.home}" />
+  </target>
+
+  <target name="clean.build" depends="clean, build"
+          description="cleans then builds the project"/>
+
+  <!-- =================================================================
+       "build.all" and "clean.all" targets for the project - build
+       subsidiary projects as well
+       ================================================================= -->
+
+  <target name="build.all" depends="build.rpiutil,build.access,build"
+          description="builds the entire project"/>
+
+  <target name="clean.all" depends="clean.rpiutil,clean.access,clean"
+          description="Remove all generated files for entire project."/>
+
+  <target name="clean.build.all" depends="clean.all, build.all"
+          description="cleans then builds the entire project"/>
+
+  <!-- =================================================================
+       The "deploy" and "deploy.all" target builds and deploys the applications
+       ================================================================= -->
+
+  <target name="deploy" depends="build"
+          description="builds and deploys the applications">
+    <ant antfile="${org.bedework.project.bedework}/deployment}/build.xml" inheritrefs="true"
+         target="deploy"  >
+      <property name="app.debug.val" value="9" />
+    </ant>
+  </target>
+
+  <target name="deploy.debug" depends="build"
+          description="builds and deploys the applications">
+    <ant antfile="${org.bedework.project.bedework}/deployment/build.xml" inheritrefs="true"
+         target="deploy" />
+  </target>
+
+  <!-- =================================================================
+       The "clean.deploy" target cleans, builds and deploys the applications
+       ================================================================= -->
+
+  <target name="clean.deploy" depends="clean,deploy" />
+
+  <target name="clean.deploy.debug" depends="clean,deploy.debug" />
+
+  <!-- =================================================================
+       The "build.configured" target builds configured applications
+       ================================================================= -->
+
+  <target name="build.configured" depends="build"
+          description="Build configured applications" >
+    <ant antfile="${org.bedework.project.bedework}/deployment}/build.xml" inheritrefs="true"
+         target="build.configured"  >
+      <property name="app.debug.val" value="9" />
+    </ant>
+  </target>
+
+  <target name="build.configured.debug" depends="build"
+          description="Build configured applications" >
+    <ant antfile="${org.bedework.project.bedework}/deployment}/build.xml" inheritrefs="true"
+         target="build.configured" />
+  </target>
+
+  <target name="clean.build.configured" depends="clean,build.configured" />
+
+  <target name="clean.build.configured.debug" depends="clean,build.configured.debug"/>
+
+  <!-- =================================================================
+       Targets to build sub-projects and copy the results into dependent
+       libraries. Each sub-project generates a libapi directory which
+       contains the public api for that project.
+       ================================================================= -->
+
+  <!-- .................................................................
+                          access
+       .................................................................. -->
+  <target name="build.access" depends="init"
+          description="builds the access project">
+    <ant antfile="${org.bedework.project.access}/build.xml" inheritall="false"
+           target="build-all" />
+
+    <copy-to-dependent this="${org.bedework.project.access}"
+                       target="${org.bedework.project.caldav}" />
+    <copy-to-dependent this="${org.bedework.project.access}"
+                       target="${org.bedework.project.calendarapi}" />
+    <copy-to-dependent this="${org.bedework.project.access}"
+                       target="${org.bedework.project.davutil}" />
+    <copy-to-dependent this="${org.bedework.project.access}"
+                       target="${org.bedework.project.dumprestore}" />
+    <copy-to-dependent this="${org.bedework.project.access}"
+                       target="${org.bedework.project.webdav}" />
+
+    <copy-to-bin this="${org.bedework.project.access}"/>
+  </target>
+
+  <target name="clean.access" depends="init"
+          description="cleans the access project">
+    <ant antfile="${org.bedework.project.access}/build.xml" inheritall="false"
+           target="clean" />
+  </target>
+
+  <target name="clean.build.access" depends="clean.access,build.access"
+          description="builds the access project"/>
+
+  <!-- .................................................................
+                          bwtools
+       .................................................................. -->
+  <target name="build.bwtools" depends="init"
+          description="builds the bwtools project">
+    <ant antfile="${org.bedework.project.bwtools}/build.xml" inheritall="false"
+           target="build-all" />
+
+    <copy-to-bin this="${org.bedework.project.bwtools}"/>
+  </target>
+
+  <target name="clean.bwtools" depends="init"
+          description="clean the bwtools project">
+    <ant antfile="${org.bedework.project.bwtools}/build.xml" inheritall="false"
+           target="clean" />
+  </target>
+
+  <target name="clean.build.bwtools" depends="clean.bwtools,build.bwtools"
+          description="builds the bwtools project"/>
+
+  <!-- .................................................................
+                          caldav
+       .................................................................. -->
+  <target name="build.caldav" depends="init"
+          description="builds the caldav project">
+    <ant antfile="${org.bedework.project.caldav}/build.xml" inheritall="false"
+           target="build-all" />
+
+    <copy-to-bin this="${org.bedework.project.caldav}"/>
+  </target>
+
+  <target name="clean.caldav" depends="init"
+          description="clean the caldav project">
+    <ant antfile="${org.bedework.project.caldav}/build.xml" inheritall="false"
+           target="clean" />
+  </target>
+
+  <target name="clean.build.caldav" depends="clean.caldav,build.caldav"
+          description="clean builds the caldav project"/>
+
+  <target name="build.caldav.if" depends="init"
+          description="builds the jars" if="org.bedework.qs.build.caldav" >
+    <antcall inheritrefs="true" target="build.caldav" />
+  </target>
+
+  <target name="clean.caldav.if" depends="init"
+          description="cleans jars" if="org.bedework.qs.build.caldav" >
+    <antcall inheritrefs="true" target="clean.caldav" />
+  </target>
+
+  <!-- .................................................................
+                          caldavTest
+       .................................................................. -->
+  <target name="build.caldavTest" depends="init"
+          description="builds the caldavTest project">
+    <ant antfile="${org.bedework.project.caldavTest}/build.xml" inheritall="false"
+           target="build-all" />
+
+    <copy-to-bin this="${org.bedework.project.caldavTest}"/>
+  </target>
+
+  <target name="clean.caldavTest" depends="init"
+          description="clean the caldavTest project">
+    <ant antfile="${org.bedework.project.caldavTest}/build.xml" inheritall="false"
+           target="clean" />
+  </target>
+
+  <target name="clean.build.caldavTest" depends="clean.caldavTest,build.caldavTest"
+          description="clean builds the caldavTest project"/>
+
+  <target name="build.caldavTest.if" depends="init"
+          description="builds the jars" if="org.bedework.qs.build.caldav" >
+    <antcall inheritrefs="true" target="build.caldavTest" />
+  </target>
+
+  <target name="clean.caldavTest.if" depends="init"
+          description="cleans jars" if="org.bedework.qs.build.caldav" >
+    <antcall inheritrefs="true" target="clean.caldavTest" />
+  </target>
+
+  <!-- .................................................................
+                          calendarapi
+       .................................................................. -->
+  <target name="build.calendarapi" depends="init"
+          description="builds the calendar project">
+    <ant antfile="${org.bedework.project.calendarapi}/build.xml" inheritall="false"
+           target="build-all" />
+
+    <copy-to-dependent this="${org.bedework.project.calendarapi}"
+                       target="${org.bedework.project.caldav}" />
+    <copy-to-dependent this="${org.bedework.project.calendarapi}"
+                       target="${org.bedework.project.dumprestore}" />
+    <copy-to-dependent this="${org.bedework.project.calendarapi}"
+                       target="${org.bedework.project.freebusy}" />
+    <copy-to-dependent this="${org.bedework.project.calendarapi}"
+                       target="${org.bedework.project.synchml}" />
+    <copy-to-dependent this="${org.bedework.project.calendarapi}"
+                       target="${org.bedework.project.webapps}" />
+
+    <copy-to-bin this="${org.bedework.project.calendarapi}"/>
+  </target>
+
+  <target name="clean.calendarapi" depends="init"
+          description="clean the calendar project">
+    <ant antfile="${org.bedework.project.calendarapi}/build.xml" inheritall="false"
+           target="clean" />
+  </target>
+
+  <target name="clean.build.calendarapi" depends="clean.calendarapi,build.calendarapi"
+          description="clean builds the caldavTest project"/>
+
+  <!-- .................................................................
+                          davutil
+       .................................................................. -->
+  <target name="build.davutil" depends="init"
+          description="builds the davutil project">
+    <ant antfile="${org.bedework.project.davutil}/build.xml" inheritall="false"
+           target="build-all" />
+
+    <copy-to-dependent this="${org.bedework.project.davutil}"
+                       target="${org.bedework.project.caldav}" />
+    <copy-to-dependent this="${org.bedework.project.davutil}"
+                       target="${org.bedework.project.caldavTest}" />
+    <copy-to-dependent this="${org.bedework.project.davutil}"
+                       target="${org.bedework.project.calendarapi}" />
+    <copy-to-dependent this="${org.bedework.project.davutil}"
+                       target="${org.bedework.project.webdav}" />
+
+    <copy-to-bin this="${org.bedework.project.davutil}"/>
+  </target>
+
+  <target name="clean.davutil" depends="init"
+          description="cleans the davutil project">
+    <ant antfile="${org.bedework.project.davutil}/build.xml" inheritall="false"
+           target="clean" />
+  </target>
+
+  <target name="clean.build.davutil" depends="clean.davutil,build.davutil"
+          description="clean builds the davutil project"/>
+
+  <!-- .................................................................
+                          dumprestore
+       .................................................................. -->
+  <target name="build.dumprestore" depends="init"
+          description="builds the dumprestore project">
+    <ant antfile="${org.bedework.project.dumprestore}/build.xml" inheritall="false"
+           target="build-all" />
+
+    <copy-to-bin this="${org.bedework.project.dumprestore}"/>
+  </target>
+
+  <target name="clean.dumprestore" depends="init"
+          description="clean the dumprestore project">
+    <ant antfile="${org.bedework.project.dumprestore}/build.xml" inheritall="false"
+           target="clean" />
+  </target>
+
+  <target name="clean.build.dumprestore" depends="clean.dumprestore,build.dumprestore"
+          description="builds the dumprestore project"/>
+
+  <!-- .................................................................
+                          freebusy
+       .................................................................. -->
+  <target name="build.freebusy" depends="init"
+          description="builds the freebusy project">
+    <ant antfile="${org.bedework.project.freebusy}/build.xml" inheritall="false"
+           target="build-all" />
+
+    <copy-to-bin this="${org.bedework.project.freebusy}"/>
+  </target>
+
+  <target name="clean.freebusy" depends="init"
+          description="cleans the freebusy project">
+    <ant antfile="${org.bedework.project.freebusy}/build.xml" inheritall="false"
+           target="clean" />
+  </target>
+
+  <target name="clean.build.freebusy" depends="clean.freebusy,build.freebusy"
+          description="builds the freebusy project"/>
+
+  <target name="build.freebusy.if" depends="init"
+          description="builds the jars" if="org.bedework.qs.build.freebusy" >
+    <antcall inheritrefs="true" target="build.freebusy" />
+  </target>
+
+  <target name="clean.freebusy.if" depends="init" if="org.bedework.qs.build.freebusy" >
+  </target>
+
+  <!-- .................................................................
+                          rpiutil
+       .................................................................. -->
+  <target name="build.rpiutil" depends="init"
+          description="builds the rpiutil project">
+    <ant antfile="${org.bedework.project.rpiutil}/build.xml" inheritall="false"
+           target="build-all" />
+
+    <copy-to-dependent this="${org.bedework.project.rpiutil}"
+                       target="${org.bedework.project.access}" />
+    <copy-to-dependent this="${org.bedework.project.rpiutil}"
+                       target="${org.bedework.project.caldav}" />
+    <copy-to-dependent this="${org.bedework.project.rpiutil}"
+                       target="${org.bedework.project.calendarapi}" />
+    <copy-to-dependent this="${org.bedework.project.rpiutil}"
+                       target="${org.bedework.project.davutil}" />
+    <copy-to-dependent this="${org.bedework.project.rpiutil}"
+                       target="${org.bedework.project.freebusy}" />
+    <copy-to-dependent this="${org.bedework.project.rpiutil}"
+                       target="${org.bedework.project.webdav}" />
+
+    <copy-to-bin this="${org.bedework.project.rpiutil}"/>
+  </target>
+
+  <target name="clean.rpiutil" depends="init"
+          description="cleans the rpiutil project">
+    <ant antfile="${org.bedework.project.rpiutil}/build.xml" inheritall="false"
+           target="clean" />
+  </target>
+
+  <target name="clean.build.rpiutil" depends="clean.rpiutil,build.rpiutil"
+          description="builds the rpiutil project"/>
+
+  <!-- .................................................................
+                          synchml
+       .................................................................. -->
+  <target name="build.synchml" depends="init"
+          description="builds the synchml project">
+    <ant antfile="${org.bedework.project.synchml}/build.xml" inheritall="false"
+           target="build-all" />
+
+    <copy-to-bin this="${org.bedework.project.synchml}"/>
+  </target>
+
+  <target name="clean.synchml" depends="init"
+          description="clean the synchml project">
+    <ant antfile="${org.bedework.project.synchml}/build.xml" inheritall="false"
+           target="clean" />
+  </target>
+
+  <target name="clean.build.synchml" depends="clean.synchml,clean.synchml"
+          description="builds the synchml project"/>
+
+  <target name="build.synchml.if" depends="init"
+          description="builds the jars" if="org.bedework.qs.build.synchml" >
+    <antcall inheritrefs="true" target="build.synchml" />
+  </target>
+
+  <target name="clean.synchml.if" depends="init"
+          description="cleans jars" if="org.bedework.qs.build.synchml" >
+    <antcall inheritrefs="true" target="clean.synchml" />
+  </target>
+
+  <!-- .................................................................
+                          webapps
+       .................................................................. -->
+  <target name="build.webapps" depends="init"
+          description="builds the webapps project">
+    <ant antfile="${org.bedework.project.webapps}/build.xml" inheritall="false"
+           target="build-all" />
+
+    <copy-to-bin this="${org.bedework.project.webapps}"/>
+  </target>
+
+  <target name="clean.webapps" depends="init"
+          description="clean the webapps project">
+    <ant antfile="${org.bedework.project.webapps}/build.xml" inheritall="false"
+           target="clean" />
+  </target>
+
+  <target name="clean.build.webapps" depends="clean.webapps,build.webapps"
+          description="builds the webapps project"/>
+
+  <!-- .................................................................
+                          webdav
+       .................................................................. -->
+  <target name="build.webdav" depends="init"
+          description="builds the webdav project">
+    <ant antfile="${org.bedework.project.webdav}/build.xml" inheritall="false"
+           target="build-all" />
+
+    <copy-to-dependent this="${org.bedework.project.webdav}"
+                       target="${org.bedework.project.caldav}" />
+
+    <copy-to-bin this="${org.bedework.project.webdav}"/>
+  </target>
+
+  <target name="clean.webdav" depends="init"
+          description="cleans the webdav project">
+    <ant antfile="${org.bedework.project.webdav}/build.xml" inheritall="false"
+           target="clean" />
+  </target>
+
+  <target name="clean.build.webdav" depends="clean.webdav,build.webdav"
+          description="builds the webdav project"/>
+
+  <target name="build.webdav.if" depends="init"
+          description="builds the jars" if="org.bedework.qs.build.caldav" >
+    <antcall inheritrefs="true" target="build.webdav" />
+  </target>
+
+  <target name="clean.webdav.if" depends="init"
+          description="cleans jars" if="org.bedework.qs.build.caldav" >
+    <antcall inheritrefs="true" target="clean.webdav" />
+  </target>
+
+  <!-- =================================================================
+       Targets to build sub-components of this project.
+       ================================================================= -->
+
+  <target name="build.deployutil" depends="init"
+          description="builds the deployutil component">
+    <ant antfile="${org.bedework.project.bedework}/deployutil/build.xml" inheritrefs="true"
+           target="build" >
+      <property name="build.jar.file" location="${org.bedework.deployutil.jar}" />
+    </ant>
+  </target>
+
+  <!-- =================================================================
+       Build and run the unit test suite
+       ================================================================= -->
+
+  <target name="bld.test" depends="init"
+          description="Build and run tests">
+    <ant antfile="${calendar.build.file}" inheritrefs="true"
+         target="bld.test" />
+  </target>
+
+  <target name="run.test" depends="init"
+          description="Build and run tests">
+    <ant antfile="${calendar.build.file}" inheritrefs="true"
+         target="run.test" />
+  </target>
+
+  <target name="run.test.debug" depends="init"
+          description="Build and run tests">
+    <ant antfile="${calendar.build.file}" inheritrefs="true"
+         target="run.test"  >
+      <property name="org.bedework.debug" value="yes" />
+    </ant>
+  </target>
+
+  <!-- Rebuild the http test suite only -->
+  <target name="httptest" depends="init"
+          description="Run httptest suite" >
+    <input message="httptest may destroy this calendar db. Proceed with test"
+           validargs="y,n"
+           addproperty="do.httptest" />
+    <condition property="do.abort">
+      <equals arg1="n" arg2="${do.httptest}"/>
+    </condition>
+    <fail if="do.abort">httptest aborted by user.</fail>
+
+    <ant antfile="${calendar.build.file}" inheritrefs="true"
+           target="bld.httptest" />
+
+    <ant antfile="${calendar.build.file}" inheritrefs="true"
+           target="run.httptest" />
+  </target>
+
+  <!-- ======================== javadoc target =======================
+       ================================================================= -->
+
+  <target name="javadoc" depends="init"
+          description="Generate javadoc">
+    <echo message="*************** Needs to do javadoc for all sub-projects and" />
+    <echo message="*************** link them in some way." />
+  </target>
+
+  <!-- =============================================================================
+       Update dependent project (target) from a project just built (this).
+       ============================================================================= -->
+  <macrodef name="copy-to-dependent">
+    <attribute name="target"/>
+    <attribute name="this"/>
+    <sequential>
+      <copy todir="@{target}/lib" overwrite="yes">
+        <fileset dir="@{this}/libapi">
+          <include name="*.jar" />
+        </fileset>
+      </copy>
+    </sequential>
+  </macrodef>
+
+  <!-- =============================================================================
+       Copy from a project just built (this) into bedework bin directory.
+       ============================================================================= -->
+  <macrodef name="copy-to-bin">
+    <attribute name="this"/>
+    <sequential>
+      <copy todir="${org.bedework.project.bedework}/bin" overwrite="yes">
+        <fileset dir="@{this}/dist">
+          <include name="*.jar" />
+        </fileset>
+      </copy>
+    </sequential>
+  </macrodef>
+</project>
Index: trunk/bedework/build/buildwar.xml
===================================================================
--- trunk/bedework/build/buildwar.xml (revision 953)
+++ trunk/bedework/build/buildwar.xml (revision 956)
@@ -315,4 +315,6 @@
 
     <!-- Some more standard libs -->
+    <copy todir="${app.dest.lib}" file="${log4j.jar}"/>
+    <copy todir="${app.dest.lib}" file="${ical4j.jar}"/>
     <copy todir="${app.dest.lib}" file="${commons-codec.jar}"/>
     <copy todir="${app.dest.lib}" file="${commons-collections.jar}"/>