Revision

3571

Author

sagen@apple.com

Date

2009-01-05 15:24:17 -0800 (Mon, 05 Jan 2009)

Log Message

/timezones and /ischedule don't require on-disk presence

Modified Paths

• CalendarServer/trunk/calendarserver/tap/caldav.py
• CalendarServer/trunk/twistedcaldav/static.py

Diff

--- CalendarServer/trunk/calendarserver/tap/caldav.py	2009-01-05 18:57:18 UTC (rev 3570)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py	2009-01-05 23:24:17 UTC (rev 3571)
@@ -64,6 +64,7 @@
 from twistedcaldav.directory.principal import DirectoryPrincipalProvisioningResource
 from twistedcaldav.directory.aggregate import AggregateDirectoryService
 from twistedcaldav.directory.sudo import SudoDirectoryService
+from twistedcaldav.directory.util import NotFilePath
 from twistedcaldav.directory.wiki import WikiDirectoryService
 from twistedcaldav.httpfactory import HTTP503LoggingFactory, RedirectRequest
 from twistedcaldav.static import CalendarHomeProvisioningFile
@@ -481,7 +482,7 @@
                           % (self.timezoneServiceResourceClass,))
 
             timezoneService = self.timezoneServiceResourceClass(
-                os.path.join(config.DocumentRoot, "timezones"),
+                NotFilePath(isfile=True),
                 root,
             )
             root.putChild("timezones", timezoneService)
@@ -492,7 +493,7 @@
                           % (self.iScheduleResourceClass,))
     
             ischedule = self.iScheduleResourceClass(
-                os.path.join(config.DocumentRoot, "ischedule"),
+                NotFilePath(isfile=True),
                 root,
             )
             root.putChild("ischedule", ischedule)

--- CalendarServer/trunk/twistedcaldav/static.py	2009-01-05 18:57:18 UTC (rev 3570)
+++ CalendarServer/trunk/twistedcaldav/static.py	2009-01-05 23:24:17 UTC (rev 3571)
@@ -895,6 +895,15 @@
             (caldav_namespace, "calendar-collection-location-ok")
         )
 
+    def hasDeadProperty(self, name):
+        return False
+
+    def etag(self):
+        return None
+
+    def checkPreconditions(self, request):
+        return None
+
     ##
     # ACL
     ##
@@ -902,6 +911,8 @@
     def supportedPrivileges(self, request):
         return succeed(deliverSchedulePrivilegeSet)
 
+
+
 class FreeBusyURLFile (AutoProvisioningFileMixIn, FreeBusyURLResource, CalDAVFile):
     """
     Free-busy URL resource.
@@ -1007,6 +1018,18 @@
             (caldav_namespace, "calendar-collection-location-ok")
         )
 
+    def hasDeadProperty(self, name):
+        return False
+
+    def etag(self):
+        return None
+
+    def checkPreconditions(self, request):
+        return None
+
+    def checkPrivileges(self, request, privileges, recurse=False, principal=None, inherited_aces=None):
+        return succeed(None)
+
 ##
 # Utilities
 ##