[CalendarServer-changes] [9752] CalendarServer/branches/users/cdaboo/ischedule-dkim/twistedcaldav/ scheduling/ischedule

[source_changes at macosforge.org]

Revision: 9752
          http://trac.macosforge.org/projects/calendarserver/changeset/9752
Author:   cdaboo at apple.com
Date:     2012-08-29 18:33:55 -0700 (Wed, 29 Aug 2012)
Log Message:
-----------
XML schema change.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/ischedule-dkim/twistedcaldav/scheduling/ischedule/resource.py
    CalendarServer/branches/users/cdaboo/ischedule-dkim/twistedcaldav/scheduling/ischedule/xml.py

Modified: CalendarServer/branches/users/cdaboo/ischedule-dkim/twistedcaldav/scheduling/ischedule/resource.py
===================================================================
--- CalendarServer/branches/users/cdaboo/ischedule-dkim/twistedcaldav/scheduling/ischedule/resource.py	2012-08-29 20:24:20 UTC (rev 9751)
+++ CalendarServer/branches/users/cdaboo/ischedule-dkim/twistedcaldav/scheduling/ischedule/resource.py	2012-08-30 01:33:55 UTC (rev 9752)
@@ -138,40 +138,37 @@
 
         result = ischedulexml.QueryResult(
             
-            ischedulexml.CapabilitySet(
-                ischedulexml.SupportedVersionSet(
+            ischedulexml.Capabilities(
+                ischedulexml.Versions(
                     ischedulexml.Version.fromString("1.0"),
                 ),
-                ischedulexml.SupportedSchedulingMessageSet(
-                    ischedulexml.Comp(
+                ischedulexml.SchedulingMessages(
+                    ischedulexml.Component(
                         ischedulexml.Method(name="REQUEST"),
                         ischedulexml.Method(name="CANCEL"),
                         ischedulexml.Method(name="REPLY"),
                         name="VEVENT"
                     ),
-                    ischedulexml.Comp(
+                    ischedulexml.Component(
                         ischedulexml.Method(name="REQUEST"),
                         ischedulexml.Method(name="CANCEL"),
                         ischedulexml.Method(name="REPLY"),
                         name="VTODO"
                     ),
-                    ischedulexml.Comp(
+                    ischedulexml.Component(
                         ischedulexml.Method(name="REQUEST"),
                         name="VFREEBUSY"
                     ),
                 ),
-                ischedulexml.SupportedCalendarDataType(
+                ischedulexml.CalendarDataTypes(
                     ischedulexml.CalendarDataType(**{
                             "content-type":"text/calendar",
                             "version":"2.0",
                     }),
                 ),
-                ischedulexml.SupportedAttachmentValues(
-                    ischedulexml.ExternalAttachment(),
+                ischedulexml.Attachments(
+                    ischedulexml.External(),
                 ),
-                ischedulexml.SupportedRecipientURISchemeSet(
-                    ischedulexml.Scheme.fromString("mailto")
-                ),
                 ischedulexml.MaxContentLength.fromString(config.MaxResourceSize),
                 ischedulexml.MinDateTime.fromString(minDateTime.getText()),
                 ischedulexml.MaxDateTime.fromString(maxDateTime.getText()),

Modified: CalendarServer/branches/users/cdaboo/ischedule-dkim/twistedcaldav/scheduling/ischedule/xml.py
===================================================================
--- CalendarServer/branches/users/cdaboo/ischedule-dkim/twistedcaldav/scheduling/ischedule/xml.py	2012-08-29 20:24:20 UTC (rev 9751)
+++ CalendarServer/branches/users/cdaboo/ischedule-dkim/twistedcaldav/scheduling/ischedule/xml.py	2012-08-30 01:33:55 UTC (rev 9752)
@@ -39,14 +39,14 @@
 
 
 @registerElement
-class CapabilitySet (WebDAVElement):
+class Capabilities (WebDAVElement):
     namespace = ischedule_namespace
-    name = "capability-set"
+    name = "capabilities"
     allowed_children = {
-        (ischedule_namespace, "supported-version-set"): (1, 1),
-        (ischedule_namespace, "supported-scheduling-message-set"): (1, 1),
-        (ischedule_namespace, "supported-calendar-data-type"): (1, 1),
-        (ischedule_namespace, "supported-attachment-values"): (1, 1),
+        (ischedule_namespace, "versions"): (1, 1),
+        (ischedule_namespace, "scheduling-messages"): (1, 1),
+        (ischedule_namespace, "calendar-data-types"): (1, 1),
+        (ischedule_namespace, "attachments"): (1, 1),
         (ischedule_namespace, "supported-recipient-uri-scheme-set"): (1, 1),
         (ischedule_namespace, "max-content-length"): (1, 1),
         (ischedule_namespace, "min-date-time"): (1, 1),
@@ -58,9 +58,9 @@
 
 
 @registerElement
-class SupportedVersionSet (WebDAVElement):
+class Versions (WebDAVElement):
     namespace = ischedule_namespace
-    name = "supported-version-set"
+    name = "versions"
     allowed_children = {
         (ischedule_namespace, "version"): (1, None),
     }
@@ -73,18 +73,18 @@
 
 
 @registerElement
-class SupportedSchedulingMessageSet (WebDAVElement):
+class SchedulingMessages (WebDAVElement):
     namespace = ischedule_namespace
-    name = "supported-scheduling-message-set"
+    name = "scheduling-messages"
     allowed_children = {
-        (ischedule_namespace, "comp"): (1, None),
+        (ischedule_namespace, "component"): (1, None),
     }
 
 
 @registerElement
-class Comp (WebDAVElement):
+class Component (WebDAVElement):
     namespace = ischedule_namespace
-    name = "comp"
+    name = "component"
     allowed_children = {
         (ischedule_namespace, "method"): (0, None),
     }
@@ -99,9 +99,9 @@
 
 
 @registerElement
-class SupportedCalendarDataType (WebDAVElement):
+class CalendarDataTypes (WebDAVElement):
     namespace = ischedule_namespace
-    name = "supported-calendar-data-type"
+    name = "calendar-data-types"
     allowed_children = {
         (ischedule_namespace, "calendar-data-type"): (1, None),
     }
@@ -118,43 +118,28 @@
 
 
 @registerElement
-class SupportedAttachmentValues (WebDAVElement):
+class Attachments (WebDAVElement):
     namespace = ischedule_namespace
-    name = "supported-attachment-values"
+    name = "attachments"
     allowed_children = {
-        (ischedule_namespace, "inline-attachment"): (0, 1),
-        (ischedule_namespace, "external-attachment"): (0, 1),
+        (ischedule_namespace, "inline"): (0, 1),
+        (ischedule_namespace, "external"): (0, 1),
     }
 
 
 @registerElement
-class InlineAttachment (WebDAVEmptyElement):
+class Inline (WebDAVEmptyElement):
     namespace = ischedule_namespace
-    name = "inline-attachment"
+    name = "inline"
 
 
 @registerElement
-class ExternalAttachment (WebDAVEmptyElement):
+class External (WebDAVEmptyElement):
     namespace = ischedule_namespace
-    name = "external-attachment"
+    name = "external"
 
 
 @registerElement
-class SupportedRecipientURISchemeSet (WebDAVElement):
-    namespace = ischedule_namespace
-    name = "supported-recipient-uri-scheme-set"
-    allowed_children = {
-        (ischedule_namespace, "scheme"): (1, None),
-    }
-
-
- at registerElement
-class Scheme (WebDAVTextElement):
-    namespace = ischedule_namespace
-    name = "scheme"
-
-
- at registerElement
 class MaxContentLength (WebDAVTextElement):
     namespace = ischedule_namespace
     name = "max-content-length"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120829/51b11aad/attachment.html>