[CalendarServer-changes] [5470] CalendarServer/trunk/twistedcaldav/carddavxml.py

source_changes at macosforge.org source_changes at macosforge.org
Mon Apr 12 13:48:58 PDT 2010


Revision: 5470
          http://trac.macosforge.org/projects/calendarserver/changeset/5470
Author:   cdaboo at apple.com
Date:     2010-04-12 13:48:56 -0700 (Mon, 12 Apr 2010)
Log Message:
-----------
More CardDAV clean-up.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/carddavxml.py

Modified: CalendarServer/trunk/twistedcaldav/carddavxml.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/carddavxml.py	2010-04-12 20:22:32 UTC (rev 5469)
+++ CalendarServer/trunk/twistedcaldav/carddavxml.py	2010-04-12 20:48:56 UTC (rev 5470)
@@ -169,25 +169,6 @@
     """
     name = "addressbook"
 
-class SearchAddressBook (CardDAVEmptyElement):
-    """
-    Denotes a search address book collection, that will respond 
-    to query reports by querying the user-readable address books 
-    on this server not cached by AddressBook.app.
-    For version 1.0, this object simply redirects queries to the open directory address book
-    """
-    name = "searchaddressbook"
-
-class SearchAllAddressBook (CardDAVEmptyElement):
-    """
-    Denotes a search address book collection, that will respond 
-    to query reports by querying the user-readable address books 
-    on this server.
-    For version 1.0, this will include the user's private address book,
-    the open directory address book, and user-readable group (shared) address books.
-    """
-    name = "searchalladdressbook"
-
 class AddressBookQuery (CardDAVElement):
     """
     Defines a report for querying address book data.
@@ -731,18 +712,6 @@
         self.property  = property
         self.resources = resources
 
-class AddressBookFindShared (davxml.WebDAVElement):
-    """
-    Report used to retrieve shared address books accessible for a user principal
-    """
-    name = "addressbook-findshared"
-    namespace = addressbookserver_namespace
-
-    allowed_children = {
-#         (davxml.dav_namespace, "href"    ): (0, None),    # Actually ought to be (1, None)
-    }
-
-
 class NoUIDConflict(CardDAVElement):
     """
     CardDAV precondition used to indicate a UID conflict during PUT/COPY/MOVE.
@@ -772,5 +741,3 @@
 def _isAddressBook(self): return bool(self.childrenOfType(AddressBook))
 davxml.ResourceType.isAddressBook = _isAddressBook
 davxml.ResourceType.addressbook = davxml.ResourceType(davxml.Collection(), AddressBook())
-davxml.ResourceType.searchaddressbook = davxml.ResourceType(davxml.Collection(), SearchAddressBook())
-davxml.ResourceType.searchalladdressbook = davxml.ResourceType(davxml.Collection(), SearchAllAddressBook())
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100412/c6886b52/attachment.html>


More information about the calendarserver-changes mailing list