[CalendarServer-changes] [5286] CalDAVTester/branches/users/cdaboo/sharing-5228

source_changes at macosforge.org source_changes at macosforge.org
Thu Mar 11 13:47:52 PST 2010 

Revision: 5286
          http://trac.macosforge.org/projects/calendarserver/changeset/5286
Author:   cdaboo at apple.com
Date:     2010-03-11 13:47:50 -0800 (Thu, 11 Mar 2010)
Log Message:
-----------
Update for XML schema changes.

Modified Paths:
--------------
    CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/invites/new/2.xml
    CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/invites/updatenew/2.xml
    CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/accept/2.xml
    CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/accept/3.xml
    CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/decline/1.xml
    CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/sharing-invites.xml

Modified: CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/invites/new/2.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/invites/new/2.xml	2010-03-11 19:09:42 UTC (rev 5285)
+++ CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/invites/new/2.xml	2010-03-11 21:47:50 UTC (rev 5286)
@@ -1,8 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
   <dtstamp></dtstamp>
   <uid></uid>
-  <sequence>1</sequence>
-  <invite-notification>
+  <invite-notification shared-type='calendar'>
     <href xmlns='DAV:'>/principals/__uids__/user02/</href>
     <invite-noresponse/>
     <access>
@@ -11,10 +10,6 @@
     <hosturl>
       <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
     </hosturl>
-    <resourcetype xmlns="DAV:">
-      <collection />
-      <calendar xmlns="urn:ietf:params:xml:ns:caldav" />
-    </resourcetype>
     <organizer>
       <href xmlns='DAV:'>/principals/__uids__/user01/</href>
     </organizer>

Modified: CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/invites/updatenew/2.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/invites/updatenew/2.xml	2010-03-11 19:09:42 UTC (rev 5285)
+++ CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/invites/updatenew/2.xml	2010-03-11 21:47:50 UTC (rev 5286)
@@ -1,8 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
   <dtstamp></dtstamp>
   <uid></uid>
-  <sequence>2</sequence>
-  <invite-notification>
+  <invite-notification shared-type='calendar'>
     <href xmlns='DAV:'>/principals/__uids__/user02/</href>
     <invite-noresponse/>
     <access>
@@ -11,10 +10,6 @@
     <hosturl>
       <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
     </hosturl>
-    <resourcetype xmlns="DAV:">
-      <collection />
-      <calendar xmlns="urn:ietf:params:xml:ns:caldav" />
-    </resourcetype>
     <organizer>
       <href xmlns='DAV:'>/principals/__uids__/user01/</href>
     </organizer>

Modified: CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/accept/2.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/accept/2.xml	2010-03-11 19:09:42 UTC (rev 5285)
+++ CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/accept/2.xml	2010-03-11 21:47:50 UTC (rev 5286)
@@ -1,8 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
   <dtstamp></dtstamp>
   <uid></uid>
-  <sequence>1</sequence>
-  <invite-notification>
+  <invite-notification shared-type='calendar'>
     <href xmlns='DAV:'>/principals/__uids__/user02/</href>
     <invite-noresponse/>
     <access>
@@ -11,10 +10,6 @@
     <hosturl>
       <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
     </hosturl>
-    <resourcetype xmlns="DAV:">
-      <collection />
-      <calendar xmlns="urn:ietf:params:xml:ns:caldav" />
-    </resourcetype>
     <organizer>
       <href xmlns='DAV:'>/principals/__uids__/user01/</href>
     </organizer>

Modified: CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/accept/3.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/accept/3.xml	2010-03-11 19:09:42 UTC (rev 5285)
+++ CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/accept/3.xml	2010-03-11 21:47:50 UTC (rev 5286)
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<invite-notification xmlns='http://calendarserver.org/ns/'>
+<invite-reply xmlns='http://calendarserver.org/ns/'>
   <href xmlns='DAV:'>/principals/__uids__/user02/</href>
-  <uid>$inviteuid:</uid>
+  <in-reply-to>$inviteuid:</in-reply-to>
   <invite-accepted/>
   <hosturl>
     <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
   </hosturl>
   <summary>The Shared Calendar</summary>
-</invite-notification>
+</invite-reply>

Modified: CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/decline/1.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/decline/1.xml	2010-03-11 19:09:42 UTC (rev 5285)
+++ CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/decline/1.xml	2010-03-11 21:47:50 UTC (rev 5286)
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<invite-notification xmlns='http://calendarserver.org/ns/'>
+<invite-reply xmlns='http://calendarserver.org/ns/'>
   <href xmlns='DAV:'>/principals/__uids__/user02/</href>
-  <uid>$inviteuid:</uid>
+  <in-reply-to>$inviteuid:</in-reply-to>
   <invite-declined/>
   <hosturl>
     <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
   </hosturl>
   <summary>The Shared Calendar</summary>
-</invite-notification>
+</invite-reply>

Modified: CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/sharing-invites.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/sharing-invites.xml	2010-03-11 19:09:42 UTC (rev 5285)
+++ CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/sharing-invites.xml	2010-03-11 21:47:50 UTC (rev 5286)
@@ -103,7 +103,7 @@
 					<callback>propfindValues</callback>
 					<arg>
 						<name>props</name>
-						<value><![CDATA[http://calendarserver.org/ns/notification-type$invite-notification]]></value>
+						<value><![CDATA[http://calendarserver.org/ns/notification-type$<invite-notification shared-type="calendar"/>]]></value>
 					</arg>
 				</verify>
 			</request>
@@ -165,7 +165,7 @@
 					<callback>propfindValues</callback>
 					<arg>
 						<name>props</name>
-						<value><![CDATA[http://calendarserver.org/ns/notification-type$invite-notification]]></value>
+						<value><![CDATA[http://calendarserver.org/ns/notification-type$<invite-notification shared-type="calendar"/>]]></value>
 					</arg>
 				</verify>
 			</request>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100311/9df79589/attachment-0001.html>

More information about the calendarserver-changes mailing list