Index: releases/bedework-3.7/build.xml
===================================================================
--- trunk/build.xml (revision 2985)
+++ releases/bedework-3.7/build.xml (revision 3104)
@@ -6,5 +6,5 @@
 -->
 
-<project name="bedework.build" default="usage" basedir=".">
+<project name="bedework.build" default="init" basedir=".">
   <property environment="env"/>
 
@@ -62,7 +62,17 @@
             location="${org.bedework.projects}/webdav" />
 
-  <import file="${org.bedework.project.bedework}/build/buildfilters.xml" />
-  <import file="${org.bedework.project.bedework}/build/loadDeployConfig.xml"/>
-  <import file="${org.bedework.project.bedework}/build/dirTools.xml"/>
+  <property name="build.dir" location="${org.bedework.project.bedework}/build"/>
+  
+  <property name="buildjar" location="${build.dir}/buildTools/buildjar.xml"/>
+  <property name="buildsh" location="${build.dir}/buildsh.xml"/>
+  <property name="buildwar" location="${build.dir}/buildwar.xml"/>
+
+  <import file="${build.dir}/buildTools/deftasks.xml"/>
+
+  <deftasks/>
+
+  <import file="${build.dir}/buildfilters.xml" />
+  <import file="${build.dir}/loadDeployConfig.xml"/>
+  <import file="${build.dir}/dirTools.xml"/>
 
   <target name="README" depends="init"
@@ -101,10 +111,5 @@
     <property name="resources.dir" location="${bw.project.home}/resources"/>
     <property name="bin.home" location="${bw.project.home}/bin"/>
-
-    <property name="build.dir" location="${bw.project.home}/build"/>
-    <property name="buildjar" location="${build.dir}/buildTools/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" />
 
@@ -176,5 +181,5 @@
        ================================================================= -->
 
-  <target name="build" depends="init.build,build.rpiutil,build.build,
+  <target name="build" depends="init.build,build.deployutil,build.rpiutil,build.build,
                                 build.access,build.davutil,
                                 build.webdav,build.caldav,
@@ -183,5 +188,5 @@
                                 build.bwtools,build.webapps,build.indexer,
                               	build.dumprestore,
-                                build.testsuite,build.deployutil"
+                                build.testsuite"
           description="builds the project">
     <mkdir dir="${dist.home}/tools" />
@@ -663,4 +668,6 @@
       <property name="build.jar.file" location="${org.bedework.deployutil.jar}" />
     </ant>
+    
+    <copy todir="${build.dir}" file="${org.bedework.deployutil.jar}" />
   </target>
 
Index: releases/bedework-3.7/build/build.xml
===================================================================
--- trunk/build/build.xml (revision 2675)
+++ releases/bedework-3.7/build/build.xml (revision 3104)
@@ -8,5 +8,4 @@
 
 <project name="bedework.build" default="build">
-  <property name="base.name" value="build"/>
   <property name="lib.dir" location="${org.bedework.default.lib}"/>
 
Index: releases/bedework-3.7/build/buildfilters.xml
===================================================================
--- trunk/build/buildfilters.xml (revision 3001)
+++ releases/bedework-3.7/build/buildfilters.xml (revision 3104)
@@ -12,4 +12,7 @@
             value="${quickstart.dir}"/>
 
+    <filter token="APPSERVER-DATA-DIR"
+            value="${org.bedework.data.dir}"/>
+  	
     <filter token="DATA_DIR"
             value="${org.bedework.data.dir}"/>
@@ -53,4 +56,7 @@
     <filter token="LIFERAY-COMPANY-ID"
             value="${org.bedework.global.liferay.company-id}"/>
+
+    <filter token="JBOSS-CARDDB-DATASOURCE"
+            value="${org.bedework.global.jboss.carddb.datasource.jndiname}"/>
 
     <filter token="JBOSS-DB-DATASOURCE"
Index: releases/bedework-3.7/build/buildsh.xml
===================================================================
--- trunk/build/buildsh.xml (revision 2973)
+++ releases/bedework-3.7/build/buildsh.xml (revision 3104)
@@ -29,5 +29,5 @@
               location="${app.dest.home}/classes" />
     <property name="app.dest.properties"
-              location="${app.dest.classes}/properties/calendar" />
+              location="${app.dest.classes}/properties/${org.bedework.deployment.name}" />
     <property name="app.dest.data"
               location="${app.dest.home}/data" />
@@ -51,13 +51,24 @@
     <antcall target="addLibs" inheritRefs="true" />
 
-    <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>
+    <if>
+      <isset property="org.bedework.sou.hibernate.properties" />
+      <then>
+        <if>
+          <istrue value="${org.bedework.build.debug}" />
+          <then>
+            <echo message="************* Copy hib properties from ${org.bedework.sou.hibernate.properties}" />
+          </then>
+        </if>
+        <copy todir="${app.dest.classes}">
+          <fileset dir="${org.bedework.sou.hibernate.properties}/properties" />
+          <filterset refid="property.filters" />
+        </copy>
+    
+        <copy todir="${app.dest.classes}">
+          <fileset dir="${org.bedework.sou.hibernate.properties}/hbms" />
+          <filterset refid="property.filters" />
+        </copy>
+      </then>
+    </if>
 
     <copy tofile="${app.dest.classes}/sysevents.properties"
@@ -81,5 +92,5 @@
 
     <copy tofile="${app.dest.properties}/options.xml"
-          file="${org.bedework.config.options}" >
+          file="${org.bedework.options.file}" >
       <filterset>
         <filter token="RPI-DEBUG" value="${app.debug.val}"/>
Index: releases/bedework-3.7/build/buildwar.xml
===================================================================
--- trunk/build/buildwar.xml (revision 2876)
+++ releases/bedework-3.7/build/buildwar.xml (revision 3104)
@@ -38,4 +38,6 @@
 
 <project name="bedework.buildwar" default="build" >
+  <taskdef resource="net/sf/antcontrib/antcontrib.properties" />
+
   <import file="${build.dir}/buildfilters.xml" />
 
@@ -63,8 +65,6 @@
       </else>
     </if>
-    <property name="app.dest.properties.old"
-              location="${app.dest.classes}/properties/calendar" />
     <property name="app.dest.properties"
-              location="${app.dest.classes}/properties" />
+              location="${app.dest.classes}/properties/${org.bedework.deployment.name}" />
   </target>
 
@@ -108,17 +108,20 @@
 
   <target name="build" depends="init">
-    <echo message="**************************************************" />
-    <echo message=" * Building war ${propval.app.war.name}"/>
-    <echo message="**************************************************" />
+    <infoMsg message="* =========== Building war ${propval.app.war.name}" />
 
     <delete dir="${app.dest.war}" />
 
-    <!-- Add modifed login pages -->
-    <copy todir="${app.dest.docs}/login" failonerror="false" >
-      <fileset dir="${org.bedework.common.resources}/login" />
-      <filterset>
-        <filter token="DISPLAY-NAME" value="${propval.app.display.name}"/>
-      </filterset>
-    </copy>
+    <if>
+      <available file="${app.sou.dir}/war/docs" type="dir" />
+      <then>
+        <!-- Add modifed login pages -->
+        <copy todir="${app.dest.docs}/login" failonerror="false" >
+          <fileset dir="${org.bedework.common.resources}/login" />
+          <filterset>
+            <filter token="DISPLAY-NAME" value="${propval.app.display.name}"/>
+          </filterset>
+        </copy>
+      </then>
+    </if>
 
     <!-- ===============================================================
@@ -164,5 +167,5 @@
 
     <copy tofile="${app.dest.properties}/options.xml"
-          file="${org.bedework.config.options}" >
+          file="${org.bedework.options.file}" >
       <filterset>
         <filter token="RPI-DEBUG" value="${app.debug.val}"/>
@@ -170,51 +173,38 @@
       <filterset refid="property.filters" />
     </copy>
-
-    <!-- Temp do it again -->
-    <mkdir dir="${app.dest.properties.old}" />
-
-    <copy tofile="${app.dest.properties.old}/options.xml"
-          file="${org.bedework.config.options}" >
-      <filterset>
-        <filter token="RPI-DEBUG" value="${app.debug.val}"/>
-      </filterset>
-      <filterset refid="property.filters" />
-    </copy>
-
-  	<!--
-    <if>
-      <available file="${app.sou.dir}/war/WEB-INF/classes" type="dir" />
-      <then>
-		    <copy todir="${app.dest.classes}">
-		      <fileset dir="${app.sou.dir}/war/WEB-INF/classes"
-		               includes="*"/>
-		      <filterset refid="property.filters" />
-		    </copy>
-      </then>
-    </if>
-    -->
-
-  	<!-- Make our own servlet.properties file for struts applications
-    <copy tofile="${app.dest.classes}/servlet.properties" file="${app.sou.properties}">
-      <filterset refid="property.filters" />
-    </copy>
-    -->
-
+    
     <copy tofile="${app.dest.classes}/sysevents.properties"
           file="${org.bedework.config.sysevents.properties}" />
 
-    <!-- ===============================================================
-         Add hibernate jars and property files from calendar api.
-         =============================================================== -->
-
-    <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>
+    <if>
+      <isset property="org.bedework.sou.classpath.properties" />
+      <then>
+        <copy todir="${app.dest.classes}">
+          <fileset dir="${org.bedework.sou.classpath.properties}" />
+          <filterset refid="property.filters" />
+        </copy>
+      </then>
+    </if>
+
+    <if>
+      <isset property="org.bedework.sou.hibernate.properties" />
+      <then>
+        <!-- ===========================================================
+             Add hibernate config.
+             =========================================================== -->
+
+        <debugMsg message="************* Copy hib properties from ${org.bedework.sou.hibernate.properties}" />
+
+        <copy todir="${app.dest.classes}">
+          <fileset dir="${org.bedework.sou.hibernate.properties}/properties" />
+          <filterset refid="property.filters" />
+        </copy>
+    
+        <copy todir="${app.dest.classes}">
+          <fileset dir="${org.bedework.sou.hibernate.properties}/hbms" />
+          <filterset refid="property.filters" />
+        </copy>
+      </then>
+    </if>
 
     <!-- Make a temp copy of the web.xml file -->
@@ -249,18 +239,18 @@
     <!-- build the war file or directory -->
     <mkdir dir="${dist.home}" />
-  	
-  	<!-- may be there as a file or a directory -->
+
+    <!-- may be there as a file or a directory -->
     <delete file="${app.war.file}" />
     <delete dir="${app.war.file}" />
   	
     <if>
-    	<or>
-    		<not>
+      <or>
+        <not>
           <isset property="org.bedework.global.wars.zipped" />
-    		</not>
-    		<istrue value="${org.bedework.global.wars.zipped}"/>
+        </not>
+        <istrue value="${org.bedework.global.wars.zipped}"/>
       </or>
       <then>
-      	<!-- Build a zipped war file -->
+        <!-- Build a zipped war file -->
         <war warfile="${app.war.file}"
              webxml="${app.dest.web.xml}"
@@ -284,5 +274,5 @@
 
   <target name="struts-stuff" if="org.bedework.strutsapp">
-  	<!-- Make our own servlet.properties file for struts applications -->
+    <!-- Make our own servlet.properties file for struts applications -->
     <echo file="${app.dest.classes}/servlet.properties" ><![CDATA[#
 # ========================================================================
@@ -346,5 +336,5 @@
                      value="${propval.app.default.contenttype}" />
     </replace>
-    	
+      
     <!-- Copy a dummy startup file into the war. -->
     <copy todir="${app.dest.war}">
Index: releases/bedework-3.7/build/loadDeployConfig.xml
===================================================================
--- trunk/build/loadDeployConfig.xml (revision 2053)
+++ releases/bedework-3.7/build/loadDeployConfig.xml (revision 3104)
@@ -8,4 +8,5 @@
 <project name="loadDeployConfig" basedir="." default="">
   <macrodef name="loadDeployConfig">
+    <!--<attribute name="extra.options" default="${org.bedework.carddav.options}"/> -->
     <sequential>
       <taskdef resource="net/sf/antcontrib/antcontrib.properties" />
@@ -13,27 +14,23 @@
       <property environment="env"/>
 
-      <echo message="Load user properties from ${org.bedework.user.build.properties}" />
-
       <!-- Load user property definition overrides -->
       <property file="${org.bedework.user.build.properties}" />
 
-      <!-- These should already be defined in the above file
-      <property name="org.bedework.config.properties"
-                location="${org.bedework.config.base}/configs/democal.properties" />
-      <property name="org.bedework.config.options"
-                location="${org.bedework.config.base}/configs/democal.options.xml" />
-                -->
-
-      <echo message="==========================================================" />
-      <echo message="Use config properties ${org.bedework.config.properties}" />
-      <property file="${org.bedework.config.properties}" />
+      <infoMsg message="==========================================================" />
+      <infoMsg message="Loading user properties from ${org.bedework.user.build.properties}" />
+      <infoMsg message="Use config properties ${org.bedework.config.properties}" />
+      <infoMsg message="Runtime options from ${org.bedework.config.options}" />
+      <infoMsg message="==========================================================" />
+    	
+    	<property file="${org.bedework.config.properties}" />
 
       <!-- Load the run time options and define some properties based on some
            of the values -->
 
+      <!-- Load the general bedework options -->
       <xmlproperty file="${org.bedework.config.options}"/>
 
-      <!-- Load the CardDAV options -->
-      <xmlproperty file="${org.bedework.carddav.options}"/>
+      <!-- Load the extra options 
+      <xmlproperty file="@{extra.options}"/>-->
 
       <if>
@@ -49,9 +46,11 @@
                     value="${org.bedework.configurations.home}/.portal/common-resources" />
 
-          <echo message="******************* load from ${org.bedework.config.portal.home}/portal.properties" />
+          <debugMsg message="******************* load from ${org.bedework.config.portal.home}/portal.properties" />
+
           <property file="${org.bedework.config.portal.home}/portal.properties" />
         </then>
         <else>
-          <echo message="******************* load from ${org.bedework.configurations.home}/.standalone/standalone.properties" />
+          <debugMsg message="******************* load from ${org.bedework.configurations.home}/.standalone/standalone.properties" />
+
           <property file="${org.bedework.configurations.home}/.platform/standalone.properties" />
         </else>
Index: releases/bedework-3.7/build/platforms/jboss-bedework.xml
===================================================================
---  (revision )
+++ releases/bedework-3.7/build/platforms/jboss-bedework.xml (revision 3104)
@@ -1,0 +1,82 @@
+<?xml version="1.0"?>
+
+<!-- ===================================================================
+     This file is imported by termination/build.xml and adds the targets
+     which will be invoked by that file.
+        doPlatform - misc stuff
+     =================================================================== -->
+
+<project name="bedework.platformTermination" default="doPlatform" >
+  <target name="doPlatform" >
+    <!-- copy startup website that sends you to the applications -->
+    <property name="startup.website.dir"
+              location="${org.bedework.appserver.dir}/${org.bedework.server.resource.root.dir}/bedework" />
+    <delete dir="${startup.website.dir}"/>
+    <mkdir dir="${startup.website.dir}"/>
+    <copy todir="${startup.website.dir}">
+      <fileset dir="${app.root.dir}/resources/bedework"/>
+    </copy>
+
+    <!-- copy any jars required in the server lib (jdbc etc) -->
+    <if>
+      <available file="${org.bedework.global.ext.lib}/server" type="dir" />
+      <then>
+        <copy todir="${appserver.lib.dir}" flatten="yes" >
+          <fileset dir="${org.bedework.global.ext.lib}/server">
+            <include name="*.jar"/>
+          </fileset>
+        </copy>
+      </then>
+    </if>
+    
+    <if>
+      <isset property="org.bedework.global.extra.jars" />
+      <then>
+        <foreach list="${org.bedework.global.extra.jars}"
+                 target="copyToServer"
+                 param="org.bedework.extra.jar"
+                 inheritall="true"
+                 trim="true" />
+      </then>
+    </if>
+
+    <if>
+      <available file="${java.tools.jar}" />
+      <then>
+        <copy todir="${appserver.lib.dir}" file="${java.tools.jar}"/>
+      </then>
+    </if>
+    
+    <if>
+      <isset property="org.bedework.appserver.deploy.dir" />
+      <then>
+        <!-- If requested copy in the activemq configuration. -->
+
+        <if>
+          <istrue value="${org.bedework.global.copy.activemq.config}" />
+          <then>
+            <copy file="${org.bedework.config.home}/activemq-ra.xml"
+                  tofile="${org.bedework.global.activemq.dir}/META-INF/ra.xml"
+                  overwrite="yes" />
+            <copy file="${org.bedework.config.home}/activemq-broker-config.xml"
+                  tofile="${org.bedework.global.activemq.dir}/broker-config.xml"
+                  overwrite="yes" />
+            <copy file="${org.bedework.config.home}/activemq-jms-ds.xml"
+                  tofile="${org.bedework.appserver.deploy.dir}/activemq-jms-ds.xml"
+                  overwrite="yes" />
+          </then>
+        </if>
+        <!-- If requested copy in the db configuration. -->
+
+        <if>
+          <istrue value="${org.bedework.global.copy.bedeworkds.config}" />
+          <then>
+            <copy file="${org.bedework.config.home}/bedework-ds.xml"
+                  tofile="${org.bedework.appserver.deploy.dir}/bedework-ds.xml"
+                  overwrite="yes" />
+          </then>
+        </if>
+      </then>
+    </if>
+  </target>
+</project>
Index: releases/bedework-3.7/build/platforms/jboss-card.xml
===================================================================
---  (revision )
+++ releases/bedework-3.7/build/platforms/jboss-card.xml (revision 3104)
@@ -1,0 +1,22 @@
+<?xml version="1.0"?>
+
+<!-- ===================================================================
+     This file is imported by termination/build.xml and adds the targets
+     which will be invoked by that file.
+        doPlatform - misc stuff
+     =================================================================== -->
+
+<project name="bedework.platformTermination" default="doPlatform" >
+  <target name="doPlatform" >
+    <!-- If requested copy in the db configuration. -->
+
+    <if>
+      <istrue value="${org.bedework.global.copy.bedeworkcardds.config}" />
+      <then>
+        <copy file="${org.bedework.config.home}/bedework-card-ds.xml"
+              tofile="${org.bedework.appserver.deploy.dir}/bedework-card-ds.xml"
+              overwrite="yes" />
+      </then>
+    </if>
+  </target>
+</project>
Index: releases/bedework-3.7/build/platforms/jboss-exsynch.xml
===================================================================
---  (revision )
+++ releases/bedework-3.7/build/platforms/jboss-exsynch.xml (revision 3104)
@@ -1,0 +1,22 @@
+<?xml version="1.0"?>
+
+<!-- ===================================================================
+     This file is imported by termination/build.xml and adds the targets
+     which will be invoked by that file.
+        doPlatform - misc stuff
+     =================================================================== -->
+
+<project name="bedework.platformTermination" default="doPlatform" >
+  <target name="doPlatform" >
+    <!-- If requested copy in the db configuration. -->
+
+    <if>
+      <istrue value="${org.bedework.global.copy.bedeworkexsynchds.config}" />
+      <then>
+        <copy file="${org.bedework.config.home}/bedework-exsynch-ds.xml"
+              tofile="${org.bedework.appserver.deploy.dir}/bedework-exsynch-ds.xml"
+              overwrite="yes" />
+      </then>
+    </if>
+  </target>
+</project>
Index: releases/bedework-3.7/build/platforms/jboss-tzsvr.xml
===================================================================
---  (revision )
+++ releases/bedework-3.7/build/platforms/jboss-tzsvr.xml (revision 3104)
@@ -1,0 +1,23 @@
+<?xml version="1.0"?>
+
+<!-- ===================================================================
+     This file is imported by termination/build.xml and adds the targets
+     which will be invoked by that file.
+        doPlatform - misc stuff
+     =================================================================== -->
+
+<project name="bedework.platformTermination" default="doPlatform" >
+  <target name="doPlatform" >
+    <!-- If requested copy in the db configuration.
+
+    <if>
+      <istrue value="${org.bedework.global.copy.bedeworkexsynchds.config}" />
+      <then>
+        <copy file="${org.bedework.config.home}/bedework-exsynch-ds.xml"
+              tofile="${org.bedework.appserver.deploy.dir}/bedework-exsynch-ds.xml"
+              overwrite="yes" />
+      </then>
+    </if>
+     -->
+  </target>
+</project>
Index: releases/bedework-3.7/build/platforms/jboss.xml
===================================================================
--- releases/bedework-3.7/build/platforms/jboss.xml (revision 2936)
+++  (revision )
@@ -1,43 +1,0 @@
-<?xml version="1.0"?>
-
-<!-- ===================================================================
-     This file is imported by termination/build.xml and adds the targets
-     which will be invoked by that file.
-        doPlatform - misc stuff
-     =================================================================== -->
-
-<project name="bedework.platformTermination" default="doPlatform" >
-  <target name="doPlatform" >
-    <if>
-      <isset property="org.bedework.appserver.deploy.dir" />
-      <then>
-        <!-- If requested copy in the activemq configuration. -->
-
-        <if>
-          <istrue value="${org.bedework.global.copy.activemq.config}" />
-          <then>
-            <copy file="${org.bedework.config.home}/activemq-ra.xml"
-                  tofile="${org.bedework.global.activemq.dir}/META-INF/ra.xml"
-                  overwrite="yes" />
-            <copy file="${org.bedework.config.home}/activemq-broker-config.xml"
-                  tofile="${org.bedework.global.activemq.dir}/broker-config.xml"
-                  overwrite="yes" />
-            <copy file="${org.bedework.config.home}/activemq-jms-ds.xml"
-                  tofile="${org.bedework.appserver.deploy.dir}/activemq-jms-ds.xml"
-                  overwrite="yes" />
-          </then>
-        </if>
-        <!-- If requested copy in the db configuration. -->
-
-        <if>
-          <istrue value="${org.bedework.global.copy.bedeworkds.config}" />
-          <then>
-            <copy file="${org.bedework.config.home}/bedework-ds.xml"
-                  tofile="${org.bedework.appserver.deploy.dir}/bedework-ds.xml"
-                  overwrite="yes" />
-          </then>
-        </if>
-      </then>
-    </if>
-  </target>
-</project>
Index: releases/bedework-3.7/build/platforms/jbossService.xml
===================================================================
--- releases/bedework-3.7/build/platforms/jbossService.xml (revision 3095)
+++ releases/bedework-3.7/build/platforms/jbossService.xml (revision 3104)
@@ -21,9 +21,11 @@
       </then>
       <else>
+        <mkdir dir="${app.dest.classes}"/>
+      	
         <echo file="${app.dest.classes}/hibernate.properties">
 hibernate.query.substitutions true 'T', false 'F', yes 'Y', no 'N'
 hibernate.dialect=${org.bedework.global.hibernate.dialect}
     	
-hibernate.connection.datasource=java:${org.bedework.global.jboss.db.datasource.jndiname}
+hibernate.connection.datasource=java:${org.bedework.jboss.datasource.jndiname}
 
 hibernate.bytecode.use_reflection_optimizer=false
@@ -52,4 +54,7 @@
       <else>
         <!-- Library in sar file -->
+        <property name="app.dest.lib"
+                  location="${app.dest.webinf}/lib" />
+        
         <copy todir="${app.dest.lib}" >
           <fileset dir="${org.bedework.temp.extrajars.dir}" />
@@ -61,6 +66,4 @@
           </not>
           <then>
-            <property name="app.dest.lib"
-                      location="${app.dest.webinf}/lib" />
             <antcall target="copyLibs" inheritRefs="true" />
           </then>
Index: releases/bedework-3.7/build/platforms/jbossWar.xml
===================================================================
--- trunk/build/platforms/jbossWar.xml (revision 2955)
+++ releases/bedework-3.7/build/platforms/jbossWar.xml (revision 3104)
@@ -50,5 +50,12 @@
         <property name="app.dest.lib"
                   location="${app.dest.webinf}/lib" />
-        <antcall target="copyLibs" inheritRefs="true" />
+        <if>
+          <not>
+            <isset property="propval.app.no.defaultlibs" />
+          </not>
+          <then>
+            <antcall target="copyLibs" inheritRefs="true" />
+          </then>
+        </if>
       </then>
       <else>
@@ -71,7 +78,5 @@
       </not>
       <then>
-        <echo message="***************************************************************" />
-        <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" />
-        <echo message="***************************************************************" />
+        <infoMsg message="* =========== Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" />
 
         <!-- copy the war file. -->
@@ -90,17 +95,43 @@
 
   <target name="deployEar">
+    <if>
+      <equals arg1="${org.bedework.global.ear.zipped}"
+              arg2="yes" />
+      <then>
+        <property name="org.bedework.ear.dir"
+                  location="${org.bedework.temp.dir}/${org.bedework.ear.name}" />
+        <property name="org.bedework.ear.file"
+                  location="${org.bedework.temp.dir}/${org.bedework.ear.name}.ear" />
+      </then>
+      <else>
+        <property name="org.bedework.ear.dir"
+                  location="${org.bedework.temp.dir}/${org.bedework.ear.name}.ear" />
+      </else>
+    </if>
+
+    <delete dir="${org.bedework.ear.dir}" />
+    <mkdir dir="${org.bedework.ear.dir}" />
+
+    <property name="org.bedework.ear.properties.jar"
+              value="${org.bedework.ear.dir}/bw-ear-properties.jar"/>
+
     <!-- Common library in ear file -->
     <property name="app.dest.lib"
               location="${org.bedework.ear.dir}" />
-    <antcall target="copyLibs" inheritRefs="true" />
-
-  	<!-- And the extra jars we preserved -->
+    <if>
+      <not>
+        <isset property="propval.app.no.defaultlibs" />
+      </not>
+      <then>
+        <antcall target="copyLibs" inheritRefs="true" />
+      </then>
+    </if>
+
+    <!-- And the extra jars we preserved -->
     <copy todir="${app.dest.lib}" >
       <fileset dir="${org.bedework.temp.ear.extrajars.dir}" />
     </copy>
   	
-    <echo message="***************************************************************" />
-    <echo message="Building ear file for jboss deployment" />
-    <echo message="***************************************************************" />
+    <infoMsg message="* =========== Building ear file ${org.bedework.ear.dir} for jboss deployment" />
 
     <jar jarfile="${org.bedework.ear.properties.jar}">
@@ -108,17 +139,10 @@
     </jar>
 
-    <path id="app.xml.cp">
-      <pathelement location="${org.bedework.deployutil.jar}"/>
-    </path>
-
-    <taskdef name="applicationXml"
-             classname="org.bedework.deployment.ApplicationXmlTask">
-      <classpath refid="app.xml.cp"/>
-    </taskdef>
-
-    <echo message="outFile=${org.bedework.ear.dir}/META-INF/application.xml
-                    warDir=${org.bedework.temp.dir}/wars
-                    contexts=${org.bedework.global.context.roots}" />
-
+    <debugMsg message="outFile=${org.bedework.ear.dir}/META-INF/application.xml
+                        warDir=${org.bedework.temp.dir}/wars
+                        contexts=${org.bedework.global.context.roots}" />
+
+  	<mkdir dir="${org.bedework.ear.dir}/META-INF" />
+  	
     <applicationXml displayName="Bedework calendar suite"
                     outFile="${org.bedework.ear.dir}/META-INF/application.xml"
@@ -129,5 +153,5 @@
       </fileset>
     </applicationXml>
-  	
+    
     <echo file="${org.bedework.ear.dir}/META-INF/jboss-app.xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
 <jboss-app>
@@ -138,9 +162,22 @@
 </jboss-app>
 ]]></echo>
-    	
+      
     <replace file="${org.bedework.ear.dir}/META-INF/jboss-app.xml"
-    	       token="@EAR_NAME@" 
-    	       value="${app.ear.file.name}"/>
-    	    
+             token="@EAR_NAME@" 
+             value="${app.ear.file.name}"/>
+
+    <if>
+      <and>
+        <isset property="ear.meta.dir" />
+        <available file="${ear.meta.dir}" type="dir" />
+      </and>
+      <then>
+        <copy todir="${org.bedework.ear.dir}/META-INF">
+          <fileset dir="${ear.meta.dir}" />
+          <filterset refid="property.filters" />
+        </copy>
+      </then>
+    </if>
+          
     <manifest file="${org.bedework.ear.dir}/META-INF/MANIFEST.MF" />
 
Index: releases/bedework-3.7/build/quickstart/build.xml
===================================================================
--- releases/bedework-3.7/build/quickstart/build.xml (revision 3097)
+++ releases/bedework-3.7/build/quickstart/build.xml (revision 3104)
@@ -128,6 +128,10 @@
     <ant antfile="${bedework.build.file}" inheritrefs="true"
            target="build" />
-    <tstamp prefix="endbuild" />
-    <echo level="info" message="=================> Build finished at ${endbuild.TODAY}" />
+
+    <tstamp>
+      <format property="deploydebug.time" pattern="MM/dd/yyyy HH:mm:ss"/>
+    </tstamp>
+
+    <echo message="* ============== finished at ${deploydebug.time}" />
   </target>
 
@@ -136,4 +140,10 @@
     <ant antfile="${bedework.build.file}" inheritrefs="true"
            target="clean.build" />
+
+    <tstamp>
+      <format property="deploydebug.time" pattern="MM/dd/yyyy HH:mm:ss"/>
+    </tstamp>
+
+    <echo message="* ============== finished at ${deploydebug.time}" />
   </target>
 
@@ -159,4 +169,10 @@
     <ant antfile="${bedework.build.file}" inheritrefs="true"
            target="deploy" />
+
+    <tstamp>
+      <format property="deploydebug.time" pattern="MM/dd/yyyy HH:mm:ss"/>
+    </tstamp>
+
+    <echo message="* ============== finished at ${deploydebug.time}" />
   </target>
 
@@ -165,9 +181,10 @@
     <ant antfile="${bedework.build.file}" inheritrefs="true"
            target="deploy.debug" />
-    <tstamp>
-      <format property="deploydebug.time" pattern="MM/dd/yyyy HH:mm:ss"/>
-    </tstamp>
-
-    <echo level="info" message="=================> deploy.debug finished at ${deploydebug.time}" />
+
+    <tstamp>
+      <format property="deploydebug.time" pattern="MM/dd/yyyy HH:mm:ss"/>
+    </tstamp>
+
+    <echo message="* ============== finished at ${deploydebug.time}" />
   </target>
 
@@ -186,4 +203,10 @@
     <ant antfile="${bedework.build.file}" inheritrefs="true"
            target="quickstart-clean" />
+
+    <tstamp>
+      <format property="deploydebug.time" pattern="MM/dd/yyyy HH:mm:ss"/>
+    </tstamp>
+
+    <echo message="* ============== finished at ${deploydebug.time}" />
   </target>
 
@@ -192,4 +215,10 @@
     <ant antfile="${bedework.build.file}" inheritrefs="true"
            target="clean.deploy" />
+
+    <tstamp>
+      <format property="deploydebug.time" pattern="MM/dd/yyyy HH:mm:ss"/>
+    </tstamp>
+
+    <echo message="* ============== finished at ${deploydebug.time}" />
   </target>
 
@@ -198,4 +227,10 @@
     <ant antfile="${bedework.build.file}" inheritrefs="true"
            target="clean.deploy.debug" />
+
+    <tstamp>
+      <format property="deploydebug.time" pattern="MM/dd/yyyy HH:mm:ss"/>
+    </tstamp>
+
+    <echo message="* ============== finished at ${deploydebug.time}" />
   </target>
 
Index: releases/bedework-3.7/build/quickstart/linux/bw
===================================================================
--- releases/bedework-3.7/build/quickstart/linux/bw (revision 3099)
+++ releases/bedework-3.7/build/quickstart/linux/bw (revision 3104)
@@ -17,4 +17,7 @@
 ant_logger=
 
+ant_loglevel="-quiet"
+bw_loglevel=""
+
 echo ""
 echo "  Bedework Calendar System"
@@ -25,5 +28,5 @@
 
 usage() {
-  echo "  $PRG [CONFIG-SOURCE] [CONFIG] [PROJECT] [ -offline ] [ target ] "
+  echo "  $PRG [CONFIG-SOURCE] [CONFIG] [PROJECT] [ -offline ] [LOG_LEVEL] [ target ] "
   echo "  $PRG ACTION"
   echo ""
@@ -40,4 +43,13 @@
   echo ""
   echo "   -offline     Build without attempting to retrieve library jars"
+  echo ""
+  echo "   LOG_LEVEL sets the level of logging and can be"
+  echo "      -log-silent   Nearly silent"
+  echo "      -log-quiet    The default"
+  echo "      -log-inform   A little more noisy"
+  echo "      -log-verbose  Noisier"
+  echo "      -ant-debug    Vast amounts of ant output"
+  echo "      -build-debug  Some bedework build debug output"
+  echo ""
   echo "   target       Ant target to execute"
   echo ""
@@ -304,5 +316,34 @@
       shift
       ;;
-# Projects
+# ----------------------- Log level       
+    -log-silent)
+      ant_loglevel="-quiet"
+      bw_loglevel="-Dorg.bedework.build.silent=true"
+      shift
+      ;;
+    -log-quiet)
+      ant_loglevel="-quiet"
+      bw_loglevel=""
+      shift
+      ;;
+    -log-inform)
+      ant_loglevel=""
+      bw_loglevel="-Dorg.bedework.build.inform=true"
+      shift
+      ;;
+    -log-verbose)
+      ant_loglevel="-verbose"
+      bw_loglevel="-Dorg.bedework.build.inform=true -Dorg.bedework.build.noisy=true"
+      shift
+      ;;
+    -ant-debug)
+      ant_loglevel="-debug"
+      shift
+      ;;
+    -build-debug)
+      bw_loglevel="-Dorg.bedework.build.inform=true -Dorg.bedework.build.noisy=true -Dorg.bedework.build.debug=true "
+      shift
+      ;;
+# ------------------------Projects
     -carddav)
       carddav="yes"
@@ -418,3 +459,3 @@
 fi
 
-$JAVA_HOME/bin/java -classpath $CLASSPATH $ant_xmllogfile $offline -Dant.home=$ANT_HOME org.apache.tools.ant.launch.Launcher $BWCONFIG $ant_listener $ant_logger $*
+$JAVA_HOME/bin/java -classpath $CLASSPATH $ant_xmllogfile $offline -Dant.home=$ANT_HOME org.apache.tools.ant.launch.Launcher $BWCONFIG $ant_listener $ant_logger $ant_loglevel $bw_loglevel $*
Index: releases/bedework-3.7/config/build.xml
===================================================================
--- trunk/config/build.xml (revision 1953)
+++ releases/bedework-3.7/config/build.xml (revision 3104)
@@ -8,10 +8,4 @@
 
 <project name="cal.config" default="init" >
-  <property name="base.name" value="config"/>
-
-  <!--
-  <import file="${org.bedework.config.base}/build.pubcaldav.xml"/>
-  -->
-
   <target name="init">
     <dirname property="this.dir" file="${ant.file}"/>
Index: releases/bedework-3.7/config/bwbuild/.platform/ear.properties
===================================================================
--- trunk/config/bwbuild/.platform/ear.properties (revision 2872)
+++ releases/bedework-3.7/config/bwbuild/.platform/ear.properties (revision 3104)
@@ -11,8 +11,8 @@
 org.bedework.ear.templib=${org.bedework.temp.dir}/earlib
 
-org.bedework.ear.dir=${org.bedework.temp.dir}/${org.bedework.global.ear.name}
+#org.bedework.ear.dir=${org.bedework.temp.dir}/${org.bedework.global.ear.name}
 
 org.bedework.ear.properties.dir=${org.bedework.temp.dir}/ear-properties
 
-org.bedework.ear.properties.jar=${org.bedework.ear.dir}/bw-ear-properties.jar
+#Sorg.bedework.ear.properties.jar=${org.bedework.ear.dir}/bw-ear-properties.jar
 
Index: releases/bedework-3.7/config/bwbuild/jboss-h2/activemq-broker-config.xml
===================================================================
--- releases/bedework-3.7/config/bwbuild/jboss-h2/activemq-broker-config.xml (revision 3095)
+++ releases/bedework-3.7/config/bwbuild/jboss-h2/activemq-broker-config.xml (revision 3104)
@@ -85,5 +85,5 @@
               <queue physicalName="bedework.sysevents.monitor" />
               <queue physicalName="bedework.crawler" />
-              <filteredDestination selector="inbox = 'true' or scheduleEvent = 'true'"
+              <filteredDestination selector="inbox = 'true'"
                                    queue="bedework.scheduleIn"/>
               <filteredDestination selector="outbox = 'true'"
@@ -101,6 +101,5 @@
       <policyMap>
         <policyEntries>
-          <policyEntry queue=">" producerFlowControl="false"
-            memoryLimit="64mb" />
+          <policyEntry queue=">" memoryLimit="5mb" />
           <policyEntry topic=">" memoryLimit="5mb">
             <!--
Index: releases/bedework-3.7/config/bwbuild/jboss-postgresql/build.properties
===================================================================
--- trunk/config/bwbuild/jboss-postgresql/build.properties (revision 3059)
+++ releases/bedework-3.7/config/bwbuild/jboss-postgresql/build.properties (revision 3104)
@@ -3,13 +3,4 @@
 #
 # Configure a build of a demo calendar running on bedework.org.
-#
-# This file gives users the opportunity to override properties that will be
-# defined later in the build process.
-# The order of loading is:
-#   <home-dir>/bedework.build.properties  (this file)
-#   local.build.properties
-#   <various other distributed properties>
-#
-# Therefore add individual developer overrrides to <home-dir>/bedework.build.properties
 #
 
@@ -42,5 +33,2 @@
 #org.bedework.exsynch.options=${env.BEDEWORK_CONFIG}/exsynch.options.xml
 
-# Enable/disable replacement of log4j config during deployment
-org.bedework.deploy.log4j.config=no
-
Index: releases/bedework-3.7/config/bwbuild/jboss-postgresql/cal.options.xml
===================================================================
--- trunk/config/bwbuild/jboss-postgresql/cal.options.xml (revision 3060)
+++ releases/bedework-3.7/config/bwbuild/jboss-postgresql/cal.options.xml (revision 3104)
@@ -606,5 +606,5 @@
 
           <!-- Exchange sync callback. Comment out for no service -->
-          <exchangeWsPushURI>http://128.113.124.238:8080/exsynch/</exchangeWsPushURI>
+          <exchangeWsPushURI>http://128.113.124.164:8080/exsynch/</exchangeWsPushURI>
 
           <!-- Path to keystore - comment out to use default -->          
Index: releases/bedework-3.7/deployment/build.xml
===================================================================
--- trunk/deployment/build.xml (revision 2829)
+++ releases/bedework-3.7/deployment/build.xml (revision 3104)
@@ -56,6 +56,4 @@
 
 <project name="deploy.bedework" default="init">
-  <property name="base.name" value="deployment"/>
-
   <property name="org.bedework.temp.wars.home"
             location="${org.bedework.temp.dir}/wars" />
@@ -89,6 +87,18 @@
     <property name="app.debug.val" value="0" />
 
-    <!-- set this for the war builds -->
+    <!-- set these for the war builds -->
     <dirname property="app.root.dir" file="${ant.file}"/>
+    
+    <property name="org.bedework.deployment.name"
+              value="bedework" />
+    
+    <property name="org.bedework.sou.hibernate.properties"
+              location="${org.bedework.project.calendarapi}/calCore/resources" />
+    
+    <property name="org.bedework.jboss.datasource.jndiname"
+              value="${org.bedework.global.jboss.db.datasource.jndiname}" />
+    
+    <property name="org.bedework.options.file"
+              value="${org.bedework.config.options}" />
 
     <!-- Common resources directory -->
@@ -106,27 +116,9 @@
                   value="${org.bedework.global.ear.name}.ear" />
 
-        <if>
-          <equals arg1="${org.bedework.global.ear.zipped}"
-                  arg2="yes" />
-          <then>
-            <property name="org.bedework.ear.dir"
-                      location="${dist.home}/${org.bedework.global.ear.name}" />
-            <property name="org.bedework.ear.file"
-                      location="${dist.home}/${org.bedework.global.ear.name}.ear" />
-          </then>
-          <else>
-            <property name="org.bedework.ear.dir"
-                      location="${dist.home}/${org.bedework.global.ear.name}.ear" />
-          </else>
-        </if>
+        <property name="org.bedework.ear.name"
+                  value="${org.bedework.global.ear.name}" />
 
         <property name="org.bedework.ear.properties.dir"
                   location="${org.bedework.temp.dir}/ear-properties" />
-
-        <property name="org.bedework.ear.properties.jar"
-                  location="${org.bedework.ear.dir}/bw-ear-properties.jar"/>
-
-        <delete dir="${org.bedework.ear.dir}" />
-        <mkdir dir="${org.bedework.ear.dir}" />
 
         <delete dir="${org.bedework.ear.templib}" />
@@ -153,4 +145,5 @@
   </target>
 
+  		<!--
   <target name="deftasks" depends="init">
     <path id="app.xml.cp">
@@ -173,6 +166,7 @@
     </taskdef>
   </target>
-
-  <target name="build.configured" depends="deftasks" >
+  -->
+
+  <target name="build.configured" depends="init" >
     <!-- Clean up before we start -->
     <delete dir="${org.bedework.temp.wars.home}" />
@@ -196,5 +190,5 @@
        ================================================================= -->
 
-  <target name="deploy" depends="deftasks" >
+  <target name="deploy" depends="init" >
     <!-- Clean up before we start -->
     <delete dir="${org.bedework.temp.wars.home}" />
@@ -271,5 +265,10 @@
     <property name="org.bedework.deploy.type.dir"
               location="${app.root.dir}/${org.bedework.deploy.name}/${propval.app.type}" />
-    <echo message="*********************************** deploy directory is ${org.bedework.deploy.type.dir}" />
+    <if>
+      <istrue value="${org.bedework.build.debug}" />
+      <then>
+        <echo message="*************** deployment build directory is ${org.bedework.deploy.type.dir}" />
+      </then>
+    </if>
 
     <if>
@@ -313,5 +312,10 @@
     <property name="org.bedework.deploy.type.dir"
               location="${app.root.dir}/${propval.app.type}" />
-    <echo message="*********************************** deploy directory is ${org.bedework.deploy.type.dir}" />
+    <if>
+      <istrue value="${org.bedework.build.debug}" />
+      <then>
+        <echo message="*********************** deployment build directory is ${org.bedework.deploy.type.dir}" />
+      </then>
+    </if>
 
     <if>
Index: releases/bedework-3.7/deployment/publiccaldav/webapp/build.xml
===================================================================
--- trunk/deployment/publiccaldav/webapp/build.xml (revision 2698)
+++ releases/bedework-3.7/deployment/publiccaldav/webapp/build.xml (revision 3104)
@@ -33,8 +33,4 @@
        The "deploy" target first builds a configured component then copies
        all required files to the appropriate servlet container directories.
-
-       Currently this only works for the quickstart distribution.
-       For example, it does not handle deploying into jboss and copying
-       resource files (images, stylesheets) to external locations.
        ================================================================= -->
 
Index: releases/bedework-3.7/deployment/termination/build.xml
===================================================================
--- trunk/deployment/termination/build.xml (revision 2829)
+++ releases/bedework-3.7/deployment/termination/build.xml (revision 3104)
@@ -6,9 +6,10 @@
 
 <project name="bwdeploy.termination" default="deploy" >
-  <import file="${org.bedework.deployment.base}/deployprops.xml" />
-
-  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}.xml" />
+  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}-${org.bedework.deployment.name}.xml" />
 
   <dirname property="this.dir" file="${ant.file}"/>
+
+  <!-- ensure has value -->
+  <property name="propval.app.cal.suite" value="" />
 
   <target name="init">
@@ -16,43 +17,4 @@
 
   <target name="deploy" depends="init,build.configured" >
-    <!-- copy startup website that sends you to the applications -->
-    <property name="startup.website.dir"
-              location="${org.bedework.appserver.dir}/${org.bedework.server.resource.root.dir}/bedework" />
-    <delete dir="${startup.website.dir}"/>
-    <mkdir dir="${startup.website.dir}"/>
-    <copy todir="${startup.website.dir}">
-      <fileset dir="${app.root.dir}/resources/bedework"/>
-    </copy>
-
-    <!-- copy any jars required in the server lib (jdbc etc) -->
-    <if>
-      <available file="${org.bedework.global.ext.lib}/server" type="dir" />
-      <then>
-        <copy todir="${appserver.lib.dir}" flatten="yes" >
-          <fileset dir="${org.bedework.global.ext.lib}/server">
-            <include name="*.jar"/>
-          </fileset>
-        </copy>
-      </then>
-    </if>
-    
-    <if>
-      <isset property="org.bedework.global.extra.jars" />
-      <then>
-        <foreach list="${org.bedework.global.extra.jars}"
-                 target="copyToServer"
-                 param="org.bedework.extra.jar"
-                 inheritall="true"
-                 trim="true" />
-      </then>
-    </if>
-
-    <if>
-      <available file="${java.tools.jar}" />
-      <then>
-        <copy todir="${appserver.lib.dir}" file="${java.tools.jar}"/>
-      </then>
-    </if>
-  	
     <!-- Platform specific -->
     <antcall target="doPlatform" inheritRefs="true" />
Index: releases/bedework-3.7/deployment/termination/webapp/build.xml
===================================================================
--- trunk/deployment/termination/webapp/build.xml (revision 2698)
+++ releases/bedework-3.7/deployment/termination/webapp/build.xml (revision 3104)
@@ -2,13 +2,16 @@
 
 <!-- ===================================================================
-     Standalone apps terminations tasks.
+     terminations task.
      =================================================================== -->
 
 <project name="bwdeploy.termination" default="deploy" >
-  <import file="${org.bedework.deployment.base}/deployprops.xml" />
-
   <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" />
 
+  <import file="${build.dir}/buildfilters.xml" />
+
   <dirname property="this.dir" file="${ant.file}"/>
+
+  <!-- ensure has value -->
+  <property name="propval.app.cal.suite" value="" />
 
   <target name="init">
@@ -16,8 +19,13 @@
 
   <target name="deploy" depends="init,build.configured" >
-    <!-- Deploy common resources -->
-    <ant antfile="${org.bedework.common.resources}/build.xml"
-         inheritrefs="true" target="deploy" />
-
+    <if>
+      <isset property="org.bedework.common.resources" />
+      <then>
+        <!-- Deploy common resources -->
+        <ant antfile="${org.bedework.common.resources}/build.xml"
+             inheritrefs="true" target="deploy" />
+      </then>
+    </if>
+    
     <if>
       <isset property="org.bedework.global.build.ear" />
Index: releases/bedework-3.7/deployment/webpublic/webapp/build.xml
===================================================================
--- trunk/deployment/webpublic/webapp/build.xml (revision 2698)
+++ releases/bedework-3.7/deployment/webpublic/webapp/build.xml (revision 3104)
@@ -37,5 +37,4 @@
     <property name="app.resources.dir"
               location="${this.dir}/resources" />
-  	<echo message="app.resources.dir=${app.resources.dir}" />
   </target>
 
Index: releases/bedework-3.7/deployutil/build.xml
===================================================================
--- trunk/deployutil/build.xml (revision 2625)
+++ releases/bedework-3.7/deployutil/build.xml (revision 3104)
@@ -8,5 +8,4 @@
 
 <project name="bedework.deployutil" default="build">
-  <property name="base.name" value="deployutil"/>
   <property name="lib.dir" location="${org.bedework.default.lib}"/>