[CalendarServer-changes] [5219] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 5219
          http://trac.macosforge.org/projects/calendarserver/changeset/5219
Author:   glyph at apple.com
Date:     2010-02-25 21:40:57 -0800 (Thu, 25 Feb 2010)
Log Message:
-----------
Advertise DAV capabilities correctly on the root resource.

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/provision/root.py
    CalendarServer/trunk/twistedcaldav/directory/addressbook.py

Modified: CalendarServer/trunk/calendarserver/provision/root.py
===================================================================
--- CalendarServer/trunk/calendarserver/provision/root.py	2010-02-26 00:59:25 UTC (rev 5218)
+++ CalendarServer/trunk/calendarserver/provision/root.py	2010-02-26 05:40:57 UTC (rev 5219)
@@ -1,3 +1,4 @@
+# -*- test-case-name: calendarserver.provision.test.test_root -*-
 ##
 # Copyright (c) 2005-2010 Apple Inc. All rights reserved.
 #
@@ -28,6 +29,7 @@
 
 from twext.python.log import Logger
 
+from twistedcaldav.resource import CalDAVComplianceMixIn
 from twistedcaldav.extensions import DAVFile, CachingPropertyStore
 from twistedcaldav.extensions import DirectoryPrincipalPropertySearchMixIn
 from twistedcaldav.extensions import ReadOnlyResourceMixIn
@@ -41,7 +43,7 @@
 log = Logger()
 
 
-class RootResource (ReadOnlyResourceMixIn, DirectoryPrincipalPropertySearchMixIn, DAVFile):
+class RootResource (ReadOnlyResourceMixIn, DirectoryPrincipalPropertySearchMixIn, CalDAVComplianceMixIn, DAVFile):
     """
     A special root resource that contains support checking SACLs
     as well as adding responseFilters.

Modified: CalendarServer/trunk/twistedcaldav/directory/addressbook.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/addressbook.py	2010-02-26 00:59:25 UTC (rev 5218)
+++ CalendarServer/trunk/twistedcaldav/directory/addressbook.py	2010-02-26 05:40:57 UTC (rev 5219)
@@ -36,7 +36,7 @@
 
 from twistedcaldav.config import config
 from twistedcaldav.extensions import ReadOnlyResourceMixIn, DAVResource
-from twistedcaldav.resource import CalDAVResource, SearchAddressBookResource, SearchAllAddressBookResource
+from twistedcaldav.resource import CalDAVResource, SearchAddressBookResource, SearchAllAddressBookResource, CalDAVComplianceMixIn
 from twistedcaldav.directory.idirectory import IDirectoryService
 from twistedcaldav.directory.resource import AutoProvisioningResourceMixIn
 
@@ -51,6 +51,7 @@
 class DirectoryAddressBookProvisioningResource (
     AutoProvisioningResourceMixIn,
     ReadOnlyResourceMixIn,
+    CalDAVComplianceMixIn,
     DAVResource,
 ):
     def defaultAccessControlList(self):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100225/fe0fd635/attachment.html>