Skip to content
Permalink
Browse files

use $cuaddrurn instead of $cuaddr; add CardDAV main address book shar…

  • Loading branch information...
bgaya committed Jul 11, 2012
1 parent 014f05c commit eb22b0ac3f341cbcbf1b885a5ed8d970fcf36f17
Showing with 597 additions and 23 deletions.
  1. +1 −1 Resource/CalDAV/sharing/calendars/read-only/2.xml
  2. +1 −1 Resource/CalDAV/sharing/calendars/read-write/2.xml
  3. +1 −1 Resource/CalDAV/sharing/invites/double/2.xml
  4. +1 −1 Resource/CalDAV/sharing/invites/double/4.xml
  5. +1 −1 Resource/CalDAV/sharing/invites/new/2.xml
  6. +1 −1 Resource/CalDAV/sharing/invites/updatenew/2.xml
  7. +1 −1 Resource/CalDAV/sharing/notification-sync/13.xml
  8. +1 −1 Resource/CalDAV/sharing/notification-sync/6.xml
  9. +1 −1 Resource/CalDAV/sharing/peruser-properties/read-write/2.xml
  10. +1 −1 Resource/CalDAV/sharing/replies/accept/2.xml
  11. +1 −1 Resource/CalDAV/sharing/replies/accept/5.xml
  12. +1 −1 Resource/CalDAV/sharing/replies/decline/3.xml
  13. +1 −1 Resource/CalDAV/sharing/setup/2.xml
  14. +1 −1 Resource/CalDAV/sharing/setup/5.xml
  15. +8 −0 Resource/CardDAV/sharing/addressbooks/main/1.xml
  16. +19 −0 Resource/CardDAV/sharing/addressbooks/main/10.xml
  17. +19 −0 Resource/CardDAV/sharing/addressbooks/main/2.xml
  18. +13 −0 Resource/CardDAV/sharing/addressbooks/main/3.xml
  19. +8 −0 Resource/CardDAV/sharing/addressbooks/main/4.xml
  20. +11 −0 Resource/CardDAV/sharing/addressbooks/main/5.vcf
  21. +11 −0 Resource/CardDAV/sharing/addressbooks/main/6.vcf
  22. +11 −0 Resource/CardDAV/sharing/addressbooks/main/7.vcf
  23. +11 −0 Resource/CardDAV/sharing/addressbooks/main/8.vcf
  24. +6 −0 Resource/CardDAV/sharing/addressbooks/main/9.xml
  25. +1 −1 Resource/CardDAV/sharing/addressbooks/read-only/2.xml
  26. +1 −1 Resource/CardDAV/sharing/addressbooks/read-write/2.xml
  27. +1 −1 Resource/CardDAV/sharing/replies/accept/2.xml
  28. +1 −1 Resource/CardDAV/sharing/replies/accept/5.xml
  29. +1 −1 Resource/CardDAV/sharing/replies/decline/3.xml
  30. +1 −1 Resource/CardDAV/sharing/setup/2.xml
  31. +1 −1 Resource/CardDAV/sharing/setup/5.xml
  32. +1 −1 scripts/tests/CalDAV/sharing-calendars.xml
  33. +458 −1 scripts/tests/CardDAV/sharing-addressbooks.xml
@@ -2,7 +2,7 @@
<dtstamp></dtstamp>
<invite-notification shared-type='calendar'>
<uid></uid>
<href xmlns='DAV:'>$cuaddr2:</href>
<href xmlns='DAV:'>$cuaddrurn2:</href>
<invite-accepted/>
<access>
<read/>
@@ -3,7 +3,7 @@
<dtstamp></dtstamp>
<invite-notification shared-type='calendar'>
<uid></uid>
<href xmlns='DAV:'>$cuaddr2:</href>
<href xmlns='DAV:'>$cuaddrurn2:</href>
<invite-noresponse/>
<access>
<read-write/>
@@ -2,7 +2,7 @@
<dtstamp></dtstamp>
<invite-notification shared-type='calendar'>
<uid></uid>
<href xmlns='DAV:'>$cuaddr2:</href>
<href xmlns='DAV:'>$cuaddrurn2:</href>
<invite-noresponse/>
<access>
<read-write/>
@@ -2,7 +2,7 @@
<dtstamp></dtstamp>
<invite-notification shared-type='calendar'>
<uid></uid>
<href xmlns='DAV:'>$cuaddr2:</href>
<href xmlns='DAV:'>$cuaddrurn2:</href>
<invite-noresponse/>
<access>
<read-write/>
@@ -2,7 +2,7 @@
<dtstamp></dtstamp>
<invite-notification shared-type='calendar'>
<uid></uid>
<href xmlns='DAV:'>$cuaddr2:</href>
<href xmlns='DAV:'>$cuaddrurn2:</href>
<invite-noresponse/>
<access>
<read-write/>
@@ -2,7 +2,7 @@
<dtstamp></dtstamp>
<invite-notification shared-type='calendar'>
<uid></uid>
<href xmlns='DAV:'>$cuaddr2:</href>
<href xmlns='DAV:'>$cuaddrurn2:</href>
<invite-noresponse/>
<access>
<read/>
@@ -2,7 +2,7 @@
<dtstamp></dtstamp>
<invite-notification shared-type='calendar'>
<uid></uid>
<href xmlns='DAV:'>$cuaddr2:</href>
<href xmlns='DAV:'>$cuaddrurn2:</href>
<invite-declined/>
<access>
<read-write/>
@@ -2,7 +2,7 @@
<dtstamp></dtstamp>
<invite-notification shared-type='calendar'>
<uid></uid>
<href xmlns='DAV:'>$cuaddr2:</href>
<href xmlns='DAV:'>$cuaddrurn2:</href>
<invite-noresponse/>
<access>
<read-write/>
@@ -2,7 +2,7 @@
<dtstamp></dtstamp>
<invite-notification shared-type='calendar'>
<uid></uid>
<href xmlns='DAV:'>$cuaddr2:</href>
<href xmlns='DAV:'>$cuaddrurn2:</href>
<invite-noresponse/>
<access>
<read-write/>
@@ -2,7 +2,7 @@
<dtstamp></dtstamp>
<invite-notification shared-type='calendar'>
<uid></uid>
<href xmlns='DAV:'>$cuaddr2:</href>
<href xmlns='DAV:'>$cuaddrurn2:</href>
<invite-noresponse/>
<access>
<read-write/>
@@ -6,7 +6,7 @@
<invite xmlns='http://calendarserver.org/ns/'>
<user>
<uid></uid>
<href xmlns='DAV:'>$cuaddr2:</href>
<href xmlns='DAV:'>$cuaddrurn2:</href>
<common-name>User 02</common-name>
<access>
<read-write/>
@@ -6,7 +6,7 @@
<invite xmlns='http://calendarserver.org/ns/'>
<user>
<uid></uid>
<href xmlns='DAV:'>$cuaddr2:</href>
<href xmlns='DAV:'>$cuaddrurn2:</href>
<common-name>User 02</common-name>
<access>
<read-write/>
@@ -2,7 +2,7 @@
<dtstamp></dtstamp>
<invite-notification shared-type='calendar'>
<uid></uid>
<href xmlns='DAV:'>$cuaddr2:</href>
<href xmlns='DAV:'>$cuaddrurn2:</href>
<invite-noresponse/>
<access>
<read-write/>
@@ -6,7 +6,7 @@
<invite xmlns='http://calendarserver.org/ns/'>
<user>
<uid></uid>
<href xmlns='DAV:'>$cuaddr2:</href>
<href xmlns='DAV:'>$cuaddrurn2:</href>
<common-name>User 02</common-name>
<access>
<read-write/>
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8" ?>
<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
<CS:set>
<D:href>$cuaddr2:</D:href>
<CS:summary>My Main Shared Address Book</CS:summary>
<CS:read-write/>
</CS:set>
</CS:share>
@@ -0,0 +1,19 @@
<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
<dtstamp></dtstamp>
<invite-notification shared-type='addressbook'>
<uid></uid>
<href xmlns='DAV:'>$cuaddrurn2:</href>
<invite-deleted/>
<access>
<read-write/>
</access>
<hosturl>
<href xmlns='DAV:'>$addressbookpath1:</href>
</hosturl>
<organizer>
<href xmlns='DAV:'>$principaluri1:</href>
<common-name>User 01</common-name>
</organizer>
<summary>The Shared Address Book</summary>
</invite-notification>
</notification>
@@ -0,0 +1,19 @@
<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
<dtstamp></dtstamp>
<invite-notification shared-type='addressbook'>
<uid></uid>
<href xmlns='DAV:'>$cuaddrurn2:</href>
<invite-noresponse/>
<access>
<read-write/>
</access>
<hosturl>
<href xmlns='DAV:'>$addressbookpath1:</href>
</hosturl>
<organizer>
<href xmlns='DAV:'>$principaluri1:</href>
<common-name>User 01</common-name>
</organizer>
<summary>My Main Shared Address Book</summary>
</invite-notification>
</notification>
@@ -0,0 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?>
<invite-reply xmlns='http://calendarserver.org/ns/'>
<href xmlns='DAV:'>mailto:$email2:</href>
<invite-accepted/>
<hosturl>
<href xmlns='DAV:'>$addressbookpath1:</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>
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8" ?>
<D:propfind xmlns:D="DAV:">
<D:prop>
<D:resourcetype/>
<D:owner/>
<D:current-user-privilege-set/>
</D:prop>
</D:propfind>
@@ -0,0 +1,11 @@
BEGIN:VCARD
VERSION:3.0
N:Thompson;Default;;;
FN:Default Thompson
EMAIL;type=INTERNET;type=WORK;type=pref:lthompson@example.com
TEL;type=WORK;type=pref:1-555-555-5555
TEL;type=CELL:1-444-444-4444
item1.ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
item1.X-ABADR:us
UID:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E1:ABPerson-1
END:VCARD
@@ -0,0 +1,11 @@
BEGIN:VCARD
VERSION:3.0
N:Thompson;Default;;;
FN:Default Thompson
EMAIL;type=INTERNET;type=WORK;type=pref:lthompson@example.com
TEL;type=WORK;type=pref:1-555-555-5555
TEL;type=CELL:1-444-444-4444
item1.ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
item1.X-ABADR:us
UID:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E1:ABPerson-1
END:VCARD
@@ -0,0 +1,11 @@
BEGIN:VCARD
VERSION:3.0
N:Thompson;Default;;;
FN:Default Thompson
EMAIL;type=INTERNET;type=WORK;type=pref:lthompson@example.com
TEL;type=WORK;type=pref:1-555-555-5555
TEL;type=CELL:1-444-444-4444
item1.ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
item1.X-ABADR:us
UID:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E1:ABPerson-2
END:VCARD
@@ -0,0 +1,11 @@
BEGIN:VCARD
VERSION:3.0
N:Thompson;Default;;;
FN:Default Thompson
EMAIL;type=INTERNET;type=WORK;type=pref:lthompson@example.com
TEL;type=WORK;type=pref:1-555-555-5555
TEL;type=CELL:1-444-444-4444
item1.ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
item1.X-ABADR:us
UID:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E1:ABPerson-2
END:VCARD
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
<CS:remove>
<D:href>$cuaddr2:</D:href>
</CS:remove>
</CS:share>
@@ -2,7 +2,7 @@
<dtstamp></dtstamp>
<invite-notification shared-type='addressbook'>
<uid></uid>
<href xmlns='DAV:'>$cuaddr2:</href>
<href xmlns='DAV:'>$cuaddrurn2:</href>
<invite-accepted/>
<access>
<read/>
@@ -2,7 +2,7 @@
<dtstamp></dtstamp>
<invite-notification shared-type='addressbook'>
<uid></uid>
<href xmlns='DAV:'>$cuaddr2:</href>
<href xmlns='DAV:'>$cuaddrurn2:</href>
<invite-noresponse/>
<access>
<read-write/>
@@ -2,7 +2,7 @@
<dtstamp></dtstamp>
<invite-notification shared-type='addressbook'>
<uid></uid>
<href xmlns='DAV:'>$cuaddr2:</href>
<href xmlns='DAV:'>$cuaddrurn2:</href>
<invite-noresponse/>
<access>
<read-write/>
@@ -6,7 +6,7 @@
<invite xmlns='http://calendarserver.org/ns/'>
<user>
<uid></uid>
<href xmlns='DAV:'>$cuaddr2:</href>
<href xmlns='DAV:'>$cuaddrurn2:</href>
<common-name>User 02</common-name>
<access>
<read-write/>
@@ -6,7 +6,7 @@
<invite xmlns='http://calendarserver.org/ns/'>
<user>
<uid></uid>
<href xmlns='DAV:'>$cuaddr2:</href>
<href xmlns='DAV:'>$cuaddrurn2:</href>
<common-name>User 02</common-name>
<access>
<read-write/>
@@ -2,7 +2,7 @@
<dtstamp></dtstamp>
<invite-notification shared-type='addressbook'>
<uid></uid>
<href xmlns='DAV:'>$cuaddr2:</href>
<href xmlns='DAV:'>$cuaddrurn2:</href>
<invite-noresponse/>
<access>
<read-write/>
@@ -6,7 +6,7 @@
<invite xmlns='http://calendarserver.org/ns/'>
<user>
<uid></uid>
<href xmlns='DAV:'>$cuaddr2:</href>
<href xmlns='DAV:'>$cuaddrurn2:</href>
<common-name>User 02</common-name>
<access>
<read-write/>
@@ -178,7 +178,7 @@
<value>$verify-property-prefix:/{http://calendarserver.org/ns/}invite/{http://calendarserver.org/ns/}organizer/{DAV:}href[=$principaluri1:]</value>
<value>$verify-property-prefix:/{http://calendarserver.org/ns/}invite/{http://calendarserver.org/ns/}organizer/{http://calendarserver.org/ns/}common-name[=$username1:]</value>
<value>$verify-property-prefix:/{http://calendarserver.org/ns/}invite/{http://calendarserver.org/ns/}user</value>
<value>$verify-property-prefix:/{http://calendarserver.org/ns/}invite/{http://calendarserver.org/ns/}user/{DAV:}href[=$cuaddr2:]</value>
<value>$verify-property-prefix:/{http://calendarserver.org/ns/}invite/{http://calendarserver.org/ns/}user/{DAV:}href[=$cuaddrurn2:]</value>
<value>$verify-property-prefix:/{http://calendarserver.org/ns/}invite/{http://calendarserver.org/ns/}user/{http://calendarserver.org/ns/}access/{http://calendarserver.org/ns/}read-write</value>
<value>$verify-property-prefix:/{http://calendarserver.org/ns/}invite/{http://calendarserver.org/ns/}user/{http://calendarserver.org/ns/}invite-accepted</value>
</arg>

0 comments on commit eb22b0a

Please sign in to comment.
You can’t perform that action at this time.