[CalendarServer-changes] [12573] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 12573
          http://trac.calendarserver.org//changeset/12573
Author:   sagen at apple.com
Date:     2014-02-05 09:46:58 -0800 (Wed, 05 Feb 2014)
Log Message:
-----------
DirectoryProxyServiceMaker is in a new module now

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tap/caldav.py
    CalendarServer/trunk/twisted/plugins/caldav.py
    CalendarServer/trunk/twistedcaldav/stdconfig.py

Modified: CalendarServer/trunk/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/caldav.py	2014-02-05 17:45:05 UTC (rev 12572)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py	2014-02-05 17:46:58 UTC (rev 12573)
@@ -77,7 +77,7 @@
     UpgradeDatabaseSchemaStep, UpgradeDatabaseAddressBookDataStep,
     UpgradeAcquireLockStep, UpgradeReleaseLockStep, UpgradeDatabaseNotificationDataStep)
 from txdav.common.datastore.work.revision_cleanup import scheduleFirstFindMinRevision
-from txdav.dps.service import DirectoryProxyServiceMaker
+from txdav.dps.server import DirectoryProxyServiceMaker
 
 from twistedcaldav import memcachepool
 from twistedcaldav.config import config, ConfigurationError
@@ -526,7 +526,7 @@
              config.DirectoryProxy.SocketPath != ""
          ):
              log.info("Adding directory proxy service")
- 
+
              dpsArgv = [
                  sys.executable,
                  sys.argv[0],

Modified: CalendarServer/trunk/twisted/plugins/caldav.py
===================================================================
--- CalendarServer/trunk/twisted/plugins/caldav.py	2014-02-05 17:45:05 UTC (rev 12572)
+++ CalendarServer/trunk/twisted/plugins/caldav.py	2014-02-05 17:46:58 UTC (rev 12573)
@@ -51,4 +51,4 @@
 
 
 TwistedCalDAV = TAP("calendarserver.tap.caldav.CalDAVServiceMaker")
-DirectoryProxy = TAP("txdav.dps.service.DirectoryProxyServiceMaker")
+DirectoryProxy = TAP("txdav.dps.server.DirectoryProxyServiceMaker")

Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/stdconfig.py	2014-02-05 17:45:05 UTC (rev 12572)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py	2014-02-05 17:46:58 UTC (rev 12573)
@@ -834,7 +834,8 @@
 
     "DirectoryProxy": {
         "Enabled": False,
-        "SocketPath": "directory-proxy.sock"
+        "SocketPath": "directory-proxy.sock",
+        "DirectoryType": "XML",  # "LDAP", "OD", "XML"
     },
 
     #
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/a459b503/attachment.html>