Index: trunk/config/bwbuild/default/cal.options.xml
===================================================================
--- trunk/config/bwbuild/default/cal.options.xml (revision 2023)
+++ trunk/config/bwbuild/default/cal.options.xml (revision 2067)
@@ -36,15 +36,17 @@
         <timezonesUri>http://localhost:8080/tzsvr</timezonesUri>
 
+        <systemRoots  classname="org.bedework.calfacade.configs.SystemRoots" >
+          <principalRoot>/principals</principalRoot>
+          <userPrincipalRoot>/principals/users</userPrincipalRoot>
+          <groupPrincipalRoot>/principals/groups</groupPrincipalRoot>
+          <resourcePrincipalRoot>/principals/resources</resourcePrincipalRoot>
+          <venuePrincipalRoot>/principals/locations</venuePrincipalRoot>
+          <ticketPrincipalRoot>/principals/tickets</ticketPrincipalRoot>
+          <hostPrincipalRoot>/principals/hosts</hostPrincipalRoot>
+        </systemRoots>
+
         <module>
           <!-- A dummy module with no directory. -->
           <dir-config classname="org.bedework.calfacade.configs.DirConfigProperties">
-            <principalRoot>/principals</principalRoot>
-            <userPrincipalRoot>/principals/users</userPrincipalRoot>
-            <groupPrincipalRoot>/principals/groups</groupPrincipalRoot>
-            <resourcePrincipalRoot>/principals/resources</resourcePrincipalRoot>
-            <venuePrincipalRoot>/principals/locations</venuePrincipalRoot>
-            <ticketPrincipalRoot>/principals/tickets</ticketPrincipalRoot>
-            <hostPrincipalRoot>/principals/hosts</hostPrincipalRoot>
-
             <!-- List domains at your site separated by commas.
                     A single leading wildcard "*" is allowed.
@@ -65,12 +67,4 @@
           <!-- An example of how we might configure an ldap directory module. -->
           <user-ldap-group classname="org.bedework.calfacade.configs.LdapConfigProperties">
-            <principalRoot>/principals</principalRoot>
-            <userPrincipalRoot>/principals/users</userPrincipalRoot>
-            <groupPrincipalRoot>/principals/groups</groupPrincipalRoot>
-            <resourcePrincipalRoot>/principals/resources</resourcePrincipalRoot>
-            <venuePrincipalRoot>/principals/locations</venuePrincipalRoot>
-            <ticketPrincipalRoot>/principals/tickets</ticketPrincipalRoot>
-            <hostPrincipalRoot>/principals/hosts</hostPrincipalRoot>
-
             <domains>mysite.edu</domains>
             <defaultDomain>mysite.edu</defaultDomain>