Index: trunk/bedework/build.xml
===================================================================
--- trunk/bedework/build.xml (revision 961)
+++ trunk/bedework/build.xml (revision 966)
@@ -201,5 +201,5 @@
        ================================================================= -->
 
-  <target name="build" depends="build.rpiutil,build.access,build.davutil,
+  <target name="build" depends="init,build.rpiutil,build.access,build.davutil,
                                 build.calendarapi,build.dumprestore,build.synchml.if,
                                 build.webdav.if,build.caldav.if,build.caldavTest.if,
@@ -208,5 +208,5 @@
           description="builds the project"/>
 
-  <target name="clean" depends="clean.rpiutil,clean.access,clean.davutil,
+  <target name="clean" depends="init,clean.rpiutil,clean.access,clean.davutil,
                                 clean.calendarapi,clean.dumprestore,clean.synchml.if,
                                 clean.webdav.if,clean.caldav.if,clean.caldavTest.if,
@@ -217,5 +217,5 @@
   </target>
 
-  <target name="quickstart-clean" depends="clean.rpiutil,clean.access,clean.davutil,
+  <target name="quickstart-clean" depends="init,clean.rpiutil,clean.access,clean.davutil,
                                            clean.calendarapi,clean.dumprestore,clean.synchml.if,
                                            clean.webdav.if,clean.caldav.if,clean.caldavTest.if,
@@ -233,18 +233,4 @@
   <target name="clean.build" depends="clean, build"
           description="cleans then builds the project"/>
-
-  <!-- =================================================================
-       "build.all" and "clean.all" targets for the project - build
-       subsidiary projects as well
-       ================================================================= -->
-
-  <target name="build.all" depends="build.rpiutil,build.access,build"
-          description="builds the entire project"/>
-
-  <target name="clean.all" depends="clean.rpiutil,clean.access,clean"
-          description="Remove all generated files for entire project."/>
-
-  <target name="clean.build.all" depends="clean.all, build.all"
-          description="cleans then builds the entire project"/>
 
   <!-- =================================================================
Index: trunk/bedework/build/buildsh.xml
===================================================================
--- trunk/bedework/build/buildsh.xml (revision 959)
+++ trunk/bedework/build/buildsh.xml (revision 966)
@@ -116,4 +116,5 @@
     <copy todir="${app.dest.lib}" file="${log4j.jar}"/>
     <copy todir="${app.dest.lib}" file="${ical4j.jar}"/>
+    <copy todir="${app.dest.lib}" file="${commons-digester.jar}"/>
     <copy todir="${app.dest.lib}" file="${commons-httpclient.jar}"/>
 
Index: trunk/bedework/build/buildwar.xml
===================================================================
--- trunk/bedework/build/buildwar.xml (revision 956)
+++ trunk/bedework/build/buildwar.xml (revision 966)
@@ -119,6 +119,17 @@
 
   <target name="init.j2ee" if="org.bedework.global.j2ee.platform">
+    <property name="propval.app.servlet.class"
+              value="org.apache.struts.action.ActionServlet" />
+
+    <property name="propval.app.ignoreContentType"
+              value="false" />
+
+    <property name="propval.app.portlet.mapping" value="" />
+
+    <property name="propval.app.genurl.taglib.tld"
+              value="struts-html.tld" />
+
     <property name="app.dest.lib"
-              location="${org.bedework.temp.home}/earlib" />
+              location="${org.bedework.temp.dir}/earlib" />
   </target>
 
Index: trunk/bedework/build/libjars.properties
===================================================================
--- trunk/bedework/build/libjars.properties (revision 953)
+++ trunk/bedework/build/libjars.properties (revision 966)
@@ -71,4 +71,7 @@
 commons-collections.jar=${commons.dir}/commons-collections.jar
 
+#      commons-beanutils.jar    Used for struts.
+commons-digester.jar=${commons.dir}/commons-digester-1.7.jar
+
 #      commons-fileupload.jar    Used for struts
 commons-fileupload.jar=${commons.dir}/commons-fileupload.jar
Index: trunk/bedework/config/configs/democal.options.xml
===================================================================
--- trunk/bedework/config/configs/democal.options.xml (revision 953)
+++ trunk/bedework/config/configs/democal.options.xml (revision 966)
@@ -67,5 +67,5 @@
                           Admin web client CalAdmin
              ================================================================== -->
-        <CalAdmin classname="org.bedework.webcommon.AdminConfig">
+        <CalAdmin classname="org.bedework.calfacade.configs.AdminConfig">
           <autoCreateSponsors>false</autoCreateSponsors>
           <autoDeleteSponsors>false</autoDeleteSponsors>
@@ -85,5 +85,5 @@
           <logPrefix>PubEventsAdmin</logPrefix>
 
-          <appRoot>@APPLICATION-ROOT@</appRoot>
+          <appRoot>/caladminrsrc</appRoot>
           <portalPlatform>@PORTAL-PLATFORM@</portalPlatform>
         </CalAdmin>
@@ -92,5 +92,5 @@
                           Public web client Events
              ================================================================== -->
-        <Events classname="org.bedework.webcommon.ClientConfig">
+        <Events classname="org.bedework.calfacade.configs.ClientConfig">
           <autoCreateSponsors>false</autoCreateSponsors>
           <autoDeleteSponsors>false</autoDeleteSponsors>
@@ -108,5 +108,5 @@
           <logPrefix>PubEvents</logPrefix>
 
-          <appRoot>@APPLICATION-ROOT@</appRoot>
+          <appRoot>/calrsrc</appRoot>
           <portalPlatform>@PORTAL-PLATFORM@</portalPlatform>
 
@@ -114,5 +114,5 @@
           <refreshInterval>300</refreshInterval>
 
-          <calSuite>@CAL-SUITE@</calSuite>
+          <calSuite>MainCampus</calSuite>
         </Events>
 
@@ -120,5 +120,5 @@
                           Demo departmental Public web client SoEDept
              ================================================================== -->
-        <SoEDept classname="org.bedework.webcommon.ClientConfig">
+        <SoEDept classname="org.bedework.calfacade.configs.ClientConfig">
           <autoCreateSponsors>false</autoCreateSponsors>
           <autoDeleteSponsors>false</autoDeleteSponsors>
@@ -136,5 +136,5 @@
           <logPrefix>SoEDept</logPrefix>
 
-          <appRoot>@APPLICATION-ROOT@</appRoot>
+          <appRoot>/calrsrc</appRoot>
           <portalPlatform>@PORTAL-PLATFORM@</portalPlatform>
 
@@ -142,5 +142,5 @@
           <refreshInterval>300</refreshInterval>
 
-          <calSuite>@CAL-SUITE@</calSuite>
+          <calSuite>SoEDepartmental</calSuite>
         </SoEDept>
 
@@ -148,5 +148,5 @@
                           User web client UserCal
              ================================================================== -->
-        <UserCal classname="org.bedework.webcommon.ClientConfig">
+        <UserCal classname="org.bedework.calfacade.configs.ClientConfig">
           <autoCreateSponsors>false</autoCreateSponsors>
           <autoDeleteSponsors>false</autoDeleteSponsors>
@@ -164,5 +164,5 @@
           <logPrefix>PersonalCalendar</logPrefix>
 
-          <appRoot>@APPLICATION-ROOT@</appRoot>
+          <appRoot>/ucalrsrc</appRoot>
           <portalPlatform>@PORTAL-PLATFORM@</portalPlatform>
 
Index: trunk/bedework/config/configs/democal.properties
===================================================================
--- trunk/bedework/config/configs/democal.properties (revision 953)
+++ trunk/bedework/config/configs/democal.properties (revision 966)
@@ -44,5 +44,5 @@
 org.bedework.app.bwconfig.type=webconfig
 org.bedework.app.bwconfig.sou.dir=webconfig
-org.bedework.app.bwconfig.version=3.1
+org.bedework.app.bwconfig.version=3.2
 org.bedework.app.bwconfig.default.contenttype=text/xml
 org.bedework.app.bwconfig.war.name=bwconfig
@@ -66,5 +66,5 @@
 org.bedework.app.CalAdmin.type=webadmin
 org.bedework.app.CalAdmin.sou.dir=webadmin
-org.bedework.app.CalAdmin.version=3.1
+org.bedework.app.CalAdmin.version=3.2
 org.bedework.app.CalAdmin.default.contenttype=text/xml
 org.bedework.app.CalAdmin.nogroupallowed=false
@@ -98,5 +98,5 @@
 org.bedework.app.Events.type=webpublic
 org.bedework.app.Events.sou.dir=webclient
-org.bedework.app.Events.version=3.1
+org.bedework.app.Events.version=3.2
 org.bedework.app.Events.default.contenttype=text/xml
 org.bedework.app.Events.web.xml=guest/web.xml
@@ -128,5 +128,5 @@
 org.bedework.app.SoEDept.type=webpublic
 org.bedework.app.SoEDept.sou.dir=webclient
-org.bedework.app.SoEDept.version=3.1
+org.bedework.app.SoEDept.version=3.2
 org.bedework.app.SoEDept.default.contenttype=text/xml
 org.bedework.app.SoEDept.web.xml=guest/web.xml
@@ -156,5 +156,5 @@
 org.bedework.app.UserCal.type=webuser
 org.bedework.app.UserCal.sou.dir=webclient
-org.bedework.app.UserCal.version=3.1
+org.bedework.app.UserCal.version=3.2
 org.bedework.app.UserCal.default.contenttype=text/xml
 org.bedework.app.UserCal.web.xml=user/web.xml
Index: trunk/bedework/deployment/termination/jboss/build.xml
===================================================================
--- trunk/bedework/deployment/termination/jboss/build.xml (revision 952)
+++ trunk/bedework/deployment/termination/jboss/build.xml (revision 966)
@@ -25,8 +25,8 @@
 
     <property name="ear.dir"
-              location="${org.bedework.temp.home}/ear" />
+              location="${org.bedework.temp.dir}/ear" />
 
     <path id="app.xml.cp">
-      <pathelement location="${org.bedework.deployment.jar}"/>
+      <pathelement location="${org.bedework.deployutil.jar}"/>
     </path>
 
@@ -38,5 +38,5 @@
     <!-- We have to drop some of the libraries so they don't conflict -->
     <copy toDir="${ear.dir}">
-      <fileset dir="${org.bedework.temp.home}/earlib">
+      <fileset dir="${org.bedework.temp.dir}/earlib">
         <exclude name="commons-logging*" />
         <exclude name="log4j*" />
@@ -47,5 +47,5 @@
     <applicationXml displayName="Bedework calendar suite"
                     outFile="${ear.dir}/META-INF/application.xml"
-                    warDir="${org.bedework.temp.home}/wars">
+                    warDir="${org.bedework.temp.dir}/wars">
       <fileset dir="${ear.dir}">
         <include name="*.jar"/>
@@ -56,5 +56,5 @@
 
     <copy toDir="${ear.dir}">
-      <fileset dir="${org.bedework.temp.home}/wars"/>
+      <fileset dir="${org.bedework.temp.wars.home}"/>
     </copy>