Index: trunk/build.xml
===================================================================
--- trunk/build.xml (revision 1894)
+++ trunk/build.xml (revision 1895)
@@ -136,4 +136,7 @@
     <property name="buildwar" location="${build.dir}/buildwar.xml"/>
 
+    <property name="org.bedework.libcache.dir"
+              location="${project.home}/libcache"/>
+
     <property name="org.bedework.build.caldav" value="yes" />
 
@@ -178,10 +181,4 @@
     <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"
@@ -389,7 +386,6 @@
 
   <!-- =================================================================
-       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.
+       Targets to build sub-projects. Each sub-project generates a libapi
+       directory which contains the public api for that project.
        ================================================================= -->
 
@@ -401,6 +397,4 @@
     <ant antfile="${org.bedework.project.access}/build.xml" inheritall="false"
            target="build-all" />
-
-    <copy-to-bin this="${org.bedework.project.access}"/>
   </target>
 
@@ -421,6 +415,4 @@
     <ant antfile="${org.bedework.project.bwtools}/build.xml" inheritall="false"
            target="build-all" />
-
-    <copy-to-bin this="${org.bedework.project.bwtools}"/>
   </target>
 
@@ -444,6 +436,4 @@
         <ant antfile="${org.bedework.project.caldav}/build.xml" inheritall="false"
              target="build-all" />
-
-      <copy-to-bin this="${org.bedework.project.caldav}"/>
       </then>
     </if>
@@ -474,6 +464,4 @@
         <ant antfile="${org.bedework.project.caldavTest}/build.xml" inheritall="false"
              target="build-all" />
-
-        <copy-to-bin this="${org.bedework.project.caldavTest}"/>
       </then>
     </if>
@@ -501,6 +489,4 @@
     <ant antfile="${org.bedework.project.calendarapi}/build.xml" inheritall="false"
            target="build-all" />
-
-    <copy-to-bin this="${org.bedework.project.calendarapi}"/>
   </target>
 
@@ -521,6 +507,4 @@
     <ant antfile="${org.bedework.project.davutil}/build.xml" inheritall="false"
            target="build-all" />
-
-    <copy-to-bin this="${org.bedework.project.davutil}"/>
   </target>
 
@@ -541,6 +525,4 @@
     <ant antfile="${org.bedework.project.dumprestore}/build.xml" inheritall="false"
            target="build-all" />
-
-    <copy-to-bin this="${org.bedework.project.dumprestore}"/>
   </target>
 
@@ -564,6 +546,4 @@
         <ant antfile="${org.bedework.project.freebusy}/build.xml" inheritall="false"
              target="build-all" />
-
-        <copy-to-bin this="${org.bedework.project.freebusy}"/>
       </then>
     </if>
@@ -591,6 +571,4 @@
     <ant antfile="${org.bedework.project.rpiutil}/build.xml" inheritall="false"
            target="build-all" />
-
-    <copy-to-bin this="${org.bedework.project.rpiutil}"/>
   </target>
 
@@ -614,6 +592,4 @@
         <ant antfile="${org.bedework.project.synchml}/build.xml" inheritall="false"
              target="build-all" />
-
-        <copy-to-bin this="${org.bedework.project.synchml}"/>
       </then>
     </if>
@@ -641,6 +617,4 @@
     <ant antfile="${org.bedework.project.testsuite}/build.xml" inheritall="false"
          target="build-all" />
-
-    <copy-to-bin this="${org.bedework.project.testsuite}"/>
   </target>
 
@@ -661,6 +635,4 @@
     <ant antfile="${org.bedework.project.webapps}/build.xml" inheritall="false"
            target="build-all" />
-
-    <copy-to-bin this="${org.bedework.project.webapps}"/>
   </target>
 
@@ -684,6 +656,4 @@
         <ant antfile="${org.bedework.project.webdav}/build.xml" inheritall="false"
              target="build-all" />
-
-        <copy-to-bin this="${org.bedework.project.webdav}"/>
       </then>
     </if>
@@ -757,17 +727,3 @@
            target="run.httptest" />
   </target>
-
-  <!-- =============================================================================
-       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/build/buildsh.xml
===================================================================
--- trunk/build/buildsh.xml (revision 1894)
+++ trunk/build/buildsh.xml (revision 1895)
@@ -82,8 +82,8 @@
     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-mail}" />
 
-     <!-- any extra bin files-->
-    <copy todir="${app.dest.lib}" >
-      <fileset refid="app.bin.files" />
-    </copy>
+    <!-- any extra files-->
+   <copy todir="${app.dest.lib}" >
+     <fileset dir="${org.bedework.temp.extrajars.dir}" />
+   </copy>
 
     <!-- Some more standard libs -->
@@ -99,30 +99,12 @@
     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-ssl}"/>
 
-    <!-- Extra libraries specified in calling build file -->
+    <!-- This jdbc stuff needs fixing -->
+
+    <!-- jdbc drivers -->
     <copy todir="${app.dest.lib}" flatten="yes" >
-      <fileset refid="org.bedework.run.lib.jars" />
-
       <!-- local jdbc drivers -->
       <fileset dir="${org.bedework.jdbc.lib}">
         <include name="*.jar"/>
       </fileset>
-    </copy>
-
-    <!-- Include the quickstart jdbc driver -->
-    <copy todir="${app.dest.lib}" file="${appserver.jdbcdriver.jar}"/>
-
-    <copy todir="${app.dest.classes}">
-      <fileset dir="${org.bedework.project.calendarapi}/calCore/resources/properties" />
-      <filterset refid="property.filters" />
-    </copy>
-
-    <copy todir="${app.dest.classes}">
-      <fileset dir="${org.bedework.project.calendarapi}/calCore/resources/hbms" />
-      <filterset refid="property.filters" />
-    </copy>
-
-    <copy todir="${app.dest.classes}" overwrite="yes" >
-      <fileset refid="org.bedework.extra.resources" />
-      <filterset refid="property.filters" />
     </copy>
 
@@ -134,4 +116,22 @@
       </then>
     </if>
+
+    <!-- Include the quickstart jdbc driver -->
+    <copy todir="${app.dest.lib}" file="${appserver.jdbcdriver.jar}"/>
+
+    <copy todir="${app.dest.classes}">
+      <fileset dir="${org.bedework.project.calendarapi}/calCore/resources/properties" />
+      <filterset refid="property.filters" />
+    </copy>
+
+    <copy todir="${app.dest.classes}">
+      <fileset dir="${org.bedework.project.calendarapi}/calCore/resources/hbms" />
+      <filterset refid="property.filters" />
+    </copy>
+
+    <copy todir="${app.dest.classes}" overwrite="yes" >
+      <fileset refid="org.bedework.extra.resources" />
+      <filterset refid="property.filters" />
+    </copy>
 
     <!-- Create the env.properties file -->
Index: trunk/build/buildwar.xml
===================================================================
--- trunk/build/buildwar.xml (revision 1894)
+++ trunk/build/buildwar.xml (revision 1895)
@@ -227,7 +227,7 @@
     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-appcommon}" />
 
-     <!-- any extra bin files-->
+     <!-- any extra files-->
     <copy todir="${app.dest.lib}" >
-      <fileset refid="app.bin.files" />
+      <fileset dir="${org.bedework.temp.extrajars.dir}" />
     </copy>
 
Index: trunk/deployment/build.xml
===================================================================
--- trunk/deployment/build.xml (revision 1894)
+++ trunk/deployment/build.xml (revision 1895)
@@ -28,6 +28,17 @@
 <project name="deploy.bedework" default="init">
   <property name="base.name" value="deployment"/>
-    <!-- Load the location of the libraries -->
-    <property file="${org.bedework.project.bedework}/build/libjars.properties" />
+
+  <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" />
+
+  <!-- Recreateed by each app build file. Place extra jars here -->
+  <property name="org.bedework.temp.extrajars.dir"
+            location="${org.bedework.temp.dir}/extrajars" />
+
+  <!-- Load the location of the libraries -->
+  <property file="${org.bedework.project.bedework}/build/libjars.properties" />
 
   <dirname property="this.build.dir" file="${ant.file}"/>
Index: trunk/deployment/caldavTest/shellscr/appjars.xml
===================================================================
---  (revision )
+++ trunk/deployment/caldavTest/shellscr/appjars.xml (revision 1895)
@@ -1,0 +1,18 @@
+<?xml version="1.0"?>
+
+<!-- ===================================================================
+     Fetch extra jars for this application
+     =================================================================== -->
+<project name="extraJars" basedir="." default="">
+  <macrodef name="getExtraJars">
+    <sequential>
+      <delete dir="${org.bedework.temp.extrajars.dir}" />
+      <mkdir dir="${org.bedework.temp.extrajars.dir}" />
+
+      <getJar lib="${org.bedework.temp.extrajars.dir}"
+              libcache="${org.bedework.libcache.dir}"
+              name="caldavtest" version="3.5"
+              projecthome="${project.home}/projects/caldavTest" />
+    </sequential>
+ </macrodef>
+</project>
Index: trunk/deployment/caldavTest/shellscr/build.xml
===================================================================
--- trunk/deployment/caldavTest/shellscr/build.xml (revision 1894)
+++ trunk/deployment/caldavTest/shellscr/build.xml (revision 1895)
@@ -8,6 +8,10 @@
   <import file="${org.bedework.deployment.base}/deployprops.xml" />
 
+  <dirname property="this.dir" file="${ant.file}"/>
+
+  <import file="${this.dir}/appjars.xml" />
+
   <target name="init" >
-    <dirname property="this.dir" file="${ant.file}"/>
+    <getExtraJars />
 
     <property name="app.sou.dir" location="${org.bedework.deploy.app.sou}" />
@@ -43,12 +47,4 @@
          =============================================================== -->
 
-    <fileset id="org.bedework.run.lib.jars" dir="${org.bedework.empty.dir}" >
-    </fileset>
-
-    <!-- from  the bin directory -->
-    <fileset id="app.bin.files" dir="${bin.home}" >
-      <include name="caldavtest*.jar" />
-    </fileset>
-
     <!-- Extra resources -->
     <fileset id="org.bedework.extra.resources" dir="${org.bedework.empty.dir}" >
Index: trunk/deployment/dumprestore/shellscr/appjars.xml
===================================================================
---  (revision )
+++ trunk/deployment/dumprestore/shellscr/appjars.xml (revision 1895)
@@ -1,0 +1,18 @@
+<?xml version="1.0"?>
+
+<!-- ===================================================================
+     Fetch extra jars for this application
+     =================================================================== -->
+<project name="extraJars" basedir="." default="">
+  <macrodef name="getExtraJars">
+    <sequential>
+      <delete dir="${org.bedework.temp.extrajars.dir}" />
+      <mkdir dir="${org.bedework.temp.extrajars.dir}" />
+
+      <getJar lib="${org.bedework.temp.extrajars.dir}"
+              libcache="${org.bedework.libcache.dir}"
+              name="bw-dumpres" version="3.5"
+              projecthome="${project.home}/projects/dumprestore" />
+    </sequential>
+ </macrodef>
+</project>
Index: trunk/deployment/dumprestore/shellscr/build.xml
===================================================================
--- trunk/deployment/dumprestore/shellscr/build.xml (revision 1894)
+++ trunk/deployment/dumprestore/shellscr/build.xml (revision 1895)
@@ -8,6 +8,10 @@
   <import file="${org.bedework.deployment.base}/deployprops.xml" />
 
+  <dirname property="this.dir" file="${ant.file}"/>
+
+  <import file="${this.dir}/appjars.xml" />
+
   <target name="init" >
-    <dirname property="this.dir" file="${ant.file}"/>
+    <getExtraJars />
 
     <property name="app.sou.dir" location="${org.bedework.deploy.app.sou}" />
@@ -42,12 +46,4 @@
          Libraries for this application
          =============================================================== -->
-
-    <fileset id="org.bedework.run.lib.jars" dir="${org.bedework.empty.dir}" >
-    </fileset>
-
-    <!-- from  the bin directory -->
-    <fileset id="app.bin.files" dir="${bin.home}" >
-      <include name="bw-dumpres*.jar" />
-    </fileset>
 
     <!-- Extra resources -->
Index: trunk/deployment/freebusyAggregator/webapp/appjars.xml
===================================================================
---  (revision )
+++ trunk/deployment/freebusyAggregator/webapp/appjars.xml (revision 1895)
@@ -1,0 +1,28 @@
+<?xml version="1.0"?>
+
+<!-- ===================================================================
+     Fetch extra jars for this application
+     =================================================================== -->
+<project name="extraJars" basedir="." default="">
+  <macrodef name="getExtraJars">
+    <sequential>
+      <delete dir="${org.bedework.temp.extrajars.dir}" />
+      <mkdir dir="${org.bedework.temp.extrajars.dir}" />
+
+      <getJar lib="${org.bedework.temp.extrajars.dir}"
+              libcache="${org.bedework.libcache.dir}"
+              name="bw-webcommon" version="3.5"
+              projecthome="${project.home}/projects/webapps" />
+
+      <getJar lib="${org.bedework.temp.extrajars.dir}"
+              libcache="${org.bedework.libcache.dir}"
+              name="bw-fbaggregator" version="3.5"
+              projecthome="${project.home}/projects/freebusy" />
+
+      <getJar lib="${org.bedework.temp.extrajars.dir}"
+              libcache="${org.bedework.libcache.dir}"
+              name="bw-fbclient" version="3.5"
+              projecthome="${project.home}/projects/freebusy" />
+    </sequential>
+ </macrodef>
+</project>
Index: trunk/deployment/freebusyAggregator/webapp/build.xml
===================================================================
--- trunk/deployment/freebusyAggregator/webapp/build.xml (revision 1894)
+++ trunk/deployment/freebusyAggregator/webapp/build.xml (revision 1895)
@@ -8,10 +8,13 @@
   <import file="${org.bedework.deployment.base}/deployprops.xml" />
 
+  <dirname property="this.dir" file="${ant.file}"/>
+
+  <import file="${this.dir}/appjars.xml" />
+
   <target name="init" >
-    <!-- and define some properties based on those -->
+    <getExtraJars />
+
     <property name="app.war.file"
               location="${dist.home}/${propval.app.war.name}.war" />
-
-    <dirname property="this.dir" file="${ant.file}"/>
 
     <property name="app.sou.dir" location="${org.bedework.deploy.app.sou}" />
@@ -77,15 +80,4 @@
   <target name="build.configured" depends="init" >
     <!-- ===============================================================
-         Libraries for this application
-         =============================================================== -->
-
-    <!-- from  the bin directory -->
-    <fileset id="app.bin.files" dir="${bin.home}" >
-      <include name="bw-webcommon*.jar" />
-      <include name="bw-fbaggregator*.jar" />
-      <include name="bw-fbclient*.jar" />
-    </fileset>
-
-    <!-- ===============================================================
          Build the war
          =============================================================== -->
Index: trunk/deployment/publiccaldav/webapp/appjars.xml
===================================================================
---  (revision )
+++ trunk/deployment/publiccaldav/webapp/appjars.xml (revision 1895)
@@ -1,0 +1,28 @@
+<?xml version="1.0"?>
+
+<!-- ===================================================================
+     Fetch extra jars for this application
+     =================================================================== -->
+<project name="extraJars" basedir="." default="">
+  <macrodef name="getExtraJars">
+    <sequential>
+      <delete dir="${org.bedework.temp.extrajars.dir}" />
+      <mkdir dir="${org.bedework.temp.extrajars.dir}" />
+
+      <getJar lib="${org.bedework.temp.extrajars.dir}"
+              libcache="${org.bedework.libcache.dir}"
+              name="bw-caldav" version="3.5"
+              projecthome="${project.home}/projects/caldav" />
+
+      <getJar lib="${org.bedework.temp.extrajars.dir}"
+              libcache="${org.bedework.libcache.dir}"
+              name="bw-cdvserver" version="3.5"
+              projecthome="${project.home}/projects/caldav" />
+
+      <getJar lib="${org.bedework.temp.extrajars.dir}"
+              libcache="${org.bedework.libcache.dir}"
+              name="bw-webdavserver" version="3.5"
+              projecthome="${project.home}/projects/webdav" />
+    </sequential>
+ </macrodef>
+</project>
Index: trunk/deployment/publiccaldav/webapp/build.xml
===================================================================
--- trunk/deployment/publiccaldav/webapp/build.xml (revision 1894)
+++ trunk/deployment/publiccaldav/webapp/build.xml (revision 1895)
@@ -8,11 +8,14 @@
   <import file="${org.bedework.deployment.base}/deployprops.xml" />
 
+  <dirname property="this.dir" file="${ant.file}"/>
+
+  <import file="${this.dir}/appjars.xml" />
+
   <target name="init" >
-    <!-- and define some properties based on those -->
+    <getExtraJars />
+
     <!-- dist.home is bedework dist.home -->
     <property name="app.war.file"
               location="${dist.home}/${propval.app.war.name}.war" />
-
-    <dirname property="this.dir" file="${ant.file}"/>
 
     <property name="app.sou.dir" location="${org.bedework.deploy.app.sou}" />
@@ -52,15 +55,4 @@
   <target name="build.configured" depends="init" >
     <!-- ===============================================================
-         Libraries for this application
-         =============================================================== -->
-
-    <!-- from  the bin directory -->
-    <fileset id="app.bin.files" dir="${bin.home}" >
-      <include name="bw-caldav*.jar" />
-      <include name="bw-cdvserver*.jar" />
-      <include name="bw-webdavserver*.jar" />
-    </fileset>
-
-    <!-- ===============================================================
          Build the war
          =============================================================== -->
Index: trunk/deployment/testsuite/shellscr/appjars.xml
===================================================================
---  (revision )
+++ trunk/deployment/testsuite/shellscr/appjars.xml (revision 1895)
@@ -1,0 +1,26 @@
+<?xml version="1.0"?>
+
+<!-- ===================================================================
+     Fetch extra jars for this application
+     =================================================================== -->
+<project name="extraJars" basedir="." default="">
+  <macrodef name="getExtraJars">
+    <sequential>
+      <delete dir="${org.bedework.temp.extrajars.dir}" />
+      <mkdir dir="${org.bedework.temp.extrajars.dir}" />
+
+      <getJar lib="${org.bedework.app.lib}"
+              name="junit" version="4.4" />
+
+      <getJar lib="${org.bedework.temp.extrajars.dir}"
+              libcache="${org.bedework.libcache.dir}"
+              name="bw-appcommon" version="3.5"
+              projecthome="${project.home}/projects/webapps" />
+
+      <getJar lib="${org.bedework.temp.extrajars.dir}"
+              libcache="${org.bedework.libcache.dir}"
+              name="bw-testsuite" version="3.5"
+              projecthome="${project.home}/projects/testsuite" />
+    </sequential>
+ </macrodef>
+</project>
Index: trunk/deployment/testsuite/shellscr/build.xml
===================================================================
--- trunk/deployment/testsuite/shellscr/build.xml (revision 1894)
+++ trunk/deployment/testsuite/shellscr/build.xml (revision 1895)
@@ -8,6 +8,10 @@
   <import file="${org.bedework.deployment.base}/deployprops.xml" />
 
+  <dirname property="this.dir" file="${ant.file}"/>
+
+  <import file="${this.dir}/appjars.xml" />
+
   <target name="init" >
-    <dirname property="this.dir" file="${ant.file}"/>
+    <getExtraJars />
 
     <property name="app.sou.dir" location="${org.bedework.deploy.app.sou}" />
@@ -39,18 +43,4 @@
 
   <target name="build.configured" depends="init" >
-    <!-- ===============================================================
-         Libraries for this application
-         =============================================================== -->
-
-    <fileset id="org.bedework.run.lib.jars" dir="${org.bedework.default.lib}" >
-      <include name="${junit4.jar.name}" />
-    </fileset>
-
-    <!-- from  the bin directory -->
-    <fileset id="app.bin.files" dir="${bin.home}" >
-      <include name="bw-appcommon*.jar"/>
-      <include name="bw-testsuite*.jar" />
-    </fileset>
-
     <!-- Extra resources -->
     <property name="app.temp.home"
Index: trunk/deployment/usercaldav/webapp/appjars.xml
===================================================================
---  (revision )
+++ trunk/deployment/usercaldav/webapp/appjars.xml (revision 1895)
@@ -1,0 +1,28 @@
+<?xml version="1.0"?>
+
+<!-- ===================================================================
+     Fetch extra jars for this application
+     =================================================================== -->
+<project name="extraJars" basedir="." default="">
+  <macrodef name="getExtraJars">
+    <sequential>
+      <delete dir="${org.bedework.temp.extrajars.dir}" />
+      <mkdir dir="${org.bedework.temp.extrajars.dir}" />
+
+      <getJar lib="${org.bedework.temp.extrajars.dir}"
+              libcache="${org.bedework.libcache.dir}"
+              name="bw-caldav" version="3.5"
+              projecthome="${project.home}/projects/caldav" />
+
+      <getJar lib="${org.bedework.temp.extrajars.dir}"
+              libcache="${org.bedework.libcache.dir}"
+              name="bw-cdvserver" version="3.5"
+              projecthome="${project.home}/projects/caldav" />
+
+      <getJar lib="${org.bedework.temp.extrajars.dir}"
+              libcache="${org.bedework.libcache.dir}"
+              name="bw-webdavserver" version="3.5"
+              projecthome="${project.home}/projects/webdav" />
+    </sequential>
+ </macrodef>
+</project>
Index: trunk/deployment/usercaldav/webapp/build.xml
===================================================================
--- trunk/deployment/usercaldav/webapp/build.xml (revision 1894)
+++ trunk/deployment/usercaldav/webapp/build.xml (revision 1895)
@@ -8,10 +8,13 @@
   <import file="${org.bedework.deployment.base}/deployprops.xml" />
 
+  <dirname property="this.dir" file="${ant.file}"/>
+
+  <import file="${this.dir}/appjars.xml" />
+
   <target name="init" >
-    <!-- and define some properties based on those -->
+    <getExtraJars />
+
     <property name="app.war.file"
               location="${dist.home}/${propval.app.war.name}.war" />
-
-    <dirname property="this.dir" file="${ant.file}"/>
 
     <property name="app.sou.dir" location="${org.bedework.deploy.app.sou}" />
@@ -51,15 +54,4 @@
   <target name="build.configured" depends="init" >
     <!-- ===============================================================
-         Libraries for this application
-         =============================================================== -->
-
-    <!-- from  the bin directory -->
-    <fileset id="app.bin.files" dir="${bin.home}" >
-      <include name="bw-caldav*.jar" />
-      <include name="bw-cdvserver*.jar" />
-      <include name="bw-webdavserver*.jar" />
-    </fileset>
-
-    <!-- ===============================================================
          Build the war
          =============================================================== -->
Index: trunk/deployment/webadmin/webapp/appjars.xml
===================================================================
---  (revision )
+++ trunk/deployment/webadmin/webapp/appjars.xml (revision 1895)
@@ -1,0 +1,18 @@
+<?xml version="1.0"?>
+
+<!-- ===================================================================
+     Fetch extra jars for this application
+     =================================================================== -->
+<project name="extraJars" basedir="." default="">
+  <macrodef name="getExtraJars">
+    <sequential>
+      <delete dir="${org.bedework.temp.extrajars.dir}" />
+      <mkdir dir="${org.bedework.temp.extrajars.dir}" />
+
+      <getJar lib="${org.bedework.temp.extrajars.dir}"
+              libcache="${org.bedework.libcache.dir}"
+              name="bw-webcommon" version="3.5"
+              projecthome="${project.home}/projects/webapps" />
+    </sequential>
+ </macrodef>
+</project>
Index: trunk/deployment/webadmin/webapp/build.xml
===================================================================
--- trunk/deployment/webadmin/webapp/build.xml (revision 1894)
+++ trunk/deployment/webadmin/webapp/build.xml (revision 1895)
@@ -8,10 +8,13 @@
   <import file="${org.bedework.deployment.base}/deployprops.xml" />
 
-  <target name="init">
-    <!-- and define some properties based on those -->
+  <dirname property="this.dir" file="${ant.file}"/>
+
+  <import file="${this.dir}/appjars.xml" />
+
+  <target name="init" >
+    <getExtraJars />
+
     <property name="app.war.file"
               location="${dist.home}/${propval.app.war.name}.war" />
-
-    <dirname property="this.dir" file="${ant.file}"/>
 
     <property name="app.sou.dir" location="${org.bedework.deploy.app.sou}" />
@@ -86,13 +89,4 @@
   <target name="build.configured" depends="init" >
     <!-- ===============================================================
-         Libraries for this application
-         =============================================================== -->
-
-    <!-- from  the bin directory -->
-    <fileset id="app.bin.files" dir="${bin.home}" >
-      <include name="bw-webcommon*.jar" />
-    </fileset>
-
-    <!-- ===============================================================
          Build the war
          =============================================================== -->
Index: trunk/deployment/webconfig/webapp/appjars.xml
===================================================================
---  (revision )
+++ trunk/deployment/webconfig/webapp/appjars.xml (revision 1895)
@@ -1,0 +1,23 @@
+<?xml version="1.0"?>
+
+<!-- ===================================================================
+     Fetch extra jars for this application
+     =================================================================== -->
+<project name="extraJars" basedir="." default="">
+  <macrodef name="getExtraJars">
+    <sequential>
+      <delete dir="${org.bedework.temp.extrajars.dir}" />
+      <mkdir dir="${org.bedework.temp.extrajars.dir}" />
+
+      <getJar lib="${org.bedework.temp.extrajars.dir}"
+              libcache="${org.bedework.libcache.dir}"
+              name="bw-webconfig" version="3.5"
+              projecthome="${project.home}/projects/webapps" />
+
+      <getJar lib="${org.bedework.temp.extrajars.dir}"
+              libcache="${org.bedework.libcache.dir}"
+              name="bw-webcommon" version="3.5"
+              projecthome="${project.home}/projects/webapps" />
+    </sequential>
+ </macrodef>
+</project>
Index: trunk/deployment/webconfig/webapp/build.xml
===================================================================
--- trunk/deployment/webconfig/webapp/build.xml (revision 1894)
+++ trunk/deployment/webconfig/webapp/build.xml (revision 1895)
@@ -8,10 +8,13 @@
   <import file="${org.bedework.deployment.base}/deployprops.xml" />
 
+  <dirname property="this.dir" file="${ant.file}"/>
+
+  <import file="${this.dir}/appjars.xml" />
+
   <target name="init" >
-    <!-- and define some properties based on those -->
+    <getExtraJars />
+
     <property name="app.war.file"
               location="${dist.home}/${propval.app.war.name}.war" />
-
-    <dirname property="this.dir" file="${ant.file}"/>
 
     <property name="app.sou.dir" location="${org.bedework.deploy.app.sou}" />
@@ -76,14 +79,4 @@
   <target name="build.configured" depends="init" >
     <!-- ===============================================================
-         Libraries for this application
-         =============================================================== -->
-
-    <!-- from  the bin directory -->
-    <fileset id="app.bin.files" dir="${bin.home}" >
-      <include name="bw-webcommon*.jar" />
-      <include name="bw-webconfig*.jar" />
-    </fileset>
-
-    <!-- ===============================================================
          Build the war
          =============================================================== -->
Index: trunk/deployment/webpublic/webapp/appjars.xml
===================================================================
---  (revision )
+++ trunk/deployment/webpublic/webapp/appjars.xml (revision 1895)
@@ -1,0 +1,18 @@
+<?xml version="1.0"?>
+
+<!-- ===================================================================
+     Fetch extra jars for this application
+     =================================================================== -->
+<project name="extraJars" basedir="." default="">
+  <macrodef name="getExtraJars">
+    <sequential>
+      <delete dir="${org.bedework.temp.extrajars.dir}" />
+      <mkdir dir="${org.bedework.temp.extrajars.dir}" />
+
+      <getJar lib="${org.bedework.temp.extrajars.dir}"
+              libcache="${org.bedework.libcache.dir}"
+              name="bw-webcommon" version="3.5"
+              projecthome="${project.home}/projects/webapps" />
+    </sequential>
+ </macrodef>
+</project>
Index: trunk/deployment/webpublic/webapp/build.xml
===================================================================
--- trunk/deployment/webpublic/webapp/build.xml (revision 1894)
+++ trunk/deployment/webpublic/webapp/build.xml (revision 1895)
@@ -8,10 +8,13 @@
   <import file="${org.bedework.deployment.base}/deployprops.xml" />
 
+  <dirname property="this.dir" file="${ant.file}"/>
+
+  <import file="${this.dir}/appjars.xml" />
+
   <target name="init" >
-    <!-- and define some properties based on those -->
+    <getExtraJars />
+
     <property name="app.war.file"
               location="${dist.home}/${propval.app.war.name}.war" />
-
-    <dirname property="this.dir" file="${ant.file}"/>
 
     <property name="app.sou.dir" location="${org.bedework.deploy.app.sou}" />
@@ -97,13 +100,4 @@
   <target name="build.configured" depends="init" >
     <!-- ===============================================================
-         Libraries for this application
-         =============================================================== -->
-
-    <!-- from  the bin directory -->
-    <fileset id="app.bin.files" dir="${bin.home}" >
-      <include name="bw-webcommon*.jar" />
-    </fileset>
-
-    <!-- ===============================================================
          Build the war
          =============================================================== -->
Index: trunk/deployment/websubmit/webapp/appjars.xml
===================================================================
---  (revision )
+++ trunk/deployment/websubmit/webapp/appjars.xml (revision 1895)
@@ -1,0 +1,18 @@
+<?xml version="1.0"?>
+
+<!-- ===================================================================
+     Fetch extra jars for this application
+     =================================================================== -->
+<project name="extraJars" basedir="." default="">
+  <macrodef name="getExtraJars">
+    <sequential>
+      <delete dir="${org.bedework.temp.extrajars.dir}" />
+      <mkdir dir="${org.bedework.temp.extrajars.dir}" />
+
+      <getJar lib="${org.bedework.temp.extrajars.dir}"
+              libcache="${org.bedework.libcache.dir}"
+              name="bw-webcommon" version="3.5"
+              projecthome="${project.home}/projects/webapps" />
+    </sequential>
+ </macrodef>
+</project>
Index: trunk/deployment/websubmit/webapp/build.xml
===================================================================
--- trunk/deployment/websubmit/webapp/build.xml (revision 1894)
+++ trunk/deployment/websubmit/webapp/build.xml (revision 1895)
@@ -8,10 +8,13 @@
   <import file="${org.bedework.deployment.base}/deployprops.xml" />
 
+  <dirname property="this.dir" file="${ant.file}"/>
+
+  <import file="${this.dir}/appjars.xml" />
+
   <target name="init" >
-    <!-- and define some properties based on those -->
+    <getExtraJars />
+
     <property name="app.war.file"
               location="${dist.home}/${propval.app.war.name}.war" />
-
-    <dirname property="this.dir" file="${ant.file}"/>
 
     <property name="app.sou.dir" location="${org.bedework.deploy.app.sou}" />
@@ -92,13 +95,4 @@
   <target name="build.configured" depends="init" >
     <!-- ===============================================================
-         Libraries for this application
-         =============================================================== -->
-
-    <!-- from  the bin directory -->
-    <fileset id="app.bin.files" dir="${bin.home}" >
-      <include name="bw-webcommon*.jar" />
-    </fileset>
-
-    <!-- ===============================================================
          Build the war
          =============================================================== -->
Index: trunk/deployment/webuser/webapp/appjars.xml
===================================================================
---  (revision )
+++ trunk/deployment/webuser/webapp/appjars.xml (revision 1895)
@@ -1,0 +1,18 @@
+<?xml version="1.0"?>
+
+<!-- ===================================================================
+     Fetch extra jars for this application
+     =================================================================== -->
+<project name="extraJars" basedir="." default="">
+  <macrodef name="getExtraJars">
+    <sequential>
+      <delete dir="${org.bedework.temp.extrajars.dir}" />
+      <mkdir dir="${org.bedework.temp.extrajars.dir}" />
+
+      <getJar lib="${org.bedework.temp.extrajars.dir}"
+              libcache="${org.bedework.libcache.dir}"
+              name="bw-webcommon" version="3.5"
+              projecthome="${project.home}/projects/webapps" />
+    </sequential>
+ </macrodef>
+</project>
Index: trunk/deployment/webuser/webapp/build.xml
===================================================================
--- trunk/deployment/webuser/webapp/build.xml (revision 1894)
+++ trunk/deployment/webuser/webapp/build.xml (revision 1895)
@@ -8,10 +8,13 @@
   <import file="${org.bedework.deployment.base}/deployprops.xml" />
 
+  <dirname property="this.dir" file="${ant.file}"/>
+
+  <import file="${this.dir}/appjars.xml" />
+
   <target name="init" >
-    <!-- and define some properties based on those -->
+    <getExtraJars />
+
     <property name="app.war.file"
               location="${dist.home}/${propval.app.war.name}.war" />
-
-    <dirname property="this.dir" file="${ant.file}"/>
 
     <property name="app.sou.dir" location="${org.bedework.deploy.app.sou}" />
@@ -92,13 +95,4 @@
   <target name="build.configured" depends="init" >
     <!-- ===============================================================
-         Libraries for this application
-         =============================================================== -->
-
-    <!-- from  the bin directory -->
-    <fileset id="app.bin.files" dir="${bin.home}" >
-      <include name="bw-webcommon*.jar" />
-    </fileset>
-
-    <!-- ===============================================================
          Build the war
          =============================================================== -->