[Bedework-commit] bedework r2067 - trunk/config/bwbuild/default

[svnadmin at bedework.org]

Author: douglm
Date: 2009-02-20 09:59:38 -0500 (Fri, 20 Feb 2009)
New Revision: 2067

Modified:
   trunk/config/bwbuild/default/cal.options.xml
Log:
Change schema to avoid repeated fetch of owner/creator with entities.

Owner/creator is now stored in the db as a principal hierarchy path, a string value. The system then retrieves and caches the actual db entries as they are needed.

This should result in less jvm churn. It also solves a number of problems in allowing groups to own entities. The move to a principal object is not complete but should be relatively simple.

Almost no visible changes as a result of this change. The only exception is where owners/creators appear in the generated xml. They are now a full principal path rather than just the account.

Modified: trunk/config/bwbuild/default/cal.options.xml
===================================================================
--- trunk/config/bwbuild/default/cal.options.xml	2009-02-12 22:53:57 UTC (rev 2066)
+++ trunk/config/bwbuild/default/cal.options.xml	2009-02-20 14:59:38 UTC (rev 2067)
@@ -35,17 +35,19 @@
         <!-- Timezone server locations -->
         <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.
                     If there is a single domain with no wildcard it wil be stripped from
@@ -64,14 +66,6 @@
 
           <!-- 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>