[CalendarServer-changes] [13204] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Tue Apr 8 13:36:34 PDT 2014


Revision: 13204
          http://trac.calendarserver.org//changeset/13204
Author:   cdaboo at apple.com
Date:     2014-04-08 13:36:34 -0700 (Tue, 08 Apr 2014)
Log Message:
-----------
Server no longer uses first/last names.

Modified Paths:
--------------
    CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/6.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/4.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/setup/6.xml
    CalDAVTester/trunk/Resource/CardDAV/sharing/replies/accept/6.xml
    CalDAVTester/trunk/Resource/CardDAV/sharing/replies/decline/4.xml
    CalDAVTester/trunk/Resource/CardDAV/sharing/setup/15.xml
    CalDAVTester/trunk/Resource/CardDAV/sharing/setup/6.xml
    CalDAVTester/trunk/Resource/CardDAV/sharing/unshare/shareedecline/1.xml
    CalDAVTester/trunk/Resource/CardDAV/sharing/unshare/shareedecline/2.xml
    CalDAVTester/trunk/Resource/CardDAV/sharing/unshare/shareedecline/3.xml
    CalDAVTester/trunk/Resource/CardDAV/sharing/unshare/shareedecline/4.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/sharing-cache.xml

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/6.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/6.xml	2014-04-08 20:22:36 UTC (rev 13203)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/6.xml	2014-04-08 20:36:34 UTC (rev 13204)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
   <dtstamp></dtstamp>
-  <invite-reply xmlns='http://calendarserver.org/ns/'>
+  <invite-reply shared-type='calendar' xmlns='http://calendarserver.org/ns/'>
     <href xmlns='DAV:'>mailto:$email2:</href>
     <invite-accepted/>
     <hosturl>
@@ -9,7 +9,5 @@
     <in-reply-to>$inviteuid:</in-reply-to>
     <summary>The Shared Calendar</summary>
     <common-name>$username2:</common-name>
-    <first-name>$firstname2:</first-name>
-    <last-name>$lastname2:</last-name>
   </invite-reply>
 </notification>

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/4.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/4.xml	2014-04-08 20:22:36 UTC (rev 13203)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/4.xml	2014-04-08 20:36:34 UTC (rev 13204)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
   <dtstamp></dtstamp>
-  <invite-reply xmlns='http://calendarserver.org/ns/'>
+  <invite-reply shared-type='calendar' xmlns='http://calendarserver.org/ns/'>
     <href xmlns='DAV:'>mailto:$email2:</href>
     <invite-declined/>
     <hosturl>
@@ -8,7 +8,5 @@
     </hosturl>
     <in-reply-to>$inviteuid:</in-reply-to>
     <common-name>$username2:</common-name>
-    <first-name>$firstname2:</first-name>
-    <last-name>$lastname2:</last-name>
   </invite-reply>
 </notification>

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/setup/6.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/setup/6.xml	2014-04-08 20:22:36 UTC (rev 13203)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/setup/6.xml	2014-04-08 20:36:34 UTC (rev 13204)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
   <dtstamp></dtstamp>
-  <invite-reply xmlns='http://calendarserver.org/ns/'>
+  <invite-reply shared-type="calendar" xmlns='http://calendarserver.org/ns/'>
     <href xmlns='DAV:'>mailto:$email2:</href>
     <invite-accepted/>
     <hosturl>
@@ -9,7 +9,5 @@
     <in-reply-to>$inviteuid:</in-reply-to>
     <summary>The Shared Calendar</summary>
     <common-name>$username2:</common-name>
-    <first-name>$firstname2:</first-name>
-    <last-name>$lastname2:</last-name>
   </invite-reply>
 </notification>

Modified: CalDAVTester/trunk/Resource/CardDAV/sharing/replies/accept/6.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/sharing/replies/accept/6.xml	2014-04-08 20:22:36 UTC (rev 13203)
+++ CalDAVTester/trunk/Resource/CardDAV/sharing/replies/accept/6.xml	2014-04-08 20:36:34 UTC (rev 13204)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
   <dtstamp></dtstamp>
-  <invite-reply xmlns='http://calendarserver.org/ns/'>
+  <invite-reply shared-type="addressbook" xmlns='http://calendarserver.org/ns/'>
     <href xmlns='DAV:'>$cuaddrurn2:</href>
     <invite-accepted/>
     <hosturl>
@@ -9,7 +9,5 @@
     <in-reply-to>$inviteuid:</in-reply-to>
     <summary>My Shared Address Book</summary>
     <common-name>$username2:</common-name>
-    <first-name>$firstname2:</first-name>
-    <last-name>$lastname2:</last-name>
   </invite-reply>
 </notification>

Modified: CalDAVTester/trunk/Resource/CardDAV/sharing/replies/decline/4.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/sharing/replies/decline/4.xml	2014-04-08 20:22:36 UTC (rev 13203)
+++ CalDAVTester/trunk/Resource/CardDAV/sharing/replies/decline/4.xml	2014-04-08 20:36:34 UTC (rev 13204)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
   <dtstamp></dtstamp>
-  <invite-reply xmlns='http://calendarserver.org/ns/'>
+  <invite-reply shared-type="addressbook" xmlns='http://calendarserver.org/ns/'>
     <href xmlns='DAV:'>$cuaddrurn2:</href>
     <invite-declined/>
     <hosturl>
@@ -8,7 +8,5 @@
     </hosturl>
     <in-reply-to>$inviteuid:</in-reply-to>
     <common-name>$username2:</common-name>
-    <first-name>$firstname2:</first-name>
-    <last-name>$lastname2:</last-name>
   </invite-reply>
 </notification>

Modified: CalDAVTester/trunk/Resource/CardDAV/sharing/setup/15.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/sharing/setup/15.xml	2014-04-08 20:22:36 UTC (rev 13203)
+++ CalDAVTester/trunk/Resource/CardDAV/sharing/setup/15.xml	2014-04-08 20:36:34 UTC (rev 13204)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
   <dtstamp></dtstamp>
-  <invite-reply xmlns='http://calendarserver.org/ns/'>
+  <invite-reply shared-type="group" xmlns='http://calendarserver.org/ns/'>
     <href xmlns='DAV:'>$cuaddrurn2:</href>
     <invite-accepted/>
     <hosturl>
@@ -9,7 +9,5 @@
     <in-reply-to>$inviteuid:</in-reply-to>
     <summary>Read-Only Group123</summary>
     <common-name>$username2:</common-name>
-    <first-name>$firstname2:</first-name>
-    <last-name>$lastname2:</last-name>
   </invite-reply>
 </notification>

Modified: CalDAVTester/trunk/Resource/CardDAV/sharing/setup/6.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/sharing/setup/6.xml	2014-04-08 20:22:36 UTC (rev 13203)
+++ CalDAVTester/trunk/Resource/CardDAV/sharing/setup/6.xml	2014-04-08 20:36:34 UTC (rev 13204)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
   <dtstamp></dtstamp>
-  <invite-reply xmlns='http://calendarserver.org/ns/'>
+  <invite-reply shared-type='addressbook' xmlns='http://calendarserver.org/ns/'>
     <href xmlns='DAV:'>$cuaddrurn2:</href>
     <invite-accepted/>
     <hosturl>
@@ -9,7 +9,5 @@
     <in-reply-to>$inviteuid:</in-reply-to>
     <summary>My Shared Address Book</summary>
     <common-name>$username2:</common-name>
-    <first-name>$firstname2:</first-name>
-    <last-name>$lastname2:</last-name>
   </invite-reply>
 </notification>

Modified: CalDAVTester/trunk/Resource/CardDAV/sharing/unshare/shareedecline/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/sharing/unshare/shareedecline/1.xml	2014-04-08 20:22:36 UTC (rev 13203)
+++ CalDAVTester/trunk/Resource/CardDAV/sharing/unshare/shareedecline/1.xml	2014-04-08 20:36:34 UTC (rev 13204)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
   <dtstamp></dtstamp>
-  <invite-reply xmlns='http://calendarserver.org/ns/'>
+  <invite-reply shared-type="addressbook" xmlns='http://calendarserver.org/ns/'>
     <href xmlns='DAV:'>$cuaddrurn2:</href>
     <invite-declined/>
     <hosturl>
@@ -8,7 +8,5 @@
     </hosturl>
     <in-reply-to>$inviteuid:</in-reply-to>
     <common-name>$username2:</common-name>
-    <first-name>$firstname2:</first-name>
-    <last-name>$lastname2:</last-name>
   </invite-reply>
 </notification>

Modified: CalDAVTester/trunk/Resource/CardDAV/sharing/unshare/shareedecline/2.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/sharing/unshare/shareedecline/2.xml	2014-04-08 20:22:36 UTC (rev 13203)
+++ CalDAVTester/trunk/Resource/CardDAV/sharing/unshare/shareedecline/2.xml	2014-04-08 20:36:34 UTC (rev 13204)
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<invite-reply xmlns='http://calendarserver.org/ns/'>
+<invite-reply shared-type="addressbook" xmlns='http://calendarserver.org/ns/'>
   <href xmlns='DAV:'>$cuaddrurn2:</href>
   <invite-declined/>
   <hosturl>
@@ -8,6 +8,4 @@
   <in-reply-to>$inviteuid:</in-reply-to>
   <summary>My Shared Address Book</summary>
   <common-name>$username2:</common-name>
-  <first-name>$firstname2:</first-name>
-  <last-name>$lastname2:</last-name>
 </invite-reply>

Modified: CalDAVTester/trunk/Resource/CardDAV/sharing/unshare/shareedecline/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/sharing/unshare/shareedecline/3.xml	2014-04-08 20:22:36 UTC (rev 13203)
+++ CalDAVTester/trunk/Resource/CardDAV/sharing/unshare/shareedecline/3.xml	2014-04-08 20:36:34 UTC (rev 13204)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
   <dtstamp></dtstamp>
-  <invite-reply xmlns='http://calendarserver.org/ns/'>
+  <invite-reply shared-type="group" xmlns='http://calendarserver.org/ns/'>
     <href xmlns='DAV:'>$cuaddrurn2:</href>
     <invite-declined/>
     <hosturl>
@@ -8,7 +8,5 @@
     </hosturl>
     <in-reply-to>$inviteuid:</in-reply-to>
     <common-name>$username2:</common-name>
-    <first-name>$firstname2:</first-name>
-    <last-name>$lastname2:</last-name>
   </invite-reply>
 </notification>

Modified: CalDAVTester/trunk/Resource/CardDAV/sharing/unshare/shareedecline/4.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/sharing/unshare/shareedecline/4.xml	2014-04-08 20:22:36 UTC (rev 13203)
+++ CalDAVTester/trunk/Resource/CardDAV/sharing/unshare/shareedecline/4.xml	2014-04-08 20:36:34 UTC (rev 13204)
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<invite-reply xmlns='http://calendarserver.org/ns/'>
+<invite-reply shared-type="addressbook" xmlns='http://calendarserver.org/ns/'>
   <href xmlns='DAV:'>$cuaddrurn2:</href>
   <invite-declined/>
   <hosturl>
@@ -8,6 +8,4 @@
   <in-reply-to>$inviteuid:</in-reply-to>
   <summary>Read-Only Group123</summary>
   <common-name>$username2:</common-name>
-  <first-name>$firstname2:</first-name>
-  <last-name>$lastname2:</last-name>
 </invite-reply>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-cache.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-cache.xml	2014-04-08 20:22:36 UTC (rev 13203)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-cache.xml	2014-04-08 20:36:34 UTC (rev 13204)
@@ -101,7 +101,7 @@
 					<callback>dataString</callback>
 					<arg>
 						<name>contains</name>
-						<value>user02</value>
+						<value>$userguid2:</value>
 					</arg>
 				</verify>
 			</request>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140408/5b2989e4/attachment-0001.html>


More information about the calendarserver-changes mailing list