[CalendarServer-changes] [11211] CalDAVClientLibrary/trunk/caldavclientlibrary/protocol

[source_changes at macosforge.org]

Revision: 11211
          http://trac.calendarserver.org//changeset/11211
Author:   cdaboo at apple.com
Date:     2013-05-17 07:57:00 -0700 (Fri, 17 May 2013)
Log Message:
-----------
Fix up XML elements from current versions of specs and per ticket #807.

Modified Paths:
--------------
    CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/caldav/definitions/caldavxml.py
    CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/carddav/definitions/carddavxml.py

Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/caldav/definitions/caldavxml.py
===================================================================
--- CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/caldav/definitions/caldavxml.py	2013-05-17 14:39:12 UTC (rev 11210)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/caldav/definitions/caldavxml.py	2013-05-17 14:57:00 UTC (rev 11211)
@@ -18,7 +18,7 @@
 
 CalDAVNamespace = "urn:ietf:params:xml:ns:caldav"
 
-# RFC4791
+# RFC 4791
 
 mkcalendar = QName(CalDAVNamespace, "mkcalendar")
 mkcalendar_response = QName(CalDAVNamespace, "mkcalendar-response")
@@ -61,23 +61,28 @@
 
 free_busy_query = QName(CalDAVNamespace, "free-busy-query")
 
-# draft caldav-schedule
-calendar_free_busy_set = QName(CalDAVNamespace, "calendar-free-busy-set")
-originator = QName(CalDAVNamespace, "originator")
-recipient = QName(CalDAVNamespace, "recipient")
-schedule = QName(CalDAVNamespace, "schedule")
+# RFC 6638
 
-schedule_tag = QName(CalDAVNamespace, "schedule-tag")
+schedule_outbox = QName(CalDAVNamespace, "schedule-outbox")
+schedule_outbox_URL = QName(CalDAVNamespace, "schedule-outbox-URL")
 schedule_inbox = QName(CalDAVNamespace, "schedule-inbox")
 schedule_inbox_URL = QName(CalDAVNamespace, "schedule-inbox-URL")
-schedule_outbox = QName(CalDAVNamespace, "schedule-outbox")
-schedule_outbox_URL = QName(CalDAVNamespace, "schedule-outbox-URL")
 calendar_user_address_set = QName(CalDAVNamespace, "calendar-user-address-set")
+calendar_user_type = QName(CalDAVNamespace, "calendar-user-type")
 
+schedule_calendar_transp = QName(CalDAVNamespace, "schedule-calendar-transp")
+opaque = QName(CalDAVNamespace, "opaque")
+transparent = QName(CalDAVNamespace, "transparent")
+schedule_default_calendar_url = QName(CalDAVNamespace, "schedule-default-calendar-URL")
+schedule_tag = QName(CalDAVNamespace, "schedule-tag")
+
 schedule_response = QName(CalDAVNamespace, "schedule-response")
-response = QName(CalDAVNamespace, "timezone")
+response = QName(CalDAVNamespace, "response")
+recipient = QName(CalDAVNamespace, "recipient")
 request_status = QName(CalDAVNamespace, "request-status")
 
+calendar_free_busy_set = QName(CalDAVNamespace, "calendar-free-busy-set")
+
 # Extensions
 
 CalendarServerNamespace = "http://calendarserver.org/ns/"

Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/carddav/definitions/carddavxml.py
===================================================================
--- CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/carddav/definitions/carddavxml.py	2013-05-17 14:39:12 UTC (rev 11210)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/carddav/definitions/carddavxml.py	2013-05-17 14:57:00 UTC (rev 11211)
@@ -18,28 +18,33 @@
 
 CardDAVNamespace = "urn:ietf:params:xml:ns:carddav"
 
-# draft-
+# RFC 6352
 
-addressbook = QName(CardDAVNamespace, "addressbook")
 
 addressbook_description = QName(CardDAVNamespace, "addressbook-description")
 supported_addressbook_data = QName(CardDAVNamespace, "supported-addressbook-data")
+address_data_type = QName(CardDAVNamespace, "address-data-type")
 max_resource_size = QName(CardDAVNamespace, "max-resource-size")
 
 addressbook_home_set = QName(CardDAVNamespace, "addressbook-home-set")
 
+supported_collation_set = QName(CardDAVNamespace, "supported-collation-set")
+
+addressbook = QName(CardDAVNamespace, "addressbook")
 supported_collation = QName(CardDAVNamespace, "supported-collation")
 
 addressbook_query = QName(CardDAVNamespace, "addressbook-query")
 address_data = QName(CardDAVNamespace, "address-data")
-comp = QName(CardDAVNamespace, "comp")
-allcomp = QName(CardDAVNamespace, "allcomp")
+allprop = QName(CardDAVNamespace, "allprop")
 prop = QName(CardDAVNamespace, "prop")
 filter = QName(CardDAVNamespace, "filter")
-comp_filter = QName(CardDAVNamespace, "comp-filter")
 prop_filter = QName(CardDAVNamespace, "prop-filter")
 param_filter = QName(CardDAVNamespace, "param-filter")
 is_not_defined = QName(CardDAVNamespace, "is-not-defined")
 text_match = QName(CardDAVNamespace, "text-match")
+limit = QName(CardDAVNamespace, "limit")
+nresults = QName(CardDAVNamespace, "nresults")
 
 addressbook_multiget = QName(CardDAVNamespace, "addressbook-multiget")
+
+default_addressbook_url = QName(CardDAVNamespace, "default-addressbook-URL")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130517/09886ca4/attachment.html>