[CalendarServer-changes] [1243] CalendarServer/trunk

source_changes at macosforge.org source_changes at macosforge.org
Thu Feb 22 18:59:23 PST 2007


Revision: 1243
          http://trac.macosforge.org/projects/calendarserver/changeset/1243
Author:   wsanchez at apple.com
Date:     2007-02-22 18:59:23 -0800 (Thu, 22 Feb 2007)

Log Message:
-----------
useFullSchema -> requireComputerRecord

Modified Paths:
--------------
    CalendarServer/trunk/conf/caldavd-test-logged.plist
    CalendarServer/trunk/conf/caldavd-test.plist
    CalendarServer/trunk/conf/caldavd.plist
    CalendarServer/trunk/twistedcaldav/config.py
    CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py

Modified: CalendarServer/trunk/conf/caldavd-test-logged.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test-logged.plist	2007-02-23 02:45:43 UTC (rev 1242)
+++ CalendarServer/trunk/conf/caldavd-test-logged.plist	2007-02-23 02:59:23 UTC (rev 1243)
@@ -91,7 +91,7 @@
     <dict>
       <key>node</key>
       <string>/Search</string>
-      <key>useFullSchema</key>
+      <key>requireComputerRecord</key>
       <true/>
     </dict>
   </dict>

Modified: CalendarServer/trunk/conf/caldavd-test.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test.plist	2007-02-23 02:45:43 UTC (rev 1242)
+++ CalendarServer/trunk/conf/caldavd-test.plist	2007-02-23 02:59:23 UTC (rev 1243)
@@ -97,7 +97,7 @@
     <dict>
       <key>node</key>
       <string>/Search</string>
-      <key>useFullSchema</key>
+      <key>requireComputerRecord</key>
       <true/>
     </dict>
   </dict>

Modified: CalendarServer/trunk/conf/caldavd.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd.plist	2007-02-23 02:45:43 UTC (rev 1242)
+++ CalendarServer/trunk/conf/caldavd.plist	2007-02-23 02:59:23 UTC (rev 1243)
@@ -97,7 +97,7 @@
     <dict>
       <key>node</key>
       <string>/Search</string>
-      <key>useFullSchema</key>
+      <key>requireComputerRecord</key>
       <true/>
     </dict>
   </dict>

Modified: CalendarServer/trunk/twistedcaldav/config.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/config.py	2007-02-23 02:45:43 UTC (rev 1242)
+++ CalendarServer/trunk/twistedcaldav/config.py	2007-02-23 02:59:23 UTC (rev 1243)
@@ -60,7 +60,7 @@
     "DirectoryService": {
         "params": {
             "node": "/Search",
-            "useFullSchema": True,
+            "requireComputerRecord": True,
         },
         "type": "twistedcaldav.directory.appleopendirectory.OpenDirectoryService"
     },

Modified: CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2007-02-23 02:45:43 UTC (rev 1242)
+++ CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2007-02-23 02:59:23 UTC (rev 1243)
@@ -52,10 +52,10 @@
     def __repr__(self):
         return "<%s %r: %r>" % (self.__class__.__name__, self.realmName, self.node)
 
-    def __init__(self, node="/Search", useFullSchema=True, dosetup=True):
+    def __init__(self, node="/Search", requireComputerRecord=True, dosetup=True):
         """
         @param node: an OpenDirectory node name to bind to.
-        @param useFullSchema: C{True} if the directory schema is to be used to determine
+        @param requireComputerRecord: C{True} if the directory schema is to be used to determine
             which calendar users are enabled.
         @param dosetup: if C{True} then the directory records are initialized,
                         if C{False} they are not.
@@ -70,13 +70,13 @@
         self.realmName = node
         self.directory = directory
         self.node = node
-        self.useFullSchema = useFullSchema
+        self.requireComputerRecord = useFullSchema
         self.computerRecordName = ""
         self._records = {}
         self._delayedCalls = set()
 
         if dosetup:
-            if self.useFullSchema:
+            if self.requireComputerRecord:
                 try:
                     self._lookupVHostRecord()
                 except Exception, e:
@@ -320,7 +320,7 @@
             records = {}
 
             try:
-                if self.useFullSchema:
+                if self.requireComputerRecord:
                     query = {
                         dsattributes.kDSNAttrServicesLocator: self.servicetag,
                     }
@@ -344,7 +344,7 @@
                 raise
 
             for (key, value) in results.iteritems():
-                if self.useFullSchema:
+                if self.requireComputerRecord:
                     # Make sure this record has service enabled.
                     enabled = True
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070222/70b9b446/attachment.html


More information about the calendarserver-changes mailing list