[CalendarServer-changes] [3958] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 3958
          http://trac.macosforge.org/projects/calendarserver/changeset/3958
Author:   sagen at apple.com
Date:     2009-04-07 13:05:45 -0700 (Tue, 07 Apr 2009)
Log Message:
-----------
Making on-demand directory the default

Modified Paths:
--------------
    CalendarServer/trunk/conf/caldavd-apple.plist
    CalendarServer/trunk/conf/caldavd-test.plist
    CalendarServer/trunk/conf/caldavd.plist
    CalendarServer/trunk/twistedcaldav/config.py
    CalendarServer/trunk/twistedcaldav/directory/cachingappleopendirectory.py
    CalendarServer/trunk/twistedcaldav/test/test_config.py

Modified: CalendarServer/trunk/conf/caldavd-apple.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-apple.plist	2009-04-07 19:09:46 UTC (rev 3957)
+++ CalendarServer/trunk/conf/caldavd-apple.plist	2009-04-07 20:05:45 UTC (rev 3958)
@@ -133,7 +133,7 @@
     <key>DirectoryService</key>
     <dict>
       <key>type</key>
-      <string>twistedcaldav.directory.appleopendirectory.OpenDirectoryService</string>
+      <string>twistedcaldav.directory.cachingappleopendirectory.OpenDirectoryService</string>
       
       <key>params</key>
       <dict>

Modified: CalendarServer/trunk/conf/caldavd-test.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test.plist	2009-04-07 19:09:46 UTC (rev 3957)
+++ CalendarServer/trunk/conf/caldavd-test.plist	2009-04-07 20:05:45 UTC (rev 3958)
@@ -134,7 +134,7 @@
     <key>DirectoryService</key>
     <dict>
       <key>type</key>
-      <string>twistedcaldav.directory.appleopendirectory.OpenDirectoryService</string>
+      <string>twistedcaldav.directory.cachingappleopendirectory.OpenDirectoryService</string>
       
       <key>params</key>
       <dict>

Modified: CalendarServer/trunk/conf/caldavd.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd.plist	2009-04-07 19:09:46 UTC (rev 3957)
+++ CalendarServer/trunk/conf/caldavd.plist	2009-04-07 20:05:45 UTC (rev 3958)
@@ -137,7 +137,7 @@
     <key>DirectoryService</key>
     <dict>
       <key>type</key>
-      <string>twistedcaldav.directory.appleopendirectory.OpenDirectoryService</string>
+      <string>twistedcaldav.directory.cachingappleopendirectory.OpenDirectoryService</string>
       
       <key>params</key>
       <dict>

Modified: CalendarServer/trunk/twistedcaldav/config.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/config.py	2009-04-07 19:09:46 UTC (rev 3957)
+++ CalendarServer/trunk/twistedcaldav/config.py	2009-04-07 20:05:45 UTC (rev 3958)
@@ -73,7 +73,7 @@
     "twistedcaldav.directory.xmlfile.XMLDirectoryService": {
         "xmlFile": "/etc/caldavd/accounts.xml",
     },
-    "twistedcaldav.directory.appleopendirectory.OpenDirectoryService": {
+    "twistedcaldav.directory.cachingappleopendirectory.OpenDirectoryService": {
         "node": "/Search",
         "restrictEnabledRecords": False,
         "restrictToGroup": "",
@@ -218,7 +218,7 @@
             "Scheduler": "LeastConnections",
         },
         "StaggeredStartup": {
-            "Enabled": True,
+            "Enabled": False,
             "Interval": 15,
         },
     },

Modified: CalendarServer/trunk/twistedcaldav/directory/cachingappleopendirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/cachingappleopendirectory.py	2009-04-07 19:09:46 UTC (rev 3957)
+++ CalendarServer/trunk/twistedcaldav/directory/cachingappleopendirectory.py	2009-04-07 20:05:45 UTC (rev 3958)
@@ -91,7 +91,6 @@
         else:
             self.restrictToGUID = True
         self.restrictedGUIDs = None
-        self.cacheTimeout = cacheTimeout
         self._records = {}
         self._delayedCalls = set()
 

Modified: CalendarServer/trunk/twistedcaldav/test/test_config.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_config.py	2009-04-07 19:09:46 UTC (rev 3957)
+++ CalendarServer/trunk/twistedcaldav/test/test_config.py	2009-04-07 20:05:45 UTC (rev 3958)
@@ -153,9 +153,9 @@
         self.assertEquals(config.DirectoryService.type, "twistedcaldav.directory.xmlfile.XMLDirectoryService")
         self.assertEquals(config.DirectoryService.params.xmlFile, "/etc/caldavd/accounts.xml")
 
-        config.update({"DirectoryService": {"type": "twistedcaldav.directory.appleopendirectory.OpenDirectoryService"}})
+        config.update({"DirectoryService": {"type": "twistedcaldav.directory.cachingappleopendirectory.OpenDirectoryService"}})
 
-        self.assertEquals(config.DirectoryService.type, "twistedcaldav.directory.appleopendirectory.OpenDirectoryService")
+        self.assertEquals(config.DirectoryService.type, "twistedcaldav.directory.cachingappleopendirectory.OpenDirectoryService")
         self.assertNotIn("xmlFile", config.DirectoryService.params)
         self.assertEquals(config.DirectoryService.params.node, "/Search")
         self.assertEquals(config.DirectoryService.params.restrictEnabledRecords, False)
@@ -164,13 +164,13 @@
         self.assertEquals(config.DirectoryService.type, "twistedcaldav.directory.xmlfile.XMLDirectoryService")
         self.assertEquals(config.DirectoryService.params.xmlFile, "/etc/caldavd/accounts.xml")
 
-        config.update({"DirectoryService": {"type": "twistedcaldav.directory.appleopendirectory.OpenDirectoryService"}})
+        config.update({"DirectoryService": {"type": "twistedcaldav.directory.cachingappleopendirectory.OpenDirectoryService"}})
         config.update({"DirectoryService": {"params": {
             "restrictEnabledRecords": True,
             "restrictToGroup": "12345",
         }}})
 
-        self.assertEquals(config.DirectoryService.type, "twistedcaldav.directory.appleopendirectory.OpenDirectoryService")
+        self.assertEquals(config.DirectoryService.type, "twistedcaldav.directory.cachingappleopendirectory.OpenDirectoryService")
         self.assertEquals(config.DirectoryService.params.node, "/Search")
         self.assertEquals(config.DirectoryService.params.restrictEnabledRecords, True)
         self.assertEquals(config.DirectoryService.params.restrictToGroup, "12345")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090407/12a963dc/attachment.html>