[CalendarServer-changes] [8946] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Wed Mar 28 14:27:28 PDT 2012
Revision: 8946
http://trac.macosforge.org/projects/calendarserver/changeset/8946
Author: sagen at apple.com
Date: 2012-03-28 14:27:28 -0700 (Wed, 28 Mar 2012)
Log Message:
-----------
Tests the addition of common-name, first-name, and last-name to invite-reply notifications.
Modified Paths:
--------------
CalDAVTester/trunk/Resource/CalDAV/default-alarms/sharing/3.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/3.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/3.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/invites/double/5.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/multiple/2.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/multiple/3.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/5.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/3.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/3.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/6.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/1.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/4.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/setup/3.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/setup/6.xml
CalDAVTester/trunk/Resource/CardDAV/sharing/addressbooks/read-only/3.xml
CalDAVTester/trunk/Resource/CardDAV/sharing/addressbooks/read-write/3.xml
CalDAVTester/trunk/Resource/CardDAV/sharing/replies/accept/3.xml
CalDAVTester/trunk/Resource/CardDAV/sharing/replies/accept/6.xml
CalDAVTester/trunk/Resource/CardDAV/sharing/replies/decline/1.xml
CalDAVTester/trunk/Resource/CardDAV/sharing/replies/decline/4.xml
CalDAVTester/trunk/Resource/CardDAV/sharing/setup/3.xml
CalDAVTester/trunk/Resource/CardDAV/sharing/setup/6.xml
CalDAVTester/trunk/Resource/Common/POST/sharingreply2.xml
CalDAVTester/trunk/Resource/Common/POST/sharingreply23.xml
CalDAVTester/trunk/Resource/Common/POST/sharingreply24.xml
CalDAVTester/trunk/Resource/Common/POST/sharingreply3.xml
CalDAVTester/trunk/scripts/server/serverinfo-template.xml
CalDAVTester/trunk/scripts/server/serverinfo.xml
Modified: CalDAVTester/trunk/Resource/CalDAV/default-alarms/sharing/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/default-alarms/sharing/3.xml 2012-03-28 17:36:08 UTC (rev 8945)
+++ CalDAVTester/trunk/Resource/CalDAV/default-alarms/sharing/3.xml 2012-03-28 21:27:28 UTC (rev 8946)
@@ -1,10 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?>
<invite-reply xmlns='http://calendarserver.org/ns/'>
- <href xmlns='DAV:'>$principaluri1:</href>
+ <href xmlns='DAV:'>mailto:$email1:</href>
<invite-accepted/>
<hosturl>
<href xmlns='DAV:'>$calendarhome2:/shared</href>
</hosturl>
<in-reply-to>$inviteuid:</in-reply-to>
<summary>The Shared Calendar</summary>
+ <common-name>$username1:</common-name>
+ <first-name>$firstname1:</first-name>
+ <last-name>$lastname1:</last-name>
</invite-reply>
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/3.xml 2012-03-28 17:36:08 UTC (rev 8945)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/3.xml 2012-03-28 21:27:28 UTC (rev 8946)
@@ -1,10 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?>
<invite-reply xmlns='http://calendarserver.org/ns/'>
- <href xmlns='DAV:'>$principaluri2:</href>
+ <href xmlns='DAV:'>mailto:$email2:</href>
<invite-accepted/>
<hosturl>
<href xmlns='DAV:'>$calendarhome1:/shared</href>
</hosturl>
<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>
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/3.xml 2012-03-28 17:36:08 UTC (rev 8945)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/3.xml 2012-03-28 21:27:28 UTC (rev 8946)
@@ -1,10 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?>
<invite-reply xmlns='http://calendarserver.org/ns/'>
- <href xmlns='DAV:'>$principaluri2:</href>
+ <href xmlns='DAV:'>mailto:$email2:</href>
<invite-accepted/>
<hosturl>
<href xmlns='DAV:'>$calendarhome1:/shared</href>
</hosturl>
<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>
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/invites/double/5.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/invites/double/5.xml 2012-03-28 17:36:08 UTC (rev 8945)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/invites/double/5.xml 2012-03-28 21:27:28 UTC (rev 8946)
@@ -1,10 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?>
<invite-reply xmlns='http://calendarserver.org/ns/'>
- <href xmlns='DAV:'>$principaluri2:</href>
+ <href xmlns='DAV:'>mailto:$email2:</href>
<invite-accepted/>
<hosturl>
<href xmlns='DAV:'>$calendarhome1:/shared2</href>
</hosturl>
<in-reply-to>$inviteuid2:</in-reply-to>
<summary>The Shared Calendar #2</summary>
+ <common-name>$username2:</common-name>
+ <first-name>$firstname2:</first-name>
+ <last-name>$lastname2:</last-name>
</invite-reply>
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/multiple/2.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/multiple/2.xml 2012-03-28 17:36:08 UTC (rev 8945)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/multiple/2.xml 2012-03-28 21:27:28 UTC (rev 8946)
@@ -1,10 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?>
<invite-reply xmlns='http://calendarserver.org/ns/'>
- <href xmlns='DAV:'>$principaluri2:</href>
+ <href xmlns='DAV:'>mailto:$email2:</href>
<invite-accepted/>
<hosturl>
<href xmlns='DAV:'>$calendarhome1:/shared1</href>
</hosturl>
<in-reply-to>$inviteuid1:</in-reply-to>
<summary>The Shared Calendar #1</summary>
+ <common-name>$username2:</common-name>
+ <first-name>$firstname2:</first-name>
+ <last-name>$lastname2:</last-name>
</invite-reply>
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/multiple/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/multiple/3.xml 2012-03-28 17:36:08 UTC (rev 8945)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/multiple/3.xml 2012-03-28 21:27:28 UTC (rev 8946)
@@ -1,10 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?>
<invite-reply xmlns='http://calendarserver.org/ns/'>
- <href xmlns='DAV:'>$principaluri2:</href>
+ <href xmlns='DAV:'>mailto:$email2:</href>
<invite-accepted/>
<hosturl>
<href xmlns='DAV:'>$calendarhome1:/shared2</href>
</hosturl>
<in-reply-to>$inviteuid2:</in-reply-to>
<summary>The Shared Calendar #2</summary>
+ <common-name>$username2:</common-name>
+ <first-name>$firstname2:</first-name>
+ <last-name>$lastname2:</last-name>
</invite-reply>
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/5.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/5.xml 2012-03-28 17:36:08 UTC (rev 8945)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/5.xml 2012-03-28 21:27:28 UTC (rev 8946)
@@ -1,10 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?>
<invite-reply xmlns='http://calendarserver.org/ns/'>
- <href xmlns='DAV:'>$principaluri2:</href>
+ <href xmlns='DAV:'>mailto:$email2:</href>
<invite-accepted/>
<hosturl>
<href xmlns='DAV:'>$calendarhome1:/shared</href>
</hosturl>
<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>
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/3.xml 2012-03-28 17:36:08 UTC (rev 8945)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/3.xml 2012-03-28 21:27:28 UTC (rev 8946)
@@ -1,10 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?>
<invite-reply xmlns='http://calendarserver.org/ns/'>
- <href xmlns='DAV:'>$principaluri2:</href>
+ <href xmlns='DAV:'>mailto:$email2:</href>
<invite-accepted/>
<hosturl>
<href xmlns='DAV:'>$calendarhome1:/shared</href>
</hosturl>
<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>
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/3.xml 2012-03-28 17:36:08 UTC (rev 8945)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/3.xml 2012-03-28 21:27:28 UTC (rev 8946)
@@ -1,10 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?>
<invite-reply xmlns='http://calendarserver.org/ns/'>
- <href xmlns='DAV:'>$principaluri2:</href>
+ <href xmlns='DAV:'>mailto:$email2:</href>
<invite-accepted/>
<hosturl>
<href xmlns='DAV:'>$calendarhome1:/shared</href>
</hosturl>
<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>
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/6.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/6.xml 2012-03-28 17:36:08 UTC (rev 8945)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/6.xml 2012-03-28 21:27:28 UTC (rev 8946)
@@ -1,12 +1,15 @@
<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
<dtstamp></dtstamp>
<invite-reply xmlns='http://calendarserver.org/ns/'>
- <href xmlns='DAV:'>$principaluri2:</href>
+ <href xmlns='DAV:'>mailto:$email2:</href>
<invite-accepted/>
<hosturl>
<href xmlns='DAV:'>$calendarhome1:/shared</href>
</hosturl>
<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/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/1.xml 2012-03-28 17:36:08 UTC (rev 8945)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/1.xml 2012-03-28 21:27:28 UTC (rev 8946)
@@ -1,10 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?>
<invite-reply xmlns='http://calendarserver.org/ns/'>
- <href xmlns='DAV:'>$principaluri2:</href>
+ <href xmlns='DAV:'>mailto:$email2:</href>
<invite-declined/>
<hosturl>
<href xmlns='DAV:'>$calendarhome1:/shared</href>
</hosturl>
<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>
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/4.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/4.xml 2012-03-28 17:36:08 UTC (rev 8945)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/4.xml 2012-03-28 21:27:28 UTC (rev 8946)
@@ -1,11 +1,14 @@
<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
<dtstamp></dtstamp>
<invite-reply xmlns='http://calendarserver.org/ns/'>
- <href xmlns='DAV:'>$principaluri2:</href>
+ <href xmlns='DAV:'>mailto:$email2:</href>
<invite-declined/>
<hosturl>
<href xmlns='DAV:'>$calendarhome1:/shared</href>
</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/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/setup/3.xml 2012-03-28 17:36:08 UTC (rev 8945)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/setup/3.xml 2012-03-28 21:27:28 UTC (rev 8946)
@@ -1,10 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?>
<invite-reply xmlns='http://calendarserver.org/ns/'>
- <href xmlns='DAV:'>$principaluri2:</href>
+ <href xmlns='DAV:'>mailto:$email2:</href>
<invite-accepted/>
<hosturl>
<href xmlns='DAV:'>$calendarhome1:/shared</href>
</hosturl>
<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>
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/setup/6.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/setup/6.xml 2012-03-28 17:36:08 UTC (rev 8945)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/setup/6.xml 2012-03-28 21:27:28 UTC (rev 8946)
@@ -1,12 +1,15 @@
<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
<dtstamp></dtstamp>
<invite-reply xmlns='http://calendarserver.org/ns/'>
- <href xmlns='DAV:'>$principaluri2:</href>
+ <href xmlns='DAV:'>mailto:$email2:</href>
<invite-accepted/>
<hosturl>
<href xmlns='DAV:'>$calendarhome1:/shared</href>
</hosturl>
<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/addressbooks/read-only/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/sharing/addressbooks/read-only/3.xml 2012-03-28 17:36:08 UTC (rev 8945)
+++ CalDAVTester/trunk/Resource/CardDAV/sharing/addressbooks/read-only/3.xml 2012-03-28 21:27:28 UTC (rev 8946)
@@ -1,10 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?>
<invite-reply xmlns='http://calendarserver.org/ns/'>
- <href xmlns='DAV:'>$principaluri2:</href>
+ <href xmlns='DAV:'>mailto:$email2:</href>
<invite-accepted/>
<hosturl>
<href xmlns='DAV:'>$addressbookhome1:/shared</href>
</hosturl>
<in-reply-to>$inviteuid:</in-reply-to>
<summary>The 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/addressbooks/read-write/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/sharing/addressbooks/read-write/3.xml 2012-03-28 17:36:08 UTC (rev 8945)
+++ CalDAVTester/trunk/Resource/CardDAV/sharing/addressbooks/read-write/3.xml 2012-03-28 21:27:28 UTC (rev 8946)
@@ -1,10 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?>
<invite-reply xmlns='http://calendarserver.org/ns/'>
- <href xmlns='DAV:'>$principaluri2:</href>
+ <href xmlns='DAV:'>mailto:$email2:</href>
<invite-accepted/>
<hosturl>
<href xmlns='DAV:'>$addressbookhome1:/shared</href>
</hosturl>
<in-reply-to>$inviteuid:</in-reply-to>
<summary>The 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/replies/accept/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/sharing/replies/accept/3.xml 2012-03-28 17:36:08 UTC (rev 8945)
+++ CalDAVTester/trunk/Resource/CardDAV/sharing/replies/accept/3.xml 2012-03-28 21:27:28 UTC (rev 8946)
@@ -1,10 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?>
<invite-reply xmlns='http://calendarserver.org/ns/'>
- <href xmlns='DAV:'>$principaluri2:</href>
+ <href xmlns='DAV:'>mailto:$email2:</href>
<invite-accepted/>
<hosturl>
<href xmlns='DAV:'>$addressbookhome1:/shared</href>
</hosturl>
<in-reply-to>$inviteuid:</in-reply-to>
<summary>The 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/replies/accept/6.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/sharing/replies/accept/6.xml 2012-03-28 17:36:08 UTC (rev 8945)
+++ CalDAVTester/trunk/Resource/CardDAV/sharing/replies/accept/6.xml 2012-03-28 21:27:28 UTC (rev 8946)
@@ -1,12 +1,15 @@
<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
<dtstamp></dtstamp>
<invite-reply xmlns='http://calendarserver.org/ns/'>
- <href xmlns='DAV:'>$principaluri2:</href>
+ <href xmlns='DAV:'>mailto:$email2:</href>
<invite-accepted/>
<hosturl>
<href xmlns='DAV:'>$addressbookhome1:/shared</href>
</hosturl>
<in-reply-to>$inviteuid:</in-reply-to>
<summary>The 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/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/sharing/replies/decline/1.xml 2012-03-28 17:36:08 UTC (rev 8945)
+++ CalDAVTester/trunk/Resource/CardDAV/sharing/replies/decline/1.xml 2012-03-28 21:27:28 UTC (rev 8946)
@@ -1,10 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?>
<invite-reply xmlns='http://calendarserver.org/ns/'>
- <href xmlns='DAV:'>$principaluri2:</href>
+ <href xmlns='DAV:'>mailto:$email2:</href>
<invite-declined/>
<hosturl>
<href xmlns='DAV:'>$addressbookhome1:/shared</href>
</hosturl>
<in-reply-to>$inviteuid:</in-reply-to>
<summary>The 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/replies/decline/4.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/sharing/replies/decline/4.xml 2012-03-28 17:36:08 UTC (rev 8945)
+++ CalDAVTester/trunk/Resource/CardDAV/sharing/replies/decline/4.xml 2012-03-28 21:27:28 UTC (rev 8946)
@@ -1,11 +1,14 @@
<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
<dtstamp></dtstamp>
<invite-reply xmlns='http://calendarserver.org/ns/'>
- <href xmlns='DAV:'>$principaluri2:</href>
+ <href xmlns='DAV:'>mailto:$email2:</href>
<invite-declined/>
<hosturl>
<href xmlns='DAV:'>$addressbookhome1:/shared</href>
</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/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/sharing/setup/3.xml 2012-03-28 17:36:08 UTC (rev 8945)
+++ CalDAVTester/trunk/Resource/CardDAV/sharing/setup/3.xml 2012-03-28 21:27:28 UTC (rev 8946)
@@ -1,10 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?>
<invite-reply xmlns='http://calendarserver.org/ns/'>
- <href xmlns='DAV:'>$principaluri2:</href>
+ <href xmlns='DAV:'>mailto:$email2:</href>
<invite-accepted/>
<hosturl>
<href xmlns='DAV:'>$addressbookhome1:/shared</href>
</hosturl>
<in-reply-to>$inviteuid:</in-reply-to>
<summary>The 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/setup/6.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/sharing/setup/6.xml 2012-03-28 17:36:08 UTC (rev 8945)
+++ CalDAVTester/trunk/Resource/CardDAV/sharing/setup/6.xml 2012-03-28 21:27:28 UTC (rev 8946)
@@ -1,12 +1,15 @@
<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
<dtstamp></dtstamp>
<invite-reply xmlns='http://calendarserver.org/ns/'>
- <href xmlns='DAV:'>$principaluri2:</href>
+ <href xmlns='DAV:'>mailto:$email2:</href>
<invite-accepted/>
<hosturl>
<href xmlns='DAV:'>$addressbookhome1:/shared</href>
</hosturl>
<in-reply-to>$inviteuid:</in-reply-to>
<summary>The 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/Common/POST/sharingreply2.xml
===================================================================
--- CalDAVTester/trunk/Resource/Common/POST/sharingreply2.xml 2012-03-28 17:36:08 UTC (rev 8945)
+++ CalDAVTester/trunk/Resource/Common/POST/sharingreply2.xml 2012-03-28 21:27:28 UTC (rev 8946)
@@ -1,10 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?>
<invite-reply xmlns='http://calendarserver.org/ns/'>
- <href xmlns='DAV:'>$principaluri2:</href>
+ <href xmlns='DAV:'>mailto:$email2:</href>
<invite-accepted/>
<hosturl>
<href xmlns='DAV:'>$calendarhome1:/shared</href>
</hosturl>
<in-reply-to>$inviteuid2:</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>
Modified: CalDAVTester/trunk/Resource/Common/POST/sharingreply23.xml
===================================================================
--- CalDAVTester/trunk/Resource/Common/POST/sharingreply23.xml 2012-03-28 17:36:08 UTC (rev 8945)
+++ CalDAVTester/trunk/Resource/Common/POST/sharingreply23.xml 2012-03-28 21:27:28 UTC (rev 8946)
@@ -1,10 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?>
<invite-reply xmlns='http://calendarserver.org/ns/'>
- <href xmlns='DAV:'>$principalurl3:</href>
+ <href xmlns='DAV:'>mailto:$email3:</href>
<invite-accepted/>
<hosturl>
<href xmlns='DAV:'>$calendarhome2:/shared</href>
</hosturl>
<in-reply-to>$inviteuid3:</in-reply-to>
<summary>The Shared Calendar</summary>
+ <common-name>$username3:</common-name>
+ <first-name>$firstname3:</first-name>
+ <last-name>$lastname3:</last-name>
</invite-reply>
Modified: CalDAVTester/trunk/Resource/Common/POST/sharingreply24.xml
===================================================================
--- CalDAVTester/trunk/Resource/Common/POST/sharingreply24.xml 2012-03-28 17:36:08 UTC (rev 8945)
+++ CalDAVTester/trunk/Resource/Common/POST/sharingreply24.xml 2012-03-28 21:27:28 UTC (rev 8946)
@@ -1,10 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?>
<invite-reply xmlns='http://calendarserver.org/ns/'>
- <href xmlns='DAV:'>$principalurl4:</href>
+ <href xmlns='DAV:'>mailto:$email4:</href>
<invite-accepted/>
<hosturl>
<href xmlns='DAV:'>$calendarhome2:/shared</href>
</hosturl>
<in-reply-to>$inviteuid4:</in-reply-to>
<summary>The Shared Calendar</summary>
+ <common-name>$username4:</common-name>
+ <first-name>$firstname4:</first-name>
+ <last-name>$lastname4:</last-name>
</invite-reply>
Modified: CalDAVTester/trunk/Resource/Common/POST/sharingreply3.xml
===================================================================
--- CalDAVTester/trunk/Resource/Common/POST/sharingreply3.xml 2012-03-28 17:36:08 UTC (rev 8945)
+++ CalDAVTester/trunk/Resource/Common/POST/sharingreply3.xml 2012-03-28 21:27:28 UTC (rev 8946)
@@ -1,10 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?>
<invite-reply xmlns='http://calendarserver.org/ns/'>
- <href xmlns='DAV:'>$principalur3:</href>
+ <href xmlns='DAV:'>mailto:$email3:</href>
<invite-accepted/>
<hosturl>
<href xmlns='DAV:'>$calendarhome1:/shared</href>
</hosturl>
<in-reply-to>$inviteuid3:</in-reply-to>
<summary>The Shared Calendar</summary>
+ <common-name>$username3:</common-name>
+ <first-name>$firstname3:</first-name>
+ <last-name>$lastname3:</last-name>
</invite-reply>
Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2012-03-28 17:36:08 UTC (rev 8945)
+++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2012-03-28 21:27:28 UTC (rev 8946)
@@ -391,6 +391,16 @@
<key>$username-encoded%%d:</key>
<value>User%%%%20%%02d</value>
</substitution>
+ <!-- first name -->
+ <substitution>
+ <key>$firstname%d:</key>
+ <value>User</value>
+ </substitution>
+ <!-- last name -->
+ <substitution>
+ <key>$lastname%d:</key>
+ <value>%02d</value>
+ </substitution>
<!-- password -->
<substitution>
<key>$pswd%%d:</key>
Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml 2012-03-28 17:36:08 UTC (rev 8945)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml 2012-03-28 21:27:28 UTC (rev 8946)
@@ -391,6 +391,16 @@
<key>$username-encoded%d:</key>
<value>User%%20%02d</value>
</substitution>
+ <!-- first name -->
+ <substitution>
+ <key>$firstname%d:</key>
+ <value>User</value>
+ </substitution>
+ <!-- last name -->
+ <substitution>
+ <key>$lastname%d:</key>
+ <value>%02d</value>
+ </substitution>
<!-- password -->
<substitution>
<key>$pswd%d:</key>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120328/c50890c9/attachment-0001.html>
More information about the calendarserver-changes
mailing list