Index: trunk/config/bwbuild/default/cal.options.xml
===================================================================
--- trunk/config/bwbuild/default/cal.options.xml (revision 3014)
+++ trunk/config/bwbuild/default/cal.options.xml (revision 3018)
@@ -183,8 +183,16 @@
                           Timezones server
              ================================================================== -->
-        <tzsvr classname="org.bedework.calfacade.configs.ConfigCommon">
+        <tzsvr classname="org.bedework.timezones.common.TzsvrConfig">
           <appType>tzsvr</appType>
-          <publicAdmin>false</publicAdmin>
-          <guestMode>true</guestMode>
+          
+          <!--  Property defining location of the registry  -->
+          <tzdataUrl>http://localhost:8080/tzdata.zip</tzdataUrl>
+
+          <!-- Property defining long seconds refetch interval for data -->
+          <refetchInterval>6000</refetchInterval>
+          
+          <cacheName>vtz</cacheName>
+
+          <postId>12345abcde</postId>          
         </tzsvr>
 
@@ -313,6 +321,4 @@
         </Events>
 
-
-
         <!-- ==================================================================
                           Feed Service
@@ -477,4 +483,30 @@
           <webcalServiceURI>/webcal</webcalServiceURI>
         </Pubcaldav>
+
+        <!-- ==================================================================
+                          User CalWS server Usercalws
+             ================================================================== -->
+        <Usercalws classname="org.bedework.caldav.util.CalDAVConfig">
+          <appType>usercalws</appType>
+          <!--
+          <publicAdmin>false</publicAdmin>
+          -->
+          <guestMode>false</guestMode>
+
+          <sysintfImpl>org.bedework.caldav.bwserver.BwSysIntfImpl</sysintfImpl>
+        </Usercalws>
+
+        <!-- ==================================================================
+                          Public (unauthenticated) CalWS server Pubcalws
+             ================================================================== -->
+        <Pubcalws classname="org.bedework.caldav.util.CalDAVConfig">
+          <appType>publiccalws</appType>
+          <!--
+          <publicAdmin>false</publicAdmin>
+           -->
+          <guestMode>true</guestMode>
+
+          <sysintfImpl>org.bedework.caldav.bwserver.BwSysIntfImpl</sysintfImpl>
+        </Pubcalws>
 
         <!-- ==================================================================
Index: trunk/config/bwbuild/jboss-mysql/cal.options.xml
===================================================================
--- trunk/config/bwbuild/jboss-mysql/cal.options.xml (revision 3001)
+++ trunk/config/bwbuild/jboss-mysql/cal.options.xml (revision 3018)
@@ -30,11 +30,16 @@
 
         <!-- CardDAV server locations -->
-        <publicCardDAVUri>http://localhost:8080/carddav</publicCardDAVUri>
-        <personalCardDAVUri>http://localhost:8080/ucarddav</personalCardDAVUri>
+        <publicCardDAVHost>localhost</publicCardDAVHost>
+        <publicCardDAVPort>8080</publicCardDAVPort>
+        <publicCardDAVContext>/pubcarddav</publicCardDAVContext>
+        
+        <personalCardDAVHost>localhost</personalCardDAVHost>
+        <personalCardDAVPort>8080</personalCardDAVPort>
+        <personalCardDAVContext>/ucarddav</personalCardDAVContext>
 
         <!-- Timezone server locations -->
         <timezonesUri>http://localhost:8080/tzsvr</timezonesUri>
 
-        <systemRoots  classname="org.bedework.calfacade.configs.SystemRoots" >
+        <systemRoots classname="org.bedework.calfacade.configs.SystemRoots" >
           <principalRoot>/principals</principalRoot>
           <userPrincipalRoot>/principals/users</userPrincipalRoot>
@@ -47,4 +52,17 @@
         </systemRoots>
 
+        <!-- To enable mapping of calendar addresses e.g. mailto:fred@example.org
+             on to principals we need to either do a directory lookup or have
+             some sort of pattern map. 
+             
+             Setting a caladdr prefix enables pattern mapping. By default 
+             calendar addresses are users -->
+             
+          <!-- 
+        <caladdrPrefixes classname="org.bedework.calfacade.configs.CalAddrPrefixes">
+          <location>loc_</location>
+        </caladdrPrefixes>     
+           -->
+        
         <module>
           <!-- A dummy module with no directory. -->
@@ -165,8 +183,16 @@
                           Timezones server
              ================================================================== -->
-        <tzsvr classname="org.bedework.calfacade.configs.ConfigCommon">
+        <tzsvr classname="org.bedework.timezones.common.TzsvrConfig">
           <appType>tzsvr</appType>
-          <publicAdmin>false</publicAdmin>
-          <guestMode>true</guestMode>
+          
+          <!--  Property defining location of the registry  -->
+          <tzdataUrl>http://localhost:8080/tzdata.zip</tzdataUrl>
+
+          <!-- Property defining long seconds refetch interval for data -->
+          <refetchInterval>6000</refetchInterval>
+          
+          <cacheName>vtz</cacheName>
+
+          <postId>12345abcde</postId>          
         </tzsvr>
 
@@ -295,6 +321,4 @@
         </Events>
 
-
-
         <!-- ==================================================================
                           Feed Service
@@ -459,4 +483,30 @@
           <webcalServiceURI>/webcal</webcalServiceURI>
         </Pubcaldav>
+
+        <!-- ==================================================================
+                          User CalWS server Usercalws
+             ================================================================== -->
+        <Usercalws classname="org.bedework.caldav.util.CalDAVConfig">
+          <appType>usercalws</appType>
+          <!--
+          <publicAdmin>false</publicAdmin>
+          -->
+          <guestMode>false</guestMode>
+
+          <sysintfImpl>org.bedework.caldav.bwserver.BwSysIntfImpl</sysintfImpl>
+        </Usercalws>
+
+        <!-- ==================================================================
+                          Public (unauthenticated) CalWS server Pubcalws
+             ================================================================== -->
+        <Pubcalws classname="org.bedework.caldav.util.CalDAVConfig">
+          <appType>publiccalws</appType>
+          <!--
+          <publicAdmin>false</publicAdmin>
+           -->
+          <guestMode>true</guestMode>
+
+          <sysintfImpl>org.bedework.caldav.bwserver.BwSysIntfImpl</sysintfImpl>
+        </Pubcalws>
 
         <!-- ==================================================================
Index: trunk/config/bwbuild/jboss-postgresql/cal.options.xml
===================================================================
--- trunk/config/bwbuild/jboss-postgresql/cal.options.xml (revision 3002)
+++ trunk/config/bwbuild/jboss-postgresql/cal.options.xml (revision 3018)
@@ -183,8 +183,16 @@
                           Timezones server
              ================================================================== -->
-        <tzsvr classname="org.bedework.calfacade.configs.ConfigCommon">
+        <tzsvr classname="org.bedework.timezones.common.TzsvrConfig">
           <appType>tzsvr</appType>
-          <publicAdmin>false</publicAdmin>
-          <guestMode>true</guestMode>
+          
+          <!--  Property defining location of the registry  -->
+          <tzdataUrl>http://localhost:8080/tzdata.zip</tzdataUrl>
+
+          <!-- Property defining long seconds refetch interval for data -->
+          <refetchInterval>6000</refetchInterval>
+          
+          <cacheName>vtz</cacheName>
+
+          <postId>12345abcde</postId>          
         </tzsvr>