[CalendarServer-changes] [6727] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 6727
          http://trac.macosforge.org/projects/calendarserver/changeset/6727
Author:   sagen at apple.com
Date:     2011-01-11 13:36:05 -0800 (Tue, 11 Jan 2011)
Log Message:
-----------
Use pyopendirectory in trunk (for older systems), but continue to use PyObjC --> OpenDirectory.framework in caldavd-apple.plist.

Modified Paths:
--------------
    CalendarServer/trunk/conf/caldavd-apple.plist
    CalendarServer/trunk/twistedcaldav/stdconfig.py

Modified: CalendarServer/trunk/conf/caldavd-apple.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-apple.plist	2011-01-11 02:19:51 UTC (rev 6726)
+++ CalendarServer/trunk/conf/caldavd-apple.plist	2011-01-11 21:36:05 UTC (rev 6727)
@@ -538,5 +538,8 @@
     <key>EnableSearchAddressBook</key>
     <true/>
 
+    <key>OpenDirectoryModule</key>
+    <string>calendarserver.platform.darwin.od.opendirectory</string>
+
   </dict>
 </plist>

Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/stdconfig.py	2011-01-11 02:19:51 UTC (rev 6726)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py	2011-01-11 21:36:05 UTC (rev 6727)
@@ -622,9 +622,9 @@
     # Specify which opendirectory module to use:
     # "opendirectory" is PyOpenDirectory (the old one which uses
     # DirectoryService.framework)
-    # "calendarserver.platform.darwin.od.opendirectory" is the new PyObjC version which uses
-    # OpenDirectory.framework
-    "OpenDirectoryModule": "calendarserver.platform.darwin.od.opendirectory",
+    # "calendarserver.platform.darwin.od.opendirectory" is the new PyObjC
+    # version which uses OpenDirectory.framework
+    "OpenDirectoryModule": "opendirectory",
 
     # Used in the command line utilities to specify which service class to
     # use to carry out work.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110111/46d3f821/attachment.html>