[CalendarServer-changes] [4754] CalendarServer/branches/users/cdaboo/deployment-partition-4722/ calendarserver/tools/util.py

[source_changes at macosforge.org]

Revision: 4754
          http://trac.macosforge.org/projects/calendarserver/changeset/4754
Author:   cdaboo at apple.com
Date:     2009-11-17 09:33:00 -0800 (Tue, 17 Nov 2009)
Log Message:
-----------
Need augment/proxy DB classes loaded before the directory.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/deployment-partition-4722/calendarserver/tools/util.py

Modified: CalendarServer/branches/users/cdaboo/deployment-partition-4722/calendarserver/tools/util.py
===================================================================
--- CalendarServer/branches/users/cdaboo/deployment-partition-4722/calendarserver/tools/util.py	2009-11-17 17:11:47 UTC (rev 4753)
+++ CalendarServer/branches/users/cdaboo/deployment-partition-4722/calendarserver/tools/util.py	2009-11-17 17:33:00 UTC (rev 4754)
@@ -27,7 +27,7 @@
 
 import socket
 from twistedcaldav.config import config, ConfigurationError
-from twistedcaldav.directory import augment
+from twistedcaldav.directory import augment, calendaruserproxy
 from twistedcaldav.directory.directory import DirectoryService
 
 def loadConfig(configFileName):
@@ -85,13 +85,16 @@
         def principalForCalendarUserAddress(self, cua):
             return self.principalCollection.principalForCalendarUserAddress(cua)
 
+    # Load augment/proxy db classes now
+    augmentClass = namedClass(config.AugmentService.type)
+    augment.AugmentService = augmentClass(**config.AugmentService.params)
 
+    proxydbClass = namedClass(config.ProxyDBService.type)
+    calendaruserproxy.ProxyDBService = proxydbClass(**config.ProxyDBService.params)
+
     # Wait for directory service to become available
     directory = MyDirectoryService(**config.DirectoryService["params"])
 
-    augmentClass = namedClass(config.AugmentService.type)
-    augment.AugmentService = augmentClass(**config.AugmentService.params)
-
     return directory
 
 class DummyDirectoryService (DirectoryService):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20091117/9e9b404a/attachment.html>