Index: releases/bedework-3.8/build.xml
===================================================================
--- releases/bedework-3.8/build.xml (revision 3454)
+++ releases/bedework-3.8/build.xml (revision 3461)
@@ -7,5 +7,12 @@
 
 <project name="bedework.build" default="deploy" basedir=".">
+  <taskdef resource="net/sf/antcontrib/antcontrib.properties" />
+
   <property environment="env"/>
+
+  <dirname property="project.home" file="${ant.file}"/>
+
+  <property name="bedework.home"
+            location="${project.home}" />
 
   <!-- this project -->
@@ -13,33 +20,33 @@
             location="${basedir}" />
 
-    <property name="org.bedework.libcache.dir"
-              location="${org.bedework.project.bedework}/libcache"/>
-
-  <property name="build.dir" location="${org.bedework.project.bedework}/build"/>
-  
-  <property name="buildsh" location="${build.dir}/buildsh.xml"/>
-  <property name="buildwar" location="${build.dir}/buildwar.xml"/>
-
-  <!-- ========================= deployutil ================================ -->
-
-  <property name="org.bedework.default.lib"
-            location="${org.bedework.project.bedework}/lib" />
+  <property name="build.dir" location="${bedework.home}/build"/>
 
   <property name="bw.project.home" location="${org.bedework.project.bedework}"/>
 
-  <property file="${bw.project.home}/build.properties" />
-
-  <property name="project.version" value="${org.bedework.version}"/>
-  
   <import file="${build.dir}/buildTools/deftasks.xml"/>
 
   <deftasks/>
+
+  <projectDefs name="bedework main project"
+               version="${org.bedework.version}" 
+               deployment-name="bedework"
+  />
   
   <var name="org.bedework.jars.built" value="0" />
   <var name="org.bedework.jars.checked" value="0" />
 
-  <import file="${build.dir}/buildfilters.xml" />
-  <import file="${build.dir}/loadDeployConfig.xml"/>
-  <import file="${build.dir}/dirTools.xml"/>
+  <target name="init" >
+    <projectInit/>
+
+    <!-- ===============================================================
+              This project builds nothing - it just assembles.
+         =============================================================== -->
+
+    <property name="org.bedework.config.base"
+              location="${org.bedework.project.bedework}/config" />
+
+    <property name="org.bedework.deployment.base"
+              location="${org.bedework.project.bedework}/deployment" />
+  </target>
 
   <target name="README" depends="init"
@@ -55,49 +62,4 @@
               srcFile="${org.bedework.project.bedework}/docs/README"/>
     <echo level="info" message="${org.bedework.README}" />
-  </target>
-
-  <target name="init" >
-    <loadDeployConfig />
-
-    <!-- ===============================================================
-              Default properties.
-         =============================================================== -->
-
-    <property name="project.name" value="${org.bedework.package.name}"/>
-
-    <property name="dist.home" location="${bw.project.home}/dist"/>
-    <property name="lib.dir" location="${bw.project.home}/lib"/>
-    <property name="resources.dir" location="${bw.project.home}/resources"/>
-    <property name="bin.home" location="${bw.project.home}/bin"/>
-
-    <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="*" />
-
-    <!-- ===============================================================
-              This project builds nothing - it just assembles.
-         =============================================================== -->
-
-    <property name="org.bedework.temp.dir"
-              location="${dist.home}/temp" />
-
-    <property name="org.bedework.ear.properties.dir"
-              location="${org.bedework.temp.dir}/ear-properties" />
-
-    <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" />
   </target>
 
@@ -123,6 +85,10 @@
        The "deploy" target deploys the applications
        ================================================================= -->
+  
+  <target name="deploy-init" depends="init">
+    <deployInit ear-name="bwcal" />
+  </target>
 
-  <target name="deploy" depends="build"
+  <target name="deploy" depends="build,deploy-init"
           description="builds and deploys the applications">
     <ant antfile="${org.bedework.project.bedework}/deployment/build.xml" inheritrefs="true"
Index: releases/bedework-3.8/build/buildTools/deftasks.xml
===================================================================
--- releases/bedework-3.8/build/buildTools/deftasks.xml (revision 3454)
+++ releases/bedework-3.8/build/buildTools/deftasks.xml (revision 3461)
@@ -10,4 +10,6 @@
   <macrodef name="deftasks">
     <sequential>
+      <property name="build.dir" location="${bedework.home}/build"/>
+
       <path id="build.cp">
         <fileset dir="${build.dir}">
@@ -26,4 +28,9 @@
       </taskdef>
 
+      <taskdef name="license"
+               classname="org.bedework.deployment.LicenseTask">
+        <classpath refid="build.cp"/>
+      </taskdef>
+
       <taskdef name="resolveFile"
                classname="org.bedework.deployment.ResolveFile">
@@ -46,11 +53,156 @@
     <attribute name="project"/>
     <attribute name="target"/>
-	  <sequential>
-	    <ant antfile="${bedework.home}/../@{project}/build.xml" 
-	         inheritall="false"
-	         target="@{target}" />
-	  </sequential>
-	</macrodef>
+    <sequential>
+      <ant antfile="${bedework.home}/../@{project}/build.xml" 
+           inheritall="false"
+           target="@{target}" />
+    </sequential>
+  </macrodef>
     
+  <macrodef name="buildfilters">
+    <sequential>
+      <filterset id="property.filters" >
+        <!--      Global settings            -->
+        <filter token="QUICKSTART_DIR"
+                value="${quickstart.dir}"/>
+
+        <filter token="APPSERVER-DATA-DIR"
+                value="${org.bedework.data.dir}"/>
+      	
+        <filter token="DATA_DIR"
+                value="${org.bedework.data.dir}"/>
+
+        <filter token="BW-APP-NAME"
+                value="${org.bedework.deploy.name}"/>
+
+        <filter token="HIBERNATE-DIALECT"
+                value="${org.bedework.global.hibernate.dialect}" />
+
+        <filter token="SECOND-LEVEL-CACHING"
+                value="${org.bedework.global.hibernate.cache.use_second_level_cache}" />
+
+        <filter token="CACHE-PROVIDER"
+                value="${org.bedework.global.hibernate.cache.provider_class}" />
+
+        <filter token="DIRECTORY-BROWSING-DISALLOWED"
+                value="${org.bedework.global.directory.browsing.disallowed}" />
+
+        <filter token="SERVLET-CLASS"
+                value="${org.bedework.global.servlet.class}"/>
+
+        <filter token="PORTLET-SERVLET-CLASS"
+                value="${org.bedework.global.portlet-servlet.class}"/>
+
+        <filter token="PORTAL-SERVLET-CONTEXT-PROVIDER"
+                value="${org.bedework.global.portal-servlet.context.provider}"/>
+
+        <filter token="PORTAL-SERVLET-CONTEXT-LISTENER"
+                value="${org.bedework.global.portal-servlet.context.listener}"/>
+
+        <filter token="PORTLET-CLASS"
+                value="${org.bedework.global.portlet.class}"/>
+
+        <filter token="IGNORE-CONTENT-TYPE"
+                value="${org.bedework.global.ignoreContentType}" />
+
+        <filter token="GENURL-TAGLIB-TLD"
+                value="${org.bedework.global.genurl.taglib.tld}"/>
+
+        <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"
+                value="${org.bedework.global.jboss.db.datasource.jndiname}"/>
+
+        <!--      Application settings            -->
+
+        <filter token="APP-DESCRIPTION"
+                value="${propval.app.description}" />
+
+        <filter token="PORTLET-NAME"
+                value="${propval.app.portlet.name}"/>
+
+        <filter token="CAL-SUITE"
+                value="${propval.app.cal.suite}"/>
+
+        <filter token="SECURITY-DOMAIN"
+                value="${propval.app.security.domain}"/>
+        <filter token="SECURITY-PREFIX"
+                value="${propval.app.security.prefix}"/>
+        <filter token="TRANSPORT-GUARANTEE"
+                value="${propval.app.transport.guarantee}"/>
+
+        <filter token="DISPLAY-NAME"
+                value="${propval.app.display.name}"/>
+        <filter token="CONTEXT-ROOT"
+                value="${propval.app.context.root}" />
+        <filter token="APP-NAME"
+                value="${propval.app.name}"/>
+        <filter token="APP-DESCRIPTION"
+                value="${propval.app.description}"/>
+        <filter token="APP-VERSION"
+                value="${org.bedework.global.version}"/>
+        <filter token="WAR-NAME"
+                value="${propval.app.war.name}"/>
+        <filter token="TOMCAT-DOC-BASE"
+                value="${org.bedework.appserver.dir}${propval.app.deploy.dir}/${propval.app.war.name}"/>
+
+        <filter token="DEFAULT-CONTENTTYPE"
+                value="${propval.app.default.contenttype}" />
+        <filter token="NOXSLT"
+                value="${propval.app.noxslt}" />
+
+        <!-- Change this to be an app par -->
+        <filter token="RUN-AS-USER"
+                value="${org.bedework.syspar.public.user}" />
+
+                <!-- ???????
+        <filter token="CALFILE-NAME"
+                value="${propval.app.calfile.name}" /> -->
+
+        <!--      Shell script settings            -->
+
+        <filter token="SCHEMA-DELIMITER"
+                value="${propval.app.schema.delimiter}" />
+
+        <filter token="KEYFILE-DIR"
+                value="${org.bedework.global.keyfile.dir}"/>
+
+        <filter token="calSoapWsURI"
+                value="${org.bedework.calws-soap.uri}" />
+
+        <filter token="synchWsURI"
+                value="${org.bedework.synch.uri}" />
+
+        <filter token="synchService"
+                value="${org.bedework.synch.service}" />
+
+        <filter token="synchServiceManager"
+                value="${org.bedework.synch.service.manager}" />
+
+        <filter token="SYNCH_WSDL_DIR"
+                value="${org.bedework.synch.wsdl.deploy.dir}" />
+
+        <filter token="synchWsdlURI"
+                value="${org.bedework.synch.wsdl.uri}" />
+
+        <filter token="tzdataURI"
+                value="${org.bedework.app.tzsvr.tzdata.url}" />
+
+        <filter token="tzdataRefreshInterval"
+                value="${org.bedework.app.tzsvr.refetch.interval}" />
+
+        <filter token="tzserverPrimary"
+                value="${org.bedework.app.tzsvr.primary.server}" />
+
+        <filter token="tzserverPrimaryUrl"
+                value="${org.bedework.app.tzsvr.primary.url}" />
+      </filterset>
+    </sequential>
+  </macrodef>
+      
   <macrodef name="projectDefs">
     <attribute name="name"/>
@@ -67,6 +219,4 @@
 
       <property name="lib.dir" location="${project.home}/lib"/>
-
-      <property name="build.dir" location="${bedework.home}/build"/>
 
       <property name="buildjar" location="${build.dir}/buildTools/buildjar.xml"/>
@@ -98,6 +248,79 @@
       </if>
 
+      <buildfilters/>
+      
       <import file="${build.dir}/buildTools/getJar.xml"/>
       <import file="${build.dir}/buildTools/jdoc.xml"/>
+    </sequential>
+  </macrodef>
+
+  <!-- ===================================================================
+       Load the deployment configuration from the properties file. We also load
+       the run time options and define some properties based on some of the
+       values found there
+       =================================================================== -->
+  <macrodef name="loadDeployConfig">
+    <!--<attribute name="extra.options" default="${org.bedework.carddav.options}"/> -->
+    <sequential>
+      <taskdef resource="net/sf/antcontrib/antcontrib.properties" />
+    
+      <if>
+        <not>
+          <isset property="bedework-options.org.bedework.global.portal.platform"/>
+        </not>
+        <then>
+        <property environment="env"/>
+  
+        <!-- Load build property definition overrides -->
+        <property file="${org.bedework.build.properties}" />
+  
+        <configMsg message="Loading build properties from ${org.bedework.build.properties}" />
+        <configMsg message="Use config override properties ${org.bedework.config.override.properties}" />
+        <configMsg message="Use config properties ${org.bedework.config.properties}" />
+        <configMsg message="Runtime options from ${org.bedework.config.options}" />
+  
+        <property file="${org.bedework.configuration.versions}" />
+        <property file="${org.bedework.config.override.properties}" />
+        <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 extra options 
+        <xmlproperty file="@{extra.options}"/>-->
+  
+        <if>
+          <isset property="bedework-options.org.bedework.global.portal.platform"/>
+          <then>
+            <property name="org.bedework.global.portal.platform"
+                      value="${bedework-options.org.bedework.global.portal.platform}" />
+  
+            <property name="org.bedework.config.portal.home"
+                      value="${org.bedework.configurations.home}/.portal/${org.bedework.global.portal.platform}" />
+  
+            <property name="org.bedework.config.portal.common.home"
+                      value="${org.bedework.configurations.home}/.portal/common-resources" />
+  
+            <debugMsg message="******************* load from ${org.bedework.config.portal.home}/portal.properties" />
+  
+            <property file="${org.bedework.config.portal.home}/portal.properties" />
+          </then>
+          <else>
+            <debugMsg message="******************* load from ${org.bedework.configurations.home}/.standalone/standalone.properties" />
+  
+            <property file="${org.bedework.configurations.home}/.platform/standalone.properties" />
+          </else>
+        </if>
+  
+        <property name="org.bedework.global.version"
+                  value="${bedework-options.org.bedework.global.version}" />
+  
+        <property name="org.bedework.global.directory.browsing.disallowed"
+                  value="${bedework-options.org.bedework.syspars.directoryBrowsingDisallowed}" />
+        </then>
+      </if>
     </sequential>
   </macrodef>
@@ -109,4 +332,6 @@
     <sequential>
       <infoMsg message="* =========== Building ${project.name}" />
+
+      <loadDeployConfig/>
       
       <delete dir="${lib.dir}" />
@@ -170,7 +395,14 @@
       </if>
       
+      <property name="org.bedework.global.build.common.context.war.name"
+                value="bw-common" />
+      
+      <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" />
 
+      <!-- Recreated by each app build file. Place extra jars here -->
       <property name="org.bedework.temp.extrajars.dir"
                 location="${org.bedework.temp.dir}/extrajars" />
@@ -183,14 +415,11 @@
                 location="${org.bedework.temp.dir}/context-roots.properties" />
 
-      <!-- ===== End of stuff in main bedework deployment build file ======   -->
+      <tempfile property="org.bedework.global.context.roots"
+                destdir="${org.bedework.temp.dir}"
+                prefix="context-roots" suffix=".properties" />
       
       <!-- Clean up before we start -->
-      <if>
-        <isset property="org.bedework.temp.wars.home" />
-        <then>    
-          <delete dir="${org.bedework.temp.wars.home}" />
-          <mkdir dir="${org.bedework.temp.wars.home}" />
-        </then>
-      </if>
+      <delete dir="${org.bedework.temp.wars.home}" />
+      <mkdir dir="${org.bedework.temp.wars.home}" />
 
       <delete dir="${org.bedework.temp.ear.extrajars.dir}" />
@@ -231,5 +460,10 @@
   
   <!-- Override this -->
-  <target name="deploy" depends="build" />
+  <target name="deploy-init" depends="init">
+    <deployInit ear-name="" />
+  </target>
+  
+  <!-- Override this -->
+  <target name="deploy" depends="deploy-init,build" />
 
   <!-- =================================================================
@@ -585,4 +819,16 @@
   </macrodef>
   
+  <macrodef name="configMsg">
+    <attribute name="message"/>
+    <sequential>
+      <if>
+        <istrue value="${org.bedework.build.showconfigs}" />
+        <then>
+          <echo message="@{message}" />
+        </then>
+      </if>
+    </sequential>
+  </macrodef>
+  
   <macrodef name="debugMsg">
     <attribute name="message"/>
Index: releases/bedework-3.8/build/buildTools/getJar.xml
===================================================================
--- releases/bedework-3.8/build/buildTools/getJar.xml (revision 3434)
+++ releases/bedework-3.8/build/buildTools/getJar.xml (revision 3461)
@@ -35,5 +35,40 @@
       <taskdef resource="net/sf/antcontrib/antcontrib.properties" />
     	
-    	<mkdir dir="@{libcache}" />
+   	  <mkdir dir="@{libcache}" />
+
+      <if>
+        <isset property="org.bedework.print.jar.reference.info" />
+        <then>
+          <mkdir dir="${bedework.home}/dist"/>
+          <echoxml file="${bedework.home}/dist/jarrefs.xml" append="true">
+            <jar-ref>
+              <name>@{name}</name>
+              <version>@{version}</version>
+              <from>${project.name}</from>
+            </jar-ref>
+          </echoxml>
+        </then>
+      </if>
+
+      <if>
+        <isset property="org.bedework.print.jar.licence.info" />
+        <then>
+          <license name="@{name}" version="@{version}" 
+                   prefix="org.bedework.license" 
+                   licenseInfoFile="${org.bedework.license-mappings}" />
+          
+          <mkdir dir="${bedework.home}/dist"/>
+          <echoxml file="${bedework.home}/dist/jarlicenses.xml" append="true">
+            <jar-license>
+              <name>@{name}</name>
+              <version>${org.bedework.license.version}</version>
+              <groupId>${org.bedework.license.groupId}</groupId>
+              <artifactId>${org.bedework.license.artifactId}</artifactId>
+              <license>${org.bedework.license.license}</license>
+              <from>${project.name}</from>
+            </jar-license>
+          </echoxml>
+        </then>
+      </if>
 
       <!-- Names are of form
@@ -41,5 +76,4 @@
              <name-part>.jar
         -->
-
       <if>
         <equals arg1="@{version}" arg2="" />
@@ -72,6 +106,6 @@
 
       <!-- If a project or projecthome was specified try to get it from the
-           local file system
-        -->
+           local file system -->
+      
       <if>
         <or>
Index: releases/bedework-3.8/build/buildsh.xml
===================================================================
--- trunk/build/buildsh.xml (revision 3170)
+++ releases/bedework-3.8/build/buildsh.xml (revision 3461)
@@ -16,5 +16,5 @@
 
 <project name="bw.buildsh" default="build">
-  <import file="${build.dir}/buildfilters.xml" />
+  <!--<import file="${build.dir}/buildfilters.xml" />-->
 
   <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}Service.xml" />
Index: releases/bedework-3.8/build/buildwar.xml
===================================================================
--- trunk/build/buildwar.xml (revision 3336)
+++ releases/bedework-3.8/build/buildwar.xml (revision 3461)
@@ -40,5 +40,5 @@
   <taskdef resource="net/sf/antcontrib/antcontrib.properties" />
 
-  <import file="${build.dir}/buildfilters.xml" />
+  <!--<import file="${build.dir}/buildfilters.xml" />-->
 
   <if>
Index: releases/bedework-3.8/build/license-mappings.xml
===================================================================
---  (revision )
+++ releases/bedework-3.8/build/license-mappings.xml (revision 3461)
@@ -1,0 +1,1046 @@
+<?xml version="1.0" encoding="utf-8"?>
+<license-lookup xmlns="https://source.jasig.org/schemas/maven-notice-plugin/license-lookup"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="https://source.jasig.org/schemas/maven-notice-plugin/license-lookup https://source.jasig.org/schemas/maven-notice-plugin/license-lookup/license-lookup-v1.0.xsd">
+
+    <artifact>
+        <groupId>antisamy-bin</groupId>
+        <artifactId>org.owasp.validator</artifactId>
+        <license>BSD license</license>
+    </artifact>
+    <artifact>
+        <groupId>antlr</groupId>
+        <artifactId>antlr</artifactId>
+        <license>BSD License</license>
+    </artifact>
+    <artifact>
+        <groupId>asm</groupId>
+        <artifactId>asm</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>asm</groupId>
+        <artifactId>asm-attrs</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>backport-util-concurrent</groupId>
+        <artifactId>backport-util-concurrent</artifactId>
+        <license>Creative Commons Public Domain (Retired)</license>
+    </artifact>
+    <artifact>
+        <groupId>batik</groupId>
+        <artifactId>batik-css</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>batik</groupId>
+        <artifactId>batik-ext</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>batik</groupId>
+        <artifactId>batik-gui-util</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>batik</groupId>
+        <artifactId>batik-util</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.bedework.access</groupId>
+        <artifactId>rpiaccess</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.bedework.bwannotations</groupId>
+        <artifactId>bw-annotations</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.bedework.bwcalcore</groupId>
+        <artifactId>bw-alarms</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.bedework.bwcalcore</groupId>
+        <artifactId>bw-calcore</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.bedework.bwcalcore</groupId>
+        <artifactId>bw-calcorei</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.bedework.bwcalcore</groupId>
+        <artifactId>bw-calsvc</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.bedework.bwcalcore</groupId>
+        <artifactId>bw-inoutsched</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.bedework.bwcaldav</groupId>
+        <artifactId>bw-caldav</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.bedework.bwcalfacade</groupId>
+        <artifactId>bw-calfacade</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.bedework.bwdeployutil</groupId>
+        <artifactId>bw-deployutil</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.bedework.bwical</groupId>
+        <artifactId>bw-icalendar</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.bedework.bwinterfaces</groupId>
+        <artifactId>bw-interfaces</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.bedework.bwmisc</groupId>
+        <artifactId>bw-misc</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.bedework.bwsysevents</groupId>
+        <artifactId>bw-sysevents</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.bedework.bwtzsvr</groupId>
+        <artifactId>bw-tzsvr</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.bedework.bwtzsvr</groupId>
+        <artifactId>bw-tzsvr-cmn</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.bedework.bwtzsvr</groupId>
+        <artifactId>bw-tzsvr-svc</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.bedework.bwwebapps</groupId>
+        <artifactId>bw-appcommon</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.bedework.bwwebapps</groupId>
+        <artifactId>bw-webcommon</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.bedework.bwxml</groupId>
+        <artifactId>bw-caldavschema</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.bedework.bwxml</groupId>
+        <artifactId>bw-calws-soapschema</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.bedework.bwxml</groupId>
+        <artifactId>bw-exchangewsschema</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.bedework.bwxml</groupId>
+        <artifactId>bw-icalschema</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.bedework.bwxml</groupId>
+        <artifactId>bw-synchschema</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.bedework.bwxml</groupId>
+        <artifactId>bw-synchwsschema</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.bedework.bwxml</groupId>
+        <artifactId>bw-tzschema</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.bedework.caldav</groupId>
+        <artifactId>bw-cdvserver</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.bedework.caldav</groupId>
+        <artifactId>bw-cdvutil</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.bedework.carddav</groupId>
+        <artifactId>bw-carddavsvr</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.bedework.davutil</groupId>
+        <artifactId>bw-davio</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.bedework.dumprestore</groupId>
+        <artifactId>bw-dumpres</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.bedework.indexer</groupId>
+        <artifactId>bw-indexer</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.bedework.rpiutil</groupId>
+        <artifactId>rpiutil</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.bedework.synch</groupId>
+        <artifactId>bw-synch</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.bedework.synch</groupId>
+        <artifactId>bw-synch-common</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.bedework.synch</groupId>
+        <artifactId>bw-synchsvc</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.bedework.webdav</groupId>
+        <artifactId>bw-webdavserver</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>castor</groupId>
+        <artifactId>castor</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>cglib</groupId>
+        <artifactId>cglib</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>cglib</groupId>
+        <artifactId>cglib-full</artifactId>
+        <license>Apache License, Version 1.1</license>
+    </artifact>
+    <artifact>
+        <groupId>classworlds</groupId>
+        <artifactId>classworlds</artifactId>
+        <license>BSD Style License</license>
+    </artifact>
+    <artifact>
+        <groupId>com.carrotsearch</groupId>
+        <artifactId>junit-benchmarks</artifactId>
+        <version>0.3.0-SONATYPE</version>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>com.google.code.atinject</groupId>
+        <artifactId>atinject</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>com.google.code.googleportlet</groupId>
+        <artifactId>googleportlet</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>com.google.code.gson</groupId>
+        <artifactId>gson</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>com.googlecode.cernunnos</groupId>
+        <artifactId>cernunnos</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>com.h2database</groupId>
+       <artifactId>h2</artifactId>
+        <license>Eclipse Public License V1.0 or H2 (MPL 1.1 modified)</license>
+    </artifact>
+    <artifact>
+        <groupId>com.ibm.icu</groupId>
+        <artifactId>icu4j</artifactId>
+        <license>MIT License</license>
+    </artifact>
+    <artifact>
+        <groupId>com.oracle</groupId>
+        <artifactId>csdk</artifactId>
+        <license>Not distributed with project</license>
+    </artifact>
+    <artifact>
+        <groupId>com.sun.xml.bind</groupId>
+        <artifactId>jaxb-impl</artifactId>
+        <license>Commons Development and Distribution License, Version 1.0</license>
+    </artifact>
+    <artifact>
+      <groupId>com.sun.xml.stream.buffer</groupId>
+      <artifactId>streambuffer</artifactId>
+      <license>Dual license consisting of the CDDL v1.1 and GPL v2</license>
+    </artifact>
+    <artifact>
+      <groupId>com.sun.xml.ws</groupId>
+      <artifactId>jaxws-rt</artifactId>
+      <license>Commons Development and Distribution License, Version 1.0</license>
+    </artifact>
+    <artifact>
+        <groupId>com.yahoo.platform.yui</groupId>
+        <artifactId>yuicompressor</artifactId>
+        <license>BSD License</license>
+    </artifact>
+    <artifact>
+        <groupId>commons-beanutils</groupId>
+        <artifactId>commons-beanutils</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>commons-beanutils</groupId>
+        <artifactId>commons-beanutils-core</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>commons-cli</groupId>
+        <artifactId>commons-cli</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>commons-codec</groupId>
+        <artifactId>commons-codec</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>commons-collections</groupId>
+        <artifactId>commons-collections</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>commons-digester</groupId>
+        <artifactId>commons-digester</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>commons-fileupload</groupId>
+        <artifactId>commons-fileupload</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>commons-lang</groupId>
+        <artifactId>commons-lang</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>de.zeigermann.xml</groupId>
+        <artifactId>xml-im-exporter</artifactId>
+        <license>BSD License</license>
+    </artifact>
+    <artifact>
+        <groupId>dom4j</groupId>
+        <artifactId>dom4j</artifactId>
+        <license>BSD License</license>
+    </artifact>
+    <artifact>
+        <groupId>doxia</groupId>
+        <artifactId>doxia-sink-api</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>ehcache</groupId>
+        <artifactId>ehcache</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>httpclient</groupId>
+        <artifactId>httpclient</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>httpcore</groupId>
+        <artifactId>httpcore</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>httpunit</groupId>
+        <artifactId>httpunit</artifactId>
+        <license>BSD Style License</license>
+    </artifact>
+    <artifact>
+        <groupId>jakarta-regexp</groupId>
+        <artifactId>jakarta-regexp</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>javassist</groupId>
+        <artifactId>javassist</artifactId>
+        <license>Mozilla Public License, Version 1.1</license>
+    </artifact>
+    <artifact>
+        <groupId>javax.activation</groupId>
+        <artifactId>activation</artifactId>
+        <license>Commons Development and Distribution License, Version 1.0</license>
+    </artifact>
+    <artifact>
+        <groupId>javax.activation</groupId>
+        <artifactId>activation</artifactId>
+        <version>1.1.1</version>
+        <name>JavaBeans(TM) Activation Framework</name>
+        <license>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</license>
+    </artifact>
+    <artifact>
+        <groupId>javax.el</groupId>
+        <artifactId>el-api</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>javax.portlet</groupId>
+        <artifactId>portlet-api</artifactId>
+        <license>Commons Development and Distribution License, Version 1.0</license>
+    </artifact>
+    <artifact>
+        <groupId>javax.script</groupId>
+        <artifactId>groovy-engine</artifactId>
+        <license>BSD License</license>
+    </artifact>
+    <artifact>
+        <groupId>javax.script</groupId>
+        <artifactId>js-engine</artifactId>
+        <license>BSD License</license>
+    </artifact>
+    <artifact>
+        <groupId>javax.script</groupId>
+        <artifactId>script-api</artifactId>
+        <license>Commons Development and Distribution License, Version 1.0</license>
+    </artifact>
+    <artifact>
+        <groupId>javax.servlet</groupId>
+        <artifactId>jstl</artifactId>
+        <license>Commons Development and Distribution License, Version 1.0</license>
+    </artifact>
+    <artifact>
+        <groupId>javax.servlet</groupId>
+        <artifactId>servlet-api</artifactId>
+        <license>Commons Development and Distribution License, Version 1.0</license>
+    </artifact>
+    <artifact>
+        <groupId>javax.servlet.jsp</groupId>
+        <artifactId>jsp-api</artifactId>
+        <license>Commons Development and Distribution License, Version 1.0</license>
+    </artifact>
+    <artifact>
+        <groupId>javax.transaction</groupId>
+        <artifactId>jta</artifactId>
+        <license>Commons Development and Distribution License, Version 1.0</license>
+    </artifact>
+    <artifact>
+        <groupId>javax.ws.rs</groupId>
+        <artifactId>javax.ws.rs</artifactId>
+        <license>Commons Development and Distribution License, Version 1.1</license>
+    </artifact>
+    <artifact>
+        <groupId>javax.xml.bind</groupId>
+        <artifactId>jaxb-api</artifactId>
+        <license>Commons Development and Distribution License, Version 1.0</license>
+    </artifact>
+    <artifact>
+      <groupId>javax.xml.ws</groupId>
+      <artifactId>jaxws-api</artifactId>
+      <license>Commons Development and Distribution License, Version 1.0</license>
+    </artifact>
+    <artifact>
+        <groupId>jaxen</groupId>
+        <artifactId>jaxen</artifactId>
+        <license>Apache style license</license>
+    </artifact>
+    <artifact>
+        <groupId>jdom</groupId>
+        <artifactId>jdom</artifactId>
+        <license>Apache style license</license>
+    </artifact>
+    <artifact>
+        <groupId>junit-addons</groupId>
+        <artifactId>junit-addons</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <license>Common Public License - v 1.0</license>
+    </artifact>
+    <artifact>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>nekohtml</groupId>
+        <artifactId>nekohtml</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>net.jcip</groupId>
+        <artifactId>jcip-annotations</artifactId>
+        <license>Creative Commons Attribution License</license>
+    </artifact>
+    <artifact>
+        <groupId>net.sf.jsr107cache</groupId>
+        <artifactId>jsr107cache</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>ognl</groupId>
+        <artifactId>ognl</artifactId>
+        <license>The OpenSymphony Software License, Version 1.1</license>
+    </artifact>
+    <artifact>
+        <groupId>org.antlr</groupId>
+        <artifactId>antlr-runtime</artifactId>
+        <license>BSD License</license>
+    </artifact>
+    <artifact>
+        <groupId>org.apache.ant</groupId>
+        <artifactId>ant</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.apache.ant</groupId>
+        <artifactId>ant-launcher</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.apache.bcel</groupId>
+        <artifactId>bcel</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.apache.commons.ssl</groupId>
+        <artifactId>commons-ssl</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.apache.derby</groupId>
+        <artifactId>derby</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.apache.derby</groupId>
+        <artifactId>derbynet</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>lucene-misc</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>lucene-core</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.apache.maven.doxia</groupId>
+        <artifactId>doxia-sink-api</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.apache.portals.bridges</groupId>
+        <artifactId>portals-bridges-common</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.apache.portals.bridges</groupId>
+        <artifactId>portals-bridges-struts-1.2.7</artifactId>
+        <!-- Note the jar does that that name. e.g. a jar is 
+              portals-bridges-struts-1.2.7-1.0.3.jar
+         -->
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.apache.xalan</groupId>
+        <artifactId>xalan</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.apache.xerces</groupId>
+        <artifactId>resolver</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.apache.xerces</groupId>
+        <artifactId>serializer</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.apache.xerces</groupId>
+        <artifactId>xercesImpl</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.apache.xerces</groupId>
+        <artifactId>xml-apis</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.apache.xmlgraphics</groupId>
+        <artifactId>fop</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.codehaus.castor</groupId>
+        <artifactId>castor</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.codehaus.groovy</groupId>
+        <artifactId>groovy</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.codehaus.groovy</groupId>
+        <artifactId>groovy-all</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-archiver</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-cli</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-container-default</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-digest</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-i18n</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-interactivity-api</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-velocity</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.codehaus.swizzle</groupId>
+        <artifactId>swizzle-jira</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.codehaus.swizzle</groupId>
+        <artifactId>swizzle-jirareport</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.codehaus.swizzle</groupId>
+        <artifactId>swizzle-stream</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.cyberneko.html</groupId>
+        <artifactId>nekohtml</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.hibernate</groupId>
+        <artifactId>ejb3-persistence</artifactId>
+        <license>LGPL, v2.1</license>
+    </artifact>
+    <artifact>
+        <groupId>org.hibernate</groupId>
+        <artifactId>hibernate</artifactId>
+        <license>LGPL, v2.1</license>
+    </artifact>
+    <artifact>
+        <groupId>org.hibernate</groupId>
+        <artifactId>hibernate-annotations</artifactId>
+        <license>LGPL, v2.1</license>
+    </artifact>
+    <artifact>
+        <groupId>org.hibernate.javax.persistence</groupId>
+        <artifactId>hibernate-jpa-2.0-api</artifactId>
+        <license>Sun Binary Code License</license>
+    </artifact>
+    <artifact>
+        <groupId>org.jboss</groupId>
+        <artifactId>jboss-j2se</artifactId>
+        <license>LGPL, v2.1</license>
+    </artifact>
+    <artifact>
+        <groupId>org.jboss</groupId>
+        <artifactId>jboss-kernel</artifactId>
+        <license>LGPL, v2.1</license>
+    </artifact>
+    <artifact>
+        <groupId>org.jboss</groupId>
+        <artifactId>jboss-system</artifactId>
+        <license>LGPL, v2.1</license>
+    </artifact>
+    <artifact>
+        <groupId>org.jboss</groupId>
+        <artifactId>jboss-system-jmx</artifactId>
+        <license>LGPL, v2.1</license>
+    </artifact>
+    <artifact>
+        <groupId>org.json</groupId>
+        <artifactId>org.json</artifactId>
+        <license>The JSON License</license>
+    </artifact>
+    <artifact>
+      <groupId>org.jvnet.staxex</groupId>
+      <artifactId>stax-ex</artifactId>  
+      <license>Commons Development and Distribution License, Version 1.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.mnode.ical4j</groupId>
+        <artifactId>ical4j</artifactId>
+        <license>iCal4j - License</license>
+    </artifact>
+    <artifact>
+        <groupId>org.mnode.ical4j</groupId>
+        <artifactId>ical4j-vcard</artifactId>
+    </artifact>
+    <artifact>
+        <groupId>org.opensaml</groupId>
+        <artifactId>opensaml</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.opensaml</groupId>
+        <artifactId>openws</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.opensaml</groupId>
+        <artifactId>xmltooling</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.osaf</groupId>
+        <artifactId>caldav4j</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.owasp</groupId>
+        <artifactId>antisamy</artifactId>
+        <license>BSD License</license>
+    </artifact>
+    <artifact>
+        <groupId>org.slf4j</groupId>
+        <artifactId>jcl-over-slf4j</artifactId>
+        <license>MIT License</license>
+    </artifact>
+    <artifact>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <license>MIT License</license>
+    </artifact>
+    <artifact>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-log4j12</artifactId>
+        <license>MIT License</license>
+    </artifact>
+    <artifact>
+        <groupId>org.sonatype.plexus</groupId>
+        <artifactId>plexus-jetty6</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.sonatype.spice</groupId>
+        <artifactId>plexus-ehcache</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.sonatype.spice</groupId>
+        <artifactId>spice-utils</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-aop</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-asm</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-aspects</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-beans</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-context</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-context-support</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-core</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-expression</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-jdbc</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-orm</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-oxm</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-test</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-tx</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-web</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-webmvc</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-webmvc-portlet</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.springframework.ldap</groupId>
+        <artifactId>spring-ldap-core</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.springframework.ldap</groupId>
+        <artifactId>spring-ldap-core-tiger</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.springframework.webflow</groupId>
+        <artifactId>org.springframework.binding</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.springframework.webflow</groupId>
+        <artifactId>org.springframework.js</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.springframework.webflow</groupId>
+        <artifactId>org.springframework.webflow</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.springframework.webflow</groupId>
+        <artifactId>spring-binding</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.springframework.webflow</groupId>
+        <artifactId>spring-js</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.springframework.webflow</groupId>
+        <artifactId>spring-js-resources</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.springframework.webflow</groupId>
+        <artifactId>spring-webflow</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.springframework.ws</groupId>
+        <artifactId>spring-oxm</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.springframework.ws</groupId>
+        <artifactId>spring-oxm-tiger</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.springframework.ws</groupId>
+        <artifactId>spring-ws-core</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.springframework.ws</groupId>
+        <artifactId>spring-ws-core-tiger</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.springframework.ws</groupId>
+        <artifactId>spring-ws-security</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>org.springframework.ws</groupId>
+        <artifactId>spring-xml</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>oro</groupId>
+        <artifactId>oro</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>portlet-api</groupId>
+        <artifactId>portlet-api</artifactId>
+        <license>Commons Development and Distribution License, Version 1.0</license>
+    </artifact>
+    <artifact>
+        <groupId>quartz</groupId>
+        <artifactId>quartz</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>rhino</groupId>
+        <artifactId>js</artifactId>
+        <license>Mozilla Public License, Version 1.1</license>
+    </artifact>
+    <artifact>
+        <groupId>rome</groupId>
+        <artifactId>modules</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>rome</groupId>
+        <artifactId>rome</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>slide</groupId>
+        <artifactId>jakarta-slide-webdavlib</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>struts</groupId>
+        <artifactId>struts</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>taglibs</groupId>
+        <artifactId>standard</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>tyrex</groupId>
+        <artifactId>tyrex</artifactId>
+        <license>BSD Style License</license>
+    </artifact>
+    <artifact>
+        <groupId>velocity-tools</groupId>
+        <artifactId>velocity-tools</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>xalan</groupId>
+        <artifactId>serializer</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>xalan</groupId>
+        <artifactId>xalan</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>xerces</groupId>
+        <artifactId>xercesImpl</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>xerces</groupId>
+        <artifactId>xmlParserAPIs</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>xml-apis</groupId>
+        <artifactId>xmlParserAPIs</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>xml-resolver</groupId>
+        <artifactId>xml-resolver</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
+        <groupId>xom</groupId>
+        <artifactId>xom</artifactId>
+        <license>GNU Lesser General Public License</license>
+    </artifact>
+    <artifact>
+        <groupId>xstream</groupId>
+        <artifactId>xstream</artifactId>
+        <license>BSD license</license>
+    </artifact>
+</license-lookup>
Index: releases/bedework-3.8/build/loadDeployConfig.xml
===================================================================
--- releases/bedework-3.8/build/loadDeployConfig.xml (revision 3334)
+++  (revision )
@@ -1,69 +1,0 @@
-<?xml version="1.0"?>
-
-<!-- ===================================================================
-     Load the deployment configuration from the properties file. We also load
-     the run time options and define some properties based on some of the
-     values found there
-     =================================================================== -->
-<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" />
-  	
-      <property environment="env"/>
-
-      <!-- Load build property definition overrides -->
-      <property file="${org.bedework.build.properties}" />
-
-      <infoMsg message="==========================================================" />
-      <infoMsg message="Loading build properties from ${org.bedework.build.properties}" />
-      <infoMsg message="Use config override properties ${org.bedework.config.override.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.configuration.versions}" />
-      <property file="${org.bedework.config.override.properties}" />
-      <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 extra options 
-      <xmlproperty file="@{extra.options}"/>-->
-
-      <if>
-        <isset property="bedework-options.org.bedework.global.portal.platform"/>
-        <then>
-          <property name="org.bedework.global.portal.platform"
-                    value="${bedework-options.org.bedework.global.portal.platform}" />
-
-          <property name="org.bedework.config.portal.home"
-                    value="${org.bedework.configurations.home}/.portal/${org.bedework.global.portal.platform}" />
-
-          <property name="org.bedework.config.portal.common.home"
-                    value="${org.bedework.configurations.home}/.portal/common-resources" />
-
-          <debugMsg message="******************* load from ${org.bedework.config.portal.home}/portal.properties" />
-
-          <property file="${org.bedework.config.portal.home}/portal.properties" />
-        </then>
-        <else>
-          <debugMsg message="******************* load from ${org.bedework.configurations.home}/.standalone/standalone.properties" />
-
-          <property file="${org.bedework.configurations.home}/.platform/standalone.properties" />
-        </else>
-      </if>
-
-      <property name="org.bedework.global.version"
-                value="${bedework-options.org.bedework.global.version}" />
-
-      <property name="org.bedework.global.directory.browsing.disallowed"
-                value="${bedework-options.org.bedework.syspars.directoryBrowsingDisallowed}" />
-    </sequential>
-  </macrodef>
-</project>
Index: releases/bedework-3.8/build/quickstart/build.xml
===================================================================
--- trunk/build/quickstart/build.xml (revision 3336)
+++ releases/bedework-3.8/build/quickstart/build.xml (revision 3461)
@@ -10,4 +10,6 @@
 
 <project name="quickstart-build-file" default="deploy" basedir=".">
+  <taskdef resource="net/sf/antcontrib/antcontrib.properties" />
+
   <property environment="env"/>
 
@@ -15,6 +17,4 @@
   	       file="${ant.file.quickstart-build-file}"/>
 
-  <taskdef resource="net/sf/antcontrib/antcontrib.properties" />
-
   <import file="${bedework.quickstart.basedir}/run-dir.xml" />
   <import file="${bedework.quickstart.basedir}/install.xml" />
@@ -22,5 +22,8 @@
   <import file="${bedework.quickstart.basedir}/../buildTools/deftasks.xml"/>
 
-  <import file="${bedework.quickstart.basedir}/../loadDeployConfig.xml"/>
+  <property name="bedework.home"
+            location="${env.QUICKSTART_HOME}/bedework" />
+
+  <deftasks/>
 
   <!-- The only properties set below should be those directly used to
Index: releases/bedework-3.8/build/quickstart/linux/bw
===================================================================
--- releases/bedework-3.8/build/quickstart/linux/bw (revision 3446)
+++ releases/bedework-3.8/build/quickstart/linux/bw (revision 3461)
@@ -68,4 +68,5 @@
 davutil=
 dumprestore=
+exchgGateway=
 indexer=
 monitor=
@@ -124,4 +125,5 @@
   echo "      -log-inform   A little more noisy"
   echo "      -log-verbose  Noisier"
+  echo "      -log-configs  Some info about configurations"
   echo "      -ant-debug    Vast amounts of ant output"
   echo "      -build-debug  Some bedework build debug output"
@@ -394,4 +396,10 @@
 	fi
 	
+	if [ "$exchgGateway" != "" ] ; then
+	  cd $QUICKSTART_HOME/exchgGateway
+      exchgGateway=
+	  return
+	fi
+
 	if [ "$synch" != "" ] ; then
 	  cd $QUICKSTART_HOME/synch
@@ -670,4 +678,8 @@
       shift
       ;;
+    -log-configs)
+      bw_loglevel="$bw_loglevel -Dorg.bedework.build.showconfigs=true"
+      shift
+      ;;
     -ant-debug)
       ant_loglevel="-debug"
@@ -925,4 +937,14 @@
 
       bwxml="yes"
+      pkgdefault=
+      shift
+      ;;
+    -exchgGateway)
+      exchgGateway="yes"
+      
+#      access="yes"
+      bwxml="yes"
+#      davutil="yes"
+#      rpiutil="yes"
       pkgdefault=
       shift
@@ -1043,4 +1065,5 @@
     $javacmd $specialTarget
   else  
+#    echo $javacmd $*
     $javacmd $*
   fi
Index: releases/bedework-3.8/config/bwbuild/.defaults/cal.properties
===================================================================
--- releases/bedework-3.8/config/bwbuild/.defaults/cal.properties (revision 3452)
+++ releases/bedework-3.8/config/bwbuild/.defaults/cal.properties (revision 3461)
@@ -107,4 +107,8 @@
 org.bedework.global.keyfile.dir=${jboss.server.data.dir}/bedework
 
+org.bedework.project.bedework=${env.QUICKSTART_HOME}/bedework
+#
+#
+org.bedework.license-mappings=${org.bedework.project.bedework}/build/license-mappings.xml
 #
 # ------------------------------------------------------------------------
Index: releases/bedework-3.8/config/bwbuild/.defaults/versions.properties
===================================================================
--- releases/bedework-3.8/config/bwbuild/.defaults/versions.properties (revision 3408)
+++ releases/bedework-3.8/config/bwbuild/.defaults/versions.properties (revision 3461)
@@ -12,13 +12,22 @@
 org.bedework.caldavtest.version=3.8
 org.bedework.calfacade.version=3.8
+org.bedework.carddav.version=3.8
 org.bedework.davutil.version=3.8
 org.bedework.dumprestore.version=3.8
+org.bedework.exchggateway.version=3.8
 org.bedework.icalendar.version=3.8
 org.bedework.indexer.version=3.8
 org.bedework.interfaces.version=3.8
 org.bedework.misc.version=3.8
+org.bedework.monitor.version=3.8
 org.bedework.rpiutil.version=3.8
+org.bedework.synch.version=3.8
 org.bedework.sysevents.version=3.8
 org.bedework.testsuite.version=3.8
+org.bedework.bwtzsvr.version=3.8
 org.bedework.webapps.version=3.8
 org.bedework.webdav.version=3.8
+org.bedework.xmlschema.version=3.8
+
+# This is set in the deployutil build file also 
+org.bedework.deployutil.version=3.8
Index: releases/bedework-3.8/config/bwbuild/jboss-postgresql-devel/cal.properties
===================================================================
--- releases/bedework-3.8/config/bwbuild/jboss-postgresql-devel/cal.properties (revision 3395)
+++ releases/bedework-3.8/config/bwbuild/jboss-postgresql-devel/cal.properties (revision 3461)
@@ -9,2 +9,8 @@
 # True if this is a primary server 
 org.bedework.app.tzsvr.primary.server=true
+
+#Uncomment to output jar reference info
+org.bedework.print.jar.reference.info=true
+
+#Uncomment to output jar licence info
+org.bedework.print.jar.licence.info=true
Index: releases/bedework-3.8/deployment/build.xml
===================================================================
--- releases/bedework-3.8/deployment/build.xml (revision 3414)
+++ releases/bedework-3.8/deployment/build.xml (revision 3461)
@@ -56,26 +56,10 @@
 
 <project name="deploy.bedework" default="init">
-  <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" />
-
-  <!-- Recreated by each app build file. Place extra jars here -->
-  <property name="org.bedework.temp.extrajars.dir"
-            location="${org.bedework.temp.dir}/extrajars" />
-
-  <!-- Preserve extra jars for ear builds -->
-  <property name="org.bedework.temp.ear.extrajars.dir"
-            location="${org.bedework.temp.dir}/earextrajars" />
-	
   <dirname property="this.build.dir" file="${ant.file}"/>
+
   <property name="bedework.deployment.base" location="${this.build.dir}" />
+  
   <property name="org.bedework.deployment.resources" 
             location="${bedework.deployment.base}/resources" />
-
-  <import file="${build.dir}/buildTools/getJar.xml"/>
-
-  <import file="${build.dir}/loadDeployConfig.xml"/>
   
   <property name="ear.meta.dir" location="${this.build.dir}/ear.meta"/>
@@ -84,6 +68,4 @@
     <property name="org.bedework.struts.tlds"
               location="${resources.dir}/struts-1.2.9/tlds"/>
-
-    <loadDeployConfig />
 
     <!-- All the projects we deploy -->
@@ -122,7 +104,4 @@
     <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.deployment.resources}/hibernate" />
@@ -134,45 +113,4 @@
     <property name="org.bedework.common.resources"
               location="${app.root.dir}/resources" />
-
-    <property name="org.bedework.global.build.common.context.war.name"
-              value="bw-common" />
-
-    <!-- Where we put ear stuff -->
-    <if>
-      <isset property="org.bedework.global.build.ear" />
-      <then>
-        <property name="app.ear.file.name"
-                  value="${org.bedework.global.ear.name}.ear" />
-
-        <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.templib"
-                  location="${org.bedework.temp.dir}/earlib"/>
-        
-        <delete dir="${org.bedework.ear.templib}" />
-        <mkdir dir="${org.bedework.ear.templib}" />
-
-        <delete dir="${org.bedework.ear.properties.dir}" />
-        <mkdir dir="${org.bedework.ear.properties.dir}" />
-      </then>
-    </if>
-
-    <property name="org.bedework.global.context.roots"
-              location="${org.bedework.temp.dir}/context-roots.properties" />
-
-    <if>
-      <not>
-        <isset property="org.bedework.global.context.roots" />
-      </not>
-      <then>
-        <tempfile property="org.bedework.global.context.roots"
-                  destdir="${org.bedework.temp.dir}"
-                  prefix="context-roots" suffix=".properties" />
-      </then>
-    </if>
   </target>
 
@@ -231,4 +169,7 @@
     <!-- ================= termination tasks for deployment ================ -->
 
+    <!-- ensure has value -->
+    <property name="propval.app.cal.suite" value="" />
+
     <ant antfile="${org.bedework.deployment.base}/termination/build.xml"
          inheritrefs="true" target="deploy" />
@@ -244,6 +185,4 @@
        necessary -->
   <target name="cp.xalan" if="xalan.in.tomcat.common.endorsed">
-    <copy file="${org.bedework.default.lib}/xalan.jar"
-          todir="${appserver.endorsed.dir}"/>
   </target>
 
@@ -254,4 +193,5 @@
        ================================================================= -->
   <target name="build.configured.apps">
+    <!-- Is this used any more? -->
     <forEachApp names="${org.bedework.install.app.names}"
                 prefix="org.bedework.deploy"
@@ -291,4 +231,6 @@
         <propertycopy name="propval.app.unauthenticated"
                       from="bedework-options.org.bedework.app.${org.bedework.deploy.name}.guestMode" />
+        <!-- ensure has value -->
+        <property name="propval.app.cal.suite" value="" />
 
         <ant antfile="${org.bedework.deploy.type.dir}/${org.bedework.deploy.kind}/build.xml"
@@ -332,5 +274,5 @@
       <then>
         <propertyset id="deploy-app-properties">
-          <propertyref prefix="org.bedework.app.${org.bedework.deploy.name}"/>
+          <propertyref prefix="org.bedework.app.${org.bedework.deploy.name}."/>
           <globmapper from="org.bedework.app.${org.bedework.deploy.name}.*" to="propval.app.*"/>
         </propertyset>
@@ -338,4 +280,6 @@
         <propertycopy name="propval.app.unauthenticated"
                       from="bedework-options.org.bedework.app.${org.bedework.deploy.name}.guestMode" />
+        <!-- ensure has value -->
+        <property name="propval.app.cal.suite" value="" />
 
         <ant antfile="${org.bedework.deploy.type.dir}/${org.bedework.deploy.kind}/build.xml"
Index: releases/bedework-3.8/deployment/deployprops.xml
===================================================================
--- releases/bedework-3.8/deployment/deployprops.xml (revision 1938)
+++  (revision )
@@ -1,12 +1,0 @@
-<?xml version="1.0"?>
-
-<!-- ===================== Common properties ======================= -->
-
-<project name="deploy.bedework.properties" default="deployprops.init" >
-  <!-- ensure has value -->
-  <property name="propval.app.cal.suite" value="" />
-
-  <target name="deployprops.init" >
-  </target>
-</project>
-
Index: releases/bedework-3.8/deployment/dumprestore/shellscr/build.xml
===================================================================
--- trunk/deployment/dumprestore/shellscr/build.xml (revision 3180)
+++ releases/bedework-3.8/deployment/dumprestore/shellscr/build.xml (revision 3461)
@@ -6,6 +6,4 @@
 
 <project name="bwdumpres.deploy" default="deploy" >
-  <import file="${org.bedework.deployment.base}/deployprops.xml" />
-
   <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}Service.xml" />
 
Index: releases/bedework-3.8/deployment/feeder/webapp/build.xml
===================================================================
--- trunk/deployment/feeder/webapp/build.xml (revision 3180)
+++ releases/bedework-3.8/deployment/feeder/webapp/build.xml (revision 3461)
@@ -6,6 +6,4 @@
 
 <project name="bwpublic.deploy" default="deploy" >
-  <import file="${org.bedework.deployment.base}/deployprops.xml" />
-
   <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" />
 
Index: releases/bedework-3.8/deployment/genkeys/shellscr/build.xml
===================================================================
--- trunk/deployment/genkeys/shellscr/build.xml (revision 3001)
+++ releases/bedework-3.8/deployment/genkeys/shellscr/build.xml (revision 3461)
@@ -6,6 +6,4 @@
 
 <project name="genkeys.deploy" default="deploy" >
-  <import file="${org.bedework.deployment.base}/deployprops.xml" />
-
   <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}Service.xml" />
 
Index: releases/bedework-3.8/deployment/indexer/shellscr/build.xml
===================================================================
--- trunk/deployment/indexer/shellscr/build.xml (revision 3180)
+++ releases/bedework-3.8/deployment/indexer/shellscr/build.xml (revision 3461)
@@ -6,6 +6,4 @@
 
 <project name="indexer.deploy" default="deploy" >
-  <import file="${org.bedework.deployment.base}/deployprops.xml" />
-
   <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}Service.xml" />
 
Index: releases/bedework-3.8/deployment/inoutsched/shellscr/build.xml
===================================================================
--- trunk/deployment/inoutsched/shellscr/build.xml (revision 3180)
+++ releases/bedework-3.8/deployment/inoutsched/shellscr/build.xml (revision 3461)
@@ -6,6 +6,4 @@
 
 <project name="bwcrawler.deploy" default="deploy" >
-  <import file="${org.bedework.deployment.base}/deployprops.xml" />
-
   <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}Service.xml" />
 
Index: releases/bedework-3.8/deployment/monitor/shellscr/build.xml
===================================================================
--- trunk/deployment/monitor/shellscr/build.xml (revision 2787)
+++ releases/bedework-3.8/deployment/monitor/shellscr/build.xml (revision 3461)
@@ -6,6 +6,4 @@
 
 <project name="bwcrawler.deploy" default="deploy" >
-  <import file="${org.bedework.deployment.base}/deployprops.xml" />
-
   <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}Service.xml" />
 
Index: releases/bedework-3.8/deployment/publiccaldav/webapp/build.xml
===================================================================
--- trunk/deployment/publiccaldav/webapp/build.xml (revision 3180)
+++ releases/bedework-3.8/deployment/publiccaldav/webapp/build.xml (revision 3461)
@@ -6,6 +6,4 @@
 
 <project name="bwpubcaldav.deploy" default="deploy" >
-  <import file="${org.bedework.deployment.base}/deployprops.xml" />
-
   <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" />
 
Index: releases/bedework-3.8/deployment/publiccalws/webapp/build.xml
===================================================================
--- trunk/deployment/publiccalws/webapp/build.xml (revision 3180)
+++ releases/bedework-3.8/deployment/publiccalws/webapp/build.xml (revision 3461)
@@ -6,6 +6,4 @@
 
 <project name="bwpubcaldav.deploy" default="deploy" >
-  <import file="${org.bedework.deployment.base}/deployprops.xml" />
-
   <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" />
 
Index: releases/bedework-3.8/deployment/resources/build.xml
===================================================================
--- trunk/deployment/resources/build.xml (revision 3143)
+++ releases/bedework-3.8/deployment/resources/build.xml (revision 3461)
@@ -15,5 +15,6 @@
             value="${org.bedework.global.build.common.context.war.name}" />
 
-  <import file="${build.dir}/buildfilters.xml" />
+  <!--<import file="${build.dir}/buildfilters.xml" />-->
+  <buildfilters/>
 
   <target name="init" >
Index: releases/bedework-3.8/deployment/sysevlog/shellscr/build.xml
===================================================================
--- trunk/deployment/sysevlog/shellscr/build.xml (revision 2714)
+++ releases/bedework-3.8/deployment/sysevlog/shellscr/build.xml (revision 3461)
@@ -6,6 +6,4 @@
 
 <project name="bwcrawler.deploy" default="deploy" >
-  <import file="${org.bedework.deployment.base}/deployprops.xml" />
-
   <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}Service.xml" />
 
Index: releases/bedework-3.8/deployment/termination/build.xml
===================================================================
--- trunk/deployment/termination/build.xml (revision 3105)
+++ releases/bedework-3.8/deployment/termination/build.xml (revision 3461)
@@ -9,7 +9,4 @@
 
   <dirname property="this.dir" file="${ant.file}"/>
-
-  <!-- ensure has value -->
-  <property name="propval.app.cal.suite" value="" />
 
   <target name="init">
Index: releases/bedework-3.8/deployment/termination/webapp/build.xml
===================================================================
--- trunk/deployment/termination/webapp/build.xml (revision 3180)
+++ releases/bedework-3.8/deployment/termination/webapp/build.xml (revision 3461)
@@ -8,5 +8,6 @@
   <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" />
 
-  <import file="${build.dir}/buildfilters.xml" />
+  <!--<import file="${build.dir}/buildfilters.xml" />-->
+  <buildfilters/>
 
   <dirname property="this.dir" file="${ant.file}"/>
Index: releases/bedework-3.8/deployment/usercaldav/webapp/build.xml
===================================================================
--- trunk/deployment/usercaldav/webapp/build.xml (revision 3180)
+++ releases/bedework-3.8/deployment/usercaldav/webapp/build.xml (revision 3461)
@@ -6,6 +6,4 @@
 
 <project name="bwusercaldav.deploy" default="deploy" >
-  <import file="${org.bedework.deployment.base}/deployprops.xml" />
-
   <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" />
 
Index: releases/bedework-3.8/deployment/usercalws/webapp/build.xml
===================================================================
--- trunk/deployment/usercalws/webapp/build.xml (revision 3180)
+++ releases/bedework-3.8/deployment/usercalws/webapp/build.xml (revision 3461)
@@ -6,6 +6,4 @@
 
 <project name="bwusercaldav.deploy" default="deploy" >
-  <import file="${org.bedework.deployment.base}/deployprops.xml" />
-
   <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" />
 
Index: releases/bedework-3.8/deployment/webadmin/webapp/build.xml
===================================================================
--- trunk/deployment/webadmin/webapp/build.xml (revision 3180)
+++ releases/bedework-3.8/deployment/webadmin/webapp/build.xml (revision 3461)
@@ -6,11 +6,8 @@
 
 <project name="bwadmin.deploy" default="deploy" >
-  <import file="${org.bedework.deployment.base}/deployprops.xml" />
-
   <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" />
 
   <dirname property="this.dir" file="${ant.file}"/>
 
-  <!--<import file="${this.dir}/appjars.xml" />-->
   <import file="${org.bedework.deployment.base}/bw-core-appjars.xml" />
 
Index: releases/bedework-3.8/deployment/webconfig/webapp/build.xml
===================================================================
--- trunk/deployment/webconfig/webapp/build.xml (revision 2698)
+++ releases/bedework-3.8/deployment/webconfig/webapp/build.xml (revision 3461)
@@ -6,6 +6,4 @@
 
 <project name="bwconfig.deploy" default="deploy" >
-  <import file="${org.bedework.deployment.base}/deployprops.xml" />
-
   <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" />
 
Index: releases/bedework-3.8/deployment/webpublic/webapp/build.xml
===================================================================
--- trunk/deployment/webpublic/webapp/build.xml (revision 3180)
+++ releases/bedework-3.8/deployment/webpublic/webapp/build.xml (revision 3461)
@@ -6,6 +6,4 @@
 
 <project name="bwpublic.deploy" default="deploy" >
-  <import file="${org.bedework.deployment.base}/deployprops.xml" />
-
   <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" />
 
Index: releases/bedework-3.8/deployment/websubmit/webapp/build.xml
===================================================================
--- trunk/deployment/websubmit/webapp/build.xml (revision 3180)
+++ releases/bedework-3.8/deployment/websubmit/webapp/build.xml (revision 3461)
@@ -6,6 +6,4 @@
 
 <project name="bwsubmit.deploy" default="deploy" >
-  <import file="${org.bedework.deployment.base}/deployprops.xml" />
-
   <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" />
 
Index: releases/bedework-3.8/deployment/webuser/webapp/build.xml
===================================================================
--- trunk/deployment/webuser/webapp/build.xml (revision 3180)
+++ releases/bedework-3.8/deployment/webuser/webapp/build.xml (revision 3461)
@@ -6,6 +6,4 @@
 
 <project name="bwpersonal.deploy" default="deploy" >
-  <import file="${org.bedework.deployment.base}/deployprops.xml" />
-
   <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" />