[CalendarServer-changes] [5609] CalendarServer/trunk/calendarserver

[source_changes at macosforge.org]

Revision: 5609
          http://trac.macosforge.org/projects/calendarserver/changeset/5609
Author:   cdaboo at apple.com
Date:     2010-05-18 12:09:13 -0700 (Tue, 18 May 2010)
Log Message:
-----------
Resource directory service should inherit the base directory service realm.

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tap/util.py
    CalendarServer/trunk/calendarserver/tools/util.py

Modified: CalendarServer/trunk/calendarserver/tap/util.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/util.py	2010-05-17 20:37:00 UTC (rev 5608)
+++ CalendarServer/trunk/calendarserver/tap/util.py	2010-05-18 19:09:13 UTC (rev 5609)
@@ -121,6 +121,7 @@
         log.info("Configuring resource service of type: %s" % (resourceClass,))
 
         resourceDirectory = resourceClass(config.ResourceService.params)
+        resourceDirectory.realmName = baseDirectory.realmName
         directories.append(resourceDirectory)
 
     #

Modified: CalendarServer/trunk/calendarserver/tools/util.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/util.py	2010-05-17 20:37:00 UTC (rev 5608)
+++ CalendarServer/trunk/calendarserver/tools/util.py	2010-05-18 19:09:13 UTC (rev 5609)
@@ -113,6 +113,7 @@
     if config.ResourceService.Enabled:
         resourceClass = namedClass(config.ResourceService.type)
         resourceDirectory = resourceClass(config.ResourceService.params)
+        resourceDirectory.realmName = directory.realmName
         directories.append(resourceDirectory)
 
     aggregate = MyDirectoryService(directories)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100518/99a60204/attachment.html>